liquid 1.9.0 → 2.0.0

data/Manifest.txt

@@ -4,11 +4,6 @@ MIT-LICENSE
 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
@@ -37,29 +32,3 @@ lib/liquid/tags/include.rb
 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

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'hoe'
 
-PKG_VERSION = "1.9.0"
+PKG_VERSION = "2.0.0"
 PKG_NAME    = "liquid"
 PKG_DESC    = "A secure non evaling end user template engine with aesthetic markup."
 

data/lib/extras/liquid_view.rb

@@ -11,17 +11,30 @@ class LiquidView
   end
   
 
-  def render(template, local_assigns)
+  def render(template, local_assigns_for_rails_less_than_2_1_0 = nil)
     @action_view.controller.headers["Content-Type"] ||= 'text/html; charset=utf-8'
     assigns = @action_view.assigns.dup
     
+    # template is a Template object in Rails >=2.1.0, a source string previously.
+    if template.respond_to? :source
+      source = template.source
+      local_assigns = template.locals
+    else
+      source = template
+      local_assigns = local_assigns_for_rails_less_than_2_1_0
+    end
+
     if content_for_layout = @action_view.instance_variable_get("@content_for_layout")
       assigns['content_for_layout'] = content_for_layout
     end
     assigns.merge!(local_assigns)
     
-    liquid = Liquid::Template.parse(template)
+    liquid = Liquid::Template.parse(source)
     liquid.render(assigns, :filters => [@action_view.controller.master_helper_module], :registers => {:action_view => @action_view, :controller => @action_view.controller})
   end
 
+  def compilable?
+    false
+  end
+
 end

data/lib/liquid.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2005 Tobias Luetke
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # 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 PURPOSE AND
@@ -22,7 +22,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 module Liquid
-  FilterSperator              = /\|/
+  FilterSeparator             = /\|/
   ArgumentSeparator           = ','
   FilterArgumentSeparator     = ':'
   VariableAttributeSeparator  = '.'
@@ -33,9 +33,17 @@ module Liquid
   VariableStart               = /\{\{/
   VariableEnd                 = /\}\}/
   VariableIncompleteEnd       = /\}\}?/
