locomotive_liquid 2.4.1 → 2.4.2

data/lib/liquid/standardfilters.rb

@@ -6,7 +6,6 @@ module Liquid
 
     # Return the size of an array or of an string
     def size(input)
-
       input.respond_to?(:size) ? input.size : 0
     end
 

data/lib/liquid/tags/extends.rb

@@ -10,7 +10,7 @@ module Liquid
 
     def initialize(tag_name, markup, tokens, context)
       if markup =~ Syntax
-        @template_name = $1.gsub('\'', '').strip
+        @template_name = $1.gsub(/["']/o, '').strip
       else
         raise SyntaxError.new("Error in tag 'extends' - Valid syntax: extends [template]")
       end

data/lib/liquid/tags/inherited_block.rb

@@ -10,15 +10,17 @@ module Liquid
     Syntax = /(#{QuotedFragment}+)/
 
     attr_accessor :parent
-    attr_reader :name
+    attr_reader   :name
 
     def initialize(tag_name, markup, tokens, context)
       if markup =~ Syntax
-        @name = $1
+        @name = $1.gsub(/["']/o, '').strip
       else
         raise SyntaxError.new("Error in tag 'block' - Valid syntax: block [name]")
       end
 
+      self.set_full_name!(context)
+
       (context[:block_stack] ||= []).push(self)
       context[:current_block] = self
 
@@ -56,6 +58,12 @@ module Liquid
 
     protected
 
+    def set_full_name!(context)
+      if context[:current_block]
+        @name = context[:current_block].name + '/' + @name
+      end
+    end
+
     def register_current_block
       @context[:blocks] ||= {}
 

data/lib/liquid/template.rb

@@ -132,6 +132,31 @@ module Liquid
       @rethrow_errors = true; render(*args)
     end
 
+    def walk(memo = {}, &block)
+      # puts @root.nodelist.inspect
+      self._walk(@root.nodelist, memo, &block)
+    end
+
+    def _walk(list, memo = {}, &block)
+      list.each do |node|
+        saved_memo = memo.clone
+
+        # puts "fetch ! #{node.respond_to?(:name) ? node.name : 'String'} / #{node.respond_to?(:nodelist)}"
+        if block_given?
+          # puts "youpi ! #{node.name}"
+          _memo = yield(node, memo) || {}
+          memo.merge!(_memo)
+        end
+
+        if node.respond_to?(:nodelist) && !node.nodelist.blank?
+          self._walk(node.nodelist, memo, &block)
+        end
+
+        memo = saved_memo
+      end
+      memo
+    end
+
     private
 
     # Uses the <tt>Liquid::TemplateParser</tt> regexp to tokenize the passed source

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_liquid
 version: !ruby/object:Gem::Version
-  version: 2.4.1
   prerelease: 
+  version: 2.4.2
 platform: ruby
 authors:
 - Tobias Luetke
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-12-16 00:00:00.000000000 Z
 dependencies: []
 description: A secure, non-evaling end user template engine with aesthetic markup.
   Extended with liquid template inheritance for use in LocomotiveCMS
@@ -81,10 +81,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -1636499300789474358
+      hash: -1080489168898257421
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: