fix for replacing a value inside an iterable in a super template

Sam Pullara · Sam Pullara · commit 20f2fe311557 · 2012-07-17T10:48:53.000-07:00
diff --git a/compiler/src/main/java/com/github/mustachejava/Mustache.java b/compiler/src/main/java/com/github/mustachejava/Mustache.java
@@ -13,7 +13,7 @@ public interface Mustache extends Code {
   void append(String text);
 
   /**
-   * Shallow clone of the mustache object.
+   * Deep clone of the mustache object.
    * @return
    */
   Object clone();
diff --git a/compiler/src/main/java/com/github/mustachejava/codes/DefaultCode.java b/compiler/src/main/java/com/github/mustachejava/codes/DefaultCode.java
@@ -13,17 +13,29 @@ public class DefaultCode implements Code, Cloneable {
   // Final once init() is complete
   protected String appended;
 
+  protected Mustache mustache;
   protected final ObjectHandler oh;
   protected final String name;
   protected final TemplateContext tc;
-  protected final Mustache mustache;
   protected final String type;
   protected final boolean returnThis;
   protected final Binding binding;
 
   public Object clone() {
     try {
-      return super.clone();
+      DefaultCode code = (DefaultCode) super.clone();
+      Code[] codes = code.getCodes();
+      if (codes != null) {
+        codes = codes.clone();
+        for (int i = 0; codes != null && i < codes.length; i++) {
+          codes[i] = (Code) codes[i].clone();
+        }
+        code.setCodes(codes);
+      }
+      if (mustache != null) {
+        code.mustache = (Mustache) mustache.clone();
+      }
+      return code;
     } catch (CloneNotSupportedException e) {
       throw new MustacheException("Clone not supported");
     }
diff --git a/compiler/src/main/java/com/github/mustachejava/codes/ExtendCode.java b/compiler/src/main/java/com/github/mustachejava/codes/ExtendCode.java
@@ -68,7 +68,8 @@ public synchronized void init() {
                 "Illegal code in extend section: " + code.getClass().getName());
       }
     }
-    partial = (Mustache) mf.compile(partialName()).clone();
+    Mustache original = mf.compile(partialName());
+    partial = (Mustache) original.clone();
     Code[] supercodes = partial.getCodes();
     // recursively replace named sections with replacements
     partial.setCodes(replaceCodes(supercodes, replaceMap));
diff --git a/compiler/src/test/java/com/github/mustachejava/ExtensionTest.java b/compiler/src/test/java/com/github/mustachejava/ExtensionTest.java
@@ -4,6 +4,7 @@
 import org.junit.Test;
 
 import java.io.*;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -77,6 +78,18 @@ public void testSubSub() throws MustacheException, IOException, ExecutionExcepti
     assertEquals(getContents(root, "subsub.txt"), sw.toString());
   }
 
+  @Test
+  public void testClientMethod() throws MustacheException, IOException, ExecutionException, InterruptedException {
+    MustacheFactory c = new DefaultMustacheFactory(root);
+    Mustache m = c.compile("client.html");
+    StringWriter sw = new StringWriter();
+    Map scope = new HashMap();
+    scope.put("reply", "TestReply");
+    scope.put("commands", Arrays.asList("a", "b"));
+    m.execute(sw, scope);
+    assertEquals(getContents(root, "client.txt"), sw.toString());
+  }
+
   protected String getContents(File root, String file) throws IOException {
     BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(new File(root, file)),"UTF-8"));
     StringWriter capture = new StringWriter();
diff --git a/compiler/src/test/resources/client.html b/compiler/src/test/resources/client.html
@@ -0,0 +1,11 @@
+{{#commands}}
+{{<method}}
+{{$method}}execute{{/method}}
+{{/method}}
+{{/commands}}
+{{#commands}}
+{{<method}}
+{{$method}}pipeline{{/method}}
+{{$return}}New reply {{reply}}{{/return}}
+{{/method}}
+{{/commands}}
diff --git a/compiler/src/test/resources/client.txt b/compiler/src/test/resources/client.txt
@@ -0,0 +1,12 @@
+1:TestReply
+2:TestReply execute
+3:TestReply execute
+1:TestReply
+2:TestReply execute
+3:TestReply execute
+1:New reply TestReply
+2:New reply TestReply pipeline
+3:New reply TestReply pipeline
+1:New reply TestReply
+2:New reply TestReply pipeline
+3:New reply TestReply pipeline
diff --git a/compiler/src/test/resources/method.html b/compiler/src/test/resources/method.html
@@ -0,0 +1,5 @@
+1:{{$return}}{{reply}}{{/return}}
+{{#toString}}
+2:{{$return}}{{reply}}{{/return}} {{$method}}method{{/method}}
+3:{{$return}}{{reply}}{{/return}} {{$method}}method{{/method}}
+{{/toString}}

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ public synchronized void init() {`
`68`	`68`	`"Illegal code in extend section: " + code.getClass().getName());`
`69`	`69`	`}`
`70`	`70`	`}`
`71`		`- partial = (Mustache) mf.compile(partialName()).clone();`
	`71`	`+ Mustache original = mf.compile(partialName());`
	`72`	`+ partial = (Mustache) original.clone();`
`72`	`73`	`Code[] supercodes = partial.getCodes();`
`73`	`74`	`// recursively replace named sections with replacements`
`74`	`75`	`partial.setCodes(replaceCodes(supercodes, replaceMap));`