liquid 1.9.0 → 2.0.0

data/lib/liquid/drop.rb

@@ -28,10 +28,12 @@ module Liquid
     end
     
     # called by liquid to invoke a drop
-    def invoke_drop(method)      
-      result = before_method(method)
-      result ||= send(method.to_sym) if self.class.public_instance_methods.include?(method.to_s)
-      result
+    def invoke_drop(method)          
+      if self.class.public_instance_methods.include?(method.to_s)
+        send(method.to_sym) 
+      else        
+        before_method(method)
+      end
     end
     
     def has_key?(name)

data/lib/liquid/errors.rb

@@ -7,4 +7,5 @@ module Liquid
   class FileSystemError < Error; end
   class StandardError < Error; end
   class SyntaxError < Error; end
+  class StackLevelError < Error; end
 end

data/lib/liquid/standardfilters.rb

@@ -63,9 +63,27 @@ module Liquid
     end
 
     # Sort elements of the array
-    def sort(input)
-      [input].flatten.sort
+    # provide optional property with which to sort an array of hashes or drops
+    def sort(input, property = nil)
+      ary = [input].flatten
+      if property.nil?
+        ary.sort
+      elsif ary.first.respond_to?('[]') and !ary.first[property].nil?
+        ary.sort {|a,b| a[property] <=> b[property] }
+      elsif ary.first.respond_to?(property)
+        ary.sort {|a,b| a.send(property) <=> b.send(property) }
+      end
     end               
+    
+    # map/collect on a given property
+    def map(input, property)
+      ary = [input].flatten
+      if ary.first.respond_to?('[]') and !ary.first[property].nil?
+        ary.map {|e| e[property] }
+      elsif ary.first.respond_to?(property)
+        ary.map {|e| e.send(property) }
+      end
+    end
             
     # Replace occurrences of a string with another
     def replace(input, string, replacement = '')
@@ -85,7 +103,17 @@ module Liquid
     # remove the first occurrences of a substring
     def remove_first(input, string)
       input.to_s.sub(string, '')      
-    end            
+    end             
+                              
+    # add one string to another
+    def append(input, string)
+      input.to_s + string.to_s
+    end
+                                
+    # prepend a string to another
+    def prepend(input, string)
+      string.to_s + input.to_s
+    end
                                              
     # Add <br /> tags in front of all newlines in input string
     def newline_to_br(input)        
@@ -126,16 +154,13 @@ module Liquid
         return input.to_s
       end
       
-      date = case input
-      when String
-        Time.parse(input)
-      when Date, Time, DateTime
-        input
+      date = input.is_a?(String) ? Time.parse(input) : input
+      
+      if date.respond_to?(:strftime)
+        date.strftime(format.to_s)
       else
-        return input
+        input
       end
-              
-      date.strftime(format.to_s)
     rescue => e 
       input
     end
@@ -158,6 +183,26 @@ module Liquid
       array.last if array.respond_to?(:last)
     end
     
+    # addition
+    def plus(input, operand)
+      input + operand if input.respond_to?('+')
+    end
+    
+    # subtraction
+    def minus(input, operand)
+      input - operand if input.respond_to?('-')
+    end
+    
+    # multiplication
+    def times(input, operand)
+      input * operand if input.respond_to?('*')
+    end
+    
+    # division
+    def divided_by(input, operand)
+      input / operand if input.respond_to?('/')
+    end
+    
   end
    
   Template.register_filter(StandardFilters)

data/lib/liquid/strainer.rb

@@ -34,7 +34,7 @@ module Liquid
       strainer
     end
     
-    def respond_to?(method)
+    def respond_to?(method, include_private = false)
       method_name = method.to_s
       return false if method_name =~ INTERNAL_METHOD
       return false if @@required_methods.include?(method_name)

data/lib/liquid/tags/assign.rb

@@ -9,7 +9,7 @@ module Liquid
   #  {{ monkey }}
   #
   class Assign < Tag
