Allow to chain escapers fix #521

Author: jknack

handlebars/src/main/java/com/github/jknack/handlebars/EscapingStrategy.java

@@ -49,7 +49,7 @@ public interface EscapingStrategy {
    * @author edgar
    * @since 4.0.4
    */
-  public class Hbs implements EscapingStrategy {
+  class Hbs implements EscapingStrategy {
 
     /** EMPTY. */
     private static final String EMPTY = "";

handlebars/src/main/java/com/github/jknack/handlebars/Handlebars.java

@@ -1042,6 +1042,16 @@ public Handlebars with(final EscapingStrategy escapingStrategy) {
     return this;
   }
 
+  /**
+   * Set a new {@link EscapingStrategy}.
+   *
+   * @param chain The escaping strategy. Required.
+   * @return This handlebars object.
+   */
+  public Handlebars with(final EscapingStrategy... chain) {
+    return with(newEscapeChain(chain));
+  }
+
   /**
    * @return A formatter chain.
    */
@@ -1381,4 +1391,22 @@ public Handlebars setCharset(final Charset charset) {
   public Charset getCharset() {
     return charset;
   }
+
+  /**
+   * Chain escape strategies.
+   *
+   * @param chain Escape to chain.
+   * @return Composite escape strategy.
+   */
+  private static EscapingStrategy newEscapeChain(final EscapingStrategy[] chain) {
+    return new EscapingStrategy() {
+      @Override public CharSequence escape(final CharSequence value) {
+        CharSequence result = value;
+        for (EscapingStrategy escape : chain) {
+          result = escape.escape(result);
+        }
+        return result;
+      }
+    };
+  }
 }

handlebars/src/test/java/com/github/jknack/handlebars/issues/Issue478.java

@@ -1,22 +1,35 @@
 package com.github.jknack.handlebars.issues;
 
+import com.github.jknack.handlebars.EscapingStrategy;
+import com.github.jknack.handlebars.Handlebars;
 import com.github.jknack.handlebars.v4Test;
 import org.junit.Test;
 
 import java.io.IOException;
 
 public class Issue478 extends v4Test {
 
-  @Test
-  public void whiteSpaceControlShouldWorkOnElse() throws IOException {
-    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{else}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", true)), "<b>\n");
-    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{else}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", false)), "\n<i>");
+  public static class Foo implements EscapingStrategy {
+
+    @Override public CharSequence escape(CharSequence value) {
+      return value.toString().replace("foo", "bar");
+    }
+  }
+
+  public static class Bar implements EscapingStrategy {
 
-    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{~else~}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", true)), "<b>");
-    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{~else~}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", false)), "<i>");
+    @Override public CharSequence escape(CharSequence value) {
+      return value.toString().replace("bar", "$bar$");
+    }
+  }
+
+  @Override protected void configure(Handlebars handlebars) {
+    handlebars.with(new Foo(), new Bar());
+  }
 
-    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{~^~}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", true)), "<b>");
-    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{~^~}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", false)), "<i>");
+  @Test
+  public void shouldAllowToChainEscapeStrategy() throws IOException {
+    shouldCompileTo("{{var}}", $("hash", $("var", "foo")), "$bar$");
   }
 
 }

handlebars/src/test/java/com/github/jknack/handlebars/issues/Issue521.java

@@ -0,0 +1,22 @@
+package com.github.jknack.handlebars.issues;
+
+import com.github.jknack.handlebars.v4Test;
+import org.junit.Test;
+
+import java.io.IOException;
+
+public class Issue521 extends v4Test {
+
+  @Test
+  public void whiteSpaceControlShouldWorkOnElse() throws IOException {
+    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{else}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", true)), "<b>\n");
+    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{else}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", false)), "\n<i>");
+
+    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{~else~}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", true)), "<b>");
+    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{~else~}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", false)), "<i>");
+
+    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{~^~}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", true)), "<b>");
+    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{~^~}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", false)), "<i>");
+  }
+
+}