liquid 1.7.0

data/CHANGELOG

@@ -0,0 +1,38 @@
+Changelog
+
+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

@@ -0,0 +1,20 @@
+Copyright (c) 2005, 2006 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
+without limitation the rights to use, copy, modify, merge, publish,
+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 PURPOa AND
+NONINFRINGEMENT. IN NO EVENT SaALL 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

@@ -0,0 +1,60 @@
+CHANGELOG
+MIT-LICENSE
+Manifest.txt
+README
+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
+lib/liquid/block.rb
+lib/liquid/condition.rb
+lib/liquid/context.rb
+lib/liquid/document.rb
+lib/liquid/drop.rb
+lib/liquid/errors.rb
+lib/liquid/extensions.rb
+lib/liquid/file_system.rb
+lib/liquid/htmltags.rb
+lib/liquid/standardfilters.rb
+lib/liquid/strainer.rb
+lib/liquid/tag.rb
+lib/liquid/tags/assign.rb
+lib/liquid/tags/capture.rb
+lib/liquid/tags/case.rb
+lib/liquid/tags/comment.rb
+lib/liquid/tags/cycle.rb
+lib/liquid/tags/for.rb
+lib/liquid/tags/if.rb
+lib/liquid/tags/ifchanged.rb
+lib/liquid/tags/include.rb
+lib/liquid/tags/unless.rb
+lib/liquid/template.rb
+lib/liquid/variable.rb
+test/block_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/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/unless_else_test.rb
+test/variable_test.rb

data/README

@@ -0,0 +1,38 @@
+= Liquid template engine
+
+Liquid is a template engine which I wrote for very specific requirements
+
+* It has to have beautiful and simple markup. 
+  Template engines which don't produce good looking markup are no fun to use. 
+* It needs to be non evaling and secure. Liquid templates are made so that users can edit them. You don't want to run code on your server which your users wrote. 
+* It has to be stateless. Compile and render steps have to be seperate so that the expensive parsing and compiling can be done once and later on you can 
+  just render it   passing in a hash with local variables and objects.
+
+== Why should i use Liquid
+
+* You want to allow your users to edit the appearance of your application but don't want them to run insecure code on your server.
+* You want to render templates directly from the database
+* You like smarty style template engines 
+* You need a template engine which does HTML just as well as Emails
+* You don't like the markup of your current one
+
+== What does it look like?
+
+	<ul id="products">  
+	  {% for product in products %}
+	    <li>
+	      <h2>{{product.name}}</h2>
+	      Only {{product.price | price }}
+  
+	      {{product.description | prettyprint | paragraph }}
+ 	    </li>      
+	  {% endfor %}  
+	</ul>
+
+== Howto use Liquid
+
+Liquid supports a very simple API based around the Liquid::Template class.
+For standard use you can just pass it the content of a file and call render with a parameters hash. 
+
+	@template = Liquid::Template.parse("hi {{name}}") # Parses and compiles the template
+	@template.render( 'name' => 'tobi' )              # => "hi tobi" 

data/Rakefile

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'rake'
+require 'hoe'
+
+PKG_VERSION = "1.7.0"
+PKG_NAME    = "liquid"
+PKG_DESC    = "A secure non evaling end user template engine with aesthetic markup."
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "lib"
+  t.libs << "test"
+  t.pattern = 'test/*_test.rb'
+  t.verbose = false
+end
+
+Hoe.new(PKG_NAME, PKG_VERSION) do |p|
+  p.rubyforge_name = PKG_NAME
+  p.summary        = PKG_DESC
+  p.description    = nil
+  p.author         = "Tobias Luetke"
+  p.email          = "tobi@leetsoft.com"
+  p.url            = "http://home.leetsoft.com/liquid"    
+end

data/example/server/example_servlet.rb

@@ -0,0 +1,37 @@
+module ProductsFilter
+  def price(integer)
+    sprintf("$%.2d USD", integer / 100.0)
+  end
+  
+  def prettyprint(text)
+    text.gsub( /\*(.*)\*/, '<b>\1</b>' )
+  end
+  
+  def count(array)
+    array.size
+  end
+  
+  def paragraph(p)
+    "<p>#{p}</p>"
+  end
+end
+
+class Servlet < LiquidServlet
+  
+  def index
+    { 'date' => Time.now }
+  end
+  
+  def products    
+    { 'products' => products_list, 'section' => 'Snowboards', 'cool_products' => true}    
+  end
+  
+  private
+  
+  def products_list
+    [{'name' => 'Arbor Draft', 'price' => 39900, 'description' => 'the *arbor draft* is a excellent product' },
+    {'name' => 'Arbor Element', 'price' => 40000, 'description' => 'the *arbor element* rocks for freestyling'},
+    {'name' => 'Arbor Diamond', 'price' => 59900, 'description' => 'the *arbor diamond* is a made up product because im obsessed with arbor and have no creativity'}]
+  end
+  
+end

data/example/server/liquid_servlet.rb

@@ -0,0 +1,28 @@
+class LiquidServlet < WEBrick::HTTPServlet::AbstractServlet
+
+  def do_GET(req, res)
+    handle(:get, req, res)
+  end
+
+  def do_POST(req, res)
+    handle(:post, req, res)
+  end
+  
+  private
+  
+  def handle(type, req, res)
+    @request, @response = req, res
+    
+    @request.path_info =~ /(\w+)$/
+    @action = $1 || 'index'    
+    @assigns = send(@action) if respond_to?(@action)    
+
+    @response['Content-Type'] = "text/html"
+    @response.status = 200
+    @response.body = Liquid::Template.parse(read_template).render(@assigns, :filters => [ProductsFilter])      
+  end
+  
+  def read_template(filename = @action)
+    File.read( File.dirname(__FILE__) + "/templates/#{filename}.liquid" )
+  end
+end

data/example/server/server.rb

@@ -0,0 +1,12 @@
+require 'webrick'
+require 'rexml/document'
+
+require File.dirname(__FILE__) + '/../../lib/liquid'
+require File.dirname(__FILE__) + '/liquid_servlet'
+require File.dirname(__FILE__) + '/example_servlet'
+
+# Setup webrick
+server = WEBrick::HTTPServer.new( :Port => ARGV[1] || 3000 )
+server.mount('/', Servlet)
+trap("INT"){ server.shutdown }
+server.start

data/example/server/templates/index.liquid

@@ -0,0 +1,6 @@
+<p>Hello world!</p>
+
+<p>It is {{date}}</p>
+
+
+<p>Check out the <a href="http://localhost:3000/products">Products</a> screen </p>

data/example/server/templates/products.liquid

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Language" content="en-us" />
+		
+		<title>products</title>
+		
+		<meta name="ROBOTS" content="ALL" />
+		<meta http-equiv="imagetoolbar" content="no" />
+		<meta name="MSSmartTagsPreventParsing" content="true" />
+		<meta name="Copyright" content="(c) 2005 Copyright content:  Copyright design: Tobias Luetke" />
+		<!-- (c) Copyright 2005 by Tobias Luetke All Rights Reserved. -->
+	</head>
+	
+	<body>
+	  
+	  <h1>There are currently {{products | count}} products in the {{section}} catalog</h1>
+
+    {% if cool_products %}
+      Cool products :) 
+    {% else %}
+      Uncool products :(    
+    {% endif %}
+
+    <ul id="products">
+      
+      {% for product in products %}
+        <li>
+          <h2>{{product.name}}</h2>
+          Only {{product.price | price }}
+      
+          {{product.description | prettyprint | paragraph }}
+          
+          {{ 'it rocks!' | paragraph }}
+          
+        </li>      
+      {% endfor %}
+      
+    </ul>
+	
+	</body>
+</html>

data/init.rb

@@ -0,0 +1,6 @@
+require 'liquid'
+require 'extras/liquid_view'
+
+ActionView::Base::register_template_handler :liquid, LiquidView
+  
+  

data/lib/extras/liquid_view.rb

@@ -0,0 +1,27 @@
+# LiquidView is a action view extension class. You can register it with rails
+# and use liquid as an template system for .liquid files
+#
+# Example
+# 
+#   ActionView::Base::register_template_handler :liquid, LiquidView
+class LiquidView
+
+  def initialize(action_view)
+    @action_view = action_view
+  end
+  
+
+  def render(template, local_assigns)
+    @action_view.controller.headers["Content-Type"] ||= 'text/html; charset=utf-8'
+    assigns = @action_view.assigns.dup
+    
+    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.render(assigns, :filters => [@action_view.controller.master_helper_module], :registers => {:action_view => @action_view, :controller => @action_view.controller})
+  end
+
+end

data/lib/liquid.rb

@@ -0,0 +1,66 @@
+# 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
+# without limitation the rights to use, copy, modify, merge, publish,
+# 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 PURPOa AND
+# NONINFRINGEMENT. IN NO EVENT SaALL 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.
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+module Liquid
+  FilterSperator              = /\|/
+  ArgumentSeparator           = ','
+  FilterArgumentSeparator     = ':'
+  VariableAttributeSeparator  = '.'
+  TagStart                    = /\{\%/
+  TagEnd                      = /\%\}/
+  VariableSignature           = /[\w\-\.\[\]]/
+  VariableSegment             = /[\w\-]/
+  VariableStart               = /\{\{/
+  VariableEnd                 = /\}\}/
+  QuotedFragment              = /"[^"]+"|'[^']+'|[^\s,|]+/
+  TagAttributes               = /(\w+)\s*\:\s*(#{QuotedFragment})/
+  TemplateParser              = /(#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableEnd})/
+  VariableParser              = /(?=\[)#{VariableSegment}+(?=\])|#{VariableSegment}+/
+end
+
+require 'liquid/drop'
+require 'liquid/extensions'
+require 'liquid/errors'
+require 'liquid/strainer'
+require 'liquid/context'
+require 'liquid/tag'
+require 'liquid/block'
+require 'liquid/document'
+require 'liquid/variable'
+require 'liquid/file_system'
+require 'liquid/template'
+require 'liquid/htmltags'
+require 'liquid/standardfilters'
+require 'liquid/condition'
+
+# Load all the tags of the standard library 
+#
+Dir[File.dirname(__FILE__) + '/liquid/tags/*.rb'].each { |f| require f }
+
+
+
+
+
+
+
+

data/lib/liquid/block.rb

@@ -0,0 +1,101 @@
+module Liquid
+  
+  class Block < Tag
+    def parse(tokens)
+      @nodelist ||= []
+      @nodelist.clear
+
+      while token = tokens.shift 
+
+        case token
+        when /^#{TagStart}/                   
+          if token =~ /^#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}$/
+
+            # if we found the proper block delimitor just end parsing here and let the outer block
+            # proceed                               
+            if block_delimiter == $1
+              end_tag
+              return
+            end
+
+            # fetch the tag from registered blocks
+            if tag = Template.tags[$1]
+              @nodelist << tag.new($2, tokens)
+            else
+              # this tag is not registered with the system 
+              # pass it to the current block for special handling or error reporting
+              unknown_tag($1, $2, tokens)
+            end              
+          else
+            raise SyntaxError, "Tag '#{token}' was not properly terminated with regexp: #{TagEnd.inspect} "
+          end
+        when /^#{VariableStart}/
+          @nodelist << create_variable(token)
+        when ''
+          # pass
+        else
+          @nodelist << token
+        end
+      end       
+      
+      # Make sure that its ok to end parsing in the current block. 
+      # Effectively this method will throw and exception unless the current block is 
+      # of type Document 
+      assert_missing_delimitation!
+    end                     
+    
+    def end_tag      
+    end
+
+    def unknown_tag(tag, params, tokens)
+      case tag 
+      when 'else'
+        raise SyntaxError, "#{block_name} tag does not expect else tag"
+      when 'end'
+        raise SyntaxError, "'end' is not a valid delimiter for #{block_name} tags. use #{block_delimiter}"
+      else
+        raise SyntaxError, "Unknown tag '#{tag}'"
+      end
+    end
+
+    def block_delimiter
+      "end#{block_name}"
+    end                           
+
+    def block_name
+      self.class.name.scan(/\w+$/).first.downcase
+    end
+
+    def create_variable(token)
+      token.scan(/^#{VariableStart}(.*)#{VariableEnd}$/) do |content|
+        return Variable.new(content.first)
+      end
+      raise SyntaxError.new("Variable '#{token}' was not properly terminated with regexp: #{VariableEnd.inspect} ")
+    end
+
+    def render(context)
+      render_all(@nodelist, context)
+    end
+
+    protected
+
+    def assert_missing_delimitation!
+      raise SyntaxError.new("#{block_name} tag was never closed")
+    end
+
+    def render_all(list, context)
+      list.collect do |token|
+        begin        
+          if token.respond_to?(:render)
+            token.render(context) 
+          else
+            token.to_s
+          end
+        rescue Exception => e          
+          context.template.handle_error(e)
+        end
+          
+      end      
+    end
+  end  
+end