liquid 1.7.0 → 1.9.0

data/CHANGELOG

@@ -1,30 +1,32 @@
-Changelog
+* Fixed gem install rake task
+* Improve Error encapsulation in liquid by maintaining a own set of exceptions instead of relying on ruby build ins
 
-Implemented .to_liquid for all objects which can be passed to liquid like Strings Arrays Hashes Numerics and Booleans. 
-To export new objects to liquid just implement .to_liquid on them and return objects which themselves have .to_liquid methods. 
+* Added If with or / and expressions
 
-Added more tags to standard library
+* Implemented .to_liquid for all objects which can be passed to liquid like Strings Arrays Hashes Numerics and Booleans. To export new objects to liquid just implement .to_liquid on them and return objects which themselves have .to_liquid methods. 
 
-Added include tag ( like partials in rails )
+* Added more tags to standard library
 
-[...] Gazillion of detail improvements
+* Added include tag ( like partials in rails )
 
-Added strainers as filter hosts for better security [Tobias Luetke]
+* [...] Gazillion of detail improvements
 
-Fixed that rails integration would call filter with the wrong "self" [Michael Geary]
+* Added strainers as filter hosts for better security [Tobias Luetke]
 
-Fixed bad error reporting when a filter called a method which doesn't exist. Liquid told you that it couldn't find the 
-filter which was obviously misleading [Tobias Luetke]
+* Fixed that rails integration would call filter with the wrong "self" [Michael Geary]
 
-Removed count helper from standard lib. use size [Tobias Luetke]
+* Fixed bad error reporting when a filter called a method which doesn't exist. Liquid told you that it couldn't find the filter which was obviously misleading [Tobias Luetke]
 
-Fixed bug with string filter parameters failing to tolerate commas in strings. [Paul Hammond]
+* Removed count helper from standard lib. use size [Tobias Luetke]
 
-Improved filter parameters. Filter parameters are now context sensitive; Types are resolved according to the rules of the context. Multiple parameters are now separated by the Liquid::ArgumentSeparator: , by default [Paul Hammond]
+* Fixed bug with string filter parameters failing to tolerate commas in strings. [Paul Hammond]
+
+* Improved filter parameters. Filter parameters are now context sensitive; Types are resolved according to the rules of the context. Multiple parameters are now separated by the Liquid::ArgumentSeparator: , by default [Paul Hammond]
+	
 	{{ 'Typo' | link_to: 'http://typo.leetsoft.com', 'Typo - a modern weblog engine' }}
 	
 
-Added Liquid::Drop. A base class which you can use for exporting proxy objects to liquid which can acquire more data when used in liquid. [Tobias Luetke] 
+* Added Liquid::Drop. A base class which you can use for exporting proxy objects to liquid which can acquire more data when used in liquid. [Tobias Luetke] 
 
   class ProductDrop < Liquid::Drop
     def top_sales
@@ -35,4 +37,4 @@ Added Liquid::Drop. A base class which you can use for exporting proxy objects t
   t.render('product' => ProductDrop.new )
 
 
-Added filter parameters support. Example: {{ date | format_date: "%Y" }} [Paul Hammond]
+* Added filter parameters support. Example: {{ date | format_date: "%Y" }} [Paul Hammond]

data/History.txt

@@ -0,0 +1,44 @@
+1.9.0 / 2008-03-04
+
+* Fixed gem install rake task
+* Improve Error encapsulation in liquid by maintaining a own set of exceptions instead of relying on ruby build ins
+
+Before 1.9.0
+
+* Added If with or / and expressions
+
+* Implemented .to_liquid for all objects which can be passed to liquid like Strings Arrays Hashes Numerics and Booleans. To export new objects to liquid just implement .to_liquid on them and return objects which themselves have .to_liquid methods. 
+
+* Added more tags to standard library
+
+* Added include tag ( like partials in rails )
+
+* [...] Gazillion of detail improvements
+
+* Added strainers as filter hosts for better security [Tobias Luetke]
+
+* Fixed that rails integration would call filter with the wrong "self" [Michael Geary]
+
+* Fixed bad error reporting when a filter called a method which doesn't exist. Liquid told you that it couldn't find the filter which was obviously misleading [Tobias Luetke]
+
+* Removed count helper from standard lib. use size [Tobias Luetke]
+
+* Fixed bug with string filter parameters failing to tolerate commas in strings. [Paul Hammond]
+
+* Improved filter parameters. Filter parameters are now context sensitive; Types are resolved according to the rules of the context. Multiple parameters are now separated by the Liquid::ArgumentSeparator: , by default [Paul Hammond]
+	
+	{{ 'Typo' | link_to: 'http://typo.leetsoft.com', 'Typo - a modern weblog engine' }}
+	
+
+* Added Liquid::Drop. A base class which you can use for exporting proxy objects to liquid which can acquire more data when used in liquid. [Tobias Luetke] 
+
+  class ProductDrop < Liquid::Drop
+    def top_sales
+       Shop.current.products.find(:all, :order => 'sales', :limit => 10 )
+    end
+  end   
+  t = Liquid::Template.parse( ' {% for product in product.top_sales %} {{ product.name }} {% endfor %} '  )
+  t.render('product' => ProductDrop.new )
+
+
+* Added filter parameters support. Example: {{ date | format_date: "%Y" }} [Paul Hammond]

data/MIT-LICENSE

@@ -13,8 +13,8 @@ included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOa AND
-NONINFRINGEMENT. IN NO EVENT SaALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Manifest.txt

@@ -1,7 +1,8 @@
 CHANGELOG
+History.txt
 MIT-LICENSE
 Manifest.txt
-README
+README.txt
 Rakefile
 example/server/example_servlet.rb
 example/server/liquid_servlet.rb
@@ -20,6 +21,7 @@ lib/liquid/errors.rb
 lib/liquid/extensions.rb
 lib/liquid/file_system.rb
 lib/liquid/htmltags.rb
+lib/liquid/module_ex.rb
 lib/liquid/standardfilters.rb
 lib/liquid/strainer.rb
 lib/liquid/tag.rb
@@ -36,6 +38,7 @@ 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
@@ -47,6 +50,7 @@ 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
@@ -56,5 +60,6 @@ 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

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'hoe'
 
-PKG_VERSION = "1.7.0"
+PKG_VERSION = "1.9.0"
 PKG_NAME    = "liquid"
 PKG_DESC    = "A secure non evaling end user template engine with aesthetic markup."
 
@@ -17,8 +17,8 @@ end
 Hoe.new(PKG_NAME, PKG_VERSION) do |p|
   p.rubyforge_name = PKG_NAME
   p.summary        = PKG_DESC
-  p.description    = nil
+  p.description    = PKG_DESC
   p.author         = "Tobias Luetke"
   p.email          = "tobi@leetsoft.com"
-  p.url            = "http://home.leetsoft.com/liquid"    
+  p.url            = "http://www.liquidmarkup.org"    
 end

data/init.rb

@@ -1,6 +1,8 @@
 require 'liquid'
 require 'extras/liquid_view'
 
-ActionView::Base::register_template_handler :liquid, LiquidView
-  
-  
+if defined? ActionView::Template and ActionView::Template.respond_to? :register_template_handler
+  ActionView::Template
+else
+  ActionView::Base
+end.register_template_handler(:liquid, LiquidView)

data/lib/liquid.rb

@@ -13,8 +13,8 @@
 # 
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOa AND
-# NONINFRINGEMENT. IN NO EVENT SaALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -28,14 +28,15 @@ module Liquid
   VariableAttributeSeparator  = '.'
   TagStart                    = /\{\%/
   TagEnd                      = /\%\}/
-  VariableSignature           = /[\w\-\.\[\]]/
-  VariableSegment             = /[\w\-]/
+  VariableSignature           = /\(?[\w\-\.\[\]]\)?/
+  VariableSegment             = /[\w\-]\??/
   VariableStart               = /\{\{/
   VariableEnd                 = /\}\}/
+  VariableIncompleteEnd       = /\}\}?/
   QuotedFragment              = /"[^"]+"|'[^']+'|[^\s,|]+/
   TagAttributes               = /(\w+)\s*\:\s*(#{QuotedFragment})/
-  TemplateParser              = /(#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableEnd})/
-  VariableParser              = /(?=\[)#{VariableSegment}+(?=\])|#{VariableSegment}+/
+  TemplateParser              = /(#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd})/
+  VariableParser              = /\[[^\]]+\]|#{VariableSegment}+/
 end
 
 require 'liquid/drop'
@@ -52,6 +53,7 @@ require 'liquid/template'
 require 'liquid/htmltags'
 require 'liquid/standardfilters'
 require 'liquid/condition'
+require 'liquid/module_ex'
 
 # Load all the tags of the standard library 
 #

data/lib/liquid/block.rb

@@ -1,6 +1,7 @@
 module Liquid
   
   class Block < Tag
+
     def parse(tokens)
       @nodelist ||= []
       @nodelist.clear
@@ -20,7 +21,7 @@ module Liquid
 
             # fetch the tag from registered blocks
             if tag = Template.tags[$1]
-              @nodelist << tag.new($2, tokens)
+              @nodelist << tag.new($1, $2, tokens)
             else
               # this tag is not registered with the system 
               # pass it to the current block for special handling or error reporting
@@ -63,7 +64,7 @@ module Liquid
     end                           
 
     def block_name
-      self.class.name.scan(/\w+$/).first.downcase
+      @tag_name
     end
 
     def create_variable(token)
@@ -76,7 +77,7 @@ module Liquid
     def render(context)
       render_all(@nodelist, context)
     end
-
+    
     protected
 
     def assert_missing_delimitation!
@@ -86,13 +87,9 @@ module Liquid
     def render_all(list, context)
       list.collect do |token|
         begin        
-          if token.respond_to?(:render)
-            token.render(context) 
-          else
-            token.to_s
-          end
+          token.respond_to?(:render) ? token.render(context) : token
         rescue Exception => e          
-          context.template.handle_error(e)
+          context.handle_error(e)
         end
           
       end      

data/lib/liquid/condition.rb

@@ -1,21 +1,55 @@
 module Liquid
-  # Container for liquid nodes which conveniently wrapps decision making logic
+  # Container for liquid nodes which conveniently wraps decision making logic
   #
   # Example:
   #
   #   c = Condition.new('1', '==', '1') 
   #   c.evaluate #=> true
   #
-  class Condition
+  class Condition #:nodoc:
+    @@operators = {
+      '==' => lambda { |cond, left, right|  cond.send(:equal_variables, left, right) },
+      '!=' => lambda { |cond, left, right| !cond.send(:equal_variables, left, right) },
+      '<>' => lambda { |cond, left, right| !cond.send(:equal_variables, left, right) },
+      '<'  => :<,
+      '>'  => :>,
+      '>=' => :>=,
+      '<=' => :<=,
+      'contains' => lambda { |cond, left, right| left.include?(right) },
+    }
+    
+    def self.operators
+      @@operators
+    end
+
     attr_reader :attachment
     attr_accessor :left, :operator, :right
   
     def initialize(left = nil, operator = nil, right = nil)
       @left, @operator, @right = left, operator, right
+      @child_relation  = nil
+      @child_condition = nil
     end
     
     def evaluate(context = Context.new)
-      interpret_condition(left, right, operator, context)
+      result = interpret_condition(left, right, operator, context)        
+      
+      case @child_relation
+      when :or 
+        result || @child_condition.evaluate(context)
+      when :and 
+        result && @child_condition.evaluate(context)
+      else
+        result
+      end      
+    end                    
+    
+    def or(condition)
+      @child_relation, @child_condition = :or, condition
+    end
+
+    def and(condition)
+      @child_relation, @child_condition = :and, condition
     end
   
     def attach(attachment)
@@ -24,6 +58,10 @@ module Liquid
   
     def else?
       false
+    end                          
+    
+    def inspect
+      "#<Condition #{[@left, @operator, @right].compact.join(' ')}>"
     end
     
     private
@@ -56,26 +94,20 @@ module Liquid
       return context[left] if op == nil      
 
       left, right = context[left], context[right]
+            
 
-      operation = case op
-      when '==' then return equal_variables(left, right)
-      when '!=' then return !equal_variables(left, right)
-      when '<>' then return !equal_variables(left, right)
-      when '>'  then :>
-      when '<'  then :<
-      when '>=' then :>=
-      when '<=' then :<=
-      else
-        raise ArgumentError.new("Error in tag '#{name}' - Unknown operator #{op}")        
-      end
+      operation = self.class.operators[op] || raise(ArgumentError.new("Unknown operator #{op}"))
 
-      if left.respond_to?(operation) and right.respond_to?(operation)
-        left.send(operation, right)      
+      if operation.respond_to?(:call)
+        operation.call(self, left, right)
+      elsif left.respond_to?(operation) and right.respond_to?(operation)        
+        left.send(operation, right)
       else
         nil
       end
     end    
-  end
+  end           
+
 
   class ElseCondition < Condition
       

data/lib/liquid/context.rb

@@ -1,8 +1,5 @@
 module Liquid
   
-  class ContextError < StandardError
-  end
-  
   # Context keeps the variable stack and resolves variables, as well as keywords
   #
   #   context['variable'] = 'testing'
@@ -17,20 +14,18 @@ module Liquid
   #   context['bob']  #=> nil  class Context
   class Context
     attr_reader :scopes
-    attr_reader :template
+    attr_reader :errors, :registers
     
-    def initialize(template)
-      @template   = template
-      @scopes     = [template.assigns]
-    end
+    def initialize(assigns = {}, registers = {}, rethrow_errors = false)
+      @scopes     = [(assigns || {})]
+      @registers  = registers
+      @errors     = []
+      @rethrow_errors = rethrow_errors
+    end    
            
     def strainer
       @strainer ||= Strainer.create(self)
-    end
-    
-    def registers
-      @template.registers
-    end
+    end  
                
     # adds filters to this context. 
     # this does not register the filters with the main Template object. see <tt>Template.register_filter</tt> 
@@ -38,12 +33,22 @@ module Liquid
     def add_filters(filters)
       filters = [filters].flatten.compact
       
-      raise ArgumentError, "Expected module but got: #{filter_module.class}" unless filters.all? { |f| f.is_a?(Module)}
-      
       filters.each do |f|         
+        raise ArgumentError, "Expected module but got: #{f.class}" unless f.is_a?(Module)
         strainer.extend(f)
       end      
     end
+    
+    def handle_error(e)
+      errors.push(e)
+      raise if @rethrow_errors
+      
+      case e
+      when SyntaxError then "Liquid syntax error: #{e.message}"        
+      else "Liquid error: #{e.message}"
+      end
+    end
+    
                               
     def invoke(method, *args)
       if strainer.respond_to?(method)
@@ -115,16 +120,16 @@ module Liquid
     #
     def resolve(key)
       case key
-      when nil
+      when nil, 'nil', 'null', ''
         nil
       when 'true'
         true
       when 'false'
-        false
+        false               
+      when 'blank'
+        :blank?        
       when 'empty'
         :empty?
-      when 'nil', 'null'
-        nil
       # Single quoted strings
       when /^'(.*)'$/
         $1.to_s
@@ -134,11 +139,15 @@ module Liquid
       # Integer and floats
       when /^(\d+)$/ 
         $1.to_i
+      # Ranges
+      when /^\((\S+)\.\.(\S+)\)$/        
+        (resolve($1).to_i..resolve($2).to_i)
+      # Floats
       when /^(\d[\d\.]+)$/ 
         $1.to_f
       else
         variable(key)
-      end
+      end      
     end
     
     # fetches an object starting at the local scope and then moving up 
@@ -148,7 +157,8 @@ module Liquid
         if scope.has_key?(key)
           variable = scope[key] 
           variable = scope[key] = variable.call(self) if variable.is_a?(Proc)
-          variable.context = self if variable.respond_to?(:context=)                          
+          variable = variable.to_liquid
+          variable.context = self if variable.respond_to?(:context=)
           return variable
         end
       end
@@ -164,39 +174,55 @@ module Liquid
     #  assert_equal 'tobi', @context['hash[name]']
     #
     def variable(markup)
-      parts   = markup.scan(VariableParser)      
+      parts = markup.scan(VariableParser)
+      square_bracketed = /^\[(.*)\]$/
+      
+      first_part = parts.shift
+      if first_part =~ square_bracketed
+        first_part = resolve($1)
+      end
       
-      if object = find_variable(parts.shift).to_liquid
+      if object = find_variable(first_part)
             
         parts.each do |part|        
 
           # If object is a hash we look for the presence of the key and if its available 
           # we return it
+          
+          if part =~ square_bracketed
+            part = resolve($1)
+            
+            object[pos] = object[part].call(self) if object[part].is_a?(Proc) and object.respond_to?(:[]=)
+            object      = object[part].to_liquid
+            
+          else
 
-          # Hash
-          if object.respond_to?(:has_key?) and object.has_key?(part)
+            # Hash
+            if object.respond_to?(:has_key?) and object.has_key?(part)
           
-            # if its a proc we will replace the entry in the hash table with the proc
-            object[part] = object[part].call(self) if object[part].is_a?(Proc) and object.respond_to?(:[]=)
-            object = object[part].to_liquid
+              # if its a proc we will replace the entry in the hash table with the proc
+              res = object[part]
+              res = object[part] = res.call(self) if res.is_a?(Proc) and object.respond_to?(:[]=)
+              object = res.to_liquid
 
-          # Array
-          elsif object.respond_to?(:fetch) and part =~ /^\d+$/ 
-            pos = part.to_i
+            # Array
+            elsif object.respond_to?(:fetch) and part =~ /^\d+$/ 
+              pos = part.to_i
 
-            object[pos] = object[pos].call(self) if object[pos].is_a?(Proc) and object.respond_to?(:[]=)
-            object = object[pos].to_liquid
+              object[pos] = object[pos].call(self) if object[pos].is_a?(Proc) and object.respond_to?(:[]=)
+              object = object[pos].to_liquid
           
-          # Some special cases. If no key with the same name was found we interpret following calls
-          # as commands and call them on the current object
-          elsif object.respond_to?(part) and ['size', 'first', 'last'].include?(part)
+            # Some special cases. If no key with the same name was found we interpret following calls
+            # as commands and call them on the current object
+            elsif object.respond_to?(part) and ['size', 'first', 'last'].include?(part)
           
-            object = object.send(part.intern).to_liquid
+              object = object.send(part.intern).to_liquid
         
-          # No key was present with the desired value and it wasn't one of the directly supported
-          # keywords either. The only thing we got left is to return nil
-          else
-            return nil
+            # No key was present with the desired value and it wasn't one of the directly supported
+            # keywords either. The only thing we got left is to return nil
+            else
+              return nil
+            end
           end
                 
           # If we are dealing with a drop here we have to