You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2015/03/12 15:04:22 UTC
svn commit: r1666197 - in /sling/trunk/contrib/scripting/sightly:
engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/
testing-content/src/main/resources/SLING-INF/
testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/tem...
Author: radu
Date: Thu Mar 12 14:04:21 2015
New Revision: 1666197
URL: http://svn.apache.org/r1666197
Log:
SLING-4489 - Sightly: Hyphenated identifiers cause a compilation exception in Sightly generated Java classes
* added hyphen checks and parsing exception throwing
* added integration tests
(applied patch sent by Vlad Băilescu; closes #68)
Added:
sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/template/
sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/template/bad-id.html
sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/template/template.html
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/VariableAnalyzer.java
sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/sightly.json
sling/trunk/contrib/scripting/sightly/testing/src/test/java/org/apache/sling/scripting/sightly/it/SlingSpecificsSightlyIT.java
Modified: sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/VariableAnalyzer.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/VariableAnalyzer.java?rev=1666197&r1=1666196&r2=1666197&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/VariableAnalyzer.java (original)
+++ sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/VariableAnalyzer.java Thu Mar 12 14:04:21 2015
@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import org.apache.sling.scripting.sightly.impl.compiler.SightlyParsingException;
import org.apache.sling.scripting.sightly.impl.compiler.util.VariableTracker;
/**
@@ -133,7 +134,7 @@ public class VariableAnalyzer {
private VariableDescriptor dynamicDescriptor(String original) {
VariableDescriptor descriptor = dynamicVariables.get(original);
if (descriptor == null) {
- String dynamicName = findDynamicName(original);
+ String dynamicName = findDynamicName(validName(original));
descriptor = new VariableDescriptor(original, dynamicName, Type.UNKNOWN, VariableScope.DYNAMIC);
dynamicVariables.put(original, descriptor);
variables.add(descriptor);
@@ -142,7 +143,7 @@ public class VariableAnalyzer {
}
private String findDynamicName(String original) {
- return DYNAMIC_PREFIX + original;
+ return DYNAMIC_PREFIX + syntaxSafeName(original);
}
private String findGlobalName(String original) {
@@ -166,6 +167,13 @@ public class VariableAnalyzer {
return original.replaceAll("-", "_");
}
+ private String validName(String name) {
+ if (name == null || name.contains("-")) {
+ throw new SightlyParsingException("Unsupported identifier name: " + name);
+ }
+ return name.toLowerCase();
+ }
+
static {
javaKeywords.add("abstract");
javaKeywords.add("continue");
Added: sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/template/bad-id.html
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/template/bad-id.html?rev=1666197&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/template/bad-id.html (added)
+++ sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/template/bad-id.html Thu Mar 12 14:04:21 2015
@@ -0,0 +1 @@
+<template data-sly-template.bad-template-id=" @ ">should produce parsing exception</template>
Added: sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/template/template.html
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/template/template.html?rev=1666197&view=auto
==============================================================================
--- sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/template/template.html (added)
+++ sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/template/template.html Thu Mar 12 14:04:21 2015
@@ -0,0 +1,2 @@
+<template data-sly-template.templ=" @ ">SUCCESS</template>
+<div id="template" data-sly-call="${templ}"></div>
\ No newline at end of file
Modified: sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/sightly.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/sightly.json?rev=1666197&r1=1666196&r2=1666197&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/sightly.json (original)
+++ sling/trunk/contrib/scripting/sightly/testing-content/src/main/resources/SLING-INF/sightly.json Thu Mar 12 14:04:21 2015
@@ -12,5 +12,9 @@
"includedresource": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "/apps/sightly/scripts/includedresource"
+ },
+ "template": {
+ "jcr:primaryType": "nt:unstructured",
+ "sling:resourceType": "/apps/sightly/scripts/template"
}
}
Modified: sling/trunk/contrib/scripting/sightly/testing/src/test/java/org/apache/sling/scripting/sightly/it/SlingSpecificsSightlyIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/testing/src/test/java/org/apache/sling/scripting/sightly/it/SlingSpecificsSightlyIT.java?rev=1666197&r1=1666196&r2=1666197&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/sightly/testing/src/test/java/org/apache/sling/scripting/sightly/it/SlingSpecificsSightlyIT.java (original)
+++ sling/trunk/contrib/scripting/sightly/testing/src/test/java/org/apache/sling/scripting/sightly/it/SlingSpecificsSightlyIT.java Thu Mar 12 14:04:21 2015
@@ -34,6 +34,8 @@ public class SlingSpecificsSightlyIT {
private static final String SLING_USE = "/sightly/use.html";
private static final String SLING_JAVA_USE_NPE = "/sightly/use.javaerror.html";
private static final String SLING_RESOURCE = "/sightly/resource.html";
+ private static final String SLING_TEMPLATE = "/sightly/template.html";
+ private static final String SLING_TEMPLATE_BAD_IDENTIFIER = "/sightly/template.bad-id.html";
@BeforeClass
public static void init() {
@@ -76,4 +78,18 @@ public class SlingSpecificsSightlyIT {
assertEquals("It works", HTMLExtractor.innerHTML(url, pageContent, "#dot"));
}
+ @Test
+ public void testDataSlyTemplate() {
+ String url = launchpadURL + SLING_TEMPLATE;
+ String pageContent = client.getStringContent(url, 200);
+ assertEquals("SUCCESS", HTMLExtractor.innerHTML(url, pageContent, "#template"));
+ }
+
+ @Test
+ public void testBadTemplateIdentifier() {
+ String url = launchpadURL + SLING_TEMPLATE_BAD_IDENTIFIER;
+ String pageContent = client.getStringContent(url, 500);
+ assertTrue(pageContent.contains("org.apache.sling.scripting.sightly.impl.compiler.SightlyParsingException"));
+ }
+
}