Fix 179

_includes/include_iterations_variables.liquid

@@ -0,0 +1,3 @@
+list: {{ list }}
+inner: {{ inner }}
+n: {{ n }}

_includes/include_read_var.liquid

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

ruby/README.md

@@ -0,0 +1,66 @@
+## About this folder
+
+This folder is a playground where developers can test original liquid/jekyll code with real ruby via docker machines without need of installing ruby on local machine, as well as these libraries.
+
+### How to use
+Simply write your ruby script and run it with predefined runners. 
+
+Run in jekyll: ` ./run_with_jekyll.sh your_script.rb`
+
+Run in liquid: ` ./run_with_liquid.sh your_script.rb`
+
+In fact, this may be same script, just unsure yourself you are safe in both cases:
+```ruby
+
+$is_Jekyll = false
+begin
+  require "jekyll"
+  puts "testing cases using jekyll"
+  $is_Jekyll = true
+rescue LoadError
+  require "liquid"
+  puts "testing cases using liquid"
+end
+def isJekyll
+  $is_Jekyll
+end
+
+# write your code here
+
+if isJekyll
+  # add jekyll-specific code here
+else
+  # add liquid-specific code here
+end
+```
+
+For more complex tuning of *jekyll* environment, where the creation of `site` variable needed, here`s example how you can do that:
+```ruby
+
+config = Jekyll::Utils.deep_merge_hashes(Marshal.load(Marshal.dump(Jekyll::Configuration::DEFAULTS)), {
+      "destination" => "dest",
+      "incremental" => false,
+      "includes_dir" => "_includes",
+      "source" => ".",
+      "skip_config_files" => true,
+      "timezone" => "UTC",
+      "url" => "http://example.com",
+      "baseurl" => "/base",
+      "disable_disk_cache" => true
+  })
+  @site = Jekyll::Site.new(Jekyll::Configuration.from(config))
+  @context = Liquid::Context.new({}, {}, :site => @site)
+
+  def render(data = {}, source)
+    Liquid::Template.parse(source, {:strict_variables => true}).render!(@context, data);
+  end
+```
+
+*Liquid* is more simple one:
+```ruby
+Liquid::Template.file_system = Liquid::LocalFileSystem.new("_includes/", "%s.liquid")
+
+def render(data = {}, source)
+  Liquid::Template.parse(source, {:strict_variables => true}).render!(data);
+end
+```

ruby/_helpers.rb

@@ -98,7 +98,8 @@ def build_configs(overrides, base_hash = default_configuration)
   def site_configuration(overrides = {})
     full_overrides = build_configs(overrides, build_configs(
         "destination" => dest_dir,
-        "incremental" => false
+        "incremental" => false,
+        "disable_disk_cache" => true
     ))
     Jekyll::Configuration.from(full_overrides.merge(
         "source" => source_dir

ruby/cases_ifchanged_scope.rb

@@ -18,4 +18,5 @@ def render(data = {}, source)
   Liquid::Template.parse(source, {:strict_variables => true}).render!(data);
 end
 
+pp render({}, "{% ifchanged %}1{% endifchanged %}{%for item in (1..4) %}{% ifchanged %}{{ item }}{% endifchanged %}{% endfor %}{% ifchanged %}4{% endifchanged %}{% ifchanged %}5{% endifchanged %}")
 assertEqual("12345", render({}, "{% ifchanged %}1{% endifchanged %}{%for item in (1..4) %}{% ifchanged %}{{ item }}{% endifchanged %}{% endfor %}{% ifchanged %}4{% endifchanged %}{% ifchanged %}5{% endifchanged %}"))

ruby/cases_increment_decrement_scope.rb

@@ -29,5 +29,7 @@ def render(data = {}, source)
   Liquid::Template.parse(source, {:strict_variables => true}).render!(data);
 end
 
-assertEqual("-1-2-2", render({}, "{% decrement var %}{% decrement var %}{{ var }}"))
-assertEqual("0152", render({}, "{% increment var %}{% assign var=5 %}{% increment var %}{{ var }}{% increment var %}"))
+# assertEqual("-1-2-2", render({}, "{% decrement var %}{% decrement var %}{{ var }}"))
+assertEqual("06", render({}, "{% increment var %}{% assign a = var | plus: 5 %}{{ a }}"))
+
+# assertEqual("0152", render({}, "{% increment var %}{% assign var=5 %}{% increment var %}{{ var }}{% increment var %}"))

ruby/cases_variable_inside_import/_includes/include_create_new_var.liquid

@@ -0,0 +1 @@
+{% assign incl_var = 'incl_var' %}

ruby/cases_variable_inside_import/_includes/include_cycle.liquid

@@ -0,0 +1 @@
+{% cycle 1,2,3,4 %}

ruby/cases_variable_inside_import/_includes/include_decrement_var.liquid

@@ -0,0 +1 @@
+{% decrement var1 %},{% increment var2 %}

ruby/cases_variable_inside_import/_includes/include_ifchanged.liquid

@@ -0,0 +1 @@
+-->{% ifchanged %}2{% endifchanged %}<--

ruby/cases_variable_inside_import/_includes/include_read_var.liquid

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

ruby/cases_variable_inside_import/case.rb

@@ -0,0 +1,70 @@
+#!/usr/bin/env ruby
+
+require 'pp'
+
+$is_Jekyll = false
+begin
+  require "jekyll"
+  puts "testing cases using jekyll"
+  $is_Jekyll = true
+rescue LoadError
+  require "liquid"
+  puts "testing cases using liquid"
+end
+def isJekyll
+  $is_Jekyll
+end
+
+if isJekyll
+  config = Jekyll::Utils.deep_merge_hashes(Marshal.load(Marshal.dump(Jekyll::Configuration::DEFAULTS)), {
+      "destination" => "dest",
+      "incremental" => false,
+      "includes_dir" => "cases_variable_inside_import/_includes/",
+      "source" => ".",
+      "skip_config_files" => true,
+      "timezone" => "UTC",
+      "url" => "http://example.com",
+      "baseurl" => "/base",
+      "disable_disk_cache" => true
+  })
+  @site = Jekyll::Site.new(Jekyll::Configuration.from(config))
+  @context = Liquid::Context.new({}, {}, :site => @site)
+
+  def render(data = {}, source)
+    Liquid::Template.parse(source, {:strict_variables => true}).render!(@context, data);
+  end
+
+else
+  Liquid::Template.file_system = Liquid::LocalFileSystem.new("cases_variable_inside_import/_includes/", "%s.liquid")
+
+  def render(data = {}, source)
+    Liquid::Template.parse(source, {:strict_variables => true}).render!(data);
+  end
+end
+
+def assertEqual(expected, real)
+  if expected != real
+    raise "#{real} is not #{expected}"
+  end
+end
+
+# liquid requires template without extension
+#
+# tested: Decrement, Increment, Cycle, TableRow, ifchanged
+# things to test: tags: , , For, ,
+# visibility of variables from "with expression",
+if isJekyll
+  assertEqual("variable", render({}, "{% assign var = 'variable' %}{% include include_read_var.liquid %}"));
+  assertEqual("incl_var", render({}, "{% include include_create_new_var.liquid %}{{ incl_var }}"))
+
+  # Like increment, variables declared inside decrement are independent from variables created through assign or capture.
+  assertEqual("[-1,0][-2,1][-3,2][-3, 3]", render({}, "[{% decrement var1 %},{% increment var2 %}][{% include include_decrement_var.liquid %}][{% decrement var1 %},{% increment var2 %}][{{ var1 }}, {{ var2 }}]"))
+  assertEqual("1234", render({}, "{% cycle 1,2,3,4 %}{% assign list = \"1\" | split: \",\" %}{% for n in list %}{% cycle 1,2,3,4 %}{% endfor %}{% cycle 1,2,3,4 %}{% include include_cycle.liquid %}"))
+  assertEqual("12--><--3", render({}, "{% ifchanged %}1{% endifchanged %}{% ifchanged %}2{% endifchanged %}{% include include_ifchanged.liquid %}{% ifchanged %}3{% endifchanged %}"))
+else
+  assertEqual("variable", render({}, "{% assign var = 'variable' %}{% include 'include_read_var' %}"));
+  assertEqual("incl_var", render({}, "{% include 'include_create_new_var' %}{{ incl_var }}"))
+  assertEqual("[-1,0][-2,1][-3,2][-3, 3]", render({}, "[{% decrement var1 %},{% increment var2 %}][{% include 'include_decrement_var' %}][{% decrement var1 %},{% increment var2 %}][{{ var1 }}, {{ var2 }}]"))
+  assertEqual("1234", render({}, "{% cycle 1,2,3,4 %}{% assign list = \"1\" | split: \",\" %}{% for n in list %}{% cycle 1,2,3,4 %}{% endfor %}{% cycle 1,2,3,4 %}{% include 'include_cycle' %}"))
+  assertEqual("12--><--3", render({}, "{% ifchanged %}1{% endifchanged %}{% ifchanged %}2{% endifchanged %}{% include 'include_ifchanged' %}{% ifchanged %}3{% endifchanged %}"))
+end

ruby/docker_images/jekyll/Dockerfile

@@ -18,9 +18,13 @@ RUN apk update && apk add --no-cache \
   libc6-compat
 
 RUN gem install jekyll
+RUN gem install ruby-debug-ide
 
 RUN mkdir -p /srv/jekyll
 WORKDIR /srv/jekyll
 VOLUME  /srv/jekyll
 
+EXPOSE 1234
+
+# ENTRYPOINT ["sh"]
 ENTRYPOINT ["ruby"]

ruby/docker_images/liquid/Dockerfile

@@ -18,6 +18,7 @@ RUN apk update && apk add --no-cache \
   libc6-compat
 
 RUN gem install liquid
+RUN gem install ruby-debug-ide
 
 RUN mkdir -p /srv/liquid
 WORKDIR /srv/liquid

ruby/run_with_jekyll.sh

@@ -6,5 +6,6 @@ fi
 
 docker run -it --rm --name jekyll \
     --volume=$PWD:/srv/jekyll \
+    -p 1234:1234 \
      ruby_with_jekyll \
      $1

snippets/include_create_new_var.liquid

@@ -0,0 +1 @@
+{% assign incl_var = 'incl_var' %}

snippets/include_cycle.liquid

@@ -0,0 +1 @@
+{% cycle 1,2,3,4 %}

snippets/include_decrement_var.liquid

@@ -0,0 +1 @@
+{% decrement var1 %},{% increment var2 %}

snippets/include_decrement_var_not_interfere.liquid

@@ -0,0 +1 @@
+{% decrement var %}

snippets/include_ifchanged.liquid

@@ -0,0 +1 @@
+>{% ifchanged %}2{% endifchanged %}<

snippets/include_iteration.liquid

@@ -0,0 +1 @@
+{% for item in (1..2) %}{{ item }}{% endfor %}

snippets/include_read_var.liquid

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

snippets/include_var.liquid

@@ -0,0 +1 @@
+{% assign val = 'INNER'%}

src/main/java/liqp/RenderSettings.java

@@ -10,6 +10,7 @@
 
 public class RenderSettings {
 
+    public static final RenderSettings EXCEPTIONS_FROM_INCLUDE = new RenderSettings.Builder().withShowExceptionsFromInclude(true).build();
 
     public enum EvaluateMode {
         LAZY,

src/main/java/liqp/Template.java

@@ -19,6 +19,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -252,6 +253,10 @@ public static Template parse(File file, ParseSettings parseSettings, RenderSetti
         return new Template(file, Tag.getTags(), Filter.getFilters(parseSettings.flavor), parseSettings, renderSettings);
     }
 
+    public static Template parse(String  template, ParseSettings parseSettings, RenderSettings renderSettings) throws IOException {
+        return new Template(template, Tag.getTags(), Filter.getFilters(parseSettings.flavor), parseSettings, renderSettings);
+    }
+
     public static Template parse(InputStream input) {
         return new Template(input, Tag.getTags(), Filter.getFilters(ParseSettings.DEFAULT_FLAVOR), new ParseSettings.Builder().build());
     }
@@ -444,19 +449,28 @@ public String call() {
      * @return a string denoting the rendered template.
      */
     public String renderUnguarded(Map<String, Object> variables) {
+        return renderUnguarded(variables, null);
+    }
 
+    private String renderUnguarded(Map<String, Object> variables, TemplateContext parent) {
         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());
+            } else if (includeDirectory instanceof Path) {
+                variables.put(Include.INCLUDES_DIRECTORY_KEY, ((Path) includeDirectory).toAbsolutePath().toString());
             }
         }
         variables = renderSettings.evaluate(parseSettings.mapper, variables);
 
         final NodeVisitor visitor = new NodeVisitor(this.tags, this.filters, this.parseSettings);
         try {
             LNode node = visitor.visit(root);
-            this.templateContext = new TemplateContext(protectionSettings, renderSettings, parseSettings, variables);
+            if (parent == null) {
+                this.templateContext = new TemplateContext(protectionSettings, renderSettings, parseSettings, variables);
+            } else {
+                this.templateContext = new TemplateContext(parent);
+            }
             if (this.contextHolder != null) {
                 contextHolder.setContext(templateContext);
             }
@@ -472,6 +486,15 @@ public String renderUnguarded(Map<String, Object> variables) {
         }
     }
 
+    /**
+     * Renders the template using parent context
+     * @param parent
+     * @return
+     */
+    public String renderUnguarded(TemplateContext parent) {
+        return renderUnguarded(new HashMap<String, Object>(), parent);
+    }
+
     // Use toStringTree()
     @Deprecated
     public String toStringAST() {

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

@@ -38,7 +38,7 @@ public Object render(TemplateContext context, LNode... nodes) {
                 context.put(includeResource, value);
             }
 
-            return template.render(context.getVariables());
+            return template.renderUnguarded(context);
 
         } catch(Exception e) {
             if (context.renderSettings.showExceptionsFromInclude) {

src/test/java/liqp/TemplateTest.java

@@ -2,6 +2,7 @@
 
 import liqp.parser.Inspectable;
 import org.antlr.v4.runtime.RecognitionException;
+import org.junit.Rule;
 import org.junit.Test;
 
 import java.io.File;