-  QuotedFragment              = /"[^"]+"|'[^']+'|[^\s,|]+/
+  QuotedString                = /"[^"]+"|'[^']+'/
+  QuotedFragment              = /#{QuotedString}|(?:[^\s,\|'"]|#{QuotedString})+/
+  StrictQuotedFragment        = /"[^"]+"|'[^']+'|[^\s,\|,\:,\,]+/
+  FirstFilterArgument         = /#{FilterArgumentSeparator}(?:#{StrictQuotedFragment})/
+  OtherFilterArgument         = /#{ArgumentSeparator}(?:#{StrictQuotedFragment})/
+  SpacelessFilter             = /#{FilterSeparator}(?:#{StrictQuotedFragment})(?:#{FirstFilterArgument}(?:#{OtherFilterArgument})*)?/
+  Expression                  = /(?:#{QuotedFragment}(?:#{SpacelessFilter})*)/
   TagAttributes               = /(\w+)\s*\:\s*(#{QuotedFragment})/
-  TemplateParser              = /(#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd})/
+  AnyStartingTag              = /\{\{|\{\%/
+  PartialTemplateParser       = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/
+  TemplateParser              = /(#{PartialTemplateParser}|#{AnyStartingTag})/
   VariableParser              = /\[[^\]]+\]|#{VariableSegment}+/
 end
 
@@ -55,14 +63,6 @@ require 'liquid/standardfilters'
 require 'liquid/condition'
 require 'liquid/module_ex'
 
-# Load all the tags of the standard library 
+# Load all the tags of the standard library
 #
 Dir[File.dirname(__FILE__) + '/liquid/tags/*.rb'].each { |f| require f }
-
-
-
-
-
-
-
-

data/lib/liquid/block.rb

@@ -90,8 +90,7 @@ module Liquid
           token.respond_to?(:render) ? token.render(context) : token
         rescue Exception => e          
           context.handle_error(e)
-        end
-          
+        end          
       end      
     end
   end  

data/lib/liquid/context.rb

@@ -1,13 +1,13 @@
 module Liquid
-  
+
   # Context keeps the variable stack and resolves variables, as well as keywords
   #
   #   context['variable'] = 'testing'
   #   context['variable'] #=> 'testing'
   #   context['true']     #=> true
   #   context['10.2232']  #=> 10.2232
-  #   
-  #   context.stack do 
+  #
+  #   context.stack do
   #      context['bob'] = 'bobsen'
   #   end
   #
@@ -15,70 +15,73 @@ module Liquid
   class Context
     attr_reader :scopes
     attr_reader :errors, :registers
-    
+
     def initialize(assigns = {}, registers = {}, rethrow_errors = false)
       @scopes     = [(assigns || {})]
       @registers  = registers
       @errors     = []
       @rethrow_errors = rethrow_errors
-    end    
-           
+    end
+
     def strainer
       @strainer ||= Strainer.create(self)
-    end  
-               
-    # adds filters to this context. 
-    # this does not register the filters with the main Template object. see <tt>Template.register_filter</tt> 
+    end
+
+    # adds filters to this context.
+    # this does not register the filters with the main Template object. see <tt>Template.register_filter</tt>
     # for that
     def add_filters(filters)
       filters = [filters].flatten.compact
-      
-      filters.each do |f|         
+
+      filters.each do |f|
         raise ArgumentError, "Expected module but got: #{f.class}" unless f.is_a?(Module)
         strainer.extend(f)
-      end      
+      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}"
+      when SyntaxError
+        "Liquid syntax error: #{e.message}"
+      else
+        "Liquid error: #{e.message}"
       end
     end
-    
-                              
+
+
     def invoke(method, *args)
       if strainer.respond_to?(method)
         strainer.__send__(method, *args)
       else
         args.first
-      end        
+      end
     end
 
     # push new local scope on the stack. use <tt>Context#stack</tt> instead
     def push
+      raise StackLevelError, "Nesting too deep" if @scopes.length > 100
       @scopes.unshift({})
     end
-    
+
     # merge a hash of variables in the current local scope
     def merge(new_scopes)
       @scopes[0].merge!(new_scopes)
     end
-  
+
     # pop from the stack. use <tt>Context#stack</tt> instead
     def pop
-      raise ContextError if @scopes.size == 1 
+      raise ContextError if @scopes.size == 1
       @scopes.shift
     end
-    
+
     # pushes a new local scope on the stack, pops it at the end of the block
     #
     # Example:
     #
-    #   context.stack do 
+    #   context.stack do
     #      context['var'] = 'hi'
     #   end
     #   context['var]  #=> nil
@@ -88,33 +91,33 @@ module Liquid
       push
       begin
         result = yield
-      ensure 
+      ensure
         pop
       end
-      result      
+      result
     end
-  
+
     # Only allow String, Numeric, Hash, Array, Proc, Boolean or <tt>Liquid::Drop</tt>
     def []=(key, value)
       @scopes[0][key] = value
     end
-  
+
     def [](key)
       resolve(key)
     end
-  
+
     def has_key?(key)
       resolve(key) != nil
     end
-        
+
     private
-    
-    # Look up variable, either resolve directly after considering the name. We can directly handle 
-    # Strings, digits, floats and booleans (true,false). If no match is made we lookup the variable in the current scope and 
+
+    # Look up variable, either resolve directly after considering the name. We can directly handle
+    # Strings, digits, floats and booleans (true,false). If no match is made we lookup the variable in the current scope and
     # later move up to the parent blocks to see if we can resolve the variable somewhere up the tree.
     # Some special keywords return symbols. Those symbols are to be called on the rhs object in expressions
     #
-    # Example: 
+    # Example:
     #
     #   products == empty #=> products.empty?
     #
@@ -125,37 +128,40 @@ module Liquid
       when 'true'
         true
       when 'false'
-        false               
+        false
       when 'blank'
-        :blank?        
+        :blank?
       when 'empty'
         :empty?
+      # filtered variables
+      when SpacelessFilter
+        filtered_variable(key)
       # Single quoted strings
       when /^'(.*)'$/
         $1.to_s
       # Double quoted strings
       when /^"(.*)"$/
-        $1.to_s        
+        $1.to_s
       # Integer and floats
-      when /^(\d+)$/ 
+      when /^(\d+)$/
         $1.to_i
       # Ranges
-      when /^\((\S+)\.\.(\S+)\)$/        
+      when /^\((\S+)\.\.(\S+)\)$/
         (resolve($1).to_i..resolve($2).to_i)
       # Floats
-      when /^(\d[\d\.]+)$/ 
+      when /^(\d[\d\.]+)$/
         $1.to_f
       else
         variable(key)
-      end      
+      end
     end
-    
-    # fetches an object starting at the local scope and then moving up 
-    # the hierachy 
+
+    # fetches an object starting at the local scope and then moving up
+    # the hierachy
     def find_variable(key)
-      @scopes.each do |scope|        
+      @scopes.each do |scope|
         if scope.has_key?(key)
-          variable = scope[key] 
+          variable = scope[key]
           variable = scope[key] = variable.call(self) if variable.is_a?(Proc)
           variable = variable.to_liquid
           variable.context = self if variable.respond_to?(:context=)
@@ -166,77 +172,61 @@ module Liquid
     end
 
     # resolves namespaced queries gracefully.
-    # 
+    #
     # Example
-    # 
+    #
     #  @context['hash'] = {"name" => 'tobi'}
     #  assert_equal 'tobi', @context['hash.name']
-    #  assert_equal 'tobi', @context['hash[name]']
+    #  assert_equal 'tobi', @context['hash["name"]']
     #
     def variable(markup)
       parts = markup.scan(VariableParser)
       square_bracketed = /^\[(.*)\]$/
-      
+
       first_part = parts.shift
       if first_part =~ square_bracketed
         first_part = resolve($1)
       end
-      
+
       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)
-          
-              # 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
-
-              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)
-          
-              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
-            end
+        parts.each do |part|
+          part = resolve($1) if part_resolved = (part =~ square_bracketed)
+
+          # If object is a hash- or array-like object we look for the
+          # presence of the key and if its available we return it
+          if object.respond_to?(:[]) and
+            ((object.respond_to?(:has_key?) and object.has_key?(part)) or
+             (object.respond_to?(:fetch) and part.is_a?(Integer)))
+
+            # if its a proc we will replace the entry 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
+
+          # Some special cases. If the part wasn't in square brackets and
+          # no key with the same name was found we interpret following calls
+          # as commands and call them on the current object
+          elsif !part_resolved and object.respond_to?(part) and ['size', 'first', 'last'].include?(part)
+
+            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
           end
-                
-          # If we are dealing with a drop here we have to         
+
+          # If we are dealing with a drop here we have to
           object.context = self if object.respond_to?(:context=)
         end
       end
-            
+
       object
-    end                                       
-    
-    private
+    end
     
-    def execute_proc(proc)
-      proc.call(self)
+    def filtered_variable(markup)
+      Variable.new(markup).render(self)
     end
   end
 end