-    Syntax = /(#{VariableSignature}+)\s*=\s*(#{QuotedFragment}+)/   
+    Syntax = /(#{VariableSignature}+)\s*=\s*(#{Expression}+)/   
   
     def initialize(tag_name, markup, tokens)          
       if markup =~ Syntax

data/lib/liquid/tags/case.rb

@@ -1,7 +1,7 @@
 module Liquid
   class Case < Block
-    Syntax     = /(#{QuotedFragment})/
-    WhenSyntax = /(#{QuotedFragment})(?:(?:\s+or\s+|\s*\,\s*)(#{QuotedFragment}.*))?/
+    Syntax     = /(#{Expression})/
+    WhenSyntax = /(#{Expression})(?:(?:\s+or\s+|\s*\,\s*)(#{Expression}.*))?/
 
     def initialize(tag_name, markup, tokens)      
       @blocks = []

data/lib/liquid/tags/cycle.rb

@@ -13,8 +13,8 @@ module Liquid
   #    <div class="green"> Item five</div>
   #
   class Cycle < Tag
-    SimpleSyntax = /#{QuotedFragment}/        
-    NamedSyntax = /(#{QuotedFragment})\s*\:\s*(.*)/
+    SimpleSyntax = /^#{Expression}/        
+    NamedSyntax  = /^(#{Expression})\s*\:\s*(.*)/
   
     def initialize(tag_name, markup, tokens)      
       case markup
@@ -27,7 +27,6 @@ module Liquid
       else
         raise SyntaxError.new("Syntax Error in 'cycle' - Valid syntax: cycle [name :] var [, var2, var3 ...]")
       end
-
       super    
     end    
   
@@ -49,7 +48,7 @@ module Liquid
   
     def variables_from_string(markup)
       markup.split(',').collect do |var|
-    	  var =~ /\s*(#{QuotedFragment})\s*/
+    	  var =~ /\s*(#{Expression})\s*/
     	  $1 ? $1 : nil
     	end.compact
     end

data/lib/liquid/tags/for.rb

@@ -20,7 +20,9 @@ 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 %}
   #
   # == Available variables:
   #
@@ -40,13 +42,14 @@ module Liquid
   # forloop.last:: Returns true if the item is the last item.
   #
   class For < Block                                             
-    Syntax = /(\w+)\s+in\s+(#{VariableSignature}+)/   
+    Syntax = /(\w+)\s+in\s+(#{Expression}+)\s*(reversed)?/   
   
     def initialize(tag_name, markup, tokens)
       if markup =~ Syntax
         @variable_name = $1
         @collection_name = $2
-        @name = "#{$1}-#{$2}"
+        @name = "#{$1}-#{$2}"           
+        @reversed = $3             
         @attributes = {}
         markup.scan(TagAttributes) do |key, value|
           @attributes[key] = value
@@ -64,35 +67,33 @@ module Liquid
       collection = context[@collection_name]
       collection = collection.to_a if collection.is_a?(Range)
     
-      return '' if collection.nil? or collection.empty?
-    
-      range = (0..collection.length)
-    
-      if @attributes['limit'] or @attributes['offset']
-        offset = 0
-        if @attributes['offset'] == 'continue'
-          offset = context.registers[:for][@name] 
-        else          
-          offset = context[@attributes['offset']] || 0
-        end
-        limit  = context[@attributes['limit']]
-
-        range_end = limit ? offset + limit : collection.length
-        range = (offset..range_end-1)
-      
-        # Save the range end in the registers so that future calls to 
-        # offset:continue have something to pick up
-        context.registers[:for][@name] = range_end
+      return '' unless collection.respond_to?(:each) 
+                                                 
+      from = if @attributes['offset'] == 'continue'
+        context.registers[:for][@name].to_i
+      else
+        context[@attributes['offset']].to_i
       end
-            
-      result = []
-      segment = collection[range]
-      return '' if segment.nil?        
+        
+      limit = context[@attributes['limit']]
+      to    = limit ? limit.to_i + from : nil  
+          
+                       
+      segment = slice_collection_using_each(collection, from, to)      
+      
+      return '' if segment.empty?
+      
+      segment.reverse! if @reversed
 
+      result = []
+        
+      length = segment.length            
+            
+      # Store our progress through the collection for the continue flag
+      context.registers[:for][@name] = from + segment.length
+              
       context.stack do 
-        length = segment.length
-      
-        segment.each_with_index do |item, index|
+        segment.each_with_index do |item, index|     
           context[@variable_name] = item
           context['forloop'] = {
             'name'    => @name,
@@ -103,15 +104,32 @@ module Liquid
             'rindex0' => length - index -1,
             'first'   => (index == 0),
             'last'    => (index == length - 1) }
-        
+
           result << render_all(@nodelist, context)
         end
       end
-    
-      # Store position of last element we rendered. This allows us to do 
-    
-      result 
-    end           
+      result     
+    end          
+        
+    def slice_collection_using_each(collection, from, to)       
+      segments = []      
+      index = 0      
+      yielded = 0
+      collection.each do |item|         
+                
+        if to && to <= index
+          break
+        end
+        
+        if from <= index                               
+          segments << item
+        end                    
+                
+        index += 1
+      end    
+
+      segments
+    end
   end
 
   Template.register_tag('for', For)

data/lib/liquid/tags/if.rb

@@ -13,7 +13,7 @@ module Liquid
   #
   class If < Block
     SyntaxHelp = "Syntax Error in tag 'if' - Valid syntax: if [expression]"
-    Syntax = /(#{QuotedFragment})\s*([=!<>a-z_]+)?\s*(#{QuotedFragment})?/
+    Syntax = /(#{Expression})\s*([=!<>a-z_]+)?\s*(#{Expression})?/
     
     def initialize(tag_name, markup, tokens)    
     
@@ -51,14 +51,14 @@ module Liquid
       else        
         
         expressions = markup.split(/\b(and|or)\b/).reverse
-        raise SyntaxHelp unless expressions.shift =~ Syntax 
+        raise(SyntaxError, SyntaxHelp) unless expressions.shift =~ Syntax 
 
         condition = Condition.new($1, $2, $3)               
         
         while not expressions.empty?
           operator = expressions.shift 
           
-          raise SyntaxHelp unless expressions.shift.to_s =~ Syntax    
+          raise(SyntaxError, SyntaxHelp) unless expressions.shift.to_s =~ Syntax    
           
           new_condition = Condition.new($1, $2, $3)
           new_condition.send(operator.to_sym, condition)     

data/lib/liquid/template.rb

@@ -83,7 +83,7 @@ module Liquid
     #    filters and tags and might be useful to integrate liquid more with its host application  
     #
     def render(*args)
-      return '' if @root.nil?
+      return '' if @root.nil?                          
 
       context = case args.first
       when Liquid::Context
@@ -107,17 +107,17 @@ module Liquid
 
         if options[:filters]
           context.add_filters(options[:filters])
-        end
+        end                         
+        
       when Module
         context.add_filters(args.pop)    
       when Array
         context.add_filters(args.pop)            
       end
-                              
-                              
-      # render the nodelist.
-      # for performance reasons we get a array back here. to_s will make a string out of it
+                                                            
       begin
+        # render the nodelist.
+        # for performance reasons we get a array back here. join will make a string out of it
         @root.render(context).join
       ensure
         @errors = context.errors
@@ -131,7 +131,8 @@ module Liquid
     private
     
     # Uses the <tt>Liquid::TemplateParser</tt> regexp to tokenize the passed source
-    def tokenize(source)      
+    def tokenize(source)
+      source = source.source if source.respond_to?(:source)      
       return [] if source.to_s.empty?
       tokens = source.split(TemplateParser)
 

data/lib/liquid/variable.rb

@@ -1,5 +1,5 @@
 module Liquid
-  
+
   # Holds variables. Variables are only loaded "just in time"
   # and are not evaluated as part of the render stage
   #
@@ -10,30 +10,29 @@ module Liquid
   #
   #   {{ user | link }}
   #
-  class Variable    
+  class Variable
     attr_accessor :filters, :name
-    
+
     def initialize(markup)
-      @markup  = markup                            
+      @markup  = markup
       @name    = nil
       @filters = []
       if match = markup.match(/\s*(#{QuotedFragment})/)
         @name = match[1]
-        if markup.match(/#{FilterSperator}\s*(.*)/)
-          filters = Regexp.last_match(1).split(/#{FilterSperator}/)
-        
+        if markup.match(/#{FilterSeparator}\s*(.*)/)
+          filters = Regexp.last_match(1).split(/#{FilterSeparator}/)
           filters.each do |f|    
             if matches = f.match(/\s*(\w+)/)
               filtername = matches[1]
-              filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*(#{QuotedFragment})/).flatten            
+              filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*(#{QuotedFragment})/).flatten
               @filters << [filtername.to_sym, filterargs]
             end
           end
         end
       end
-    end                        
+    end
 
-    def render(context)      
+    def render(context)
       return '' if @name.nil?
       output = context[@name]
       @filters.inject(output) do |output, filter|
@@ -45,7 +44,7 @@ module Liquid
         rescue FilterNotFound
           raise FilterNotFound, "Error - filter '#{filter[0]}' in '#{@markup.strip}' could not be found."
         end
-      end  
+      end
       output
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: liquid
 version: !ruby/object:Gem::Version 
-  version: 1.9.0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -9,17 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -04:00
+date: 2009-03-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.8.2
     version: 
 description: A secure non evaling end user template engine with aesthetic markup.
 email: tobi@leetsoft.com
@@ -38,11 +39,6 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- example/server/example_servlet.rb
-- example/server/liquid_servlet.rb
-- example/server/server.rb
-- example/server/templates/index.liquid
-- example/server/templates/products.liquid
 - init.rb
 - lib/extras/liquid_view.rb
 - lib/liquid.rb
@@ -71,32 +67,6 @@ files:
 - lib/liquid/tags/unless.rb
 - lib/liquid/template.rb
 - lib/liquid/variable.rb
-- test/block_test.rb
-- test/condition_test.rb
-- test/context_test.rb
-- test/drop_test.rb
-- test/error_handling_test.rb
-- test/extra/breakpoint.rb
-- test/extra/caller.rb
-- test/file_system_test.rb
-- test/filter_test.rb
-- test/helper.rb
-- test/html_tag_test.rb
-- test/if_else_test.rb
-- test/include_tag_test.rb
-- test/module_ex_test.rb
-- test/output_test.rb
-- test/parsing_quirks_test.rb
-- test/regexp_test.rb
-- test/security_test.rb
-- test/standard_filter_test.rb
-- test/standard_tag_test.rb
-- test/statements_test.rb
-- test/strainer_test.rb
-- test/template_test.rb
-- test/test_helper.rb
-- test/unless_else_test.rb
-- test/variable_test.rb
 has_rdoc: true
 homepage: http://www.liquidmarkup.org
 post_install_message: 
@@ -120,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: liquid
-rubygems_version: 1.1.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A secure non evaling end user template engine with aesthetic markup.