jekyll-template 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6975e356063a9820af8618e472c8124c2c3b0c22
-  data.tar.gz: 31d6b3136a508fc8d535d97ad0028b997ed26236
+  metadata.gz: e3cfd7d22291e09bd926714707e2f3e999d1dc7d
+  data.tar.gz: 4d246888810dd10beee9a6557a50fcf134186a0a
 SHA512:
-  metadata.gz: 46ab2cacbc17854beb7494015fdd2303b0eb3437a77898fcac3fe2a650fbb56802473690dc83ced68f9256e1cb25c60ba8b1f73e142f1e86a1a32b648ede59b0
-  data.tar.gz: f1ec53fdb9155e13b335b2316f266c45cbad20426cf6d50aadff692ed4b2f8e88ecdd1a9429f3bcc26a500ba17da715e0679ec21206b262cd9588f877f3dbd8a
+  metadata.gz: a7f35139c84975ef8335d7b98240bb3aaceba52f78c7f2b79d79cc26f07b9bd523f535305e657ba7c14405317dd9cd535acfe0bbb981ac7f7e03994f2c43af17
+  data.tar.gz: 67c40f775d2ac0cd641f63d8ed604388b4acdfba817508d775e4fe7960d51f5c1b7d14576602ca6081fe174e5c4ed6efe74c2b239513811265cbc9ba87163314

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/lib/jekyll/template.rb

@@ -24,6 +24,7 @@ module Jekyll
           @template_name = $1.freeze
           @attributes = {}
           @sanitize = false
+          @id = rand(36**8).to_s(36)
 
           # Parse parameters
           # Source: https://gist.github.com/jgatjens/8925165
@@ -35,6 +36,10 @@ module Jekyll
         end
       end
 
+      def id
+        @id
+      end
+
       # blank?
       # Description: Override's Liquid's default blank checker. This allows
       # for templates to be used without passing inner content.
@@ -59,7 +64,6 @@ module Jekyll
         })
 
         add_template_to_dependency(@template_name, context)
-
         template = load_cached_template(@template_name, context)
 
         # Define the default template attributes
@@ -71,7 +75,7 @@ module Jekyll
 
         # Parse and extend template's front-matter with content front-matter
         update_attributes(get_front_matter(content))
-        
+
         # Setting template attributes from @attributes
         # This allows for @attributes to be used within the template as
         # {{ template.atttribute_name }}
@@ -89,7 +93,11 @@ module Jekyll
 
         context["template"]["content"] = sanitize(strip_front_matter(content))
 
-        compressor.compress(template.render(context))
+        store_template_data(context)
+        content = compressor.compress(template.render(context))
+        reset_template_data(context)
+
+        content
       end
 
       # update_attributes(data)
@@ -101,6 +109,34 @@ module Jekyll
         end
       end
 
+      # store_template_data(context)
+      # Description: Works with reset_template_data. This is a work-around
+      # to ensure data stays in scope and isn't leaked from child->parent
+      # template.
+      def store_template_data(context)
+        context.registers[:template_data_store] ||= {}
+        store = context.registers[:template_data_store]
+        unless store.key?(@id)
+          store[@id] = context["template"]
+        end
+      end
+
+      # reset_template_data(context)
+      # Description: Works with store_template_data. This is a work-around
+      # to ensure data stays in scope and isn't leaked from child->parent
+      # template.
+      def reset_template_data(context)
+        context.registers[:template_data_store] ||= {}
+        store = context.registers[:template_data_store]
+        if store.keys.size
+          if store.keys[0] == @id
+            store = {}
+          else
+            context["template"] = store[store.keys[0]]
+          end
+        end
+      end
+
       # add_template_to_dependency(path, context)
       # source: https://github.com/jekyll/jekyll/blob/e509cf2139d1a7ee11090b09721344608ecf48f6/lib/jekyll/tags/include.rb
       def add_template_to_dependency(path, context)
@@ -156,11 +192,11 @@ module Jekyll
 
         template_obj = Hash.new
         data = get_front_matter(template_content)
-        content = strip_front_matter(template_content)
+        markup = strip_front_matter(template_content)
 
         if template_content
-          template_obj["data"] = data 
-          template_obj["template"] = file.parse(content)
+          template_obj["data"] = data
+          template_obj["template"] = file.parse(markup)
           template_obj
         else
           raise Liquid::SyntaxError, "Could not find #{file_path} in your templates"

data/lib/jekyll/template/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Template
-    VERSION = "0.18.0"
+    VERSION = "0.19.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-template
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - ItsJonQ
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll