The render settings from the main template is not propagated to the I…

snippets/wmt/footer-with-variables.html

@@ -0,0 +1 @@
+{{ FOOTERTEXT }}

src/main/java/liqp/Template.java

@@ -80,6 +80,26 @@ private Template(String input, Map<String, Tag> tags, Map<String, Filter> filter
     }
 
     /**
+     * Creates a new Template instance from a given input.
+     *  @param input
+     *         the file holding the Liquid source.
+     * @param tags
+     *         the tags this instance will make use of.
+     * @param filters
+     *         the filters this instance will make use of.
+     * @param parseSettings
+     *         the parseSettings this instance will make use of.
+     * @param renderSettings
+     *         the renderSettings this instance will make use of.
+     */
+    private Template(String input, Map<String, Tag> tags, Map<String, Filter> filters, ParseSettings parseSettings,
+        RenderSettings renderSettings) {
+
+        this(input, tags, filters, parseSettings);
+        this.renderSettings = renderSettings;
+    }
+
+   /**
      * Creates a new Template instance from a given file.
      *
      * @param file
@@ -102,6 +122,27 @@ private Template(File file, Map<String, Tag> tags, Map<String, Filter> filters,
         }
     }
 
+    /**
+     * Creates a new Template instance from a given file.
+     *
+     * @param file
+     *         the file holding the Liquid source.
+     * @param tags
+     *         the tags this instance will make use of.
+     * @param filters
+     *         the filters this instance will make use of.
+     * @param parseSettings
+     *         the parseSettings this instance will make use of.
+     * @param renderSettings
+     *         the renderSettings this instance will make use of.
+     */
+    private Template(File file, Map<String, Tag> tags, Map<String, Filter> filters, ParseSettings parseSettings,
+        RenderSettings renderSettings) throws IOException {
+
+        this(file, tags, filters, parseSettings);
+        this.renderSettings = renderSettings;
+    }
+
     private ParseTree parse(LiquidLexer lexer) {
 
         lexer.removeErrorListeners();
@@ -177,6 +218,10 @@ public static Template parse(String input, ParseSettings settings) {
         return new Template(input, Tag.getTags(), Filter.getFilters(), settings);
     }
 
+    public static Template parse(File file, ParseSettings parseSettings, RenderSettings renderSettings) throws IOException {
+        return new Template(file, Tag.getTags(), Filter.getFilters(), parseSettings, renderSettings);
+    }
+
     @Deprecated // Use `parse(file, settings)` instead
     public static Template parse(File file, Flavor flavor) throws IOException {
         ParseSettings settings = new ParseSettings.Builder().withFlavor(flavor).build();

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

@@ -29,7 +29,8 @@ public Object render(TemplateContext context, LNode... nodes) {
             else {
               includeResourceFile = new File(context.parseSettings.flavor.snippetsFolderName, includeResource + extension);
             }
-            Template template = Template.parse(includeResourceFile, context.parseSettings);
+
+            Template template = Template.parse(includeResourceFile, context.parseSettings, context.renderSettings);
 
             // check if there's a optional "with expression"
             if(nodes.length > 1) {

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

@@ -1,11 +1,16 @@
 package liqp.tags;
 
 import liqp.*;
+import liqp.exceptions.VariableNotExistException;
 import liqp.filters.Filter;
 import liqp.parser.Flavor;
 import org.antlr.v4.runtime.RecognitionException;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.internal.matchers.ThrowableCauseMatcher;
+import org.junit.rules.ExpectedException;
+import org.hamcrest.Matcher;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,10 +20,14 @@
 import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.isA;
 import static org.junit.Assert.*;
 
 public class IncludeTest {
 
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
     @Before
     public void init() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         Method method = Filter.class.getDeclaredMethod("resetFilters");
@@ -106,6 +115,35 @@ public void renderTestWithIncludeSubdirectorySpecifiedInJekyllFlavor() throws Ex
         assertTrue(result.contains("FOOTER"));
     }
 
+    @Test
+    public void renderTestWithIncludeSubdirectorySpecifiedInLiquidFlavorWithStrictVariables() throws Exception {
+
+        String expected = "Sample Footer";
+        File index = new File("src/test/jekyll/index_with_variables.html");
+        Template template = Template.parse(
+            index,
+            new ParseSettings.Builder().withFlavor(Flavor.LIQUID).build(),
+            new RenderSettings.Builder().withStrictVariables(true).withShowExceptionsFromInclude(true).build());
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("FOOTERTEXT", expected);
+        String result = template.render(variables);
+        assertTrue(result.contains(expected));
+    }
+
+
+    @Test
+    public void renderTestWithIncludeSubdirectorySpecifiedInLiquidFlavorWithStrictVariablesException() throws Exception {
+
+        thrown.expectCause(new NestedCauseMatcher<>(isA(VariableNotExistException.class)));
+
+        File index = new File("src/test/jekyll/index_with_variables.html");
+        Template template = Template.parse(
+            index,
+            new ParseSettings.Builder().withFlavor(Flavor.LIQUID).build(),
+            new RenderSettings.Builder().withStrictVariables(true).withShowExceptionsFromInclude(true).build());
+        template.render();
+    }
+
     // https://github.com/bkiers/Liqp/issues/95
     @Test
     public void renderTestWithIncludeSubdirectorySpecifiedInLiquidFlavor() throws Exception {
@@ -211,4 +249,31 @@ public void errorInIncludeCauseMissingIncludeWithCustomRenderingAndFixedError()
         // them
         assertTrue(result.contains("THE_ERROR"));
     }
+
+    private static class NestedCauseMatcher<T extends Throwable> extends ThrowableCauseMatcher<T> {
+
+        private Matcher<? extends Throwable> causeMatcher;
+
+        public NestedCauseMatcher(Matcher<T> causeMatcher) {
+
+            super(causeMatcher);
+            this.causeMatcher = causeMatcher;
+        }
+
+        @Override
+        protected boolean matchesSafely(T item) {
+
+            boolean match = false;
+            Throwable parent = item;
+            Throwable cause = null;
+
+            while (((cause = parent.getCause()) != null) && (cause != parent) && !(match = causeMatcher.matches(cause))) {
+
+                parent = cause;
+            }
+
+            return match;
+        }
+
+    }
 }

src/test/jekyll/index_with_variables.html

@@ -0,0 +1 @@
+{% include 'wmt/footer-with-variables.html' %}