Merge pull request #41 from Optum/support-lowercase

Add lowercase support.

Author: JohnMThayer

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.optum.templ</groupId>
     <artifactId>templ</artifactId>
-    <version>1.0.X-SNAPSHOT</version>
+    <version>1.1.X-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>templ</name>

templ-lib/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.optum.templ</groupId>
         <artifactId>templ</artifactId>
-        <version>1.0.X-SNAPSHOT</version>
+        <version>1.1.X-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

templ-lib/src/main/java/com/optum/templ/TemplEngine.java

@@ -9,6 +9,7 @@
 public class TemplEngine {
     private static final String EMPTY_STRING = "";
     private static final String TO_UPPER_COMMAND_PREFIX = "^";
+    private static final String TO_LOWER_COMMAND_PREFIX = "~";
 
     private static final String TEMPLATE_CANARY = "{{";
     /**
@@ -27,7 +28,7 @@ public class TemplEngine {
      *   \ needs to be Regex escaped with a backslash.  Java has to escape BOTH backslashes.  So it becomes \\\\
      */
     private static final String DELIMITERS = "[ ,.;:?&@#/()<>_\\-\\\\|]";
-    private static final Pattern PREFIX_PATTERN = Pattern.compile("^(" + DELIMITERS + "*)(\\^?)");
+    private static final Pattern PREFIX_PATTERN = Pattern.compile("^(" + DELIMITERS + "*)([\\^~]?)");
     private static final Pattern SUFFIX_PATTERN = Pattern.compile("(" + DELIMITERS + "+)$");
 
     final TemplDataSource dataSource;
@@ -73,14 +74,17 @@ public String processTemplate(String rawValue) throws TemplException {
     private String resolveTemplateFragment(String template) throws TemplException {
         final String prefix;
         final boolean uppercase;
+        final boolean lowercase;
         Matcher prefixMatcher = PREFIX_PATTERN.matcher(template);
         if (prefixMatcher.find())  {
             prefix = prefixMatcher.group(1);
             uppercase = TO_UPPER_COMMAND_PREFIX.equals(prefixMatcher.group(2));
-            template = template.substring(prefix.length()+(uppercase?1:0));
+            lowercase = TO_LOWER_COMMAND_PREFIX.equals(prefixMatcher.group(2));
+            template = template.substring(prefix.length()+((uppercase||lowercase)?1:0));
         } else {
             prefix = EMPTY_STRING;
             uppercase = false;
+            lowercase = false;
         }
 
         final String suffix;
@@ -100,7 +104,17 @@ private String resolveTemplateFragment(String template) throws TemplException {
                 throw new MissingKeyTemplException(template);
             }
         } else if (!result.isEmpty()) {
-            return prefix + (uppercase ? result.toUpperCase() : result) + suffix;
+            StringBuilder sb = new StringBuilder();
+            sb.append(prefix);
+            if (uppercase) {
+                sb.append(result.toUpperCase().replace("-","_"));
+            } else if (lowercase) {
+                sb.append(result.toLowerCase().replace("_","-"));
+            } else {
+                sb.append(result);
+            }
+            sb.append(suffix);
+            return sb.toString();
         } else {
             return EMPTY_STRING;
         }

templ-lib/src/test/groovy/com/optum/templ/TemplEngineSpec.groovy

@@ -192,7 +192,7 @@ class TemplEngineSpec extends Specification {
     def "Template Substitution Supports Uppercase Results" () {
         when:
         map.clear()
-        map.put("ENV", "dev")
+        map.put("ENV", "dev-a_b")
         TemplEngine te = new TemplEngine(ds)
         String result = te.processTemplate(template)
 
@@ -201,13 +201,31 @@ class TemplEngineSpec extends Specification {
 
         where:
         template        | expected
-        'A{{^ENV}}Z'    | 'ADEVZ'
-        'A{{.^ENV}}Z'   | 'A.DEVZ'
-        'A{{.__^ENV}}Z' | 'A.__DEVZ'
-        'A{{^ENV.}}Z'   | 'ADEV.Z'
-        'A{{.^ENV.}}Z'  | 'A.DEV.Z'
+        'A{{^ENV}}Z'    | 'ADEV_A_BZ'
+        'A{{.^ENV}}Z'   | 'A.DEV_A_BZ'
+        'A{{.__^ENV}}Z' | 'A.__DEV_A_BZ'
+        'A{{^ENV.}}Z'   | 'ADEV_A_B.Z'
+        'A{{.^ENV.}}Z'  | 'A.DEV_A_B.Z'
     }
 
+    def "Template Substitution Supports Lowercase Results" () {
+        when:
+        map.clear()
+        map.put("ENV", "DEV-A_B")
+        TemplEngine te = new TemplEngine(ds)
+        String result = te.processTemplate(template)
+
+        then:
+        result == expected
+
+        where:
+        template        | expected
+        'A{{~ENV}}Z'    | 'Adev-a-bZ'
+        'A{{.~ENV}}Z'   | 'A.dev-a-bZ'
+        'A{{.__~ENV}}Z' | 'A.__dev-a-bZ'
+        'A{{~ENV.}}Z'   | 'Adev-a-b.Z'
+        'A{{.~ENV.}}Z'  | 'A.dev-a-b.Z'
+    }
 
     def "Exception - Template Substitution Missing Value" () {
         when: