Improve escape/unescape methods.

Author: javadev

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

@@ -1653,14 +1653,14 @@ public static long now() {
         return new Date().getTime();
     }
 
-    public static String escape(String value) {
+    public static String escape(final String value) {
         return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;")
-            .replaceAll("\"", "&quot;");
+            .replaceAll("\"", "&quot;").replaceAll("'", "&#x27;").replaceAll("`", "&#x60;");
     }
 
-    public static String unescape(String value) {
-        return value.replaceAll("&lt;", "<").replaceAll("&gt;", ">").replaceAll("&quot;", "\"")
-            .replaceAll("&amp;", "&");
+    public static String unescape(final String value) {
+        return value.replaceAll("&#x60;", "`").replaceAll("&#x27;", "'").replaceAll("&lt;", "<")
+            .replaceAll("&gt;", ">").replaceAll("&quot;", "\"").replaceAll("&amp;", "&");
     }
 
     public static <E> Object result(final Iterable<E> iterable, final Predicate<E> pred) {

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

@@ -155,21 +155,21 @@ public String apply(final String string) {
     }
 
 /*
-_.escape('Curly, Larry & Moe');
-=> "Curly, Larry & Moe"
+_.escape('Curly, Larry & Moe < > "\'`');
+=> "Curly, Larry &amp; Moe &lt; &gt; &quot;&#x27;&#x60;"
 */
     @Test
     public void escape() {
-        assertEquals("Curly, Larry &amp; Moe", $.escape("Curly, Larry & Moe"));
+        assertEquals("Curly, Larry &amp; Moe &lt; &gt; &quot;&#x27;&#x60;", $.escape("Curly, Larry & Moe < > \"'`"));
     }
 
 /*
-_.unescape('Curly, Larry &amp; Moe');
-=> "Curly, Larry & Moe"
+_.unescape('Curly, Larry &amp; Moe &lt; &gt; &quot;&#x27;&#x60;');
+=> "Curly, Larry & Moe < > \"'`"
 */
     @Test
     public void unescape() {
-        assertEquals("Curly, Larry & Moe", $.unescape("Curly, Larry &amp; Moe"));
+        assertEquals("Curly, Larry & Moe < > \"'`", $.unescape("Curly, Larry &amp; Moe &lt; &gt; &quot;&#x27;&#x60;"));
     }
 
 /*