Merge branch 'master' of github.com:spullara/mustache.java

spullara · spullara · commit 314ad1542035 · 2012-10-27T11:59:32.000-07:00
diff --git a/compiler/src/main/java/com/github/mustachejava/reflect/SimpleObjectHandler.java b/compiler/src/main/java/com/github/mustachejava/reflect/SimpleObjectHandler.java
@@ -67,6 +67,9 @@ public Object call(Object[] scopes) throws GuardException {
               Wrapper wrapper = find(name.substring(0, index), subscope);
               if (wrapper != null) {
                 scope = wrapper.call(subscope);
+                if (scope == null) {
+                  continue;
+                }
                 subscope = new Object[]{scope};
                 return find(name.substring(index + 1), new Object[]{subscope}).call(subscope);
               }
diff --git a/compiler/src/test/java/com/github/mustachejava/InterpreterTest.java b/compiler/src/test/java/com/github/mustachejava/InterpreterTest.java
@@ -1,5 +1,6 @@
 package com.github.mustachejava;
 
+import com.github.mustachejava.reflect.SimpleObjectHandler;
 import com.github.mustachejava.util.CapturingMustacheVisitor;
 import com.github.mustachejavabenchmarks.JsonCapturer;
 import com.github.mustachejavabenchmarks.JsonInterpreterTest;
@@ -97,6 +98,31 @@ int taxed_value() {
     assertEquals(getContents(root, "simple.txt"), sw.toString());
   }
 
+  private class OkGenerator {
+    public boolean isItOk() {
+      return true;
+    }
+  }
+
+  public void testNestedAccessWithSimpleObjectHandler() throws IOException {
+    assertEquals(getOutput(false), getOutput(true));
+  }
+
+  private String getOutput(final boolean setObjectHandler) {
+    final DefaultMustacheFactory mustacheFactory = new DefaultMustacheFactory();
+    if (setObjectHandler) {
+      mustacheFactory.setObjectHandler(new SimpleObjectHandler());
+    }
+    final Mustache defaultMustache = mustacheFactory.compile(new StringReader("{{#okGenerator.isItOk}}{{okGenerator.isItOk}}{{/okGenerator.isItOk}}"), "Test template");
+    final Map<String, Object> params = new HashMap<String, Object>();
+    params.put("okGenerator", new OkGenerator());
+    final Writer writer = new StringWriter();
+    defaultMustache.execute(writer, params);
+    return writer.toString();
+
+  }
+
+
   public void testMultipleWrappers() throws MustacheException, IOException, ExecutionException, InterruptedException {
     MustacheFactory c = createMustacheFactory();
     Mustache m = c.compile("simple.html");
diff --git a/indy/src/test/java/IndyDemo.java b/indy/src/test/java/IndyDemo.java
@@ -21,6 +21,7 @@ public static void main(String[] args) throws Throwable {
       timeReflection(indyDemo);
       timeReflectionCached(indyDemo);
       timeDirect(indyDemo);
+      System.out.println("-----------------");
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public static void main(String[] args) throws Throwable {`
`21`	`21`	`timeReflection(indyDemo);`
`22`	`22`	`timeReflectionCached(indyDemo);`
`23`	`23`	`timeDirect(indyDemo);`
	`24`	`+ System.out.println("-----------------");`
`24`	`25`	`}`
`25`	`26`	`}`
`26`	`27`