Improve template method.

Author: javadev

src/main/java/com/github/underscore/$.java

@@ -39,8 +39,6 @@ public class $<T> {
         put("interpolate", "<%=([\\s\\S]+?)%>");
         put("escape", "<%-([\\s\\S]+?)%>");
     } };
-    private static final int GROUP_INDEX_2 = 2;
-    private static final int GROUP_INDEX_3 = 3;
     private static final int ARRAY_SIZE_2 = 2;
     private static final int MIN_PASSWORD_LENGTH_8 = 8;
     private static final long CAPACITY_SIZE_5 = 5L;
@@ -123,6 +121,10 @@ public String apply(Map<K, V> value) {
                     "\\s*\\Q" + ((Map.Entry) element).getKey()
                     + "\\E\\s*")).matcher(result).replaceAll(escape(String.valueOf(((Map.Entry) element)
                     .getValue())));
+                result = java.util.regex.Pattern.compile(evaluate.replace(ALL_SYMBOLS,
+                    "\\s*\\Q" + ((Map.Entry) element).getKey()
+                    + "\\E\\s*")).matcher(result).replaceAll(String.valueOf(((Map.Entry) element)
+                    .getValue()));
             }
             return result;
         }

src/test/java/com/github/underscore/UtilityTest.java

@@ -250,6 +250,14 @@ public void templateValue2() {
                 put("name", "moe"); put("value", "<script>"); } }));
     }
 
+    @Test
+    public void templateValue3() {
+        Template<Map<String, Object>> template = $.template("hello: <% name %>, <b><%- value %></b>");
+        assertEquals("hello: moe, <b>&lt;script&gt;</b>",
+            template.apply(new LinkedHashMap<String, Object>() { {
+                put("name", "moe"); put("value", "<script>"); } }));
+    }
+
 /*
 var object = {cheese: 'crumpets', stuff: function(){ return 'nonsense'; }};
 _.result(object, 'cheese');