liquid 2.5.5 → 2.6.0.rc1

data/lib/liquid/strainer.rb

@@ -8,7 +8,7 @@ module Liquid
   # The Strainer only allows method calls defined in filters given to it via Strainer.global_filter,
   # Context#add_filters or Template.register_filter
   class Strainer #:nodoc:
-    @@filters = {}
+    @@filters = []
     @@known_filters = Set.new
     @@known_methods = Set.new
 
@@ -19,7 +19,7 @@ module Liquid
     def self.global_filter(filter)
       raise ArgumentError, "Passed filter is not a module" unless filter.is_a?(Module)
       add_known_filter(filter)
-      @@filters[filter.name] = filter
+      @@filters << filter unless @@filters.include?(filter)
     end
 
     def self.add_known_filter(filter)
@@ -34,7 +34,7 @@ module Liquid
 
     def self.create(context)
       strainer = Strainer.new(context)
-      @@filters.each { |k,m| strainer.extend(m) }
+      @@filters.each { |m| strainer.extend(m) }
       strainer
     end
 

data/lib/liquid/tag.rb

@@ -23,4 +23,4 @@ module Liquid
 
   end # Tag
 
-end # Tag
+end # Liquid

data/lib/liquid/tags/assign.rb

@@ -10,24 +10,26 @@ module Liquid
   #
   class Assign < Tag
     Syntax = /(#{VariableSignature}+)\s*=\s*(.*)\s*/o
-  
-    def initialize(tag_name, markup, tokens)          
+
+    def initialize(tag_name, markup, tokens)
       if markup =~ Syntax
         @to = $1
         @from = Variable.new($2)
       else
         raise SyntaxError.new("Syntax Error in 'assign' - Valid syntax: assign [var] = [source]")
       end
-      
-      super      
+
+      super
     end
-  
+
     def render(context)
-       context.scopes.last[@to] = @from.render(context)
-       ''
-    end 
-  
-  end  
-  
-  Template.register_tag('assign', Assign)  
+      val = @from.render(context)
+      context.scopes.last[@to] = val
+      context.resource_limits[:assign_score_current] += (val.respond_to?(:length) ? val.length : 1)
+      ''
+    end
+
+  end
+
+  Template.register_tag('assign', Assign)
 end

data/lib/liquid/tags/break.rb

@@ -8,8 +8,8 @@ module Liquid
   #        {% break %}
   #      {% endif %}
   #    {% endfor %}
-  # 
-  class Break < Tag 
+  #
+  class Break < Tag
 
     def interrupt
       BreakInterrupt.new

data/lib/liquid/tags/capture.rb

@@ -27,6 +27,7 @@ module Liquid
     def render(context)
       output = super
       context.scopes.last[@to] = output
+      context.resource_limits[:assign_score_current] += (output.respond_to?(:length) ? output.length : 1)
       ''
     end
   end

data/lib/liquid/tags/case.rb

@@ -3,15 +3,15 @@ module Liquid
     Syntax     = /(#{QuotedFragment})/o
     WhenSyntax = /(#{QuotedFragment})(?:(?:\s+or\s+|\s*\,\s*)(#{QuotedFragment}.*))?/o
 
-    def initialize(tag_name, markup, tokens)      
+    def initialize(tag_name, markup, tokens)
       @blocks = []
-      
+
       if markup =~ Syntax
         @left = $1
       else
         raise SyntaxError.new("Syntax Error in tag 'case' - Valid syntax: case [condition]")
       end
-            
+
       super
     end
 
@@ -27,53 +27,53 @@ module Liquid
       end
     end
 
-    def render(context)      
-      context.stack do          
+    def render(context)
+      context.stack do
         execute_else_block = true
-        
+
         output = ''
         @blocks.each do |block|
-          if block.else? 
+          if block.else?
             return render_all(block.attachment, context) if execute_else_block
           elsif block.evaluate(context)
-            execute_else_block = false        
+            execute_else_block = false
             output << render_all(block.attachment, context)
-          end            
+          end
         end
         output
-      end          
+      end
     end
-    
+
     private
-    
-    def record_when_condition(markup)                
+
+    def record_when_condition(markup)
       while markup
-      	# Create a new nodelist and assign it to the new block
-      	if not markup =~ WhenSyntax
-      	  raise SyntaxError.new("Syntax Error in tag 'case' - Valid when condition: {% when [condition] [or condition2...] %} ")
-      	end
+        # Create a new nodelist and assign it to the new block
+        if not markup =~ WhenSyntax
+          raise SyntaxError.new("Syntax Error in tag 'case' - Valid when condition: {% when [condition] [or condition2...] %} ")
+        end
 
-      	markup = $2
+        markup = $2
 
-      	block = Condition.new(@left, '==', $1)        
-      	block.attach(@nodelist)
-      	@blocks.push(block)
+        block = Condition.new(@left, '==', $1)
+        block.attach(@nodelist)
+        @blocks.push(block)
       end
     end
 
-    def record_else_condition(markup)            
+    def record_else_condition(markup)
 
       if not markup.strip.empty?
         raise SyntaxError.new("Syntax Error in tag 'case' - Valid else condition: {% else %} (no parameters) ")
       end
-         
-      block = ElseCondition.new            
+
+      block = ElseCondition.new
       block.attach(@nodelist)
       @blocks << block
     end
-    
-        
-  end    
-  
+
+
+  end
+
   Template.register_tag('case', Case)
 end

data/lib/liquid/tags/continue.rb

@@ -8,7 +8,7 @@ module Liquid
   #        {% continue %}
   #      {% endif %}
   #    {% endfor %}
-  # 
+  #
   class Continue < Tag
 
     def interrupt

data/lib/liquid/tags/cycle.rb

@@ -1,5 +1,5 @@
 module Liquid
-  
+
   # Cycle is usually used within a loop to alternate between values, like colors or DOM classes.
   #
   #   {% for item in items %}
@@ -15,45 +15,45 @@ module Liquid
   class Cycle < Tag
     SimpleSyntax = /^#{QuotedFragment}+/o
     NamedSyntax  = /^(#{QuotedFragment})\s*\:\s*(.*)/o
-  
-    def initialize(tag_name, markup, tokens)      
+
+    def initialize(tag_name, markup, tokens)
       case markup
       when NamedSyntax
-      	@variables = variables_from_string($2)
-      	@name = $1
+        @variables = variables_from_string($2)
+        @name = $1
       when SimpleSyntax
         @variables = variables_from_string(markup)
-      	@name = "'#{@variables.to_s}'"
+        @name = "'#{@variables.to_s}'"
       else
         raise SyntaxError.new("Syntax Error in 'cycle' - Valid syntax: cycle [name :] var [, var2, var3 ...]")
       end
-      super    
-    end    
-  
+      super
+    end
+
     def render(context)
       context.registers[:cycle] ||= Hash.new(0)
-    
+
       context.stack do
-        key = context[@name]	
+        key = context[@name]
         iteration = context.registers[:cycle][key]
         result = context[@variables[iteration]]
-        iteration += 1    
-        iteration  = 0  if iteration >= @variables.size 
+        iteration += 1
+        iteration  = 0  if iteration >= @variables.size
         context.registers[:cycle][key] = iteration
-        result 
+        result
       end
     end
-  
+
     private
-  
+
     def variables_from_string(markup)
       markup.split(',').collect do |var|
-    	  var =~ /\s*(#{QuotedFragment})\s*/o
-    	  $1 ? $1 : nil
-    	end.compact
+        var =~ /\s*(#{QuotedFragment})\s*/o
+        $1 ? $1 : nil
+      end.compact
     end
-  
+
   end
-  
+
   Template.register_tag('cycle', Cycle)
 end

data/lib/liquid/tags/decrement.rb

@@ -1,5 +1,5 @@
 module Liquid
-  
+
   # decrement is used in a place where one needs to insert a counter
   #     into a template, and needs the counter to survive across
   #     multiple instantiations of the template.
@@ -19,21 +19,21 @@ module Liquid
   #    Hello: -3
   #
   class Decrement < Tag
-    def initialize(tag_name, markup, tokens)      
+    def initialize(tag_name, markup, tokens)
       @variable = markup.strip
 
-      super    
-    end    
-  
+      super
+    end
+
     def render(context)
       value = context.environments.first[@variable] ||= 0
       value = value - 1
       context.environments.first[@variable] = value
       value.to_s
     end
-  
+
     private
   end
-  
+
   Template.register_tag('decrement', Decrement)
 end

data/lib/liquid/tags/for.rb

@@ -1,6 +1,6 @@
 module Liquid
 
-  # "For" iterates over an array or collection. 
+  # "For" iterates over an array or collection.
   # Several useful variables are available to you within the loop.
   #
   # == Basic usage:
@@ -22,7 +22,7 @@ module Liquid
   #
   #    {% for item in collection limit:5 offset:10 %}
   #      {{ item.name }}
-  #    {% end %}             
+  #    {% end %}
   #
   #  To reverse the for loop simply use {% for item in collection reversed %}
   #
@@ -31,7 +31,7 @@ module Liquid
   # forloop.name:: 'item-collection'
   # forloop.length:: Length of the loop
   # forloop.index:: The current item's position in the collection;
-  #                 forloop.index starts at 1. 
+  #                 forloop.index starts at 1.
   #                 This is helpful for non-programmers who start believe
   #                 the first item in an array is 1, not 0.
   # forloop.index0:: The current item's position in the collection
@@ -43,19 +43,19 @@ module Liquid
   # forloop.first:: Returns true if the item is the first item.
   # forloop.last:: Returns true if the item is the last item.
   #
-  class For < Block                                             
-    Syntax = /(\w+)\s+in\s+(#{QuotedFragment}+)\s*(reversed)?/o
-  
+  class For < Block
+    Syntax = /\A(\w+)\s+in\s+(#{QuotedFragment}+)\s*(reversed)?/o
+
     def initialize(tag_name, markup, tokens)
       if markup =~ Syntax
         @variable_name = $1
         @collection_name = $2
-        @name = "#{$1}-#{$2}"           
-        @reversed = $3             
+        @name = "#{$1}-#{$2}"
+        @reversed = $3
         @attributes = {}
         markup.scan(TagAttributes) do |key, value|
           @attributes[key] = value
-        end        
+        end
       else
         raise SyntaxError.new("Syntax Error in 'for loop' - Valid syntax: for [item] in [collection]")
       end
@@ -68,51 +68,51 @@ module Liquid
       return super unless tag == 'else'
       @nodelist = @else_block = []
     end
-  
-    def render(context)       
+
+    def render(context)
       context.registers[:for] ||= Hash.new(0)
-    
+
       collection = context[@collection_name]
       collection = collection.to_a if collection.is_a?(Range)
-    
+
       # Maintains Ruby 1.8.7 String#each behaviour on 1.9
       return render_else(context) unless iterable?(collection)
-                                                 
+
       from = if @attributes['offset'] == 'continue'
         context.registers[:for][@name].to_i
       else
         context[@attributes['offset']].to_i
       end
-        
+
       limit = context[@attributes['limit']]
-      to    = limit ? limit.to_i + from : nil  
+      to    = limit ? limit.to_i + from : nil
 
 
       segment = Utils.slice_collection_using_each(collection, from, to)
 
       return render_else(context) if segment.empty?
-      
+
       segment.reverse! if @reversed
 
       result = ''
-        
-      length = segment.length            
-            
+
+      length = segment.length
+
       # Store our progress through the collection for the continue flag
       context.registers[:for][@name] = from + segment.length
-              
+
       context.stack do
         segment.each_with_index do |item, index|
           context[@variable_name] = item
           context['forloop'] = {
             'name'    => @name,
             'length'  => length,
-            'index'   => index + 1, 
-            'index0'  => index, 
+            'index'   => index + 1,
+            'index0'  => index,
             'rindex'  => length - index,
             'rindex0' => length - index - 1,
             'first'   => (index == 0),
-            'last'    => (index == length - 1) }
+          'last'    => (index == length - 1) }
 
           result << render_all(@for_block, context)
 
@@ -124,8 +124,8 @@ module Liquid
           end
         end
       end
-      result     
-    end          
+      result
+    end
 
     private
 

data/lib/liquid/tags/if.rb

@@ -15,7 +15,6 @@ module Liquid
     SyntaxHelp = "Syntax Error in tag 'if' - Valid syntax: if [expression]"
     Syntax = /(#{QuotedFragment})\s*([=!<>a-z_]+)?\s*(#{QuotedFragment})?/o
     ExpressionsAndOperators = /(?:\b(?:\s?and\s?|\s?or\s?)\b|(?:\s*(?!\b(?:\s?and\s?|\s?or\s?)\b)(?:#{QuotedFragment}|\S+)\s*)+)/o
-    BOOLEAN_OPERATORS = %w(and or)
 
     def initialize(tag_name, markup, tokens)
       @blocks = []
@@ -62,8 +61,7 @@ module Liquid
             raise(SyntaxError, SyntaxHelp) unless expressions.shift.to_s =~ Syntax
 
             new_condition = Condition.new($1, $2, $3)
-            raise SyntaxError, "invalid boolean operator" unless BOOLEAN_OPERATORS.include?(operator)
-            new_condition.send(operator, condition)
+            new_condition.send(operator.to_sym, condition)
             condition = new_condition
           end
 
@@ -73,6 +71,8 @@ module Liquid
         @blocks.push(block)
         @nodelist = block.attach(Array.new)
       end
+
+
   end
 
   Template.register_tag('if', If)