new renderer helper 3

alternative_includes/header.html

@@ -0,0 +1 @@
+ALTERNATIVE

src/main/java/liqp/Template.java

@@ -1,10 +1,12 @@
 package liqp;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import liqp.filters.Filter;
 import liqp.nodes.LNode;
 import liqp.parser.Flavor;
 import liqp.parser.v4.NodeVisitor;
+import liqp.tags.Include;
 import liqp.tags.Tag;
 import liquid.parser.v4.LiquidLexer;
 import liquid.parser.v4.LiquidParser;
@@ -122,7 +124,7 @@ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int
                 throw new RuntimeException(String.format("parser error on line %s, index %s", line, charPositionInLine), e);
             }
         });
-        
+
         parser.getInterpreter().setPredictionMode(PredictionMode.SLL);
         try {
             return parser.parse();
@@ -335,10 +337,20 @@ public String call() {
      * @return a string denoting the rendered template.
      */
     public String renderUnguarded(final Map<String, Object> variables) {
+
+        if (variables.containsKey(Include.INCLUDES_DIRECTORY_KEY)) {
+            Object includeDirectory = variables.get(Include.INCLUDES_DIRECTORY_KEY);
+            if (includeDirectory instanceof File) {
+                variables.put(Include.INCLUDES_DIRECTORY_KEY, ((File) includeDirectory).getAbsolutePath());
+            }
+        }
+        ObjectNode value = parseSettings.mapper.convertValue(variables, ObjectNode.class);
+        Map map = parseSettings.mapper.convertValue(value, Map.class);
+
         final NodeVisitor visitor = new NodeVisitor(this.tags, this.filters, this.parseSettings);
         try {
             LNode node = visitor.visit(root);
-            Object rendered = node.render(new TemplateContext(protectionSettings, renderSettings, parseSettings.flavor, variables));
+            Object rendered = node.render(new TemplateContext(protectionSettings, renderSettings, parseSettings.flavor, map));
             return rendered == null ? "" : String.valueOf(rendered);
         }
         catch (Exception e) {

src/main/java/liqp/tags/Include.java

@@ -22,6 +22,7 @@ public Object render(TemplateContext context, LNode... nodes) {
             }
             File includeResourceFile;
             File includesDirectory = (File) context.get(INCLUDES_DIRECTORY_KEY);
+
             if (includesDirectory != null) {
                 includeResourceFile = new File(includesDirectory, includeResource + extension);
             }

src/test/java/liqp/TemplateTest.java

@@ -1,9 +1,14 @@
 package liqp;
 
 import org.antlr.v4.runtime.RecognitionException;
+import org.junit.Ignore;
 import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
 public class TemplateTest {
@@ -80,4 +85,17 @@ public void renderVarArgsTest() throws RecognitionException {
     public void renderVarArgsTestInvalidKey2() throws RecognitionException {
         Template.parse("mu").render(null, 456);
     }
+
+    @Test
+    public void renderMapWithPojosExistedNotRender() {
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("foo", new Foo());
+        data.put("bar", "zoo");
+        data.put("bear", true);
+
+        String fooA = Template.parse("{{foo.a}}{{bar}}{{bear}}").render(data);
+
+        assertThat(fooA, is("Azootrue"));
+    }
+
 }

src/test/java/liqp/tags/IncludeTest.java

@@ -147,7 +147,24 @@ public void expressionInIncludeTagDefaultFlavorThrowsException() {
     }
 
     @Test
-    public void errorInIncludeCauseMissingIncludeWithDefaultRendering() throws IOException {
+    public void includeDirectoryKeyInInputShouldChangeIncludeDirectory() throws IOException {
+        // given
+        File jekyll = new File(new File("").getAbsolutePath(), "src/test/jekyll");
+        File index = new File(jekyll, "index_without_quotes.html");
+        Template template = Template.parse(index, new ParseSettings.Builder().withFlavor(Flavor.JEKYLL).build());
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put(Include.INCLUDES_DIRECTORY_KEY, new File(new File("").getAbsolutePath(), "src/test/jekyll/alternative_includes"));
+
+        // when
+
+        String result = template.render(data);
+
+        // then
+        assertTrue(result.contains("ALTERNATIVE"));
+    }
+
+    @Test
+    public void includeDirectoryKeyStringInInputShouldChangeIncludeDirectory() throws IOException {
         //given
         File jekyll = new File(new File("").getAbsolutePath(), "src/test/jekyll");
         File index = new File(jekyll, "index_with_errored_include.html");
@@ -203,7 +220,7 @@ public void includeDirectoryKeyInInputShouldChangeIncludeDirectory() throws IOEx
         File index = new File(jekyll, "index_without_quotes.html");
         Template template = Template.parse(index, new ParseSettings.Builder().withFlavor(Flavor.JEKYLL).build());
         Map<String, Object> data = new HashMap<String, Object>();
-        data.put(Include.INCLUDES_DIRECTORY_KEY, new File(new File("").getAbsolutePath(), "src/test/jekyll/alternative_includes"));
+        data.put(Include.INCLUDES_DIRECTORY_KEY, "alternative_includes");
 
         // when