C extensin for Variable#lax_parse

If we are trying to get the struct from something other than self, then we
should make sure to check the class of the object.  This util functions
make this easier.

.gitignore

@@ -1,3 +1,10 @@
+*~
 *.gem
 *.swp
 pkg
+*.rbc
+.rvmrc
+.ruby-version
+*.bundle
+/tmp
+Gemfile.lock

.travis.yml

@@ -0,0 +1,16 @@
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - jruby-19mode
+  - jruby-head
+  - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode
+    - rvm: jruby-head
+
+script: "rake test"
+
+notifications:
+  disable: true

CHANGELOG

@@ -1,46 +0,0 @@
-* Make context and assign work the same
-
-* Ruby 1.9.1 bugfixes
-
-* Fix LiquidView for Rails 2.2. Fix local assigns for all versions of Rails
-
-* Fixed gem install rake task
-* Improve Error encapsulation in liquid by maintaining a own set of exceptions instead of relying on ruby build ins
-
-* 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]

CONTRIBUTING.md

@@ -0,0 +1,26 @@
+# How to contribute
+
+## Things we will merge
+
+* Bugfixes
+* Performance improvements
+* Features which are likely to be useful to the majority of Liquid users
+
+## Things we won't merge
+
+* Code which introduces considerable performance degrations
+* Code which touches performance critical parts of Liquid and comes without benchmarks
+* Features which are not important for most people (we want to keep the core Liquid code small and tidy)
+* Features which can easily be implemented on top of Liquid (for example as a custom filter or custom filesystem)
+* Code which comes without tests
+* Code which breaks existing tests
+
+## Workflow
+
+* Fork the Liquid repository
+* Create a new branch in your fork
+* If it makes sense, add tests for your code and run a performance benchmark
+* Make sure all tests pass
+* Create a pull request
+* In the description, ping one of [@boourns](https://github.com/boourns), [@fw42](https://github.com/fw42), [@camilo](https://github.com/camilo), [@dylanahsmith](https://github.com/dylanahsmith), or [@arthurnn](https://github.com/arthurnn) and ask for a code review.
+

Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

History.md

@@ -0,0 +1,139 @@
+# Liquid Version History
+
+## 3.0.0 / not yet released / branch "master"
+
+* ...
+* Add a to_s default for liquid drops, see #306 [Adam Doeler, releod]
+* Add strip, lstrip, and rstrip to standard filters [Florian Weingarten, fw42]
+* Make if, for & case tags return complete and consistent nodelists, see #250 [Nick Jones, dntj]
+* Prevent arbitrary method invocation on condition objects, see #274 [Dylan Thacker-Smith, dylanahsmith]
+* Don't call to_sym when creating conditions for security reasons, see #273 [Bouke van der Bijl, bouk]
+* Fix resource counting bug with respond_to?(:length), see #263 [Florian Weingarten, fw42]
+* Allow specifying custom patterns for template filenames, see #284 [Andrei Gladkyi, agladkyi]
+* Allow drops to optimize loading a slice of elements, see #282 [Tom Burns, boourns]
+* Support for passing variables to snippets in subdirs, see #271 [Joost Hietbrink, joost]
+* Add a class cache to avoid runtime extend calls, see #249 [James Tucker, raggi]
+* Remove some legacy Ruby 1.8 compatibility code, see #276 [Florian Weingarten, fw42]
+* Add default filter to standard filters, see #267 [Derrick Reimer, djreimer]
+* Add optional strict parsing and warn parsing, see #235 [Tristan Hume, trishume]
+* Add I18n syntax error translation, see #241 [Simon Hørup Eskildsen, Sirupsen]
+* Make sort filter work on enumerable drops, see #239 [Florian Weingarten, fw42]
+* Fix clashing method names in enumerable drops, see #238 [Florian Weingarten, fw42]
+* Make map filter work on enumerable drops, see #233 [Florian Weingarten, fw42]
+* Improved whitespace stripping for blank blocks, related to #216 [Florian Weingarten, fw42]
+* Raise `Liquid::ArgumentError` instead of `::ArgumentError` when filter has wrong number of arguments #309 [Bogdan Gusiev, bogdan]
+
+## 2.6.0 / 2013-11-25 / branch "2.6-stable"
+
+IMPORTANT: Liquid 2.6 is going to be the last version of Liquid which maintains explicit Ruby 1.8 compatability.
+The following releases will only be tested against Ruby 1.9 and Ruby 2.0 and are likely to break on Ruby 1.8.
+
+* Bugfix for #106: fix example servlet [gnowoel]
+* Bugfix for #97: strip_html filter supports multi-line tags [Jo Liss, joliss]
+* Bugfix for #114: strip_html filter supports style tags [James Allardice, jamesallardice]
+* Bugfix for #117: 'now' support for date filter in Ruby 1.9 [Notre Dame Webgroup, ndwebgroup]
+* Bugfix for #166: truncate filter on UTF-8 strings with Ruby 1.8 [Florian Weingarten, fw42]
+* Bugfix for #204: 'raw' parsing bug [Florian Weingarten, fw42]
+* Bugfix for #150: 'for' parsing bug [Peter Schröder, phoet]
+* Bugfix for #126: Strip CRLF in strip_newline [Peter Schröder, phoet]
+* Bugfix for #174, "can't convert Fixnum into String" for "replace" [wǒ_is神仙, jsw0528]
+* Allow a Liquid::Drop to be passed into Template#render [Daniel Huckstep, darkhelmet]
+* Resource limits [Florian Weingarten, fw42]
+* Add reverse filter [Jay Strybis, unreal]
+* Add utf-8 support
+* Use array instead of Hash to keep the registered filters [Tasos Stathopoulos, astathopoulos]
+* Cache tokenized partial templates [Tom Burns, boourns]
+* Avoid warnings in Ruby 1.9.3 [Marcus Stollsteimer, stomar]
+* Better documentation for 'include' tag (closes #163) [Peter Schröder, phoet]
+* Use of BigDecimal on filters to have better precision (closes #155) [Arthur Nogueira Neves, arthurnn]
+
+## 2.5.4 / 2013-11-11 / branch "2.5-stable"
+
+* Fix "can't convert Fixnum into String" for "replace", see #173, [wǒ_is神仙, jsw0528]
+
+## 2.5.3 / 2013-10-09
+
+* #232, #234, #237: Fix map filter bugs [Florian Weingarten, fw42]
+
+## 2.5.2 / 2013-09-03 / deleted
+
+Yanked from rubygems, as it contained too many changes that broke compatibility. Those changes will be on following major releases.
+
+## 2.5.1 / 2013-07-24
+
+* #230: Fix security issue with map filter, Use invoke_drop in map filter [Florian Weingarten, fw42]
+
+## 2.5.0 / 2013-03-06
+
+* Prevent Object methods from being called on drops
+* Avoid symbol injection from liquid
+* Added break and continue statements
+* Fix filter parser for args without space separators
+* Add support for filter keyword arguments
+
+
+## 2.4.0 / 2012-08-03
+
+* Performance improvements
+* Allow filters in `assign`
+* Add `modulo` filter
+* Ruby 1.8, 1.9, and Rubinius compatibility fixes
+* Add support for `quoted['references']` in `tablerow`
+* Add support for Enumerable to `tablerow`
+* `strip_html` filter removes html comments
+
+
+## 2.3.0 / 2011-10-16
+
+* Several speed/memory improvements
+* Numerous bug fixes
+* Added support for MRI 1.9, Rubinius, and JRuby
+* Added support for integer drop parameters
+* Added epoch support to `date` filter
+* New `raw` tag that suppresses parsing
+* Added `else` option to `for` tag
+* New `increment` tag
+* New `split` filter
+
+
+## 2.2.1 / 2010-08-23
+
+* Added support for literal tags
+
+
+## 2.2.0 / 2010-08-22
+
+* Compatible with Ruby 1.8.7, 1.9.1 and 1.9.2-p0
+* Merged some changed made by the community
+
+
+## 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]

History.txt

@@ -1,53 +0,0 @@
-2.2.1 / 2010-08-23
-
-* Added support for literal tags
-
-2.2.0 / 2010-08-22
-
-* Compatible with Ruby 1.8.7, 1.9.1 and 1.9.2-p0
-* Merged some changed made by the community
-
-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]

MIT-LICENSE

@@ -17,4 +17,4 @@ 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Manifest.txt

@@ -1,34 +0,0 @@
-CHANGELOG
-History.txt
-MIT-LICENSE
-Manifest.txt
-README.md
-Rakefile
-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/module_ex.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

README.md

@@ -1,42 +1,73 @@
+[![Build Status](https://secure.travis-ci.org/Shopify/liquid.png?branch=master)](http://travis-ci.org/Shopify/liquid)
 # Liquid template engine
 
+* [Contributing guidelines](CONTRIBUTING.md)
+* [Version history](History.md)
+* [Liquid documentation from Shopify](http://docs.shopify.com/themes/liquid-basics)
+* [Liquid Wiki at GitHub](https://github.com/Shopify/liquid/wiki)
+* [Website](http://liquidmarkup.org/)
+
 ## Introduction
 
-Liquid is a template engine which I wrote for very specific requirements
+Liquid is a template engine which was written with 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.
+* It has to be stateless. Compile and render steps have to be separate 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
+## Why you should 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 (PHP) 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 templating engine
+* You want to render templates directly from the database.
+* You like smarty (PHP) 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 templating engine.
 
 ## What does it look like?
 
-<code>
-  <ul id="products">
-    {% for product in products %}
-      <li>
-        <h2>{{product.name}}</h2>
-        Only {{product.price | price }}
+```html
+<ul id="products">
+  {% for product in products %}
+    <li>
+      <h2>{{ product.name }}</h2>
+      Only {{ product.price | price }}
 
-        {{product.description | prettyprint | paragraph }}
-      </li>
-    {% endfor %}
-  </ul>
-</code>
+      {{ product.description | prettyprint | paragraph }}
+    </li>
+  {% endfor %}
+</ul>
+```
 
-## Howto use Liquid
+## How to 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.
 
-<pre>
+```ruby
 @template = Liquid::Template.parse("hi {{name}}") # Parses and compiles the template
-@template.render( 'name' => 'tobi' )              # => "hi tobi"
-</pre>
+@template.render('name' => 'tobi')                # => "hi tobi"
+```
+
+### Error Modes
+
+Setting the error mode of Liquid lets you specify how strictly you want your templates to be interpreted.
+Normally the parser is very lax and will accept almost anything without error. Unfortunately this can make
+it very hard to debug and can lead to unexpected behaviour. 
+
+Liquid also comes with a stricter parser that can be used when editing templates to give better error messages
+when templates are invalid. You can enable this new parser like this:
+
+```ruby
+Liquid::Template.error_mode = :strict # Raises a SyntaxError when invalid syntax is used
+Liquid::Template.error_mode = :warn # Adds errors to template.errors but continues as normal
+Liquid::Template.error_mode = :lax # The default mode, accepts almost anything.
+```
+
+If you want to set the error mode only on specific templates you can pass `:error_mode` as an option to `parse`:
+```ruby
+Liquid::Template.parse(source, :error_mode => :strict)
+```
+This is useful for doing things like enabling strict mode only in the theme editor.
+
+It is recommended that you enable `:strict` or `:warn` mode on new apps to stop invalid templates from being created.
+It is also recommended that you use it in the template editors of existing apps to give editors better error messages.

Rakefile

@@ -1,43 +1,87 @@
-#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__), 'test') unless $:.include? File.join(File.dirname(__FILE__), 'test')
-
-require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-require 'rake/gempackagetask'
+require 'rake/extensiontask'
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require "liquid/version"
 
 task :default => 'test'
 
-Rake::TestTask.new(:test) do |t|
+desc 'run test suite with default parser'
+Rake::TestTask.new(:base_test) do |t|
   t.libs << '.' << 'lib' << 'test'
-  t.pattern = 'test/lib/**/*_test.rb'
+  t.test_files = FileList['test/liquid/**/*_test.rb']
   t.verbose = false
 end
 
-gemspec = eval(File.read('liquid.gemspec'))
-Rake::GemPackageTask.new(gemspec) do |pkg|
-  pkg.gem_spec = gemspec
+desc 'run test suite with warn error mode'
+task :warn_test do
+  ENV['LIQUID_PARSER_MODE'] = 'warn'
+  Rake::Task['base_test'].invoke
 end
 
-desc "build the gem and release it to rubygems.org"
-task :release => :gem do
-  sh "gem push pkg/liquid-#{gemspec.version}.gem"
+desc 'runs test suite with both strict and lax parsers'
+task :test do
+  ENV['LIQUID_PARSER_MODE'] = 'lax'
+  Rake::Task['base_test'].invoke
+  ENV['LIQUID_PARSER_MODE'] = 'strict'
+  Rake::Task['base_test'].reenable
+  Rake::Task['base_test'].invoke
 end
 
+task :gem => :build
+task :build do
+  system "gem build liquid.gemspec"
+end
+
+task :install => :build do
+  system "gem install liquid-#{Liquid::VERSION}.gem"
+end
+
+task :release => :build do
+  system "git tag -a v#{Liquid::VERSION} -m 'Tagging #{Liquid::VERSION}'"
+  system "git push --tags"
+  system "gem push liquid-#{Liquid::VERSION}.gem"
+  system "rm liquid-#{Liquid::VERSION}.gem"
+end
+
+namespace :benchmark do
+
+  desc "Run the liquid benchmark with lax parsing"
+  task :run do
+    ruby "./performance/benchmark.rb lax"
+  end
+
+  desc "Run the liquid benchmark with strict parsing"
+  task :strict do
+    ruby "./performance/benchmark.rb strict"
+  end
+end
+
+
 namespace :profile do
 
-  task :default => [:run]
-
-  desc "Run the liquid profile/perforamce coverage"
+  desc "Run the liquid profile/performance coverage"
   task :run do
+    ruby "./performance/profile.rb"
+  end
 
-    ruby "performance/shopify.rb"
-
+  task :stackprof do
+    ruby "./performance/stackprof.rb"
   end
 
   desc "Run KCacheGrind"
   task :grind => :run  do
-    system "kcachegrind /tmp/liquid.rubyprof_calltreeprinter.txt"
+    system "qcachegrind /tmp/liquid.rubyprof_calltreeprinter.txt"
   end
 
 end
+
+desc "Run example"
+task :example do
+  ruby "-w -d -Ilib example/server/server.rb"
+end
+
+Rake::ExtensionTask.new "liquid" do |ext|
+  ext.lib_dir = "lib/liquid"
+end
+Rake::Task[:test].prerequisites << :compile

example/server/example_servlet.rb

@@ -2,36 +2,40 @@ 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}    
+
+  def products
+    { 'products' => products_list, 'description' => description, '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
+
+  def description
+    "List of Products ~ This is a list of products with price and description."
+  end
+
+end

example/server/liquid_servlet.rb

@@ -7,22 +7,22 @@ class LiquidServlet < WEBrick::HTTPServlet::AbstractServlet
   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)    
+
+    @request.path_info =~ /(\w+)\z/
+    @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])      
+    @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
+end

example/server/server.rb

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

example/server/templates/index.liquid

@@ -3,4 +3,4 @@
 <p>It is {{date}}</p>
 
 
-<p>Check out the <a href="http://localhost:3000/products">Products</a> screen </p>
+<p>Check out the <a href="http://localhost:3000/products">Products</a> screen </p>

example/server/templates/products.liquid

@@ -1,45 +1,49 @@
 <?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">
+<!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>
+  <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>{{ description | split: '~' | first }}</h1>
+
+    <h2>{{ description | split: '~' | last }}</h2>
+
+    <h2>There are currently {{products | count}} products in the {{section}} catalog</h2>
 
     {% if cool_products %}
-      Cool products :) 
+      Cool products :)
     {% else %}
-      Uncool products :(    
+      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>      
+
+        </li>
       {% endfor %}
-      
+
     </ul>
-	
-	</body>
+
+  </body>
 </html>

ext/liquid/block.c

@@ -0,0 +1,168 @@
+#include "liquid_ext.h"
+
+VALUE cLiquidBlock;
+ID intern_assert_missing_delimitation, intern_block_delimiter, intern_is_blank, intern_new,
+   intern_new_with_options, intern_tags, intern_unknown_tag, intern_unterminated_tag,
+   intern_unterminated_variable;
+
+struct liquid_tag
+{
+    char *name, *markup;
+    long name_length, markup_length;
+};
+
+static bool parse_tag(struct liquid_tag *tag, char *token, long token_length)
+{
+    // Strip {{ and }} braces
+    token += 2;
+    token_length -= 4;
+
+    char *end = token + token_length;
+    while (token < end && isspace(*token))
+        token++;
+    tag->name = token;
+
+    char c = *token;
+    while (token < end && (isalnum(c) || c == '_'))
+        c = *(++token);
+    tag->name_length = token - tag->name;
+    if (!tag->name_length) {
+        memset(tag, 0, sizeof(*tag));
+        return false;
+    }
+
+    while (token < end && isspace(*token))
+        token++;
+    tag->markup = token;
+
+    char *last = end - 1;
+    while (token < last && isspace(*last))
+        last--;
+    end = last + 1;
+    tag->markup_length = end - token;
+    return true;
+}
+
+static VALUE rb_parse_body(VALUE self, VALUE tokenizerObj)
+{
+    struct liquid_tokenizer *tokenizer = LIQUID_TOKENIZER_GET_STRUCT(tokenizerObj);
+
+    bool blank = true;
+    VALUE nodelist = rb_iv_get(self, "@nodelist");
+    if (nodelist == Qnil) {
+        nodelist = rb_ary_new();
+        rb_iv_set(self, "@nodelist", nodelist);
+    } else {
+        rb_ary_clear(nodelist);
+    }
+
+    struct token token;
+    while (true) {
+        liquid_tokenizer_next(tokenizer, &token);
+        switch (token.type) {
+        case TOKEN_NONE:
+            /*
+             * Make sure that it's ok to end parsing in the current block.
+             * Effectively this method will throw an exception unless the current block is
+             * of type Document
+             */
+            rb_funcall(self, intern_assert_missing_delimitation, 0);
+            goto done;
+        case TOKEN_INVALID:
+        {
+            VALUE token_obj = rb_str_new(token.str, token.length);
+            if (token.str[1] == '%')
+                rb_funcall(self, intern_unterminated_tag, 1, token_obj);
+            else
+                rb_funcall(self, intern_unterminated_variable, 1, token_obj);
+            break;
+        }
+        case TOKEN_TAG:
+        {
+            struct liquid_tag tag;
+            if (!parse_tag(&tag, token.str, token.length)) {
+                // FIXME: provide more appropriate error message
+                rb_funcall(self, intern_unterminated_tag, 1, rb_str_new(token.str, token.length));
+            } else {
+                if (tag.name_length >= 3 && !memcmp(tag.name, "end", 3)) {
+                    VALUE block_delimiter = rb_funcall(self, intern_block_delimiter, 0);
+                    if (TYPE(block_delimiter) == T_STRING &&
+                        tag.name_length == RSTRING_LEN(block_delimiter) &&
+                        !memcmp(tag.name, RSTRING_PTR(block_delimiter), tag.name_length))
+                    {
+                        goto done;
+                    }
+                }
+
+                VALUE tags = rb_funcall(cLiquidTemplate, intern_tags, 0);
+                Check_Type(tags, T_HASH);
+                VALUE tag_name = rb_str_new(tag.name, tag.name_length);
+                VALUE tag_class = rb_hash_lookup(tags, tag_name);
+                VALUE markup = rb_str_new(tag.markup, tag.markup_length);
+                if (tag_class != Qnil) {
+                    VALUE options = rb_iv_get(self, "@options");
+                    if (options == Qnil)
+                        options = rb_hash_new();
+                    VALUE new_tag = rb_funcall(tag_class, intern_new_with_options, 4,
+                                               tag_name, markup, tokenizerObj, options);
+                    if (blank) {
+                        VALUE blank_block = rb_funcall(new_tag, intern_is_blank, 0);
+                        if (blank_block == Qnil || blank_block == Qfalse)
+                            blank = false;
+                    }
+                    rb_ary_push(nodelist, new_tag);
+                } else {
+                    rb_funcall(self, intern_unknown_tag, 3, tag_name, markup, tokenizerObj);
+                    /*
+                     * multi-block tags may store the nodelist in a block array on unknown_tag
+                     * then replace @nodelist with a new array. We need to use the new array
+                     * for the block following the tag token.
+                     */
+                    nodelist = rb_iv_get(self, "@nodelist");
+                }
+            }
+            break;
+        }
+        case TOKEN_VARIABLE:
+        {
+            VALUE markup = rb_str_new(token.str + 2, token.length - 4);
+            VALUE options = rb_iv_get(self, "@options");
+            VALUE new_var = rb_funcall(cLiquidVariable, intern_new, 2, markup, options);
+            rb_ary_push(nodelist, new_var);
+            blank = false;
+            break;
+        }
+        case TOKEN_STRING:
+            rb_ary_push(nodelist, rb_str_new(token.str, token.length));
+            if (blank) {
+                int i;
+                for (i = 0; i < token.length; i++) {
+                    if (!isspace(token.str[i])) {
+                        blank = false;
+                        break;
+                    }
+                }
+            }
+            break;
+        }
+    }
+done:
+    rb_iv_set(self, "@blank", blank ? Qtrue : Qfalse);
+    return Qnil;
+}
+
+void init_liquid_block()
+{
+    intern_assert_missing_delimitation = rb_intern("assert_missing_delimitation!");
+    intern_block_delimiter = rb_intern("block_delimiter");
+    intern_is_blank = rb_intern("blank?");
+    intern_new = rb_intern("new");
+    intern_new_with_options = rb_intern("new_with_options");
+    intern_tags = rb_intern("tags");
+    intern_unknown_tag = rb_intern("unknown_tag");
+    intern_unterminated_tag = rb_intern("unterminated_tag");
+    intern_unterminated_variable = rb_intern("unterminated_variable");
+
+    cLiquidBlock = rb_define_class_under(mLiquid, "Block", cLiquidTag);
+    rb_define_method(cLiquidBlock, "parse_body", rb_parse_body, 1);
+}

ext/liquid/block.h

@@ -0,0 +1,8 @@
+#ifndef LIQUID_BLOCK_H
+#define LIQUID_BLOCK_H
+
+void init_liquid_block();
+
+extern VALUE cLiquidBlock;
+
+#endif

ext/liquid/extconf.rb

@@ -0,0 +1,3 @@
+require 'mkmf'
+$CFLAGS << ' -Wall'
+create_makefile("liquid/liquid")

ext/liquid/liquid_ext.c

@@ -0,0 +1,16 @@
+#include "liquid_ext.h"
+
+VALUE mLiquid;
+VALUE cLiquidTemplate, cLiquidTag, cLiquidVariable;
+
+void Init_liquid(void)
+{
+    mLiquid = rb_define_module("Liquid");
+    cLiquidTemplate = rb_define_class_under(mLiquid, "Template", rb_cObject);
+    cLiquidTag = rb_define_class_under(mLiquid, "Tag", rb_cObject);
+    cLiquidVariable = rb_define_class_under(mLiquid, "Variable", rb_cObject);
+
+    init_liquid_tokenizer();
+    init_liquid_block();
+    init_liquid_variable();
+}

ext/liquid/liquid_ext.h

@@ -0,0 +1,16 @@
+#ifndef LIQUID_EXT_H
+#define LIQUID_EXT_H
+
+#include <stdbool.h>
+#include <ctype.h>
+#include <ruby.h>
+
+#include "tokenizer.h"
+#include "block.h"
+#include "utils.h"
+#include "variable.h"
+
+extern VALUE mLiquid;
+extern VALUE cLiquidTemplate, cLiquidTag, cLiquidVariable;
+
+#endif

ext/liquid/tokenizer.c

@@ -0,0 +1,113 @@
+#include "liquid_ext.h"
+
+VALUE cLiquidTokenizer;
+
+static void free_tokenizer(void *ptr)
+{
+    struct liquid_tokenizer *tokenizer = ptr;
+    xfree(tokenizer);
+}
+
+static VALUE rb_allocate(VALUE klass)
+{
+    VALUE obj;
+    struct liquid_tokenizer *tokenizer;
+
+    obj = Data_Make_Struct(klass, struct liquid_tokenizer, NULL, free_tokenizer, tokenizer);
+    return obj;
+}
+
+static VALUE rb_initialize(VALUE self, VALUE source)
+{
+    struct liquid_tokenizer *tokenizer;
+
+    Check_Type(source, T_STRING);
+    Data_Get_Struct(self, struct liquid_tokenizer, tokenizer);
+    tokenizer->cursor = RSTRING_PTR(source);
+    tokenizer->length = RSTRING_LEN(source);
+    return Qnil;
+}
+
+void liquid_tokenizer_next(struct liquid_tokenizer *tokenizer, struct token *token)
+{
+    if (tokenizer->length <= 0) {
+        memset(token, 0, sizeof(*token));
+        return;
+    }
+    token->type = TOKEN_STRING;
+
+    char *cursor = tokenizer->cursor;
+    char *last = tokenizer->cursor + tokenizer->length - 1;
+
+    while (cursor < last) {
+        if (*cursor++ != '{')
+            continue;
+
+        char c = *cursor++;
+        if (c != '%' && c != '{')
+            continue;
+        if (cursor - tokenizer->cursor > 2) {
+            token->type = TOKEN_STRING;
+            cursor -= 2;
+            goto found;
+        }
+        char *incomplete_end = cursor;
+        token->type = TOKEN_INVALID;
+        if (c == '%') {
+            while (cursor < last) {
+                if (*cursor++ != '%')
+                    continue;
+                c = *cursor++;
+                while (c == '%' && cursor <= last)
+                    c = *cursor++;
+                if (c != '}')
+                    continue;
+                token->type = TOKEN_TAG;
+                goto found;
+            }
+            cursor = incomplete_end;
+            goto found;
+        } else {
+            while (cursor < last) {
+                if (*cursor++ != '}')
+                    continue;
+                if (*cursor++ != '}') {
+                    incomplete_end = cursor - 1;
+                    continue;
+                }
+                token->type = TOKEN_VARIABLE;
+                goto found;
+            }
+            cursor = incomplete_end;
+            goto found;
+        }
+    }
+    cursor = last + 1;
+found:
+    token->str = tokenizer->cursor;
+    token->length = cursor - tokenizer->cursor;
+    tokenizer->cursor += token->length;
+    tokenizer->length -= token->length;
+}
+
+static VALUE rb_next(VALUE self)
+{
+    struct liquid_tokenizer *tokenizer;
+    Data_Get_Struct(self, struct liquid_tokenizer, tokenizer);
+
+    struct token token;
+    liquid_tokenizer_next(tokenizer, &token);
+    if (token.type == TOKEN_NONE)
+        return Qnil;
+
+    return rb_str_new(token.str, token.length);
+}
+
+void init_liquid_tokenizer()
+{
+    cLiquidTokenizer = rb_define_class_under(mLiquid, "Tokenizer", rb_cObject);
+    rb_define_alloc_func(cLiquidTokenizer, rb_allocate);
+    rb_define_method(cLiquidTokenizer, "initialize", rb_initialize, 1);
+    rb_define_method(cLiquidTokenizer, "next", rb_next, 0);
+    rb_define_alias(cLiquidTokenizer, "shift", "next");
+}

ext/liquid/tokenizer.h

@@ -0,0 +1,30 @@
+#ifndef LIQUID_TOKENIZER_H
+#define LIQUID_TOKENIZER_H
+
+extern VALUE cLiquidTokenizer;
+
+enum token_type {
+    TOKEN_NONE,
+    TOKEN_INVALID,
+    TOKEN_STRING,
+    TOKEN_TAG,
+    TOKEN_VARIABLE
+};
+
+struct token {
+    enum token_type type;
+    char *str;
+    int length;
+};
+
+struct liquid_tokenizer {
+    char *cursor;
+    int length;
+};
+
+void init_liquid_tokenizer();
+void liquid_tokenizer_next(struct liquid_tokenizer *tokenizer, struct token *token);
+
+#define LIQUID_TOKENIZER_GET_STRUCT(obj) ((struct liquid_tokenizer *)obj_get_data_ptr(obj, cLiquidTokenizer))
+
+#endif

ext/liquid/utils.c

@@ -0,0 +1,21 @@
+#include <ruby.h>
+
+void raise_type_error(VALUE expected, VALUE got)
+{
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
+                             rb_class2name(got), rb_class2name(expected));
+}
+
+void check_class(VALUE obj, int type, VALUE klass)
+{
+    Check_Type(obj, type);
+    VALUE obj_klass = RBASIC_CLASS(obj);
+    if (obj_klass != klass)
+        raise_type_error(klass, obj_klass);
+}
+
+void *obj_get_data_ptr(VALUE obj, VALUE klass)
+{
+    check_class(obj, T_DATA, klass);
+    return DATA_PTR(obj);
+}

ext/liquid/utils.h

@@ -0,0 +1,8 @@
+#ifndef LIQUID_UTILS_H
+#define LIQUID_UTILS_H
+
+void raise_type_error(VALUE expected, VALUE got);
+void check_class(VALUE klass);
+void *obj_get_data_ptr(VALUE obj, VALUE klass);
+
+#endif

ext/liquid/variable.c

@@ -0,0 +1,179 @@
+#include "liquid_ext.h"
+
+VALUE cLiquidVariable;
+extern VALUE mLiquid;
+
+static void free_variable(void *ptr)
+{
+    struct liquid_variable *variable = ptr;
+    xfree(variable);
+}
+
+static VALUE rb_variable_allocate(VALUE klass)
+{
+    VALUE obj;
+    struct liquid_variable *variable;
+
+    obj = Data_Make_Struct(klass, struct liquid_variable, NULL, free_variable, variable);
+    return obj;
+}
+
+static inline int skip_whitespace(char * str, int len) 
+{
+  int skipped = 0; char * ptr = str;
+  while (skipped < len && isspace(*ptr))
+    {skipped++; ptr++;}
+  return skipped;
+}
+
+static char * get_quoted_fragment(char * str, int len, int * ret_size, int * end_offset, bool colon) 
+{
+  int p = 0; /* Current position in string */
+  int start = -1, end = -1; /* Start and end indices for the found string */
+  char quoted_by = -1; /* Is the current part of string quoted by a single or double quote? If so 
+                          ignore any special chars */
+
+  while (p < len) {
+    
+    switch (str[p]) {
+      case '"': 
+        if (start == -1) {start = p; quoted_by = '"';}
+        else if (str[start] == '"') {end = p; goto quoted_fragment_found;}
+        else if (quoted_by == -1) quoted_by = '"';
+        else if (quoted_by == '"') quoted_by = -1;
+        break;
+      case '\'':
+        if (start == -1) {start = p; quoted_by = '\'';}
+        else if (str[start] == '\'') {end = p; goto quoted_fragment_found;}
+        else if (quoted_by == -1) quoted_by = '\'';
+        else if (quoted_by == '\'') quoted_by = -1;
+        break;
+      case ':': 
+        if (colon)
+          if (start != -1 && quoted_by == -1) {end = p-1; goto quoted_fragment_found;} 
+        else
+          if (start == -1) start = p;
+        break;
+      case '|':
+      case ',':
+      case '\n':
+      case '\r':
+      case '\f':
+      case '\t':
+      case '\v':
+      case ' ': 
+        if (start != -1 && quoted_by == -1) {end = p-1; goto quoted_fragment_found;} 
+        break;
+      default: 
+        if (start == -1) start = p; 
+        break;
+    }
+    p++;
+  }
+  if (p == len && start != -1 && end == -1) end = len-1;
+
+quoted_fragment_found:
+  if (end >= start) {
+    *ret_size = end-start+1;
+    *end_offset = end+1;
+    return &str[start];
+  } else {
+    *ret_size = 0;
+    return NULL;
+  }
+}
+
+static VALUE get_filters(char * str, int len, VALUE self) {
+  VALUE filters_arr = rb_ary_new(); 
+
+  int p = 0; 
+  int ret_size, end_offset; 
+  char * f;
+
+  while(p<len) {
+    if (str[p] == '|') {
+      VALUE filter = rb_ary_new();
+      VALUE f_args = rb_ary_new();
+
+      p += skip_whitespace(&str[p+1], len-p-1);
+      f = get_quoted_fragment(&str[p], len-p, &ret_size, &end_offset, true);
+      p += end_offset;
+
+      if (f) {
+        if (f[ret_size-1] == ':') ret_size--;
+        rb_ary_push(filter, rb_str_new(f, ret_size));
+      }
+
+      /* Check for filter arguments */
+      do {
+        if (p<len) {
+          p += skip_whitespace(&str[p], len-p);
+
+          // printf("\n1. %.*s\n", len-p, &str[p]);
+
+          if (str[p] != '|') {
+            f = get_quoted_fragment(&str[p], len-p, &ret_size, &end_offset, false);
+
+            // printf("\n2. %.*s\n", ret_size, f);
+            
+            p += end_offset;
+            p += skip_whitespace(&str[p], len-p);
+
+            if (str[p] == '|') p--;
+
+            if (f) rb_ary_push(f_args, rb_str_new(f, ret_size));
+          
+          } else p--;
+        }
+
+      } while (str[p] == ',' || str[p] == ':');
+
+      rb_ary_push(filter, f_args);
+
+      /* Add to filters_arr array */
+      rb_ary_push(filters_arr, filter);
+    }
+    p++;
+  }
+  return filters_arr;
+}
+
+static VALUE rb_variable_lax_parse(VALUE self, VALUE m) 
+{
+  char * markup = RSTRING_PTR(m);
+  int markup_len = RSTRING_LEN(m);
+
+  char * cursor = markup; int cursor_pos = 0; 
+  VALUE filters_arr; 
+  int size, end_offset;
+
+  /* Extract name */
+  cursor_pos += skip_whitespace(markup, markup_len); 
+  cursor = markup + cursor_pos;
+  cursor = get_quoted_fragment(cursor, markup_len - cursor_pos, &size, &end_offset, false);
+
+  if (cursor == NULL) {
+    rb_iv_set(self, "@name", Qnil);
+    filters_arr = rb_ary_new(); 
+    rb_iv_set(self, "@filters", filters_arr);
+  }
+  else 
+  {
+    rb_iv_set(self, "@name", rb_str_new(cursor, size));
+
+    /* Extract filters */
+    if (end_offset < markup_len) {
+      cursor = &markup[end_offset];
+      filters_arr = get_filters(cursor, markup_len - end_offset, self);
+      rb_iv_set(self, "@filters", filters_arr);
+    }
+  }
+  return filters_arr;
+}
+
+void init_liquid_variable()
+{
+    cLiquidVariable = rb_define_class_under(mLiquid, "Variable", rb_cObject);
+    rb_define_alloc_func(cLiquidVariable, rb_variable_allocate);
+    rb_define_method(cLiquidVariable, "lax_parse", rb_variable_lax_parse, 1);
+}

ext/liquid/variable.h

@@ -0,0 +1,13 @@
+#ifndef LIQUID_VARIABLE_H
+#define LIQUID_VARIABLE_H
+
+#include <regex.h>
+
+struct liquid_variable {
+    char *markup; long markup_len;
+    char *name; long name_len;
+};
+
+void init_liquid_variable();
+
+#endif

lib/extras/liquid_view.rb

@@ -2,15 +2,15 @@
 # and use liquid as an template system for .liquid files
 #
 # Example
-# 
+#
 #   ActionView::Base::register_template_handler :liquid, LiquidView
 class LiquidView
   PROTECTED_ASSIGNS = %w( template_root response _session template_class action_name request_origin session template
                           _response url _request _cookies variables_added _flash params _headers request cookies
                           ignore_missing_templates flash _params logger before_filter_chain_aborted headers )
-  PROTECTED_INSTANCE_VARIABLES = %w( @_request @controller @_first_render @_memoized__pick_template @view_paths 
+  PROTECTED_INSTANCE_VARIABLES = %w( @_request @controller @_first_render @_memoized__pick_template @view_paths
                                      @helpers @assigns_added @template @_render_stack @template_format @assigns )
-  
+
   def self.call(template)
     "LiquidView.new(self).render(template, local_assigns)"
   end
@@ -18,10 +18,10 @@ class LiquidView
   def initialize(view)
     @view = view
   end
-  
+
   def render(template, local_assigns = nil)
     @view.controller.headers["Content-Type"] ||= 'text/html; charset=utf-8'
-    
+
     # Rails 2.2 Template has source, but not locals
     if template.respond_to?(:source) && !template.respond_to?(:locals)
       assigns = (@view.instance_variables - PROTECTED_INSTANCE_VARIABLES).inject({}) do |hash, ivar|
@@ -31,15 +31,15 @@ class LiquidView
     else
       assigns = @view.assigns.reject{ |k,v| PROTECTED_ASSIGNS.include?(k) }
     end
-    
+
     source = template.respond_to?(:source) ? template.source : template
     local_assigns = (template.respond_to?(:locals) ? template.locals : local_assigns) || {}
-    
+
     if content_for_layout = @view.instance_variable_get("@content_for_layout")
       assigns['content_for_layout'] = content_for_layout
     end
     assigns.merge!(local_assigns.stringify_keys)
-    
+
     liquid = Liquid::Template.parse(source)
     liquid.render(assigns, :filters => [@view.controller.master_helper_module], :registers => {:action_view => @view, :controller => @view.controller})
   end
@@ -48,4 +48,4 @@ class LiquidView
     false
   end
 
-end
+end

lib/liquid.rb

@@ -19,8 +19,6 @@
 # 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
   FilterSeparator             = /\|/
   ArgumentSeparator           = ','
@@ -32,25 +30,26 @@ module Liquid
   VariableSegment             = /[\w\-]/
   VariableStart               = /\{\{/
   VariableEnd                 = /\}\}/
-  VariableIncompleteEnd       = /\}\}?/
   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})/
-  AnyStartingTag              = /\{\{|\{\%/
-  PartialTemplateParser       = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/
-  TemplateParser              = /(#{PartialTemplateParser}|#{AnyStartingTag})/
-  VariableParser              = /\[[^\]]+\]|#{VariableSegment}+\??/
-  LiteralShorthand            = /^(?:\{\{\{\s?)(.*?)(?:\s*\}\}\})$/
+  QuotedFragment              = /#{QuotedString}|(?:[^\s,\|'"]|#{QuotedString})+/o
+  StrictQuotedFragment        = /"[^"]+"|'[^']+'|[^\s|:,]+/
+  FirstFilterArgument         = /#{FilterArgumentSeparator}(?:#{StrictQuotedFragment})/o
+  OtherFilterArgument         = /#{ArgumentSeparator}(?:#{StrictQuotedFragment})/o
+  SpacelessFilter             = /\A(?:'[^']+'|"[^"]+"|[^'"])*#{FilterSeparator}(?:#{StrictQuotedFragment})(?:#{FirstFilterArgument}(?:#{OtherFilterArgument})*)?/o
+  Expression                  = /(?:#{QuotedFragment}(?:#{SpacelessFilter})*)/o
+  TagAttributes               = /(\w+)\s*\:\s*(#{QuotedFragment})/o
+  VariableParser              = /\[[^\]]+\]|#{VariableSegment}+\??/o
 end
 
+require 'liquid/liquid'
+require "liquid/version"
+require 'liquid/lexer'
+require 'liquid/parser'
+require 'liquid/i18n'
 require 'liquid/drop'
 require 'liquid/extensions'
 require 'liquid/errors'
+require 'liquid/interrupts'
 require 'liquid/strainer'
 require 'liquid/context'
 require 'liquid/tag'
@@ -63,6 +62,7 @@ require 'liquid/htmltags'
 require 'liquid/standardfilters'
 require 'liquid/condition'
 require 'liquid/module_ex'
+require 'liquid/utils'
 
 # Load all the tags of the standard library
 #

lib/liquid/block.rb

@@ -1,65 +1,37 @@
 module Liquid
-
   class Block < Tag
-    IsTag             = /^#{TagStart}/
-    IsVariable        = /^#{VariableStart}/
-    FullToken         = /^#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}$/
-    ContentOfVariable = /^#{VariableStart}(.*)#{VariableEnd}$/
-
-    def parse(tokens)
-      @nodelist ||= []
-      @nodelist.clear
-
-      while token = tokens.shift
-
-        case token
-        when IsTag
-          if token =~ FullToken
-
-            # 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($1, $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 IsVariable
-          @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!
+    def initialize(tag_name, markup, tokens)
+      super
+      parse_body(tokens)
     end
 
-    def end_tag
+    def blank?
+      @blank || false
+    end
+
+    # warnings of this block and all sub-tags
+    def warnings
+      all_warnings = []
+      all_warnings.concat(@warnings) if @warnings
+
+      (nodelist || []).each do |node|
+        all_warnings.concat(node.warnings || []) if node.respond_to?(:warnings)
+      end
+
+      all_warnings
     end
 
     def unknown_tag(tag, params, tokens)
       case tag
       when 'else'
-        raise SyntaxError, "#{block_name} tag does not expect else tag"
+        raise SyntaxError.new(options[:locale].t("errors.syntax.unexpected_else", 
+                                                 :block_name => block_name))
       when 'end'
-        raise SyntaxError, "'end' is not a valid delimiter for #{block_name} tags. use #{block_delimiter}"
+        raise SyntaxError.new(options[:locale].t("errors.syntax.invalid_delimiter", 
+                                                 :block_name => block_name, 
+                                                 :block_delimiter => block_delimiter))
       else
-        raise SyntaxError, "Unknown tag '#{tag}'"
+        raise SyntaxError.new(options[:locale].t("errors.syntax.unknown_tag", :tag => tag))
       end
     end
 
@@ -71,31 +43,59 @@ module Liquid
       @tag_name
     end
 
-    def create_variable(token)
-      token.scan(ContentOfVariable) 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 unterminated_variable(token)
+      raise SyntaxError.new(options[:locale].t("errors.syntax.variable_termination", :token => token, :tag_end => VariableEnd.inspect))
+    end
+
+    def unterminated_tag(token)
+      raise SyntaxError.new(options[:locale].t("errors.syntax.tag_termination", :token => token, :tag_end => TagEnd.inspect))
+    end
+
     def assert_missing_delimitation!
-      raise SyntaxError.new("#{block_name} tag was never closed")
+      raise SyntaxError.new(options[:locale].t("errors.syntax.tag_never_closed", :block_name => block_name))
     end
 
     def render_all(list, context)
-      list.collect do |token|
+      output = []
+      context.resource_limits[:render_length_current] = 0
+      context.resource_limits[:render_score_current] += list.length
+
+      list.each do |token|
+        # Break out if we have any unhanded interrupts.
+        break if context.has_interrupt?
+
         begin
-          token.respond_to?(:render) ? token.render(context) : token
-        rescue Exception => e
-          context.handle_error(e)
+          # If we get an Interrupt that means the block must stop processing. An
+          # Interrupt is any command that stops block execution such as {% break %}
+          # or {% continue %}
+          if token.is_a? Continue or token.is_a? Break
+            context.push_interrupt(token.interrupt)
+            break
+          end
+
+          token_output = (token.respond_to?(:render) ? token.render(context) : token)
+          context.increment_used_resources(:render_length_current, token_output)
+          if context.resource_limits_reached?
+            context.resource_limits[:reached] = true
+            raise MemoryError.new("Memory limits exceeded")
+          end
+          unless token.is_a?(Block) && token.blank?
+            output << token_output
+          end
+        rescue MemoryError => e
+          raise e
+        rescue ::StandardError => e
+          output << (context.handle_error(e))
         end
       end
+
+      output.join
     end
   end
 end

lib/liquid/context.rb

@@ -13,19 +13,37 @@ module Liquid
   #
   #   context['bob']  #=> nil  class Context
   class Context
-    attr_reader :scopes, :errors, :registers, :environments
+    attr_reader :scopes, :errors, :registers, :environments, :resource_limits
 
-    def initialize(environments = {}, outer_scope = {}, registers = {}, rethrow_errors = false)
-      @environments   = [environments].flatten
-      @scopes         = [(outer_scope || {})]
-      @registers      = registers
-      @errors         = []
-      @rethrow_errors = rethrow_errors
+    def initialize(environments = {}, outer_scope = {}, registers = {}, rethrow_errors = false, resource_limits = {})
+      @environments    = [environments].flatten
+      @scopes          = [(outer_scope || {})]
+      @registers       = registers
+      @errors          = []
+      @rethrow_errors  = rethrow_errors
+      @resource_limits = (resource_limits || {}).merge!({ :render_score_current => 0, :assign_score_current => 0 })
       squash_instance_assigns_with_environments
+
+      @interrupts = []
+      @filters = []
+    end
+
+    def increment_used_resources(key, obj)
+      @resource_limits[key] += if obj.kind_of?(String) || obj.kind_of?(Array) || obj.kind_of?(Hash)
+        obj.length
+      else
+        1
+      end
+    end
+
+    def resource_limits_reached?
+      (@resource_limits[:render_length_limit] && @resource_limits[:render_length_current] > @resource_limits[:render_length_limit]) ||
+      (@resource_limits[:render_score_limit]  && @resource_limits[:render_score_current]  > @resource_limits[:render_score_limit] ) ||
+      (@resource_limits[:assign_score_limit]  && @resource_limits[:assign_score_current]  > @resource_limits[:assign_score_limit] )
     end
 
     def strainer
-      @strainer ||= Strainer.create(self)
+      @strainer ||= Strainer.create(self, @filters)
     end
 
     # Adds filters to this context.
@@ -34,11 +52,36 @@ module Liquid
     # for that
     def add_filters(filters)
       filters = [filters].flatten.compact
-
       filters.each do |f|
         raise ArgumentError, "Expected module but got: #{f.class}" unless f.is_a?(Module)
-        strainer.extend(f)
+        Strainer.add_known_filter(f)
       end
+
+      # If strainer is already setup then there's no choice but to use a runtime
+      # extend call. If strainer is not yet created, we can utilize strainers
+      # cached class based API, which avoids busting the method cache.
+      if @strainer
+        filters.each do |f|
+          strainer.extend(f)
+        end
+      else
+        @filters.concat filters
+      end
+    end
+
+    # are there any not handled interrupts?
+    def has_interrupt?
+      @interrupts.any?
+    end
+
+    # push an interrupt to the stack. this interrupt is considered not handled.
+    def push_interrupt(e)
+      @interrupts.push(e)
+    end
+
+    # pop an interrupt from the stack
+    def pop_interrupt
+      @interrupts.pop
     end
 
     def handle_error(e)
@@ -54,17 +97,13 @@ module Liquid
     end
 
     def invoke(method, *args)
-      if strainer.respond_to?(method)
-        strainer.__send__(method, *args)
-      else
-        args.first
-      end
+      strainer.invoke(method, *args)
     end
 
     # Push new local scope on the stack. use <tt>Context#stack</tt> instead
     def push(new_scope={})
-      raise StackLevelError, "Nesting too deep" if @scopes.length > 100
       @scopes.unshift(new_scope)
+      raise StackLevelError, "Nesting too deep" if @scopes.length > 100
     end
 
     # Merge a hash of variables in the current local scope
@@ -86,17 +125,11 @@ module Liquid
     #   end
     #
     #   context['var]  #=> nil
-    def stack(new_scope={},&block)
-      result = nil
+    def stack(new_scope={})
       push(new_scope)
-
-      begin
-        result = yield
-      ensure
-        pop
-      end
-
-      result
+      yield
+    ensure
+      pop
     end
 
     def clear_instance_assigns
@@ -117,6 +150,14 @@ module Liquid
     end
 
     private
+      LITERALS = {
+        nil => nil, 'nil' => nil, 'null' => nil, '' => nil,
+        'true'  => true,
+        'false' => false,
+        'blank' => :blank?,
+        'empty' => :empty?
+      }
+
       # 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
@@ -126,35 +167,30 @@ module Liquid
       # Example:
       #   products == empty #=> products.empty?
       def resolve(key)
-        case key
-        when nil, 'nil', 'null', ''
-          nil
-        when 'true'
-          true
-        when 'false'
-          false
-        when 'blank'
-          :blank?
-        when 'empty' # Single quoted strings
-          :empty?
-        when /^'(.*)'$/ # Double quoted strings
-          $1.to_s
-        when /^"(.*)"$/ # Integer and floats
-          $1.to_s
-        when /^(\d+)$/ # Ranges
-          $1.to_i
-        when /^\((\S+)\.\.(\S+)\)$/ # Floats
-          (resolve($1).to_i..resolve($2).to_i)
-        when /^(\d[\d\.]+)$/
-          $1.to_f
+        if LITERALS.key?(key)
+          LITERALS[key]
         else
-          variable(key)
+          case key
+          when /\A'(.*)'\z/ # Single quoted strings
+            $1
+          when /\A"(.*)"\z/ # Double quoted strings
+            $1
+          when /\A(-?\d+)\z/ # Integer and floats
+            $1.to_i
+          when /\A\((\S+)\.\.(\S+)\)\z/ # Ranges
+            (resolve($1).to_i..resolve($2).to_i)
+          when /\A(-?\d[\d\.]+)\z/ # Floats
+            $1.to_f
+          else
+            variable(key)
+          end
         end
       end
 
       # Fetches an object starting at the local scope and then moving up the hierachy
       def find_variable(key)
         scope = @scopes.find { |s| s.has_key?(key) }
+        variable = nil
 
         if scope.nil?
           @environments.each do |e|
@@ -182,7 +218,7 @@ module Liquid
       #  assert_equal 'tobi', @context['hash["name"]']
       def variable(markup)
         parts = markup.scan(VariableParser)
-        square_bracketed = /^\[(.*)\]$/
+        square_bracketed = /\A\[(.*)\]\z/
 
         first_part = parts.shift
 

lib/liquid/document.rb

@@ -1,13 +1,14 @@
 module Liquid
   class Document < Block
     # we don't need markup to open this block
-    def initialize(tokens)
-      parse(tokens)
+    def initialize(tokens, options = {})
+      @options = options
+      parse_body(tokens)
     end
 
-    # There isn't a real delimter
+    # There isn't a real delimiter
     def block_delimiter
-      []
+      nil
     end
 
     # Document blocks don't need to be terminated since they are not actually opened

lib/liquid/drop.rb

@@ -1,40 +1,42 @@
+require 'set'
+
 module Liquid
 
-  # A drop in liquid is a class which allows you to to export DOM like things to liquid
+  # A drop in liquid is a class which allows you to export DOM like things to liquid.
   # Methods of drops are callable.
-  # The main use for liquid drops is the implement lazy loaded objects.
+  # The main use for liquid drops is to implement lazy loaded objects.
   # If you would like to make data available to the web designers which you don't want loaded unless needed then
-  # a drop is a great way to do that
+  # a drop is a great way to do that.
   #
   # Example:
   #
-  # class ProductDrop < Liquid::Drop
-  #   def top_sales
-  #      Shop.current.products.find(:all, :order => 'sales', :limit => 10 )
+  #   class ProductDrop < Liquid::Drop
+  #     def top_sales
+  #       Shop.current.products.find(:all, :order => 'sales', :limit => 10 )
+  #     end
   #   end
-  # end
   #
-  # tmpl = Liquid::Template.parse( ' {% for product in product.top_sales %} {{ product.name }} {%endfor%} '  )
-  # tmpl.render('product' => ProductDrop.new ) # will invoke top_sales query.
+  #   tmpl = Liquid::Template.parse( ' {% for product in product.top_sales %} {{ product.name }} {%endfor%} '  )
+  #   tmpl.render('product' => ProductDrop.new ) # will invoke top_sales query.
   #
   # Your drop can either implement the methods sans any parameters or implement the before_method(name) method which is a
-  # catch all
+  # catch all.
   class Drop
     attr_writer :context
 
+    EMPTY_STRING = ''.freeze
+
     # Catch all for the method
     def before_method(method)
       nil
     end
 
     # called by liquid to invoke a drop
-    def invoke_drop(method)
-      # for backward compatibility with Ruby 1.8
-      methods = self.class.public_instance_methods.map { |m| m.to_s }
-      if methods.include?(method.to_s)
-        send(method.to_sym)
+    def invoke_drop(method_or_key)
+      if method_or_key && method_or_key != EMPTY_STRING && self.class.invokable?(method_or_key)
+        send(method_or_key)
       else
-        before_method(method)
+        before_method(method_or_key)
       end
     end
 
@@ -42,10 +44,34 @@ module Liquid
       true
     end
 
+    def inspect
+      self.class.to_s
+    end
+
     def to_liquid
       self
     end
 
+    def to_s
+      self.class.name
+    end
+
     alias :[] :invoke_drop
+
+    private
+
+    # Check for method existence without invoking respond_to?, which creates symbols
+    def self.invokable?(method_name)
+      unless @invokable_methods
+        blacklist = Liquid::Drop.public_instance_methods + [:each]
+        if include?(Enumerable)
+          blacklist += Enumerable.public_instance_methods
+          blacklist -= [:sort, :count, :first, :min, :max, :include?]
+        end
+        whitelist = [:to_liquid] + (public_instance_methods - blacklist)
+        @invokable_methods = Set.new(whitelist.map(&:to_s))
+      end
+      @invokable_methods.include?(method_name.to_s)
+    end
   end
 end

lib/liquid/errors.rb

@@ -1,6 +1,6 @@
 module Liquid
   class Error < ::StandardError; end
-  
+
   class ArgumentError < Error; end
   class ContextError < Error; end
   class FilterNotFound < Error; end
@@ -8,4 +8,5 @@ module Liquid
   class StandardError < Error; end
   class SyntaxError < Error; end
   class StackLevelError < Error; end
-end
+  class MemoryError < Error; end
+end

lib/liquid/extensions.rb

@@ -43,14 +43,20 @@ class Date  # :nodoc:
   end
 end
 
-def true.to_liquid  # :nodoc:
-  self
+class TrueClass
+  def to_liquid  # :nodoc:
+    self
+  end
 end
 
-def false.to_liquid # :nodoc:
-  self
+class FalseClass
+  def to_liquid # :nodoc:
+    self
+  end
 end
 
-def nil.to_liquid # :nodoc:
-  self
-end
+class NilClass
+  def to_liquid # :nodoc:
+    self
+  end
+end

lib/liquid/file_system.rb

@@ -1,7 +1,7 @@
 module Liquid
-  # A Liquid file system is way to let your templates retrieve other templates for use with the include tag.
+  # A Liquid file system is a way to let your templates retrieve other templates for use with the include tag.
   #
-  # You can implement subclasses that retrieve templates from the database, from the file system using a different 
+  # You can implement subclasses that retrieve templates from the database, from the file system using a different
   # path structure, you can provide them as hard-coded inline strings, or any manner that you see fit.
   #
   # You can add additional instance variables, arguments, or methods as needed.
@@ -14,11 +14,11 @@ module Liquid
   # This will parse the template with a LocalFileSystem implementation rooted at 'template_path'.
   class BlankFileSystem
     # Called by Liquid to retrieve a template file
-    def read_template_file(template_path)
+    def read_template_file(template_path, context)
       raise FileSystemError, "This liquid context does not allow includes."
     end
   end
-  
+
   # This implements an abstract file system which retrieves template files named in a manner similar to Rails partials,
   # ie. with the template name prefixed with an underscore. The extension ".liquid" is also added.
   #
@@ -27,36 +27,47 @@ module Liquid
   # Example:
   #
   # file_system = Liquid::LocalFileSystem.new("/some/path")
-  # 
+  #
   # file_system.full_path("mypartial")       # => "/some/path/_mypartial.liquid"
   # file_system.full_path("dir/mypartial")   # => "/some/path/dir/_mypartial.liquid"
   #
+  # Optionally in the second argument you can specify a custom pattern for template filenames.
+  # The Kernel::sprintf format specification is used.
+  # Default pattern is "_%s.liquid".
+  #
+  # Example:
+  #
+  # file_system = Liquid::LocalFileSystem.new("/some/path", "%s.html")
+  #
+  # file_system.full_path("index") # => "/some/path/index.html"
+  #
   class LocalFileSystem
     attr_accessor :root
-    
-    def initialize(root)
+
+    def initialize(root, pattern = "_%s.liquid")
       @root = root
+      @pattern = pattern
     end
-    
-    def read_template_file(template_path)
+
+    def read_template_file(template_path, context)
       full_path = full_path(template_path)
       raise FileSystemError, "No such template '#{template_path}'" unless File.exists?(full_path)
-      
+
       File.read(full_path)
     end
-    
+
     def full_path(template_path)
-      raise FileSystemError, "Illegal template name '#{template_path}'" unless template_path =~ /^[^.\/][a-zA-Z0-9_\/]+$/
-      
+      raise FileSystemError, "Illegal template name '#{template_path}'" unless template_path =~ /\A[^.\/][a-zA-Z0-9_\/]+\z/
+
       full_path = if template_path.include?('/')
-        File.join(root, File.dirname(template_path), "_#{File.basename(template_path)}.liquid")
+        File.join(root, File.dirname(template_path), @pattern % File.basename(template_path))
       else
-        File.join(root, "_#{template_path}.liquid")
+        File.join(root, @pattern % template_path)
       end
-      
-      raise FileSystemError, "Illegal template path '#{File.expand_path(full_path)}'" unless File.expand_path(full_path) =~ /^#{File.expand_path(root)}/
-      
+
+      raise FileSystemError, "Illegal template path '#{File.expand_path(full_path)}'" unless File.expand_path(full_path) =~ /\A#{File.expand_path(root)}/
+
       full_path
     end
   end
-end
+end

lib/liquid/htmltags.rb

@@ -1,6 +1,6 @@
 module Liquid
   class TableRow < Block
-    Syntax = /(\w+)\s+in\s+(#{VariableSignature}+)/
+    Syntax = /(\w+)\s+in\s+(#{QuotedFragment}+)/o
 
     def initialize(tag_name, markup, tokens)
       if markup =~ Syntax
@@ -11,7 +11,7 @@ module Liquid
           @attributes[key] = value
         end
       else
-        raise SyntaxError.new("Syntax Error in 'table_row loop' - Valid syntax: table_row [item] in [collection] cols=3")
+        raise SyntaxError.new(options[:locale].t("errors.syntax.table_row"))
       end
 
       super
@@ -20,11 +20,10 @@ module Liquid
     def render(context)
       collection = context[@collection_name] or return ''
 
-      if @attributes['limit'] or @attributes['offset']
-        limit = context[@attributes['limit']] || -1
-        offset = context[@attributes['offset']] || 0
-        collection = collection[offset.to_i..(limit.to_i + offset.to_i - 1)]
-      end
+      from = @attributes['offset'] ? context[@attributes['offset']].to_i : 0
+      to = @attributes['limit'] ? from + context[@attributes['limit']].to_i : nil
+
+      collection = Utils.slice_collection(collection, from, to)
 
       length = collection.length
 
@@ -33,7 +32,7 @@ module Liquid
       row = 1
       col = 0
 
-      result = ["<tr class=\"row1\">\n"]
+      result = "<tr class=\"row1\">\n"
       context.stack do
 
         collection.each_with_index do |item, index|
@@ -46,7 +45,7 @@ module Liquid
             'col0'    => col,
             'index0'  => index,
             'rindex'  => length - index,
-            'rindex0' => length - index -1,
+            'rindex0' => length - index - 1,
             'first'   => (index == 0),
             'last'    => (index == length - 1),
             'col_first' => (col == 0),
@@ -56,17 +55,18 @@ module Liquid
 
           col += 1
 
-          result << ["<td class=\"col#{col}\">"] + render_all(@nodelist, context) + ['</td>']
+          result << "<td class=\"col#{col}\">" << super << '</td>'
 
-          if col == cols and not (index == length - 1)
+          if col == cols and (index != length - 1)
             col  = 0
             row += 1
-            result << ["</tr>\n<tr class=\"row#{row}\">"]
+            result << "</tr>\n<tr class=\"row#{row}\">"
           end
 
         end
       end
-      result + ["</tr>\n"]
+      result << "</tr>\n"
+      result
     end
   end
 

lib/liquid/i18n.rb

@@ -0,0 +1,39 @@
+require 'yaml'
+
+module Liquid
+  class I18n
+    DEFAULT_LOCALE = File.join(File.expand_path(File.dirname(__FILE__)), "locales", "en.yml")
+
+    class TranslationError < StandardError
+    end
+    
+    attr_reader :path
+
+    def initialize(path = DEFAULT_LOCALE)
+      @path = path
+    end
+
+    def translate(name, vars = {})
+      interpolate(deep_fetch_translation(name), vars)
+    end
+    alias_method :t, :translate
+
+    def locale
+      @locale ||= YAML.load_file(@path)
+    end
+
+    private
+    def interpolate(name, vars)
+      name.gsub(/%\{(\w+)\}/) {
+        # raise TranslationError, "Undefined key #{$1} for interpolation in translation #{name}"  unless vars[$1.to_sym]
+        "#{vars[$1.to_sym]}"
+      }
+    end
+
+    def deep_fetch_translation(name)
+      name.split('.').reduce(locale) do |level, cur|
+        level[cur] or raise TranslationError, "Translation for #{name} does not exist in locale #{path}"
+      end
+    end
+  end
+end

lib/liquid/interrupts.rb

@@ -0,0 +1,17 @@
+module Liquid
+
+  # An interrupt is any command that breaks processing of a block (ex: a for loop).
+  class Interrupt
+    attr_reader :message
+
+    def initialize(message=nil)
+      @message = message || "interrupt"
+    end
+  end
+
+  # Interrupt that is thrown whenever a {% break %} is called.
+  class BreakInterrupt < Interrupt; end
+
+  # Interrupt that is thrown whenever a {% continue %} is called.
+  class ContinueInterrupt < Interrupt; end
+end

lib/liquid/lexer.rb

@@ -0,0 +1,51 @@
+require "strscan"
+module Liquid
+  class Lexer
+    SPECIALS = {
+      '|' => :pipe,
+      '.' => :dot,
+      ':' => :colon,
+      ',' => :comma,
+      '[' => :open_square,
+      ']' => :close_square,
+      '(' => :open_round,
+      ')' => :close_round
+    }
+    IDENTIFIER = /[\w\-?!]+/
+    SINGLE_STRING_LITERAL = /'[^\']*'/
+    DOUBLE_STRING_LITERAL = /"[^\"]*"/
+    NUMBER_LITERAL = /-?\d+(\.\d+)?/
+    DOTDOT = /\.\./
+    COMPARISON_OPERATOR = /==|!=|<>|<=?|>=?|contains/
+
+    def initialize(input)
+      @ss = StringScanner.new(input.rstrip)
+    end
+
+    def tokenize
+      @output = []
+
+      while !@ss.eos?
+        @ss.skip(/\s*/)
+        tok = case
+        when t = @ss.scan(COMPARISON_OPERATOR) then [:comparison, t]
+        when t = @ss.scan(SINGLE_STRING_LITERAL) then [:string, t]
+        when t = @ss.scan(DOUBLE_STRING_LITERAL) then [:string, t]
+        when t = @ss.scan(NUMBER_LITERAL) then [:number, t]
+        when t = @ss.scan(IDENTIFIER) then [:id, t]
+        when t = @ss.scan(DOTDOT) then [:dotdot, t]
+        else
+          c = @ss.getch
+          if s = SPECIALS[c]
+            [s,c]
+          else
+            raise SyntaxError, "Unexpected character #{c}"
+          end
+        end
+        @output << tok
+      end
+
+      @output << [:end_of_string]
+    end
+  end
+end

lib/liquid/locales/en.yml

@@ -0,0 +1,22 @@
+---
+  errors:
+    syntax:
+      assign: "Syntax Error in 'assign' - Valid syntax: assign [var] = [source]"
+      capture: "Syntax Error in 'capture' - Valid syntax: capture [var]"
+      case: "Syntax Error in 'case' - Valid syntax: case [condition]"
+      case_invalid_when: "Syntax Error in tag 'case' - Valid when condition: {% when [condition] [or condition2...] %}"
+      case_invalid_else: "Syntax Error in tag 'case' - Valid else condition: {% else %} (no parameters) "
+      cycle: "Syntax Error in 'cycle' - Valid syntax: cycle [name :] var [, var2, var3 ...]"
+      for: "Syntax Error in 'for loop' - Valid syntax: for [item] in [collection]"
+      for_invalid_in: "For loops require an 'in' clause"
+      for_invalid_attribute: "Invalid attribute in for loop. Valid attributes are limit and offset"
+      if: "Syntax Error in tag 'if' - Valid syntax: if [expression]"
+      include: "Error in tag 'include' - Valid syntax: include '[template]' (with|for) [object|collection]"
+      unknown_tag: "Unknown tag '%{tag}'"
+      invalid_delimiter: "'end' is not a valid delimiter for %{block_name} tags. use %{block_delimiter}"
+      unexpected_else: "%{block_name} tag does not expect else tag"
+      tag_termination: "Tag '%{token}' was not properly terminated with regexp: %{tag_end}"
+      variable_termination: "Variable '%{token}' was not properly terminated with regexp: %{tag_end}"
+      tag_never_closed: "'%{block_name}' tag was never closed"
+      meta_syntax_error: "Liquid syntax error: #{e.message}"
+      table_row: "Syntax Error in 'table_row loop' - Valid syntax: table_row [item] in [collection] cols=3"

lib/liquid/module_ex.rb

@@ -2,7 +2,7 @@
 # This library is free software. It may be used, redistributed and/or modified
 # under the same terms as Ruby itself
 #
-# This extension is usesd in order to expose the object of the implementing class
+# This extension is used in order to expose the object of the implementing class
 # to liquid as it were a Drop. It also limits the liquid-callable methods of the instance
 # to the allowed method passed with the liquid_methods call
 # Example:

lib/liquid/parser.rb

@@ -0,0 +1,89 @@
+module Liquid
+  class Parser
+    def initialize(input)
+      l = Lexer.new(input)
+      @tokens = l.tokenize
+      @p = 0 # pointer to current location
+    end
+
+    def jump(point)
+      @p = point
+    end
+
+    def consume(type = nil)
+      token = @tokens[@p]
+      if type && token[0] != type
+        raise SyntaxError, "Expected #{type} but found #{@tokens[@p].first}"
+      end
+      @p += 1
+      token[1]
+    end
+
+    # Only consumes the token if it matches the type
+    # Returns the token's contents if it was consumed
+    # or false otherwise.
+    def consume?(type)
+      token = @tokens[@p]
+      return false unless token && token[0] == type
+      @p += 1
+      token[1]
+    end
+
+    # Like consume? Except for an :id token of a certain name
+    def id?(str)
+      token = @tokens[@p]
+      return false unless token && token[0] == :id
+      return false unless token[1] == str
+      @p += 1
+      token[1]
+    end
+
+    def look(type, ahead = 0)
+      tok = @tokens[@p + ahead]
+      return false unless tok
+      tok[0] == type
+    end
+
+    def expression
+      token = @tokens[@p]
+      if token[0] == :id
+        variable_signature
+      elsif [:string, :number].include? token[0]
+        consume
+      elsif token.first == :open_round
+        consume
+        first = expression
+        consume(:dotdot)
+        last = expression
+        consume(:close_round)
+        "(#{first}..#{last})"
+      else
+        raise SyntaxError, "#{token} is not a valid expression"
+      end
+    end
+
+    def argument
+      str = ""
+      # might be a keyword argument (identifier: expression)
+      if look(:id) && look(:colon, 1)
+        str << consume << consume << ' '
+      end
+
+      str << expression
+    end
+
+    def variable_signature
+      str = consume(:id)
+      if look(:open_square)
+        str << consume
+        str << expression
+        str << consume(:close_square)
+      end
+      if look(:dot)
+        str << consume
+        str << variable_signature
+      end
+      str
+    end
+  end
+end

lib/liquid/standardfilters.rb

@@ -1,8 +1,11 @@
 require 'cgi'
+require 'bigdecimal'
 
 module Liquid
 
   module StandardFilters
+    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;', "'" => '&#39;' }
+    HTML_ESCAPE_ONCE_REGEXP = /["><']|&(?!([a-zA-Z]+|(#\d+));)/
 
     # Return the size of an array or of an string
     def size(input)
@@ -10,12 +13,12 @@ module Liquid
       input.respond_to?(:size) ? input.size : 0
     end
 
-    # convert a input string to DOWNCASE
+    # convert an input string to DOWNCASE
     def downcase(input)
       input.to_s.downcase
     end
 
-    # convert a input string to UPCASE
+    # convert an input string to UPCASE
     def upcase(input)
       input.to_s.upcase
     end
@@ -30,7 +33,7 @@ module Liquid
     end
 
     def escape_once(input)
-      ActionView::Helpers::TagHelper.escape_once(input) rescue input
+      input.to_s.gsub(HTML_ESCAPE_ONCE_REGEXP, HTML_ESCAPE)
     end
 
     alias_method :h, :escape
@@ -51,16 +54,36 @@ module Liquid
       wordlist.length > l ? wordlist[0..l].join(" ") + truncate_string : input
     end
 
+    # Split input string into an array of substrings separated by given pattern.
+    #
+    # Example:
+    #   <div class="summary">{{ post | split '//' | first }}</div>
+    #
+    def split(input, pattern)
+      input.split(pattern)
+    end
+
+    def strip(input)
+      input.to_s.strip
+    end
+
+    def lstrip(input)
+      input.to_s.lstrip
+    end
+
+    def rstrip(input)
+      input.to_s.rstrip
+    end
+
     def strip_html(input)
-      input.to_s.gsub(/<script.*?<\/script>/, '').gsub(/<.*?>/, '')
+      input.to_s.gsub(/<script.*?<\/script>/m, '').gsub(/<!--.*?-->/m, '').gsub(/<style.*?<\/style>/m, '').gsub(/<.*?>/m, '')
     end
 
     # Remove all newlines from the string
     def strip_newlines(input)
-      input.to_s.gsub(/\n/, '')
+      input.to_s.gsub(/\r?\n/, '')
     end
 
-
     # Join elements of the array with certain character between them
     def join(input, glue = ' ')
       [input].flatten.join(glue)
@@ -69,7 +92,7 @@ module Liquid
     # Sort elements of the array
     # provide optional property with which to sort an array of hashes or drops
     def sort(input, property = nil)
-      ary = [input].flatten
+      ary = flatten_if_necessary(input)
       if property.nil?
         ary.sort
       elsif ary.first.respond_to?('[]') and !ary.first[property].nil?
@@ -79,24 +102,33 @@ module Liquid
       end
     end
 
+    # Reverse the elements of an array
+    def reverse(input)
+      ary = [input].flatten
+      ary.reverse
+    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) }
+      flatten_if_necessary(input).map do |e|
+        e = e.call if e.is_a?(Proc)
+
+        if property == "to_liquid"
+          e
+        elsif e.respond_to?(:[])
+          e[property]
+        end
       end
     end
 
     # Replace occurrences of a string with another
     def replace(input, string, replacement = '')
-      input.to_s.gsub(string, replacement)
+      input.to_s.gsub(string, replacement.to_s)
     end
 
     # Replace the first occurrences of a string with another
     def replace_first(input, string, replacement = '')
-      input.to_s.sub(string, replacement)
+      input.to_s.sub(string, replacement.to_s)
     end
 
     # remove a substring
@@ -158,14 +190,27 @@ module Liquid
         return input.to_s
       end
 
-      date = input.is_a?(String) ? Time.parse(input) : input
+      if ((input.is_a?(String) && !/\A\d+\z/.match(input.to_s).nil?) || input.is_a?(Integer)) && input.to_i > 0
+        input = Time.at(input.to_i)
+      end
+
+      date = if input.is_a?(String)
+        case input.downcase
+        when 'now', 'today'
+          Time.now
+        else
+          Time.parse(input)
+        end
+      else
+        input
+      end
 
       if date.respond_to?(:strftime)
         date.strftime(format.to_s)
       else
         input
       end
-    rescue => e
+    rescue
       input
     end
 
@@ -189,37 +234,63 @@ module Liquid
 
     # addition
     def plus(input, operand)
-      to_number(input) + to_number(operand)
+      apply_operation(input, operand, :+)
     end
 
     # subtraction
     def minus(input, operand)
-      to_number(input) - to_number(operand)
+      apply_operation(input, operand, :-)
     end
 
     # multiplication
     def times(input, operand)
-      to_number(input) * to_number(operand)
+      apply_operation(input, operand, :*)
     end
 
     # division
     def divided_by(input, operand)
-      to_number(input) / to_number(operand)
+      apply_operation(input, operand, :/)
+    end
+
+    def modulo(input, operand)
+      apply_operation(input, operand, :%)
+    end
+
+    def default(input, default_value = "")
+      is_blank = input.respond_to?(:empty?) ? input.empty? : !input
+      is_blank ? default_value : input
     end
 
     private
 
-      def to_number(obj)
-        case obj
-        when Numeric
-          obj
-        when String
-          (obj.strip =~ /^\d+\.\d+$/) ? obj.to_f : obj.to_i
-        else
-          0
-        end
+    def flatten_if_necessary(input)
+      ary = if input.is_a?(Array)
+        input.flatten
+      elsif input.is_a?(Enumerable) && !input.is_a?(Hash)
+        input
+      else
+        [input].flatten
       end
+      ary.map{ |e| e.respond_to?(:to_liquid) ? e.to_liquid : e }
+    end
 
+    def to_number(obj)
+      case obj
+      when Float
+        BigDecimal.new(obj.to_s)
+      when Numeric
+        obj
+      when String
+        (obj.strip =~ /\A\d+\.\d+\z/) ? BigDecimal.new(obj) : obj.to_i
+      else
+        0
+      end
+    end
+
+    def apply_operation(input, operand, operation)
+      result = to_number(input).send(operation, to_number(operand))
+      result.is_a?(BigDecimal) ? result.to_f : result
+    end
   end
 
   Template.register_filter(StandardFilters)

lib/liquid/strainer.rb

@@ -2,24 +2,20 @@ require 'set'
 
 module Liquid
 
-  parent_object = if defined? BlankObject
-    BlankObject
-  else
-    Object
-  end
-
   # Strainer is the parent class for the filters system.
-  # New filters are mixed into the strainer class which is then instanciated for each liquid template render run.
+  # New filters are mixed into the strainer class which is then instantiated for each liquid template render run.
   #
-  # One of the strainer's responsibilities is to keep malicious method calls out
-  class Strainer < parent_object #:nodoc:
-    INTERNAL_METHOD = /^__/
-    @@required_methods = Set.new([:__id__, :__send__, :respond_to?, :extend, :methods, :class, :object_id])
-
-    # Ruby 1.9.2 introduces Object#respond_to_missing?, which is invoked by Object#respond_to?
-    @@required_methods << :respond_to_missing? if Object.respond_to? :respond_to_missing?
-
-    @@filters = {}
+  # 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 = []
+    @@known_filters = Set.new
+    @@known_methods = Set.new
+    @@strainer_class_cache = Hash.new do |hash, filters|
+      hash[filters] = Class.new(Strainer) do
+        filters.each { |f| include f }
+      end
+    end
 
     def initialize(context)
       @context = context
@@ -27,28 +23,41 @@ module Liquid
 
     def self.global_filter(filter)
       raise ArgumentError, "Passed filter is not a module" unless filter.is_a?(Module)
-      @@filters[filter.name] = filter
+      add_known_filter(filter)
+      @@filters << filter unless @@filters.include?(filter)
     end
 
-    def self.create(context)
-      strainer = Strainer.new(context)
-      @@filters.each { |k,m| strainer.extend(m) }
-      strainer
-    end
-
-    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)
-      super
-    end
-
-    # remove all standard methods from the bucket so circumvent security
-    # problems
-    instance_methods.each do |m|
-      unless @@required_methods.include?(m.to_sym)
-        undef_method m
+    def self.add_known_filter(filter)
+      unless @@known_filters.include?(filter)
+        @@method_blacklist ||= Set.new(Strainer.instance_methods.map(&:to_s))
+        new_methods = filter.instance_methods.map(&:to_s)
+        new_methods.reject!{ |m| @@method_blacklist.include?(m) }
+        @@known_methods.merge(new_methods)
+        @@known_filters.add(filter)
       end
     end
+
+    def self.strainer_class_cache
+      @@strainer_class_cache
+    end
+
+    def self.create(context, filters = [])
+      filters = @@filters + filters
+      strainer_class_cache[filters].new(context)
+    end
+
+    def invoke(method, *args)
+      if invokable?(method)
+        send(method, *args)
+      else
+        args.first
+      end
+    rescue ::ArgumentError => e
+      raise Liquid::ArgumentError.new(e.message)
+    end
+
+    def invokable?(method)
+      @@known_methods.include?(method.to_s) && respond_to?(method)
+    end
   end
 end

lib/liquid/tag.rb

@@ -1,16 +1,21 @@
 module Liquid
-
   class Tag
+    attr_accessor :options
+    attr_reader :nodelist, :warnings
 
-    attr_accessor :nodelist
+    def self.new_with_options(tag_name, markup, tokens, options)
+      # Forgive me Matz for I have sinned. I know this code is weird
+      # but it was necessary to maintain API compatibility.
+      new_tag = self.allocate
+      new_tag.options = options
+      new_tag.send(:initialize, tag_name, markup, tokens)
+      new_tag
+    end
 
     def initialize(tag_name, markup, tokens)
       @tag_name   = tag_name
       @markup     = markup
-      parse(tokens)
-    end
-
-    def parse(tokens)
+      @options    ||= {} # needs || because might be set before initialize
     end
 
     def name
@@ -21,6 +26,31 @@ module Liquid
       ''
     end
 
-  end # Tag
+    def blank?
+      @blank || false
+    end
 
-end # Tag
+    def parse_with_selected_parser(markup)
+      case @options[:error_mode] || Template.error_mode
+      when :strict then strict_parse_with_error_context(markup)
+      when :lax    then lax_parse(markup)
+      when :warn
+        begin
+          return strict_parse_with_error_context(markup)
+        rescue SyntaxError => e
+          @warnings ||= []
+          @warnings << e
+          return lax_parse(markup)
+        end
+      end
+    end
+
+    private
+    def strict_parse_with_error_context(markup)
+      strict_parse(markup)
+    rescue SyntaxError => e
+      e.message << " in \"#{markup.strip}\"" 
+      raise e
+    end
+  end # Tag
+end # Liquid

lib/liquid/tags/assign.rb

@@ -9,25 +9,30 @@ module Liquid
   #  {{ foo }}
   #
   class Assign < Tag
-    Syntax = /(#{VariableSignature}+)\s*=\s*(#{QuotedFragment}+)/   
-  
-    def initialize(tag_name, markup, tokens)          
+    Syntax = /(#{VariableSignature}+)\s*=\s*(.*)\s*/o
+
+    def initialize(tag_name, markup, tokens)
       if markup =~ Syntax
         @to = $1
-        @from = $2
+        @from = Variable.new($2)
       else
-        raise SyntaxError.new("Syntax Error in 'assign' - Valid syntax: assign [var] = [source]")
+        raise SyntaxError.new options[:locale].t("errors.syntax.assign")
       end
-      
-      super      
+
+      super
     end
-  
+
     def render(context)
-       context.scopes.last[@to] = context[@from]
-       ''
-    end 
-  
-  end  
-  
-  Template.register_tag('assign', Assign)  
+      val = @from.render(context)
+      context.scopes.last[@to] = val
+      context.increment_used_resources(:assign_score_current, val)
+      ''
+    end
+
+    def blank?
+      true
+    end
+  end
+
+  Template.register_tag('assign', Assign)
 end

lib/liquid/tags/break.rb

@@ -0,0 +1,21 @@
+module Liquid
+
+  # Break tag to be used to break out of a for loop.
+  #
+  # == Basic Usage:
+  #    {% for item in collection %}
+  #      {% if item.condition %}
+  #        {% break %}
+  #      {% endif %}
+  #    {% endfor %}
+  #
+  class Break < Tag
+
+    def interrupt
+      BreakInterrupt.new
+    end
+
+  end
+
+  Template.register_tag('break', Break)
+end

lib/liquid/tags/capture.rb

@@ -18,7 +18,7 @@ module Liquid
       if markup =~ Syntax
         @to = $1
       else
-        raise SyntaxError.new("Syntax Error in 'capture' - Valid syntax: capture [var]")
+        raise SyntaxError.new(options[:locale].t("errors.syntax.capture"))
       end
 
       super
@@ -26,9 +26,14 @@ module Liquid
 
     def render(context)
       output = super
-      context.scopes.last[@to] = output.join
+      context.scopes.last[@to] = output
+      context.increment_used_resources(:assign_score_current, output)
       ''
     end
+
+    def blank?
+      true
+    end
   end
 
   Template.register_tag('capture', Capture)

lib/liquid/tags/case.rb

@@ -1,20 +1,24 @@
 module Liquid
   class Case < Block
-    Syntax     = /(#{QuotedFragment})/
-    WhenSyntax = /(#{QuotedFragment})(?:(?:\s+or\s+|\s*\,\s*)(#{QuotedFragment}.*))?/
+    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]")
+        raise SyntaxError.new(options[:locale].t("errors.syntax.case"))
       end
-            
+
       super
     end
 
+    def nodelist
+      @blocks.map(&:attachment).flatten
+    end
+
     def unknown_tag(tag, markup, tokens)
       @nodelist = []
       case tag
@@ -27,57 +31,50 @@ module Liquid
       end
     end
 
-    def render(context)      
-      context.stack do          
+    def render(context)
+      context.stack do
         execute_else_block = true
-        
-        @blocks.inject([]) do |output, block|
-      
-          if block.else? 
-            
+
+        output = ''
+        @blocks.each do |block|
+          if block.else?
             return render_all(block.attachment, context) if execute_else_block
-            
           elsif block.evaluate(context)
-            
-            execute_else_block = false        
-            output += render_all(block.attachment, context)                    
-          end            
-      
-          output
+            execute_else_block = false
+            output << render_all(block.attachment, context)
+          end
         end
-      end          
+        output
+      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(options[:locale].t("errors.syntax.case_invalid_when"))
+        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) ")
+        raise SyntaxError.new(options[:locale].t("errors.syntax.case_invalid_else"))
       end
-         
-      block = ElseCondition.new            
+
+      block = ElseCondition.new
       block.attach(@nodelist)
       @blocks << block
     end
-    
-        
-  end    
-  
+  end
+
   Template.register_tag('case', Case)
 end

lib/liquid/tags/comment.rb

@@ -3,6 +3,13 @@ module Liquid
     def render(context)
       ''
     end
+
+    def unknown_tag(tag, markup, tokens)
+    end
+
+    def blank?
+      true
+    end
   end
 
   Template.register_tag('comment', Comment)

lib/liquid/tags/continue.rb

@@ -0,0 +1,21 @@
+module Liquid
+
+  # Continue tag to be used to break out of a for loop.
+  #
+  # == Basic Usage:
+  #    {% for item in collection %}
+  #      {% if item.condition %}
+  #        {% continue %}
+  #      {% endif %}
+  #    {% endfor %}
+  #
+  class Continue < Tag
+
+    def interrupt
+      ContinueInterrupt.new
+    end
+
+  end
+
+  Template.register_tag('continue', Continue)
+end

lib/liquid/tags/cycle.rb

@@ -1,5 +1,4 @@
 module Liquid
-  
   # Cycle is usually used within a loop to alternate between values, like colors or DOM classes.
   #
   #   {% for item in items %}
@@ -13,47 +12,49 @@ module Liquid
   #    <div class="green"> Item five</div>
   #
   class Cycle < Tag
-    SimpleSyntax = /^#{QuotedFragment}+/        
-    NamedSyntax  = /^(#{QuotedFragment})\s*\:\s*(.*)/
-  
-    def initialize(tag_name, markup, tokens)      
+    SimpleSyntax = /\A#{QuotedFragment}+/o
+    NamedSyntax  = /\A(#{QuotedFragment})\s*\:\s*(.*)/o
+
+    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 ...]")
+        raise SyntaxError.new(options[:locale].t("errors.syntax.cycle"))
       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
-  
+
+    def blank?
+      false
+    end
+
     private
-  
     def variables_from_string(markup)
       markup.split(',').collect do |var|
-    	  var =~ /\s*(#{QuotedFragment})\s*/
-    	  $1 ? $1 : nil
-    	end.compact
+        var =~ /\s*(#{QuotedFragment})\s*/o
+        $1 ? $1 : nil
+      end.compact
     end
-  
   end
-  
+
   Template.register_tag('cycle', Cycle)
-end
+end

lib/liquid/tags/decrement.rb

@@ -0,0 +1,39 @@
+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.
+  #     NOTE: decrement is a pre-decrement, --i,
+  #           while increment is post:      i++.
+  #
+  #     (To achieve the survival, the application must keep the context)
+  #
+  #     if the variable does not exist, it is created with value 0.
+
+  #   Hello: {% decrement variable %}
+  #
+  # gives you:
+  #
+  #    Hello: -1
+  #    Hello: -2
+  #    Hello: -3
+  #
+  class Decrement < Tag
+    def initialize(tag_name, markup, tokens)
+      @variable = markup.strip
+
+      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

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:
@@ -13,6 +13,8 @@ module Liquid
   #      <div {% if forloop.first %}class="first"{% endif %}>
   #        Item {{ forloop.index }}: {{ item.name }}
   #      </div>
+  #    {% else %}
+  #      There is nothing in the collection.
   #    {% endfor %}
   #
   # You can also define a limit and offset much like SQL.  Remember
@@ -20,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 %}
   #
@@ -29,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
@@ -41,96 +43,132 @@ 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)?/   
-  
-    def initialize(tag_name, markup, tokens)
-      if markup =~ Syntax
-        @variable_name = $1
-        @collection_name = $2
-        @name = "#{$1}-#{$2}"           
-        @reversed = $3             
-        @attributes = {}
-        markup.scan(TagAttributes) do |key, value|
-          @attributes[key] = value
-        end        
-      else
-        raise SyntaxError.new("Syntax Error in 'for loop' - Valid syntax: for [item] in [collection]")
-      end
+  class For < Block
+    Syntax = /\A(#{VariableSegment}+)\s+in\s+(#{QuotedFragment}+)\s*(reversed)?/o
 
+    def initialize(tag_name, markup, tokens)
+      parse_with_selected_parser(markup)
+      @nodelist = @for_block = []
       super
     end
-  
-    def render(context)        
+
+    def nodelist
+      if @else_block
+        @for_block + @else_block
+      else
+        @for_block
+      end
+    end
+
+    def unknown_tag(tag, markup, tokens)
+      return super unless tag == 'else'
+      @nodelist = @else_block = []
+    end
+
+    def render(context)
       context.registers[:for] ||= Hash.new(0)
-    
+
       collection = context[@collection_name]
       collection = collection.to_a if collection.is_a?(Range)
-    
-      return '' unless collection.respond_to?(:each) 
-                                                 
+
+      # 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  
-          
-                       
-      segment = slice_collection_using_each(collection, from, to)      
-      
-      return '' if segment.empty?
-      
+      to    = limit ? limit.to_i + from : nil
+
+      segment = Utils.slice_collection(collection, from, to)
+
+      return render_else(context) if segment.empty?
+
       segment.reverse! if @reversed
 
-      result = []
-        
-      length = segment.length            
-            
+      result = ''
+
+      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.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,
+            'rindex0' => length - index - 1,
             'first'   => (index == 0),
-            'last'    => (index == length - 1) }
+          'last'    => (index == length - 1) }
 
-          result << render_all(@nodelist, context)
+          result << render_all(@for_block, context)
+
+          # Handle any interrupts if they exist.
+          if context.has_interrupt?
+            interrupt = context.pop_interrupt
+            break if interrupt.is_a? BreakInterrupt
+            next if interrupt.is_a? ContinueInterrupt
+          end
         end
       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
+      result
     end
+
+    protected
+
+    def lax_parse(markup)
+      if markup =~ Syntax
+        @variable_name = $1
+        @collection_name = $2
+        @name = "#{$1}-#{$2}"
+        @reversed = $3
+        @attributes = {}
+        markup.scan(TagAttributes) do |key, value|
+          @attributes[key] = value
+        end
+      else
+        raise SyntaxError.new(options[:locale].t("errors.syntax.for"))
+      end
+    end
+
+    def strict_parse(markup)
+      p = Parser.new(markup)
+      @variable_name = p.consume(:id)
+      raise SyntaxError.new(options[:locale].t("errors.syntax.for_invalid_in"))  unless p.id?('in')
+      @collection_name = p.expression
+      @name = "#{@variable_name}-#{@collection_name}"
+      @reversed = p.id?('reversed')
+
+      @attributes = {}
+      while p.look(:id) && p.look(:colon, 1)
+        unless attribute = p.id?('limit') || p.id?('offset')
+          raise SyntaxError.new(options[:locale].t("errors.syntax.for_invalid_attribute"))
+        end
+        p.consume
+        val = p.expression
+        @attributes[attribute] = val
+      end
+      p.consume(:end_of_string)
+    end
+
+    private
+
+      def render_else(context)
+        return @else_block ? [render_all(@else_block, context)] : ''
+      end
+
+      def iterable?(collection)
+        collection.respond_to?(:each) || Utils.non_blank_string?(collection)
+      end
   end
 
   Template.register_tag('for', For)
-end
+end

lib/liquid/tags/if.rb

@@ -1,5 +1,4 @@
 module Liquid
-
   # If is the conditional block
   #
   #   {% if user.admin %}
@@ -10,20 +9,21 @@ module Liquid
   #
   #    There are {% if count < 5 %} less {% else %} more {% endif %} items than you need.
   #
-  #
   class If < Block
-    SyntaxHelp = "Syntax Error in tag 'if' - Valid syntax: if [expression]"
-    Syntax = /(#{QuotedFragment})\s*([=!<>a-z_]+)?\s*(#{QuotedFragment})?/
-    ExpressionsAndOperators = /(?:\b(?:\s?and\s?|\s?or\s?)\b|(?:\s*(?!\b(?:\s?and\s?|\s?or\s?)\b)(?:#{QuotedFragment}|\S+)\s*)+)/
+    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 = []
-
       push_block('if', markup)
-
       super
     end
 
+    def nodelist
+      @blocks.map(&:attachment).flatten
+    end
+
     def unknown_tag(tag, markup, tokens)
       if ['elsif', 'else'].include?(tag)
         push_block(tag, markup)
@@ -49,30 +49,57 @@ module Liquid
         block = if tag == 'else'
           ElseCondition.new
         else
-
-          expressions = markup.scan(ExpressionsAndOperators).reverse
-          raise(SyntaxError, SyntaxHelp) unless expressions.shift =~ Syntax
-
-          condition = Condition.new($1, $2, $3)
-
-          while not expressions.empty?
-            operator = (expressions.shift).to_s.strip
-
-            raise(SyntaxError, SyntaxHelp) unless expressions.shift.to_s =~ Syntax
-
-            new_condition = Condition.new($1, $2, $3)
-            new_condition.send(operator.to_sym, condition)
-            condition = new_condition
-          end
-
-          condition
+          parse_with_selected_parser(markup)
         end
 
         @blocks.push(block)
         @nodelist = block.attach(Array.new)
       end
 
+      def lax_parse(markup)
+        expressions = markup.scan(ExpressionsAndOperators).reverse
+        raise(SyntaxError.new(options[:locale].t("errors.syntax.if"))) unless expressions.shift =~ Syntax
 
+        condition = Condition.new($1, $2, $3)
+
+        while not expressions.empty?
+          operator = (expressions.shift).to_s.strip
+
+          raise(SyntaxError.new(options[:locale].t("errors.syntax.if"))) unless expressions.shift.to_s =~ Syntax
+
+          new_condition = Condition.new($1, $2, $3)
+          raise(SyntaxError.new(options[:locale].t("errors.syntax.if"))) unless BOOLEAN_OPERATORS.include?(operator)
+          new_condition.send(operator, condition)
+          condition = new_condition
+        end
+
+        condition
+      end
+
+      def strict_parse(markup)
+        p = Parser.new(markup)
+
+        condition = parse_comparison(p)
+
+        while op = (p.id?('and') || p.id?('or'))
+          new_cond = parse_comparison(p)
+          new_cond.send(op, condition)
+          condition = new_cond
+        end
+        p.consume(:end_of_string)
+
+        condition
+      end
+
+      def parse_comparison(p)
+        a = p.expression
+        if op = p.consume?(:comparison)
+          b = p.expression
+          Condition.new(a, op, b)
+        else
+          Condition.new(a)
+        end
+      end
   end
 
   Template.register_tag('if', If)

lib/liquid/tags/ifchanged.rb

@@ -1,20 +1,20 @@
 module Liquid
   class Ifchanged < Block
-            
+
     def render(context)
-      context.stack do 
-        
-        output = render_all(@nodelist, context)
-        
+      context.stack do
+
+        output = super
+
         if output != context.registers[:ifchanged]
           context.registers[:ifchanged] = output
           output
         else
           ''
-        end              
+        end
       end
     end
-  end  
-  
-  Template.register_tag('ifchanged', Ifchanged)  
-end
+  end
+
+  Template.register_tag('ifchanged', Ifchanged)
+end

lib/liquid/tags/include.rb

@@ -1,11 +1,26 @@
 module Liquid
+
+  # Include allows templates to relate with other templates
+  #
+  # Simply include another template:
+  #
+  #   {% include 'product' %}
+  #
+  # Include a template with a local variable:
+  #
+  #   {% include 'product' with products[0] %}
+  #
+  # Include a template for a collection:
+  #
+  #   {% include 'product' for products %}
+  #
   class Include < Tag
-    Syntax = /(#{QuotedFragment}+)(\s+(?:with|for)\s+(#{QuotedFragment}+))?/
-  
-    def initialize(tag_name, markup, tokens)      
+    Syntax = /(#{QuotedFragment}+)(\s+(?:with|for)\s+(#{QuotedFragment}+))?/o
+
+    def initialize(tag_name, markup, tokens)
       if markup =~ Syntax
 
-        @template_name = $1        
+        @template_name = $1
         @variable_name = $3
         @attributes    = {}
 
@@ -14,43 +29,67 @@ module Liquid
         end
 
       else
-        raise SyntaxError.new("Error in tag 'include' - Valid syntax: include '[template]' (with|for) [object|collection]")
+        raise SyntaxError.new(options[:locale].t("errors.syntax.include"))
       end
 
       super
     end
-  
-    def parse(tokens)      
+
+    def blank?
+      false
     end
-  
-    def render(context)      
-      file_system = context.registers[:file_system] || Liquid::Template.file_system
-      source  = file_system.read_template_file(context[@template_name])      
-      partial = Liquid::Template.parse(source)      
-      
+
+    def render(context)
+      partial = load_cached_partial(context)
       variable = context[@variable_name || @template_name[1..-2]]
-      
+
       context.stack do
         @attributes.each do |key, value|
           context[key] = context[value]
         end
 
+        context_variable_name = @template_name[1..-2].split('/').last
         if variable.is_a?(Array)
-          
-          variable.collect do |variable|            
-            context[@template_name[1..-2]] = variable
+          variable.collect do |var|
+            context[context_variable_name] = var
             partial.render(context)
           end
-
         else
-                    
-          context[@template_name[1..-2]] = variable
+          context[context_variable_name] = variable
           partial.render(context)
-          
         end
       end
     end
+
+    private
+      def load_cached_partial(context)
+        cached_partials = context.registers[:cached_partials] || {}
+        template_name = context[@template_name]
+
+        if cached = cached_partials[template_name]
+          return cached
+        end
+        source = read_template_from_file_system(context)
+        partial = Liquid::Template.parse(source)
+        cached_partials[template_name] = partial
+        context.registers[:cached_partials] = cached_partials
+        partial
+      end
+
+      def read_template_from_file_system(context)
+        file_system = context.registers[:file_system] || Liquid::Template.file_system
+
+        # make read_template_file call backwards-compatible.
+        case file_system.method(:read_template_file).arity
+        when 1
+          file_system.read_template_file(context[@template_name])
+        when 2
+          file_system.read_template_file(context[@template_name], context)
+        else
+          raise ArgumentError, "file_system.read_template_file expects two parameters: (template_name, context)"
+        end
+      end
   end
 
-  Template.register_tag('include', Include)  
-end
+  Template.register_tag('include', Include)
+end

lib/liquid/tags/increment.rb

@@ -0,0 +1,35 @@
+module Liquid
+  # increment 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.
+  #     (To achieve the survival, the application must keep the context)
+  #
+  #     if the variable does not exist, it is created with value 0.
+  #
+  #   Hello: {% increment variable %}
+  #
+  # gives you:
+  #
+  #    Hello: 0
+  #    Hello: 1
+  #    Hello: 2
+  #
+  class Increment < Tag
+    def initialize(tag_name, markup, tokens)
+      @variable = markup.strip
+      super
+    end
+
+    def render(context)
+      value = context.environments.first[@variable] ||= 0
+      context.environments.first[@variable] = value + 1
+      value.to_s
+    end
+
+    def blank?
+      false
+    end
+  end
+
+  Template.register_tag('increment', Increment)
+end

lib/liquid/tags/literal.rb

@@ -1,42 +0,0 @@
-module Liquid
-
-  class Literal < Block
-
-    # Class methods
-
-    # Converts a shorthand Liquid literal into its long representation.
-    #
-    # Currently the Template parser only knows how to handle the long version.
-    # So, it always checks if it is in the presence of a literal, in which case it gets converted through this method.
-    #
-    # Example:
-    #   Liquid::Literal "{{{ hello world }}}" #=> "{% literal %} hello world {% endliteral %}"
-    def self.from_shorthand(literal)
-      literal =~ LiteralShorthand ? "{% literal %}#{$1}{% endliteral %}" : literal
-    end
-
-    # Public instance methods
-
-    def parse(tokens) # :nodoc:
-      @nodelist ||= []
-      @nodelist.clear
-
-      while token = tokens.shift
-        if token =~ FullToken && block_delimiter == $1
-          end_tag
-          return
-        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 # parse
-
-  end
-
-  Template.register_tag('literal', Literal)
-end

lib/liquid/tags/raw.rb

@@ -0,0 +1,19 @@
+module Liquid
+  class Raw < Block
+    FullTokenPossiblyInvalid = /\A(.*)#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}\z/o
+
+    def parse_body(tokens)
+      @nodelist ||= []
+      @nodelist.clear
+      while token = tokens.shift
+        if token =~ FullTokenPossiblyInvalid
+          @nodelist << $1 if $1 != ""
+          return if block_delimiter == $2
+        end
+        @nodelist << token if not token.empty?
+      end
+    end
+  end
+
+  Template.register_tag('raw', Raw)
+end

lib/liquid/tags/unless.rb

@@ -9,25 +9,25 @@ module Liquid
   class Unless < If
     def render(context)
       context.stack do
-        
+
         # First condition is interpreted backwards ( if not )
-        block = @blocks.first
-        unless block.evaluate(context)
-          return render_all(block.attachment, context)            
+        first_block = @blocks.first
+        unless first_block.evaluate(context)
+          return render_all(first_block.attachment, context)
         end
-        
+
         # After the first condition unless works just like if
         @blocks[1..-1].each do |block|
-          if block.evaluate(context)            
-            return render_all(block.attachment, context)            
+          if block.evaluate(context)
+            return render_all(block.attachment, context)
           end
-        end 
-        
+        end
+
         ''
       end
-    end    
+    end
   end
-  
+
 
   Template.register_tag('unless', Unless)
-end
+end

lib/liquid/template.rb

@@ -14,7 +14,11 @@ module Liquid
   #   template.render('user_name' => 'bob')
   #
   class Template
-    attr_accessor :root
+    DEFAULT_OPTIONS = {
+      :locale => I18n.new
+    }
+
+    attr_accessor :root, :resource_limits
     @@file_system = BlankFileSystem.new
 
     class << self
@@ -34,6 +38,18 @@ module Liquid
         @tags ||= {}
       end
 
+      # Sets how strict the parser should be.
+      # :lax acts like liquid 2.5 and silently ignores malformed tags in most cases.
+      # :warn is the default and will give deprecation warnings when invalid syntax is used.
+      # :strict will enforce correct syntax.
+      def error_mode=(mode)
+        @error_mode = mode
+      end
+
+      def error_mode
+        @error_mode || :lax
+      end
+
       # Pass a module with filter methods which should be available
       # to all liquid views. Good for registering the standard library
       def register_filter(mod)
@@ -41,24 +57,31 @@ module Liquid
       end
 
       # creates a new <tt>Template</tt> object from liquid source code
-      def parse(source)
+      def parse(source, options = {})
         template = Template.new
-        template.parse(source)
+        template.parse(source, options)
         template
       end
     end
 
     # creates a new <tt>Template</tt> from an array of tokens. Use <tt>Template.parse</tt> instead
     def initialize
+      @resource_limits = {}
     end
 
     # Parse source code.
     # Returns self for easy chaining
-    def parse(source)
-      @root = Document.new(tokenize(Liquid::Literal.from_shorthand(source)))
+    def parse(source, options = {})
+      @root = Document.new(tokenize(source), DEFAULT_OPTIONS.merge(options))
+      @warnings = nil
       self
     end
 
+    def warnings
+      return [] unless @root
+      @warnings ||= @root.warnings
+    end
+
     def registers
       @registers ||= {}
     end
@@ -88,16 +111,19 @@ module Liquid
     #
     def render(*args)
       return '' if @root.nil?
-      
+
       context = case args.first
       when Liquid::Context
         args.shift
+      when Liquid::Drop
+        drop = args.shift
+        drop.context = Context.new([drop, assigns], instance_assigns, registers, @rethrow_errors, @resource_limits)
       when Hash
-        Context.new([args.shift, assigns], instance_assigns, registers, @rethrow_errors)
+        Context.new([args.shift, assigns], instance_assigns, registers, @rethrow_errors, @resource_limits)
       when nil
-        Context.new(assigns, instance_assigns, registers, @rethrow_errors)
+        Context.new(assigns, instance_assigns, registers, @rethrow_errors, @resource_limits)
       else
-        raise ArgumentError, "Expect Hash or Liquid::Context as parameter"
+        raise ArgumentError, "Expected Hash or Liquid::Context as parameter"
       end
 
       case args.last
@@ -120,8 +146,11 @@ module Liquid
 
       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
+        # for performance reasons we get an array back here. join will make a string out of it.
+        result = @root.render(context)
+        result.respond_to?(:join) ? result.join : result
+      rescue Liquid::MemoryError => e
+        context.handle_error(e)
       ensure
         @errors = context.errors
       end
@@ -133,16 +162,9 @@ module Liquid
 
     private
 
-    # Uses the <tt>Liquid::TemplateParser</tt> regexp to tokenize the passed source
     def tokenize(source)
       source = source.source if source.respond_to?(:source)
-      return [] if source.to_s.empty?
-      tokens = source.split(TemplateParser)
-
-      # removes the rogue empty element at the beginning of the array
-      tokens.shift if tokens[0] and tokens[0].empty?
-
-      tokens
+      Tokenizer.new(source.to_s)
     end
 
   end

lib/liquid/utils.rb

@@ -0,0 +1,39 @@
+module Liquid
+  module Utils
+
+    def self.slice_collection(collection, from, to)
+      if (from != 0 || to != nil) && collection.respond_to?(:load_slice)
+        collection.load_slice(from, to)
+      else
+        slice_collection_using_each(collection, from, to)
+      end
+    end
+
+    def self.non_blank_string?(collection)
+      collection.is_a?(String) && collection != ''
+    end
+
+    def self.slice_collection_using_each(collection, from, to)
+      segments = []
+      index = 0
+
+      # Maintains Ruby 1.8.7 String#each behaviour on 1.9
+      return [collection] if non_blank_string?(collection)
+
+      collection.each do |item|
+
+        if to && to <= index
+          break
+        end
+
+        if from <= index
+          segments << item
+        end
+
+        index += 1
+      end
+
+      segments
+    end
+  end
+end

lib/liquid/variable.rb

@@ -11,34 +11,92 @@ module Liquid
   #   {{ user | link }}
   #
   class Variable
-    FilterParser = /(?:#{FilterSeparator}|(?:\s*(?!(?:#{FilterSeparator}))(?:#{QuotedFragment}|\S+)\s*)+)/
-    attr_accessor :filters, :name
+    EasyParse = /\A *(\w+(?:\.\w+)*) *\z/
+    attr_accessor :filters, :name, :warnings
 
-    def initialize(markup)
+    def initialize(markup, options = {})
       @markup  = markup
       @name    = nil
-      @filters = []
-      if match = markup.match(/\s*(#{QuotedFragment})(.*)/)
-        @name = match[1]
-        if match[2].match(/#{FilterSeparator}\s*(.*)/)
-          filters = Regexp.last_match(1).scan(FilterParser)
-          filters.each do |f|
-            if matches = f.match(/\s*(\w+)/)
-              filtername = matches[1]
-              filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*(#{QuotedFragment})/).flatten
-              @filters << [filtername.to_sym, filterargs]
-            end
-          end
+      @options = options || {}
+      
+
+      case @options[:error_mode] || Template.error_mode
+      when :strict then strict_parse(markup)
+      when :lax    then lax_parse(markup)
+      when :warn
+        begin
+          strict_parse(markup)
+        rescue SyntaxError => e
+          @warnings ||= []
+          @warnings << e
+          lax_parse(markup)
         end
       end
     end
 
+#     def lax_parse(markup)
+#       @filters = []
+#       if match = markup.match(/\s*(#{QuotedFragment})(.*)/o)
+#         @name = match[1]
+#         if match[2].match(/#{FilterSeparator}\s*(.*)/o)
+#           filters = Regexp.last_match(1).scan(FilterParser)
+#           filters.each do |f|
+#             if matches = f.match(/\s*(\w+)/)
+#               filtername = matches[1]
+#               filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*((?:\w+\s*\:\s*)?#{QuotedFragment})/o).flatten
+#               @filters << [filtername, filterargs]
+#             end
+#           end
+#         end
+#       end
+#     end
+
+    def strict_parse(markup)
+      # Very simple valid cases
+      if markup =~ EasyParse
+        @name = $1
+        @filters = []
+        return
+      end
+
+      @filters = []
+      p = Parser.new(markup)
+      # Could be just filters with no input
+      @name = p.look(:pipe) ? '' : p.expression
+      while p.consume?(:pipe)
+        filtername = p.consume(:id)
+        filterargs = p.consume?(:colon) ? parse_filterargs(p) : []
+        @filters << [filtername, filterargs]
+      end
+      p.consume(:end_of_string)
+    rescue SyntaxError => e
+      e.message << " in \"{{#{markup}}}\""
+      raise e
+    end
+
+    def parse_filterargs(p)
+      # first argument
+      filterargs = [p.argument]
+      # followed by comma separated others
+      while p.consume?(:comma)
+        filterargs << p.argument
+      end
+      filterargs
+    end
+
     def render(context)
       return '' if @name.nil?
       @filters.inject(context[@name]) do |output, filter|
-        filterargs = filter[1].to_a.collect do |a|
-         context[a]
+        filterargs = []
+        keyword_args = {}
+        filter[1].to_a.each do |a|
+          if matches = a.match(/\A#{TagAttributes}\z/o)
+            keyword_args[matches[1]] = context[matches[2]]
+          else
+            filterargs << context[a]
+          end
         end
+        filterargs << keyword_args unless keyword_args.empty?
         begin
           output = context.invoke(filter[0], output, *filterargs)
         rescue FilterNotFound

lib/liquid/version.rb

@@ -0,0 +1,4 @@
+# encoding: utf-8
+module Liquid
+  VERSION = "3.0.0"
+end

liquid.gemspec

@@ -1,23 +1,32 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+require "liquid/version"
 
 Gem::Specification.new do |s|
-  s.platform    = Gem::Platform::RUBY
-
   s.name        = "liquid"
-  s.version     = '2.2.2'
+  s.version     = Liquid::VERSION
+  s.platform    = Gem::Platform::RUBY
   s.summary     = "A secure, non-evaling end user template engine with aesthetic markup."
-
   s.authors     = ["Tobias Luetke"]
   s.email       = ["tobi@leetsoft.com"]
   s.homepage    = "http://www.liquidmarkup.org"
-
-  s.description = "A secure, non-evaling end user template engine with aesthetic markup."
+  s.license     = "MIT"
+  #s.description = "A secure, non-evaling end user template engine with aesthetic markup."
 
   s.required_rubygems_version = ">= 1.3.7"
 
-  s.files             = Dir.glob("{lib}/**/*") + %w(MIT-LICENSE README.md)
+  s.test_files  = Dir.glob("{test}/**/*")
+  s.files       = Dir.glob("{lib,ext}/**/*") + %w(MIT-LICENSE README.md)
+  s.extensions  = ['ext/liquid/extconf.rb']
 
-  s.extra_rdoc_files  = ["History.txt", "Manifest.txt", "README.md"]
+  s.extra_rdoc_files  = ["History.md", "README.md"]
 
-  s.require_path = 'lib'
+  s.require_path = "lib"
+
+  s.add_development_dependency 'rake-compiler'
+  s.add_development_dependency 'stackprof'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'activesupport'
 end

performance/benchmark.rb

@@ -0,0 +1,12 @@
+require 'rubygems'
+require 'benchmark'
+require File.dirname(__FILE__) + '/theme_runner'
+
+Liquid::Template.error_mode = ARGV.first.to_sym if ARGV.first
+profiler = ThemeRunner.new
+
+Benchmark.bmbm do |x|
+  x.report("parse:")   { 100.times { profiler.compile } }
+  x.report("parse & run:")   { 100.times { profiler.run } }
+end
+

performance/profile.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'ruby-prof' rescue fail("install ruby-prof extension/gem")
+require File.dirname(__FILE__) + '/theme_runner'
+
+profiler = ThemeRunner.new
+
+puts 'Running profiler...'
+
+results  = profiler.run_profile
+
+puts 'Success'
+puts
+
+[RubyProf::FlatPrinter, RubyProf::GraphHtmlPrinter, RubyProf::CallTreePrinter, RubyProf::DotPrinter].each do |klass|
+  filename = (ENV['TMP'] || '/tmp') + (klass.name.include?('Html') ? "/liquid.#{klass.name.downcase}.html" : "/callgrind.liquid.#{klass.name.downcase}.txt")
+  filename.gsub!(/:+/, '_')
+  File.open(filename, "w+") { |fp| klass.new(results).print(fp, :print_file => true, :min_percent => 3) }
+  $stderr.puts "wrote #{klass.name} output to #{filename}"
+end

performance/shopify/comment_form.rb

@@ -1,5 +1,5 @@
-class CommentForm < Liquid::Block                                             
-  Syntax = /(#{Liquid::VariableSignature}+)/   
+class CommentForm < Liquid::Block
+  Syntax = /(#{Liquid::VariableSignature}+)/
 
   def initialize(tag_name, markup, tokens)
     if markup =~ Syntax
@@ -8,14 +8,14 @@ class CommentForm < Liquid::Block
     else
       raise SyntaxError.new("Syntax Error in 'comment_form' - Valid syntax: comment_form [article]")
     end
-    
+
     super
   end
 
-  def render(context)          
+  def render(context)
     article = context[@variable_name]
-              
-    context.stack do       
+
+    context.stack do
       context['form'] = {
         'posted_successfully?' => context.registers[:posted_successfully],
         'errors' => context['comment.errors'],
@@ -25,9 +25,9 @@ class CommentForm < Liquid::Block
       }
       wrap_in_form(article, render_all(@nodelist, context))
     end
-  end          
-    
-  def wrap_in_form(article, input)    
-    %Q{<form id="article-#{article.id}-comment-form" class="comment-form" method="post" action="">\n#{input}\n</form>}    
+  end
+
+  def wrap_in_form(article, input)
+    %Q{<form id="article-#{article.id}-comment-form" class="comment-form" method="post" action="">\n#{input}\n</form>}
   end
 end

performance/shopify/database.rb

@@ -1,45 +1,45 @@
 require 'yaml'
 module Database
-  
-  # Load the standard vision toolkit database and re-arrage it to be simply exportable 
+
+  # Load the standard vision toolkit database and re-arrage it to be simply exportable
   # to liquid as assigns. All this is based on Shopify
   def self.tables
-    @tables ||= begin      
+    @tables ||= begin
       db = YAML.load_file(File.dirname(__FILE__) + '/vision.database.yml')
 
-      # From vision source      
+      # From vision source
       db['products'].each do |product|
         collections = db['collections'].find_all do |collection|
           collection['products'].any? { |p| p['id'].to_i == product['id'].to_i }
-        end      
-        product['collections'] = collections      
+        end
+        product['collections'] = collections
       end
 
-      # key the tables by handles, as this is how liquid expects it.      
+      # key the tables by handles, as this is how liquid expects it.
       db = db.inject({}) do |assigns, (key, values)|
         assigns[key] = values.inject({}) { |h, v| h[v['handle']] = v; h; }
         assigns
-      end  
-      
-      # Some standard direct accessors so that the specialized templates 
+      end
+
+      # Some standard direct accessors so that the specialized templates
       # render correctly
       db['collection'] = db['collections'].values.first
       db['product']    = db['products'].values.first
       db['blog']       = db['blogs'].values.first
       db['article']    = db['blog']['articles'].first
-            
-      db['cart']       = { 
+
+      db['cart']       = {
         'total_price' => db['line_items'].values.inject(0) { |sum, item| sum += item['line_price'] * item['quantity'] },
         'item_count'  => db['line_items'].values.inject(0) { |sum, item| sum += item['quantity'] },
         'items'       => db['line_items'].values
       }
-            
+
       db
-    end    
+    end
   end
 end
 
 if __FILE__ == $0
   p Database.tables['collections']['frontpage'].keys
   #p Database.tables['blog']['articles']
-end
+end

performance/shopify/json_filter.rb

@@ -1,7 +1,7 @@
 module JsonFilter
-  
+
   def json(object)
     object.reject {|k,v| k == "collections" }.to_json
   end
-  
-end
+
+end

performance/shopify/liquid.rb

@@ -1,3 +1,4 @@
+$:.unshift File.dirname(__FILE__) + '/../../lib'
 require File.dirname(__FILE__) + '/../../lib/liquid'
 
 require File.dirname(__FILE__) + '/comment_form'

performance/shopify/money_filter.rb

@@ -1,5 +1,5 @@
 module MoneyFilter
-  
+
   def money_with_currency(money)
     return '' if money.nil?
     sprintf("$ %.2f USD", money/100.0)
@@ -9,10 +9,10 @@ module MoneyFilter
     return '' if money.nil?
     sprintf("$ %.2f", money/100.0)
   end
-  
-  private 
-  
+
+  private
+
   def currency
     ShopDrop.new.currency
-  end  
-end
+  end
+end

performance/shopify/paginate.rb

@@ -3,7 +3,7 @@ class Paginate < Liquid::Block
 
   def initialize(tag_name, markup, tokens)
     @nodelist = []
-    
+
     if markup =~ Syntax
       @collection_name = $1
       @page_size = if $2
@@ -11,22 +11,22 @@ class Paginate < Liquid::Block
       else
         20
       end
-      
+
       @attributes = { 'window_size' => 3 }
       markup.scan(Liquid::TagAttributes) do |key, value|
         @attributes[key] = value
-      end        
+      end
     else
       raise SyntaxError.new("Syntax Error in tag 'paginate' - Valid syntax: paginate [collection] by number")
     end
-  
+
     super
   end
 
   def render(context)
     @context = context
 
-    context.stack do                      
+    context.stack do
       current_page  = context['current_page'].to_i
 
       pagination = {
@@ -34,60 +34,60 @@ class Paginate < Liquid::Block
         'current_page'   => 5,
         'current_offset' => @page_size * 5
       }
-      
-      context['paginate'] = pagination      
-      
-      collection_size  = context[@collection_name].size      
+
+      context['paginate'] = pagination
+
+      collection_size  = context[@collection_name].size
 
       raise ArgumentError.new("Cannot paginate array '#{@collection_name}'. Not found.") if collection_size.nil?
-    
-      page_count = (collection_size.to_f / @page_size.to_f).to_f.ceil + 1 
+
+      page_count = (collection_size.to_f / @page_size.to_f).to_f.ceil + 1
 
       pagination['items']      = collection_size
       pagination['pages']      = page_count -1
       pagination['previous']   = link('&laquo; Previous', current_page-1 )  unless 1 >= current_page
       pagination['next']       = link('Next &raquo;', current_page+1 )      unless page_count <= current_page+1
       pagination['parts']      = []
-      
+
       hellip_break = false
-      
+
       if page_count > 2
-        1.upto(page_count-1) do |page|          
-        
+        1.upto(page_count-1) do |page|
+
           if current_page == page
-            pagination['parts'] << no_link(page)        
-          elsif page == 1 
+            pagination['parts'] << no_link(page)
+          elsif page == 1
             pagination['parts'] << link(page, page)
           elsif page == page_count -1
             pagination['parts'] << link(page, page)
           elsif page <= current_page - @attributes['window_size'] or page >= current_page + @attributes['window_size']
             next if hellip_break
-            pagination['parts'] << no_link('&hellip;') 
+            pagination['parts'] << no_link('&hellip;')
             hellip_break = true
             next
           else
             pagination['parts'] << link(page, page)
           end
-        
+
           hellip_break = false
-        end 
+        end
       end
-      
-      render_all(@nodelist, context)      
+
+      render_all(@nodelist, context)
     end
   end
-    
+
   private
-  
+
   def no_link(title)
     { 'title' => title, 'is_link' => false}
   end
-  
+
   def link(title, page)
     { 'title' => title, 'url' => current_url + "?page=#{page}", 'is_link' => true}
   end
-  
+
   def current_url
     "/collections/frontpage"
   end
-end    
+end

performance/shopify/shop_filter.rb

@@ -1,5 +1,5 @@
 module ShopFilter
-      
+
   def asset_url(input)
     "/files/1/[shop_id]/[shop_id]/assets/#{input}"
   end
@@ -7,11 +7,11 @@ module ShopFilter
   def global_asset_url(input)
     "/global/#{input}"
   end
-  
+
   def shopify_asset_url(input)
     "/shopify/#{input}"
   end
-  
+
   def script_tag(url)
     %(<script src="#{url}" type="text/javascript"></script>)
   end
@@ -19,15 +19,15 @@ module ShopFilter
   def stylesheet_tag(url, media="all")
     %(<link href="#{url}" rel="stylesheet" type="text/css"  media="#{media}"  />)
   end
-       
+
   def link_to(link, url, title="")
     %|<a href="#{url}" title="#{title}">#{link}</a>|
   end
-  
+
   def img_tag(url, alt="")
-    %|<img src="#{url}" alt="#{alt}" />|  
-  end  
-  
+    %|<img src="#{url}" alt="#{alt}" />|
+  end
+
   def link_to_vendor(vendor)
     if vendor
       link_to vendor, url_for_vendor(vendor), vendor
@@ -35,7 +35,7 @@ module ShopFilter
       'Unknown Vendor'
     end
   end
-  
+
   def link_to_type(type)
     if type
       link_to type, url_for_type(type), type
@@ -43,56 +43,56 @@ module ShopFilter
       'Unknown Vendor'
     end
   end
-  
+
   def url_for_vendor(vendor_title)
     "/collections/#{vendor_title.to_handle}"
   end
-  
+
   def url_for_type(type_title)
     "/collections/#{type_title.to_handle}"
   end
-  
+
   def product_img_url(url, style = 'small')
-    
-    unless url =~ /^products\/([\w\-\_]+)\.(\w{2,4})/
+
+    unless url =~ /\Aproducts\/([\w\-\_]+)\.(\w{2,4})/
       raise ArgumentError, 'filter "size" can only be called on product images'
     end
-    
+
     case style
     when 'original'
-      return '/files/shops/random_number/' + url 
+      return '/files/shops/random_number/' + url
     when 'grande', 'large', 'medium', 'compact', 'small', 'thumb', 'icon'
-      "/files/shops/random_number/products/#{$1}_#{style}.#{$2}"              
+      "/files/shops/random_number/products/#{$1}_#{style}.#{$2}"
     else
-      raise ArgumentError, 'valid parameters for filter "size" are: original, grande, large, medium, compact, small, thumb and icon '      
+      raise ArgumentError, 'valid parameters for filter "size" are: original, grande, large, medium, compact, small, thumb and icon '
     end
   end
-  
+
   def default_pagination(paginate)
-    
-    html = []    
+
+    html = []
     html << %(<span class="prev">#{link_to(paginate['previous']['title'], paginate['previous']['url'])}</span>) if paginate['previous']
 
     for part in paginate['parts']
 
       if part['is_link']
-        html << %(<span class="page">#{link_to(part['title'], part['url'])}</span>)        
+        html << %(<span class="page">#{link_to(part['title'], part['url'])}</span>)
       elsif part['title'].to_i == paginate['current_page'].to_i
-        html << %(<span class="page current">#{part['title']}</span>)        
+        html << %(<span class="page current">#{part['title']}</span>)
       else
-        html << %(<span class="deco">#{part['title']}</span>)                
+        html << %(<span class="deco">#{part['title']}</span>)
       end
-      
+
     end
 
     html << %(<span class="next">#{link_to(paginate['next']['title'], paginate['next']['url'])}</span>) if paginate['next']
     html.join(' ')
   end
-  
+
   # Accepts a number, and two words - one for singular, one for plural
   # Returns the singular word if input equals 1, otherwise plural
   def pluralize(input, singular, plural)
     input == 1 ? singular : plural
   end
-      
+
 end

performance/shopify/tag_filter.rb

@@ -1,9 +1,9 @@
 module TagFilter
-    
-  def link_to_tag(label, tag)    
+
+  def link_to_tag(label, tag)
     "<a title=\"Show tag #{tag}\" href=\"/collections/#{@context['handle']}/#{tag}\">#{label}</a>"
   end
-  
+
   def highlight_active_tag(tag, css_class='active')
     if @context['current_tags'].include?(tag)
       "<span class=\"#{css_class}\">#{tag}</span>"
@@ -12,14 +12,14 @@ module TagFilter
     end
   end
 
-  def link_to_add_tag(label, tag)    
+  def link_to_add_tag(label, tag)
     tags = (@context['current_tags'] + [tag]).uniq
     "<a title=\"Show tag #{tag}\" href=\"/collections/#{@context['handle']}/#{tags.join("+")}\">#{label}</a>"
   end
-  
-  def link_to_remove_tag(label, tag)    
+
+  def link_to_remove_tag(label, tag)
     tags = (@context['current_tags'] - [tag]).uniq
     "<a title=\"Show tag #{tag}\" href=\"/collections/#{@context['handle']}/#{tags.join("+")}\">#{label}</a>"
   end
-  
+
 end

performance/shopify/vision.database.yml

@@ -2,7 +2,7 @@
 #   Variants
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-product_variants: 
+product_variants:
   - &product-1-var-1
     id: 1
     title: 151cm / Normal
@@ -13,7 +13,7 @@ product_variants:
     inventory_quantity: 5
     option1: 151cm
     option2: Normal
-    option3: 
+    option3:
   - &product-1-var-2
     id: 2
     title: 155cm / Normal
@@ -24,7 +24,7 @@ product_variants:
     inventory_quantity: 2
     option1: 155cm
     option2: Normal
-    option3: 
+    option3:
   - &product-2-var-1
     id: 3
     title: 162cm
@@ -34,19 +34,19 @@ product_variants:
     available: true
     inventory_quantity: 3
     option1: 162cm
-    option2: 
-    option3: 
+    option2:
+    option3:
   - &product-3-var-1
     id: 4
     title: 159cm
     price: 19900
     weight: 1000
-    compare_at_price: 
+    compare_at_price:
     available: true
     inventory_quantity: 4
     option1: 159cm
-    option2: 
-    option3: 
+    option2:
+    option3:
   - &product-4-var-1
     id: 5
     title: 159cm
@@ -56,8 +56,8 @@ product_variants:
     available: true
     inventory_quantity: 6
     option1: 159cm
-    option2: 
-    option3: 
+    option2:
+    option3:
   - &product-1-var-3
     id: 6
     title: 158cm / Wide
@@ -74,12 +74,12 @@ product_variants:
     title: 162cm
     price: 19900
     weight: 1000
-    compare_at_price: 
+    compare_at_price:
     available: false
     inventory_quantity: 0
     option1: 162cm
-    option2: 
-    option3: 
+    option2:
+    option3:
   - &product-3-var-3
     id: 8
     title: 165cm
@@ -89,8 +89,8 @@ product_variants:
     available: true
     inventory_quantity: 4
     option1: 165cm
-    option2: 
-    option3: 
+    option2:
+    option3:
   - &product-5-var-1
     id: 9
     title: black / 42
@@ -233,7 +233,7 @@ product_variants:
     inventory_quantity: 0
     option1: brown
     option2: medium
-    option3:       
+    option3:
   - &product-8-var-3
     id: 22
     title: brown / large
@@ -315,7 +315,7 @@ product_variants:
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 #   Products
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-  
+
 products:
   - &product-1
     id: 1
@@ -327,27 +327,27 @@ products:
     price_max: 31900
     price_min: 23900
     price_varies: true
-    available: true    
-    tags: 
+    available: true
+    tags:
       - season2005
       - pro
       - intermediate
-      - wooden      
+      - wooden
       - freestyle
-    options: 
+    options:
       - Length
-      - Style           
+      - Style
     compare_at_price: 49900
     compare_at_price_max: 50900
     compare_at_price_min: 49900
     compare_at_price_varies: true
     url: /products/arbor-draft
     featured_image: products/arbor_draft.jpg
-    images: 
+    images:
       - products/arbor_draft.jpg
-    description: 
+    description:
       The Arbor Draft snowboard wouldn't exist if Polynesians hadn't figured out how to surf hundreds of years ago. But the Draft does exist, and it's here to bring your urban and park riding to a new level. The board's freaky Tiki design pays homage to culture that inspired snowboarding. It's designed to spin with ease, land smoothly, lock hook-free onto rails, and take the abuse of a pavement pounding or twelve. The Draft will pop off kickers with authority and carve solidly across the pipe. The Draft features targeted Koa wood die cuts inlayed into the deck that enhance the flex pattern. Now bow down to riding's ancestors.
-    variants: 
+    variants:
       - *product-1-var-1
       - *product-1-var-2
       - *product-1-var-3
@@ -361,14 +361,14 @@ products:
     price_max: 29900
     price_min: 29900
     price_varies: false
-    available: true    
-    tags: 
+    available: true
+    tags:
       - season2005
       - pro
-      - wooden          
+      - wooden
       - freestyle
     options:
-      - Length 
+      - Length
     compare_at_price: 52900
     compare_at_price_max: 52900
     compare_at_price_min: 52900
@@ -379,29 +379,29 @@ products:
       - products/element58.jpg
     description:
       The Element is a technically advanced all-mountain board for riders who readily transition from one terrain, snow condition, or riding style to another. Its balanced design provides the versatility needed for the true ride-it-all experience. The Element is exceedingly lively, freely initiates, and holds a tight edge at speed. Its structural real-wood topsheet is made with book-matched Koa.
-    variants: 
+    variants:
       - *product-2-var-1
-    
+
   - &product-3
     id: 3
-    title: Comic ~ Pastel 
+    title: Comic ~ Pastel
     handle: comic-pastel
     type: Snowboards
     vendor: Technine
     price: 19900
     price_max: 22900
     price_min: 19900
-    tags: 
+    tags:
       - season2006
       - beginner
       - intermediate
-      - freestyle      
+      - freestyle
       - purple
     options:
       - Length
     price_varies: true
-    available: true    
-    compare_at_price: 
+    available: true
+    compare_at_price:
     compare_at_price_max: 0
     compare_at_price_min: 0
     compare_at_price_varies: false
@@ -413,7 +413,7 @@ products:
       - products/technine_detail.jpg
     description:
       2005 Technine Comic Series Description The Comic series was developed to be the ultimate progressive freestyle board in the Technine line. Dependable edge control and a perfect flex pattern for jumping in the park or out of bounds. Landins and progression will come easy with this board and it will help your riding progress to the next level. Street rails, park jibs, backcountry booters and park jumps, this board will do it all.
-    variants: 
+    variants:
       - *product-3-var-1
       - *product-3-var-2
       - *product-3-var-3
@@ -428,12 +428,12 @@ products:
     price_max: 19900
     price_min: 19900
     price_varies: false
-    available: true    
-    tags: 
+    available: true
+    tags:
       - season2006
       - beginner
       - intermediate
-      - freestyle   
+      - freestyle
       - orange
     options:
       - Length
@@ -448,9 +448,9 @@ products:
       - products/technine4.jpg
     description:
       2005 Technine Comic Series Description The Comic series was developed to be the ultimate progressive freestyle board in the Technine line. Dependable edge control and a perfect flex pattern for jumping in the park or out of bounds. Landins and progression will come easy with this board and it will help your riding progress to the next level. Street rails, park jibs, backcountry booters and park jumps, this board will do it all.
-    variants: 
+    variants:
       - *product-4-var-1
-      
+
   - &product-5
     id: 5
     title: Burton Boots
@@ -461,11 +461,11 @@ products:
     price_max: 11900
     price_min: 11900
     price_varies: false
-    available: true        
-    tags: 
+    available: true
+    tags:
       - season2006
       - beginner
-      - intermediate   
+      - intermediate
       - boots
     options:
       - Color
@@ -480,13 +480,13 @@ products:
       - products/burton.jpg
     description:
       The Burton boots are particularly well on snowboards. The very best thing about them is that the according picture is cubic. This makes testing in a Vision testing environment very easy.
-    variants: 
+    variants:
       - *product-5-var-1
       - *product-5-var-2
       - *product-5-var-3
       - *product-5-var-4
       - *product-5-var-5
-      - *product-5-var-6                        
+      - *product-5-var-6
 
   - &product-6
     id: 6
@@ -498,17 +498,17 @@ products:
     price_max: 2179500
     price_min: 2179500
     price_varies: false
-    available: true    
-    tags: 
+    available: true
+    tags:
       - ducati
       - superbike
-      - bike   
+      - bike
       - street
       - racing
-      - performance      
+      - performance
     options:
       - Color
-    compare_at_price: 
+    compare_at_price:
     compare_at_price_max: 0
     compare_at_price_min: 0
     compare_at_price_varies: false
@@ -520,7 +520,7 @@ products:
       <h3>‘S’ PERFORMANCE</h3>
       <p>Producing 170hp (125kW) and with a dry weight of just 169kg (372.6lb), the new 1198 S now incorporates more World Superbike technology than ever before by taking the 1198 motor and adding top-of-the-range suspension, lightweight chassis components and a true racing-style traction control system designed for road use.</p>
       <p>The high performance, fully adjustable 43mm Öhlins forks, which sport low friction titanium nitride-treated fork sliders, respond effortlessly to every imperfection in the tarmac. Beyond their advanced engineering solutions, one of the most important characteristics of Öhlins forks is their ability to communicate the condition and quality of the tyre-to-road contact patch, a feature that puts every rider in superior control. The suspension set-up at the rear is complemented with a fully adjustable Öhlins rear shock equipped with a ride enhancing top-out spring and mounted to a single-sided swingarm for outstanding drive and traction. The front-to-rear Öhlins package is completed with a control-enhancing adjustable steering damper.</p>
-    variants: 
+    variants:
       - *product-6-var-1
 
   - &product-7
@@ -533,17 +533,17 @@ products:
     price_max: 1900
     price_min: 1900
     price_varies: false
-    available: true    
-    tags: 
+    available: true
+    tags:
       - shopify
       - shirt
-      - apparel  
+      - apparel
       - tshirt
       - clothing
     options:
       - Color
       - Size
-    compare_at_price: 
+    compare_at_price:
     compare_at_price_max: 0
     compare_at_price_min: 0
     compare_at_price_varies: false
@@ -554,11 +554,11 @@ products:
     description:
       <p>High Quality Shopify Shirt. Wear your e-commerce solution with pride and attract attention anywhere you go.</p>
       <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-    variants: 
+    variants:
       - *product-7-var-1
       - *product-7-var-2
       - *product-7-var-3
-      - *product-7-var-4            
+      - *product-7-var-4
 
   - &product-8
     id: 8
@@ -570,11 +570,11 @@ products:
     price_max: 5900
     price_min: 5900
     price_varies: false
-    available: true    
-    tags: 
+    available: true
+    tags:
       - sweater
       - hooded
-      - apparel  
+      - apparel
       - clothing
     options:
       - Color
@@ -591,11 +591,11 @@ products:
     description:
       <p>Extra comfortable zip up sweater. Durable quality, ideal for any outdoor activities.</p>
       <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-    variants: 
+    variants:
       - *product-8-var-1
       - *product-8-var-2
       - *product-8-var-3
-      - *product-8-var-4            
+      - *product-8-var-4
       - *product-8-var-5
       - *product-8-var-6
 
@@ -609,11 +609,11 @@ products:
     price_max: 552500
     price_min: 499995
     price_varies: true
-    available: true    
-    tags: 
+    available: true
+    tags:
       - camera
       - slr
-      - nikon  
+      - nikon
       - professional
     options:
       - Bundle
@@ -626,21 +626,21 @@ products:
     images:
       - products/d3.jpg
       - products/d3_2.jpg
-      - products/d3_3.jpg      
+      - products/d3_3.jpg
     description:
       <p>Flagship pro D-SLR with a 12.1-MP FX-format CMOS sensor, blazing 9 fps shooting at full FX resolution and low-noise performance up to 6400 ISO.</p>
       <p><strong>Nikon's original 12.1-megapixel FX-format (23.9 x 36mm) CMOS sensor:</strong> Couple Nikon's exclusive digital image processing system with the 12.1-megapixel FX-format and you'll get breathtakingly rich images while also reducing noise to unprecedented levels with even higher ISOs.</p>
       <p><strong>Continuous shooting at up to 9 frames per second:</strong> At full FX resolution and up to 11fps in the DX crop mode, the D3 offers uncompromised shooting speeds for fast-action and sports photography.</p>
-    variants: 
+    variants:
       - *product-9-var-1
       - *product-9-var-2
       - *product-9-var-3
 
-      
+
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 #   Line Items
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-      
+
 line_items:
   - &line_item-1
     id: 1
@@ -661,7 +661,7 @@ line_items:
     quantity: 2
     variant: *product-4-var-1
     product: *product-4
-    
+
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 #   Link Lists
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -715,7 +715,7 @@ links:
     title: Catalog
     url: /collections/all
 
-    
+
 
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 #   Link Lists
@@ -727,7 +727,7 @@ link_lists:
     title: 'Main Menu'
     handle: 'main-menu'
     links:
-      - *link-12      
+      - *link-12
       - *link-5
       - *link-7
       - *link-8
@@ -738,7 +738,7 @@ link_lists:
     links:
       - *link-5
       - *link-6
-      
+
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 #   Collections
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -759,7 +759,7 @@ collections:
     title: Arbor
     handle: arbor
     url: /collections/arbor
-    products: 
+    products:
       - *product-1
       - *product-2
 
@@ -770,26 +770,26 @@ collections:
     url: /collections/snowboards
     description:
       <p>This is a description for my <strong>Snowboards</strong> collection.</p>
-    products: 
+    products:
       - *product-1
       - *product-2
       - *product-3
       - *product-4
-  
+
   - &collection-4
     id: 4
     title: Items On Sale
     handle: sale
     url: /collections/sale
-    products: 
+    products:
       - *product-1
-      
+
   - &collection-5
     id: 5
     title: Paginated Sale
     handle: 'paginated-sale'
     url: '/collections/paginated-sale'
-    products: 
+    products:
       - *product-1
       - *product-2
       - *product-3
@@ -801,7 +801,7 @@ collections:
     title: All products
     handle: 'all'
     url: '/collections/all'
-    products: 
+    products:
       - *product-7
       - *product-8
       - *product-9
@@ -812,7 +812,7 @@ collections:
       - *product-4
       - *product-5
 
-          
+
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 #   Pages and Blogs
 # =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -828,12 +828,12 @@ pages:
       <p>Our retail store is located at <em>Rue d'Avignon 32, Avignon (Provence)</em>.</p>
       <p><strong>Opening Hours:</strong><br />Monday through Friday: 9am - 6pm<br />Saturday: 10am - 3pm<br />Sunday: closed</p>"
     created_at: 2005-04-04 12:00
-    
+
   - &page-3
     id: 2
     title: About Us
     handle: about-us
-    url: /pages/about-us   
+    url: /pages/about-us
     author: Tobi
     content:
       "<p>Our company was founded in 1894 and we are since operating out of Avignon from the beautiful Provence.</p>
@@ -848,12 +848,12 @@ pages:
     author: Tobi
     content: "<ul><li>Your order is safe with us. Our checkout uses industry standard security to protect your information.</li><li>Your order will be billed immediately upon checkout.</li><li><b>ALL SALES ARE FINAL:</b> Defective or damaged product will be exchanged</li><li>All orders are processed expediently: usually in under 24 hours.</li></ul>"
     created_at: 2005-04-04 12:00
-    
+
   - &page-5
     id: 4
     title: Shipping and Handling
     handle: shipping
-    url: /pages/shipping    
+    url: /pages/shipping
     author: Tobi
     content: <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
     created_at: 2005-04-04 12:00
@@ -862,7 +862,7 @@ pages:
     id: 5
     title: Frontpage
     handle: frontpage
-    url: /pages/frontpage    
+    url: /pages/frontpage
     author: Tobi
     content: <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
     created_at: 2005-04-04 12:00
@@ -872,11 +872,11 @@ blogs:
     handle: news
     title: News
     url: /blogs/news
-    articles: 
+    articles:
       - id: 3
         title: 'Welcome to the new Foo Shop'
         author: Daniel
-        content: <p><strong>Welcome to your Shopify store! The jaded Pixel crew is really glad you decided to take Shopify for a spin.</strong></p><p>To help you get you started with Shopify, here are a couple of tips regarding what you see on this page.</p><p>The text you see here is an article. To edit this article, create new articles or create new pages you can go to the <a href="/admin/pages">Blogs &amp; Pages</a> tab of the administration menu.</p><p>The Shopify t-shirt above is a product and selling products is what Shopify is all about. To edit this product, or create new products you can go to the <a href="/admin/products">Products Tab</a> in of the administration menu.</p><p>While you're looking around be sure to check out the <a href="/admin/collections">Collections</a> and <a href="/admin/links">Navigations</a> tabs and soon you will be well on your way to populating your site.</p><p>And of course don't forget to browse the <a href="admin/design/appearance/themes">theme gallery</a> to pick a new look for your shop!</p><p><strong>Shopify is in beta</strong><br />If you would like to make comments or suggestions please visit us in the <a href="http://forums.shopify.com/community">Shopify Forums</a> or drop us an <a href="mailto:feedback@shopify.com">email</a>.</p>  
+        content: <p><strong>Welcome to your Shopify store! The jaded Pixel crew is really glad you decided to take Shopify for a spin.</strong></p><p>To help you get you started with Shopify, here are a couple of tips regarding what you see on this page.</p><p>The text you see here is an article. To edit this article, create new articles or create new pages you can go to the <a href="/admin/pages">Blogs &amp; Pages</a> tab of the administration menu.</p><p>The Shopify t-shirt above is a product and selling products is what Shopify is all about. To edit this product, or create new products you can go to the <a href="/admin/products">Products Tab</a> in of the administration menu.</p><p>While you're looking around be sure to check out the <a href="/admin/collections">Collections</a> and <a href="/admin/links">Navigations</a> tabs and soon you will be well on your way to populating your site.</p><p>And of course don't forget to browse the <a href="admin/design/appearance/themes">theme gallery</a> to pick a new look for your shop!</p><p><strong>Shopify is in beta</strong><br />If you would like to make comments or suggestions please visit us in the <a href="http://forums.shopify.com/community">Shopify Forums</a> or drop us an <a href="mailto:feedback@shopify.com">email</a>.</p>
         created_at: 2005-04-04 16:00
       - id: 4
         title: 'Breaking News: Restock on all sales products'
@@ -884,7 +884,7 @@ blogs:
         content: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
         created_at: 2005-04-04 12:00
     articles_count: 2
-         
+
   - id: 2
     handle: bigcheese-blog
     title: Bigcheese blog
@@ -896,7 +896,7 @@ blogs:
         content: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
         created_at: 2005-04-04 16:00
         comments:
-          - 
+          -
             id: 1
             author: John Smith
             email: john@smith.com
@@ -905,7 +905,7 @@ blogs:
             created_at: 2009-01-01 12:00
             updated_at: 2009-02-01 12:00
             url: ""
-          - 
+          -
             id: 2
             author: John Jones
             email: john@jones.com
@@ -921,22 +921,22 @@ blogs:
         created_at: 2005-04-06 12:00
         comments:
     articles_count: 2
-    comments_enabled?: true 
+    comments_enabled?: true
     comment_post_url: ""
     comments_count: 2
-    moderated?: true 
+    moderated?: true
 
   - id: 3
     handle: paginated-blog
     title: Paginated blog
     url: /blogs/paginated-blog
-    articles: 
+    articles:
       - id: 6
         title: 'One thing you probably did not know yet...'
         author: Justin
         content: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
         created_at: 2005-04-04 16:00
-    
+
       - id: 7
         title: Fascinating
         author: Tobi

performance/shopify/weight_filter.rb

@@ -3,9 +3,9 @@ module WeightFilter
   def weight(grams)
     sprintf("%.2f", grams / 1000)
   end
-  
+
   def weight_with_unit(grams)
     "#{weight(grams)} kg"
-  end  
-  
-end
+  end
+
+end

performance/stackprof.rb

@@ -0,0 +1,15 @@
+require 'stackprof' rescue fail("install stackprof extension/gem")
+require File.dirname(__FILE__) + '/theme_runner'
+
+profiler = ThemeRunner.new
+profiler.run
+results = StackProf.run(mode: :cpu, out: ENV['FILENAME']) do
+  100.times do
+    profiler.run
+  end
+end
+if results.kind_of?(File)
+  puts "wrote stackprof dump to #{results.path}"
+else
+  StackProf::Report.new(results).print_text(false, 20)
+end

performance/tests/dropify/article.liquid

@@ -4,7 +4,7 @@
 
   <div class="article-body textile">
     {{ article.content }}
-  </div>    
+  </div>
 
 </div>
 
@@ -12,27 +12,27 @@
 {% if blog.comments_enabled? %}
 <div id="comments">
   <h3>Comments</h3>
-  
+
   <!-- List all comments -->
   <ul id="comment-list">
   {% for comment in article.comments %}
     <li>
-  	  <div class="comment-details">
-  		  <span class="comment-author">{{ comment.author }}</span> said on <span class="comment-date">{{ comment.created_at | date: "%B %d, %Y" }}</span>:
+      <div class="comment-details">
+        <span class="comment-author">{{ comment.author }}</span> said on <span class="comment-date">{{ comment.created_at | date: "%B %d, %Y" }}</span>:
       </div>
 
       <div class="comment">
         {{ comment.content }}
-      </div>      
-  	</li>
+      </div>
+    </li>
   {% endfor %}
   </ul>
-  
+
   <!-- Comment Form -->
   <div id="comment-form">
   {% form article %}
     <h3>Leave a comment</h3>
-    
+
     <!-- Check if a comment has been submitted in the last request, and if yes display an appropriate message -->
     {% if form.posted_successfully? %}
       {% if blog.moderated? %}
@@ -44,11 +44,11 @@
         <div class="notice">Successfully posted your comment.</div>
       {% endif %}
     {% endif %}
-    
+
     {% if form.errors %}
       <div class="notice error">Not all the fields have been filled out correctly!</div>
     {% endif %}
-    
+
     <dl>
       <dt class="{% if form.errors contains 'author' %}error{% endif %}"><label for="comment_author">Your name</label></dt>
       <dd><input type="text" id="comment_author" name="comment[author]" size="40" value="{{form.author}}" class="{% if form.errors contains 'author' %}input-error{% endif %}" /></dd>
@@ -59,16 +59,16 @@
       <dt class="{% if form.errors contains 'body' %}error{% endif %}"><label for="comment_body">Your comment</label></dt>
       <dd><textarea id="comment_body" name="comment[body]" cols="40" rows="5" class="{% if form.errors contains 'body' %}input-error{% endif %}">{{form.body}}</textarea></dd>
     </dl>
-    
+
     {% if blog.moderated? %}
       <p class="hint">comments have to be approved before showing up</p>
-    {% endif %}    
+    {% endif %}
 
     <input type="submit" value="Post comment" id="comment-submit" />
   {% endform %}
   </div>
   <!-- END Comment Form -->
-  
+
 </div>
 {% endif %}
-<!-- END Comments -->
+<!-- END Comments -->

performance/tests/dropify/blog.liquid

@@ -1,33 +1,33 @@
-<div id="page">
-  <h2>{{page.title}}</h2>
-
-  {% paginate blog.articles by 20 %}
-
-    {% for article in blog.articles  %}
-
-    <div class="article">
-      <div class="headline">
-      <h3 class="title">
-        <a href="{{article.url}}">{{ article.title }}</a>
-      </h3>
-  		<h4 class="date">Posted on {{ article.created_at | date: "%B %d, '%y" }} by {{ article.author }}.</h4>
-      </div>
-    
-      <div class="article-body textile">
-        {{ article.content | strip_html | truncate: 250 }}
-      </div>
-      
-      {% if blog.comments_enabled? %}
-        <p style="text-align: right"><a href="{{article.url}}#comments">{{ article.comments_count }} comments</a></p>
-      {% endif %}    
-    </div>
-  
-    {% endfor %}
-    
-    <div id="pagination">
-      {{ paginate | default_pagination }}
-    </div>
-
-  {% endpaginate %}
-  
-</div>
+<div id="page">
+  <h2>{{page.title}}</h2>
+
+  {% paginate blog.articles by 20 %}
+
+    {% for article in blog.articles  %}
+
+    <div class="article">
+      <div class="headline">
+      <h3 class="title">
+        <a href="{{article.url}}">{{ article.title }}</a>
+      </h3>
+      <h4 class="date">Posted on {{ article.created_at | date: "%B %d, '%y" }} by {{ article.author }}.</h4>
+      </div>
+
+      <div class="article-body textile">
+        {{ article.content | strip_html | truncate: 250 }}
+      </div>
+
+      {% if blog.comments_enabled? %}
+        <p style="text-align: right"><a href="{{article.url}}#comments">{{ article.comments_count }} comments</a></p>
+      {% endif %}
+    </div>
+
+    {% endfor %}
+
+    <div id="pagination">
+      {{ paginate | default_pagination }}
+    </div>
+
+  {% endpaginate %}
+
+</div>

performance/tests/dropify/cart.liquid

@@ -1,66 +1,66 @@
-<script type="text/javascript">
-  function remove_item(id) {
-      document.getElementById('updates_'+id).value = 0;
-      document.getElementById('cartform').submit();
-  }
-</script>
-
-<div>
-
-  {% if cart.item_count == 0 %} 
-    <h4>Your shopping cart is looking rather empty...</h4>
-  {% else %}
-  <form action="/cart" method="post" id="cartform">
-
-  <div id="cart">
-  
-  <h3>You have {{ cart.item_count }} {{ cart.item_count | pluralize: 'product', 'products' }} in here!</h3>
-
-    <ul id="line-items">
-      {% for item in cart.items %}
-      <li id="item-{{item.id}}" class="clearfix">
-        <div class="thumb">
-				  <div class="prodimage">
-          <a href="{{item.product.url}}" title="View {{item.title}} Page"><img src="{{item.product.featured_image | product_img_url: 'thumb' }}" alt="{{item.title | escape }}" /></a>
-        </div></div>
-        <h3 style="padding-right: 150px">
-			<a href="{{item.product.url}}" title="View {{item.title | escape }} Page">
-				{{ item.title }}
-				{% if item.variant.available == true %}
-				   ({{item.variant.title}})
-				{% endif %}
-			</a>	
-		</h3>
-        <small class="itemcost">Costs {{ item.price | money }} each, <span class="money">{{item.line_price | money }}</span> total.</small>
-        <p class="right">
-          <label for="updates">How many? </label> 
-          <input type="text" size="4" name="updates[{{item.variant.id}}]" id="updates_{{item.variant.id}}" value="{{item.quantity}}" onfocus="this.select();"/><br />
-          <a href="#" onclick="remove_item({{item.variant.id}}); return false;" class="remove"><img style="padding:15px 0 0 0;margin:0;" src="{{ 'delete.gif' | asset_url }}" /></a>
-        </p>
-      </li>
-      {% endfor %}
-      <li id="total">
-        <input type="image" id="update-cart" name="update" value="Update My Cart" src="{{ 'update.gif' | asset_url }}" />
-        Subtotal: 
-        <span class="money">{{ cart.total_price | money_with_currency }}</span>
-      </li>
-    </ul>
-
-  </div>
-  
-    <div class="info">
-		<input type="image" value="Checkout!" name="checkout" src="{{ 'checkout.gif' | asset_url }}" />
-    </div>
-  
-  	{% if additional_checkout_buttons %}
-    <div class="additional-checkout-buttons">
-      <p>- or -</p>
-      {{ content_for_additional_checkout_buttons }}
-    </div>
-    {% endif %}
-  
-  </form>
-
-  {% endif %}
-
-</div>
+<script type="text/javascript">
+  function remove_item(id) {
+      document.getElementById('updates_'+id).value = 0;
+      document.getElementById('cartform').submit();
+  }
+</script>
+
+<div>
+
+  {% if cart.item_count == 0 %}
+    <h4>Your shopping cart is looking rather empty...</h4>
+  {% else %}
+  <form action="/cart" method="post" id="cartform">
+
+  <div id="cart">
+
+  <h3>You have {{ cart.item_count }} {{ cart.item_count | pluralize: 'product', 'products' }} in here!</h3>
+
+    <ul id="line-items">
+      {% for item in cart.items %}
+      <li id="item-{{item.id}}" class="clearfix">
+        <div class="thumb">
+          <div class="prodimage">
+          <a href="{{item.product.url}}" title="View {{item.title}} Page"><img src="{{item.product.featured_image | product_img_url: 'thumb' }}" alt="{{item.title | escape }}" /></a>
+        </div></div>
+        <h3 style="padding-right: 150px">
+      <a href="{{item.product.url}}" title="View {{item.title | escape }} Page">
+        {{ item.title }}
+        {% if item.variant.available == true %}
+           ({{item.variant.title}})
+        {% endif %}
+      </a>
+    </h3>
+        <small class="itemcost">Costs {{ item.price | money }} each, <span class="money">{{item.line_price | money }}</span> total.</small>
+        <p class="right">
+          <label for="updates">How many? </label>
+          <input type="text" size="4" name="updates[{{item.variant.id}}]" id="updates_{{item.variant.id}}" value="{{item.quantity}}" onfocus="this.select();"/><br />
+          <a href="#" onclick="remove_item({{item.variant.id}}); return false;" class="remove"><img style="padding:15px 0 0 0;margin:0;" src="{{ 'delete.gif' | asset_url }}" /></a>
+        </p>
+      </li>
+      {% endfor %}
+      <li id="total">
+        <input type="image" id="update-cart" name="update" value="Update My Cart" src="{{ 'update.gif' | asset_url }}" />
+        Subtotal:
+        <span class="money">{{ cart.total_price | money_with_currency }}</span>
+      </li>
+    </ul>
+
+  </div>
+
+    <div class="info">
+    <input type="image" value="Checkout!" name="checkout" src="{{ 'checkout.gif' | asset_url }}" />
+    </div>
+
+    {% if additional_checkout_buttons %}
+    <div class="additional-checkout-buttons">
+      <p>- or -</p>
+      {{ content_for_additional_checkout_buttons }}
+    </div>
+    {% endif %}
+
+  </form>
+
+  {% endif %}
+
+</div>

performance/tests/dropify/collection.liquid

@@ -1,22 +1,22 @@
-{% paginate collection.products by 20 %}
-
-<ul id="product-collection">
-    {% for product in collection.products %}
-    <li class="singleproduct clearfix">
-      <div class="small">
-        <div class="prodimage"><a href="{{product.url}}"><img src="{{ product.featured_image | product_img_url: 'small' }}" /></a></div>
-      </div>
-      <div class="description">
-        <h3><a href="{{product.url}}">{{product.title}}</a></h3>
-        <p>{{ product.description | strip_html | truncatewords: 35 }}</p>
-  	  <p class="money">{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</p>
-     </div>
-    </li>
-    {% endfor %}
-</ul>
-  
-<div id="pagination">
-  {{ paginate | default_pagination }}
-</div>
-
-{% endpaginate %}
+{% paginate collection.products by 20 %}
+
+<ul id="product-collection">
+    {% for product in collection.products %}
+    <li class="singleproduct clearfix">
+      <div class="small">
+        <div class="prodimage"><a href="{{product.url}}"><img src="{{ product.featured_image | product_img_url: 'small' }}" /></a></div>
+      </div>
+      <div class="description">
+        <h3><a href="{{product.url}}">{{product.title}}</a></h3>
+        <p>{{ product.description | strip_html | truncatewords: 35 }}</p>
+      <p class="money">{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</p>
+     </div>
+    </li>
+    {% endfor %}
+</ul>
+
+<div id="pagination">
+  {{ paginate | default_pagination }}
+</div>
+
+{% endpaginate %}

performance/tests/dropify/index.liquid

@@ -1,47 +1,47 @@
-<div id="frontproducts"><div id="frontproducts-top"><div id="frontproducts-bottom">
-<h2 style="display: none;">Featured Items</h2>
-{% for product in collections.frontpage.products limit:1 offset:0 %}
-  <div class="productmain">
-   <a href="{{ product.url }}"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}" /></a>
-   <h3><a href="{{ product.url }}">{{ product.title }}</a></h3>
-   <div class="description">{{ product.description | strip_html | truncatewords: 18 }}</div>
-	<p class="money">{{ product.price_min | money }}</p>
-  </div>
-{% endfor %}
-{% for product in collections.frontpage.products offset:1 %}
-  <div class="product">
-   <a href="{{ product.url }}"><img src="{{ product.featured_image | product_img_url: 'thumb' }}" alt="{{ product.title | escape }}" /></a>
-   <h3><a href="{{ product.url }}">{{ product.title }}</a></h3>
-     <p class="money">{{ product.price_min | money }}</p>
-  </div>
-{% endfor %}
-</div></div></div>
-
-<div id="mainarticle">
-	{% assign article = pages.frontpage %}
-
-  {% if article.content != "" %}
-	  <h2>{{ article.title }}</h2>
-    <div class="article-body textile">
-		  {{ article.content }}
-		</div>
-	{% else %}
-    <div class="article-body textile">
-	  In <em>Admin &gt; Blogs &amp; Pages</em>, create a page with the handle <strong><code>frontpage</code></strong> and it will show up here.<br />
-	  {{ "Learn more about handles" | link_to "http://wiki.shopify.com/Handle" }}
-    </div>
-	{% endif %}
-  
-</div>
-<br style="clear: both;" />
-<div id="articles">
-  {% for article in blogs.news.articles offset:1  %}
-    <div class="article">
-		<h2>{{ article.title }}</h2>
-		<div class="article-body textile">
-		  {{ article.content }}
-		</div>    
-	</div>
-  {% endfor %}
-</div>
-
+<div id="frontproducts"><div id="frontproducts-top"><div id="frontproducts-bottom">
+<h2 style="display: none;">Featured Items</h2>
+{% for product in collections.frontpage.products limit:1 offset:0 %}
+  <div class="productmain">
+   <a href="{{ product.url }}"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}" /></a>
+   <h3><a href="{{ product.url }}">{{ product.title }}</a></h3>
+   <div class="description">{{ product.description | strip_html | truncatewords: 18 }}</div>
+  <p class="money">{{ product.price_min | money }}</p>
+  </div>
+{% endfor %}
+{% for product in collections.frontpage.products offset:1 %}
+  <div class="product">
+   <a href="{{ product.url }}"><img src="{{ product.featured_image | product_img_url: 'thumb' }}" alt="{{ product.title | escape }}" /></a>
+   <h3><a href="{{ product.url }}">{{ product.title }}</a></h3>
+     <p class="money">{{ product.price_min | money }}</p>
+  </div>
+{% endfor %}
+</div></div></div>
+
+<div id="mainarticle">
+  {% assign article = pages.frontpage %}
+
+  {% if article.content != "" %}
+    <h2>{{ article.title }}</h2>
+    <div class="article-body textile">
+      {{ article.content }}
+    </div>
+  {% else %}
+    <div class="article-body textile">
+    In <em>Admin &gt; Blogs &amp; Pages</em>, create a page with the handle <strong><code>frontpage</code></strong> and it will show up here.<br />
+    {{ "Learn more about handles" | link_to: "http://wiki.shopify.com/Handle" }}
+    </div>
+  {% endif %}
+
+</div>
+<br style="clear: both;" />
+<div id="articles">
+  {% for article in blogs.news.articles offset:1  %}
+    <div class="article">
+    <h2>{{ article.title }}</h2>
+    <div class="article-body textile">
+      {{ article.content }}
+    </div>
+  </div>
+  {% endfor %}
+</div>
+

performance/tests/dropify/page.liquid

@@ -5,4 +5,4 @@
     {{page.content}}
   </div>
 
-</div>
+</div>

performance/tests/dropify/product.liquid

@@ -1,68 +1,68 @@
-<div id="productpage">
-
-	<div id="productimages"><div id="productimages-top"><div id="productimages-bottom">
-		{% for image in product.images %}
-			{% if forloop.first %}
-				<a href="{{ image | product_img_url: 'large' }}" class="productimage" rel="lightbox">
-				  <img src="{{ image | product_img_url: 'medium'}}" alt="{{product.title | escape }}" />
-				</a>
-			{% else %}
-				<a href="{{ image | product_img_url: 'large' }}" class="productimage-small" rel="lightbox">
-				  <img src="{{ image | product_img_url: 'small'}}" alt="{{product.title | escape }}" />
-				</a>
-			{% endif %}
-		{% endfor %}
-	</div></div></div>
-
-  <h2>{{ product.title }}</h2>
-  
-  <ul id="details" class="hlist">
-    <li>Vendor: {{ product.vendor | link_to_vendor }}</li>
-    <li>Type: {{ product.type | link_to_type }}</li>
-  </ul>
-  
-  <small>{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</small>
-    
-  <div id="variant-add">
-    <form action="/cart/add" method="post">
-      	  
-			<select id="variant-select" name="id" class="product-info-options">
-        {% for variant in product.variants %}
-          <option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
-        {% endfor %}
-			</select>
-
-			<div id="price-field" class="price"></div>
-    
-		<div style="text-align:center;"><input type="image" name="add" value="Add to Cart" id="add" src="{{ 'addtocart.gif' | asset_url }}" /></div>
-    </form>
-  </div>
-  
-  <div class="description textile">
-    {{ product.description }}
-  </div>
-</div>
-
-<script type="text/javascript">
-<!--
-  // prototype callback for multi variants dropdown selector
-  var selectCallback = function(variant, selector) {
-    if (variant && variant.available == true) {
-      // selected a valid variant
-      $('add').removeClassName('disabled'); // remove unavailable class from add-to-cart button
-      $('add').disabled = false;           // reenable add-to-cart button
-      $('price-field').innerHTML = Shopify.formatMoney(variant.price, "{{shop.money_with_currency_format}}");  // update price field
-    } else {
-      // variant doesn't exist
-      $('add').addClassName('disabled');      // set add-to-cart button to unavailable class
-      $('add').disabled = true;              // disable add-to-cart button      
-      $('price-field').innerHTML = (variant) ? "Sold Out" : "Unavailable"; // update price-field message
-    }
-  };
-
-  // initialize multi selector for product
-  Event.observe(document, 'dom:loaded', function() {
-    new Shopify.OptionSelectors("variant-select", { product: {{ product | json }}, onVariantSelected: selectCallback }); 
-  });
--->
-</script>
+<div id="productpage">
+
+  <div id="productimages"><div id="productimages-top"><div id="productimages-bottom">
+    {% for image in product.images %}
+      {% if forloop.first %}
+        <a href="{{ image | product_img_url: 'large' }}" class="productimage" rel="lightbox">
+          <img src="{{ image | product_img_url: 'medium'}}" alt="{{product.title | escape }}" />
+        </a>
+      {% else %}
+        <a href="{{ image | product_img_url: 'large' }}" class="productimage-small" rel="lightbox">
+          <img src="{{ image | product_img_url: 'small'}}" alt="{{product.title | escape }}" />
+        </a>
+      {% endif %}
+    {% endfor %}
+  </div></div></div>
+
+  <h2>{{ product.title }}</h2>
+
+  <ul id="details" class="hlist">
+    <li>Vendor: {{ product.vendor | link_to_vendor }}</li>
+    <li>Type: {{ product.type | link_to_type }}</li>
+  </ul>
+
+  <small>{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</small>
+
+  <div id="variant-add">
+    <form action="/cart/add" method="post">
+
+      <select id="variant-select" name="id" class="product-info-options">
+        {% for variant in product.variants %}
+          <option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
+        {% endfor %}
+      </select>
+
+      <div id="price-field" class="price"></div>
+
+    <div style="text-align:center;"><input type="image" name="add" value="Add to Cart" id="add" src="{{ 'addtocart.gif' | asset_url }}" /></div>
+    </form>
+  </div>
+
+  <div class="description textile">
+    {{ product.description }}
+  </div>
+</div>
+
+<script type="text/javascript">
+<!--
+  // prototype callback for multi variants dropdown selector
+  var selectCallback = function(variant, selector) {
+    if (variant && variant.available == true) {
+      // selected a valid variant
+      $('add').removeClassName('disabled'); // remove unavailable class from add-to-cart button
+      $('add').disabled = false;           // reenable add-to-cart button
+      $('price-field').innerHTML = Shopify.formatMoney(variant.price, "{{shop.money_with_currency_format}}");  // update price field
+    } else {
+      // variant doesn't exist
+      $('add').addClassName('disabled');      // set add-to-cart button to unavailable class
+      $('add').disabled = true;              // disable add-to-cart button
+      $('price-field').innerHTML = (variant) ? "Sold Out" : "Unavailable"; // update price-field message
+    }
+  };
+
+  // initialize multi selector for product
+  Event.observe(document, 'dom:loaded', function() {
+    new Shopify.OptionSelectors("variant-select", { product: {{ product | json }}, onVariantSelected: selectCallback });
+  });
+-->
+</script>

performance/tests/dropify/theme.liquid

@@ -1,105 +1,105 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"/>
-	<title>{{shop.name}} - {{page_title}}</title>
-
-	{{ 'textile.css'  | global_asset_url | stylesheet_tag }}
-  {{ 'lightbox/v204/lightbox.css' | global_asset_url | stylesheet_tag }}
-	
-	{{ 'prototype/1.6/prototype.js' | global_asset_url  | script_tag }}
-  {{ 'scriptaculous/1.8.2/scriptaculous.js' | global_asset_url  | script_tag }}
-  {{ 'lightbox/v204/lightbox.js'  | global_asset_url  | script_tag }}
-  {{ 'option_selection.js'        | shopify_asset_url | script_tag }}
-
-	{{ 'layout.css'   | asset_url | stylesheet_tag }}
-	{{ 'shop.js'      | asset_url | script_tag }}
-
-	{{ content_for_header }}
-</head>
-
-<body id="page-{{template}}">
-    
-	<p class="hide"><a href="#rightsiders">Skip to navigation.</a></p>
-		<!-- mini cart -->
-        {% if cart.item_count > 0 %}
-			<div id="minicart" style="display:none;"><div id="minicart-inner">
-			<div id="minicart-items">
-			<h2>There {{ cart.item_count | pluralize: 'is', 'are' }} {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} in <a href="/cart" title="View your cart">your cart</a>!</h2><h4 style="font-size: 16px; margin: 0 0 10px 0; padding: 0;">Your subtotal is {{ cart.total_price | money }}.</h4>
-			  {% for item in cart.items %}
-				<div class="thumb">
-				  <div class="prodimage"><a href="{{item.product.url}}" onMouseover="tooltip('{{ item.quantity }} x {{ item.title }} ({{ item.variant.title }})', 200)"; onMouseout="hidetooltip()"><img src="{{ item.product.featured_image | product_img_url: 'thumb' }}" /></a></div>
-				</div>
-			  {% endfor %}
-			  </div>
-			 <br style="clear:both;" />
-			</div></div>
-        {% endif %}		
-		
-  <div id="container">
-  	<div id="header">
-  	  <!-- Begin Header -->
-        <h1 id="logo"><a href="/" title="Go Home">{{shop.name}}</a></h1>
-      <div id="cartlinks">
-        {% if cart.item_count > 0 %}
-          <h2 id="cartcount"><a href="/cart" onMouseover="tooltip('There {{ cart.item_count | pluralize: 'is', 'are' }} {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} in your cart!', 200)"; onMouseout="hidetooltip()">{{ cart.item_count }} {{ cart.item_count | pluralize: 'thing', 'things' }}!</a></h2>
-		  <a href="/cart" id="minicartswitch" onclick="superSwitch(this, 'minicart', 'Close Mini Cart'); return false;" id="cartswitch">View Mini Cart ({{ cart.total_price | money }})</a>
-        {% endif %}		
-      </div>
-      <!-- End Header -->
-  	  
-  	</div>
-	<hr />
-<div id="main">
-
-  	<div id="content">
-		<div id="innercontent">
-		  {{ content_for_layout }}
-	  	</div>
-  	</div>
-    
-	<hr />
-  	<div id="rightsiders">
-  	  
-      <ul class="rightlinks">
-        {% for link in linklists.main-menu.links %}
-           <li>{{ link.title | link_to: link.url }}</li>
-        {% endfor %}
-      </ul>
-      
-        {% if tags %}
-        <ul class="rightlinks">
-          {% for tag in collection.tags %}  
-            <li><span class="add-link">{{ '+' | link_to_add_tag: tag }}</span>{{ tag | highlight_active_tag | link_to_tag: tag }}</li>
-          {% endfor %}
-        </ul>
-        {% endif %}
-  
-      <ul class="rightlinks">
-        {% for link in linklists.footer.links %}
-           <li>{{ link.title | link_to: link.url }}</li>
-        {% endfor %}
-      </ul>
-      
-  	</div>
-
-	<hr /><br style="clear:both;" />
-	
-	  <div id="footer">
-	  	<div class="footerinner">
-			All prices are in {{ shop.currency }}. 
-			Powered by <a href="http://www.shopify.com" title="Shopify, Hosted E-Commerce">Shopify</a>.
-		</div>
-	  </div>
-	  
-	</div>
-</div>
-
-<div id="tooltip"></div>
-<img id="pointer" src="{{ 'arrow2.gif' | asset_url }}" />
-
-</body>
-</html>
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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"/>
+  <title>{{shop.name}} - {{page_title}}</title>
+
+  {{ 'textile.css'  | global_asset_url | stylesheet_tag }}
+  {{ 'lightbox/v204/lightbox.css' | global_asset_url | stylesheet_tag }}
+
+  {{ 'prototype/1.6/prototype.js' | global_asset_url  | script_tag }}
+  {{ 'scriptaculous/1.8.2/scriptaculous.js' | global_asset_url  | script_tag }}
+  {{ 'lightbox/v204/lightbox.js'  | global_asset_url  | script_tag }}
+  {{ 'option_selection.js'        | shopify_asset_url | script_tag }}
+
+  {{ 'layout.css'   | asset_url | stylesheet_tag }}
+  {{ 'shop.js'      | asset_url | script_tag }}
+
+  {{ content_for_header }}
+</head>
+
+<body id="page-{{template}}">
+
+  <p class="hide"><a href="#rightsiders">Skip to navigation.</a></p>
+    <!-- mini cart -->
+        {% if cart.item_count > 0 %}
+      <div id="minicart" style="display:none;"><div id="minicart-inner">
+      <div id="minicart-items">
+      <h2>There {{ cart.item_count | pluralize: 'is', 'are' }} {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} in <a href="/cart" title="View your cart">your cart</a>!</h2><h4 style="font-size: 16px; margin: 0 0 10px 0; padding: 0;">Your subtotal is {{ cart.total_price | money }}.</h4>
+        {% for item in cart.items %}
+        <div class="thumb">
+          <div class="prodimage"><a href="{{item.product.url}}" onMouseover="tooltip('{{ item.quantity }} x {{ item.title }} ({{ item.variant.title }})', 200)"; onMouseout="hidetooltip()"><img src="{{ item.product.featured_image | product_img_url: 'thumb' }}" /></a></div>
+        </div>
+        {% endfor %}
+        </div>
+       <br style="clear:both;" />
+      </div></div>
+        {% endif %}
+
+  <div id="container">
+    <div id="header">
+      <!-- Begin Header -->
+        <h1 id="logo"><a href="/" title="Go Home">{{shop.name}}</a></h1>
+      <div id="cartlinks">
+        {% if cart.item_count > 0 %}
+          <h2 id="cartcount"><a href="/cart" onMouseover="tooltip('There {{ cart.item_count | pluralize: 'is', 'are' }} {{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }} in your cart!', 200)"; onMouseout="hidetooltip()">{{ cart.item_count }} {{ cart.item_count | pluralize: 'thing', 'things' }}!</a></h2>
+      <a href="/cart" id="minicartswitch" onclick="superSwitch(this, 'minicart', 'Close Mini Cart'); return false;" id="cartswitch">View Mini Cart ({{ cart.total_price | money }})</a>
+        {% endif %}
+      </div>
+      <!-- End Header -->
+
+    </div>
+  <hr />
+<div id="main">
+
+    <div id="content">
+    <div id="innercontent">
+      {{ content_for_layout }}
+      </div>
+    </div>
+
+  <hr />
+    <div id="rightsiders">
+
+      <ul class="rightlinks">
+        {% for link in linklists.main-menu.links %}
+           <li>{{ link.title | link_to: link.url }}</li>
+        {% endfor %}
+      </ul>
+
+        {% if tags %}
+        <ul class="rightlinks">
+          {% for tag in collection.tags %}
+            <li><span class="add-link">{{ '+' | link_to_add_tag: tag }}</span>{{ tag | highlight_active_tag | link_to_tag: tag }}</li>
+          {% endfor %}
+        </ul>
+        {% endif %}
+
+      <ul class="rightlinks">
+        {% for link in linklists.footer.links %}
+           <li>{{ link.title | link_to: link.url }}</li>
+        {% endfor %}
+      </ul>
+
+    </div>
+
+  <hr /><br style="clear:both;" />
+
+    <div id="footer">
+      <div class="footerinner">
+      All prices are in {{ shop.currency }}.
+      Powered by <a href="http://www.shopify.com" title="Shopify, Hosted E-Commerce">Shopify</a>.
+    </div>
+    </div>
+
+  </div>
+</div>
+
+<div id="tooltip"></div>
+<img id="pointer" src="{{ 'arrow2.gif' | asset_url }}" />
+
+</body>
+</html>
+

performance/tests/ripen/article.liquid

@@ -4,7 +4,7 @@
 
   <div class="article-body textile">
     {{ article.content }}
-  </div>    
+  </div>
 
 </div>
 
@@ -12,7 +12,7 @@
 {% if blog.comments_enabled? %}
 <div id="comments">
   <h3>Comments</h3>
-  
+
   <!-- List all comments -->
   <ul id="comment-list">
   {% for comment in article.comments %}
@@ -20,19 +20,19 @@
       <div class="comment">
         {{ comment.content }}
       </div>
-      
-  	  <div class="comment-details">
-  		  Posted by {{ comment.author }} on {{ comment.created_at | date: "%B %d, %Y" }}
+
+      <div class="comment-details">
+        Posted by {{ comment.author }} on {{ comment.created_at | date: "%B %d, %Y" }}
       </div>
-  	</li>
+    </li>
   {% endfor %}
   </ul>
-  
+
   <!-- Comment Form -->
   <div id="comment-form">
   {% form article %}
     <h3>Leave a comment</h3>
-    
+
     <!-- Check if a comment has been submitted in the last request, and if yes display an appropriate message -->
     {% if form.posted_successfully? %}
       {% if blog.moderated? %}
@@ -44,11 +44,11 @@
         <div class="notice">Successfully posted your comment.</div>
       {% endif %}
     {% endif %}
-    
+
     {% if form.errors %}
       <div class="notice error">Not all the fields have been filled out correctly!</div>
     {% endif %}
-    
+
     <dl>
       <dt class="{% if form.errors contains 'author' %}error{% endif %}"><label for="comment_author">Your name</label></dt>
       <dd><input type="text" id="comment_author" name="comment[author]" size="40" value="{{form.author}}" class="{% if form.errors contains 'author' %}input-error{% endif %}" /></dd>
@@ -59,16 +59,16 @@
       <dt class="{% if form.errors contains 'body' %}error{% endif %}"><label for="comment_body">Your comment</label></dt>
       <dd><textarea id="comment_body" name="comment[body]" cols="40" rows="5" class="{% if form.errors contains 'body' %}input-error{% endif %}">{{form.body}}</textarea></dd>
     </dl>
-    
+
     {% if blog.moderated? %}
       <p class="hint">comments have to be approved before showing up</p>
-    {% endif %}    
+    {% endif %}
 
     <input type="submit" value="Post comment" id="comment-submit" />
   {% endform %}
   </div>
   <!-- END Comment Form -->
-  
+
 </div>
 {% endif %}
-<!-- END Comments -->
+<!-- END Comments -->

performance/tests/ripen/blog.liquid

@@ -1,13 +1,13 @@
-<div id="blog-page">
-  <h2 class="heading-shaded">{{page.title}}</h2>
-   {% for article in blog.articles  %}
-      <h4>
-        {{ article.created_at | date: '%d %b' }}
-        <a href="{{article.url}}">{{ article.title }}</a>
-      </h4>
-      {{ article.content }}
-      {% if blog.comments_enabled? %}
-        <p><a href="{{article.url}}#comments">{{ article.comments_count }} comments</a></p>
-      {% endif %}
-  {% endfor %}
-</div>
+<div id="blog-page">
+  <h2 class="heading-shaded">{{page.title}}</h2>
+   {% for article in blog.articles  %}
+      <h4>
+        {{ article.created_at | date: '%d %b' }}
+        <a href="{{article.url}}">{{ article.title }}</a>
+      </h4>
+      {{ article.content }}
+      {% if blog.comments_enabled? %}
+        <p><a href="{{article.url}}#comments">{{ article.comments_count }} comments</a></p>
+      {% endif %}
+  {% endfor %}
+</div>

performance/tests/ripen/cart.liquid

@@ -7,9 +7,9 @@
 
 <div id="cart-page">
 
-  {% if cart.item_count == 0 %} 
+  {% if cart.item_count == 0 %}
     <p>Your shopping cart is empty...</p>
-	<p><a href="/"><img src="{{ 'continue_shopping_icon.gif' | asset_url }}" alt="Continue shopping"/></a><p>
+  <p><a href="/"><img src="{{ 'continue_shopping_icon.gif' | asset_url }}" alt="Continue shopping"/></a><p>
   {% else %}
 
   <form action="/cart" method="post" id="cart">
@@ -26,21 +26,21 @@
       {% for item in cart.items %}
       <tr class="{% cycle 'odd', 'even' %}">
         <td class="short">{{ item.product.featured_image |  product_img_url: 'thumb' | img_tag }}</td>
-		<td><a href="{{item.product.url}}">{{ item.title }}</a></td>
+    <td><a href="{{item.product.url}}">{{ item.title }}</a></td>
         <td class="short"><input type="text" class="quantity" name="updates[{{item.variant.id}}]" id="updates_{{item.variant.id}}" value="{{item.quantity}}" onfocus="this.select();"/></td>
         <td class="cart-price">{{ item.price | money }}</td>
         <td class="cart-price">{{item.line_price | money }}</td>
         <td class="short"><a href="#" onclick="remove_item({{item.variant.id}}); return false;" class="remove"><img src="{{ 'cancel_icon.gif' | asset_url }}" alt="Remove" /></a></td>
       </tr>
       {% endfor %}
-  	</table>  
-		<p class="updatebtn"><input type="image" value="Update Cart" name="update" src="{{ 'update_icon.gif' | asset_url }}" alt="Update" /></p>
-		<p class="subtotal">
-		<strong>Subtotal:</strong> {{cart.total_price | money_with_currency }}
-		</p>
+    </table>
+    <p class="updatebtn"><input type="image" value="Update Cart" name="update" src="{{ 'update_icon.gif' | asset_url }}" alt="Update" /></p>
+    <p class="subtotal">
+    <strong>Subtotal:</strong> {{cart.total_price | money_with_currency }}
+    </p>
     <p class="checkout"><input type="image" src="{{ 'checkout_icon.gif' | asset_url }}" alt="Proceed to Checkout" value="Proceed to Checkout" name="checkout"  /></p>
 
-		{% if additional_checkout_buttons %}
+    {% if additional_checkout_buttons %}
     <div class="additional-checkout-buttons">
       <p>- or -</p>
       {{ content_for_additional_checkout_buttons }}
@@ -48,7 +48,7 @@
     {% endif %}
 
   </form>
-	
+
   {% endif %}
 
-</div>
+</div>

performance/tests/ripen/collection.liquid

@@ -1,29 +1,29 @@
-<div id="collection-page">
-
-{% if collection.description %}
-  <div id="collection-description" class="textile">{{ collection.description }}</div>
-{% endif %}
-
-{% paginate collection.products by 20 %}
-
-<ul id="product-collection">
-    {% for product in collection.products %}
-    <li class="single-product clearfix">
-      <div class="small">
-        <div class="prod-image"><a href="{{product.url}}"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}" /></a></div>
-      </div>
-      <div class="prod-list-description">
-        <h3><a href="{{product.url}}">{{product.title}}</a></h3>
-        <p>{{ product.description | strip_html | truncatewords: 35 }}</p>
-  	  <p class="prd-price">{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</p>
-     </div>
-    </li>
-    {% endfor %}
-</ul>
-  
-<div id="pagination">
-  {{ paginate | default_pagination }}
-</div>
-
-{% endpaginate %}
-</div>
+<div id="collection-page">
+
+{% if collection.description %}
+  <div id="collection-description" class="textile">{{ collection.description }}</div>
+{% endif %}
+
+{% paginate collection.products by 20 %}
+
+<ul id="product-collection">
+    {% for product in collection.products %}
+    <li class="single-product clearfix">
+      <div class="small">
+        <div class="prod-image"><a href="{{product.url}}"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}" /></a></div>
+      </div>
+      <div class="prod-list-description">
+        <h3><a href="{{product.url}}">{{product.title}}</a></h3>
+        <p>{{ product.description | strip_html | truncatewords: 35 }}</p>
+      <p class="prd-price">{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</p>
+     </div>
+    </li>
+    {% endfor %}
+</ul>
+
+<div id="pagination">
+  {{ paginate | default_pagination }}
+</div>
+
+{% endpaginate %}
+</div>

performance/tests/ripen/index.liquid

@@ -1,32 +1,32 @@
-<div id="home-page">
-	<h3 class="heading-shaded">Featured products...</h3>
-	<div class="featured-prod-row clearfix">
-		{% for product in collections.frontpage.products %}
-			<div class="featured-prod-item">
-			    <p>
-				<a href="{{product.url}}"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>	
-				</p>
-				<h4><a href="{{product.url}}">{{product.title}}</a></h4>
-				{% if product.compare_at_price %} 
-					{% if product.price_min != product.compare_at_price %}
-						<p class="prd-price">Was:<del>{{product.compare_at_price | money}}</del></p>
-						<p class="prd-price"><ins>Now: {{product.price_min | money}}</ins></p>
-					{% endif %}
-				{% else %}
-					<p class="prd-price"><ins>{{product.price_min | money}}</ins></p>
-				{% endif %}
-			</div>
-		{% endfor %}
-	</div>
-
-	<div id="articles">
-  	{% assign article = pages.frontpage %}
-    {% if article.content != "" %}
-		  <h3>{{ article.title }}</h3>
-  		{{ article.content }}
-  	{% else %}
-  	  In <em>Admin &gt; Blogs &amp; Pages</em>, create a page with the handle <strong><code>frontpage</code></strong> and it will show up here.<br />
-  	  {{ "Learn more about handles" | link_to "http://wiki.shopify.com/Handle" }}
-  	{% endif %}
-	</div>
-</div>
+<div id="home-page">
+  <h3 class="heading-shaded">Featured products...</h3>
+  <div class="featured-prod-row clearfix">
+    {% for product in collections.frontpage.products %}
+      <div class="featured-prod-item">
+          <p>
+        <a href="{{product.url}}"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
+        </p>
+        <h4><a href="{{product.url}}">{{product.title}}</a></h4>
+        {% if product.compare_at_price %}
+          {% if product.price_min != product.compare_at_price %}
+            <p class="prd-price">Was:<del>{{product.compare_at_price | money}}</del></p>
+            <p class="prd-price"><ins>Now: {{product.price_min | money}}</ins></p>
+          {% endif %}
+        {% else %}
+          <p class="prd-price"><ins>{{product.price_min | money}}</ins></p>
+        {% endif %}
+      </div>
+    {% endfor %}
+  </div>
+
+  <div id="articles">
+    {% assign article = pages.frontpage %}
+    {% if article.content != "" %}
+      <h3>{{ article.title }}</h3>
+      {{ article.content }}
+    {% else %}
+      In <em>Admin &gt; Blogs &amp; Pages</em>, create a page with the handle <strong><code>frontpage</code></strong> and it will show up here.<br />
+      {{ "Learn more about handles" | link_to: "http://wiki.shopify.com/Handle" }}
+    {% endif %}
+  </div>
+</div>

performance/tests/ripen/page.liquid

@@ -1,4 +1,4 @@
-<div id="single-page">
-<h2 class="heading-shaded">{{page.title}}</h2>
-  {{ page.content }}
-</div>
+<div id="single-page">
+<h2 class="heading-shaded">{{page.title}}</h2>
+  {{ page.content }}
+</div>

performance/tests/ripen/product.liquid

@@ -1,75 +1,75 @@
-<div id="product-page">
-	<h2 class="heading-shaded">{{ product.title }}</h2>
-	<div id="product-details">
-	<div id="product-images">
-		{% for image in product.images %}
-			{% if forloop.first %}
-				<a href="{{ image | product_img_url: 'large' }}" class="product-image" rel="lightbox[ product]" title="">
-				  <img src="{{ image | product_img_url: 'medium'}}" alt="{{product.title | escape }}" />
-				</a>
-			{% else %}
-				<a href="{{ image | product_img_url: 'large' }}" class="product-image-small" rel="lightbox[ product]" title="">
-				  <img src="{{ image | product_img_url: 'small'}}" alt="{{product.title | escape }}" />
-				</a>
-			{% endif %}
-		{% endfor %}
-	</div>
-	
-	<ul id="product-info">
-		<li>Vendor: {{ product.vendor | link_to_vendor }}</li>
-		<li>Type: {{ product.type | link_to_type }}</li>
-	  </ul>
-	  
-	  <small>{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</small>
-		
-	  <div id="product-options">
-              {% if product.available %}
-
-		<form action="/cart/add" method="post">
-
-      <select id="product-select" name='id'>
-        {% for variant in product.variants %}
-          <option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
-        {% endfor %}
-      </select>
-		
-      <div id="price-field"></div>		
-		
-			<div class="add-to-cart"><input type="image" name="add" value="Add to Cart" id="add" src="{{ 'add-to-cart.gif' | asset_url }}" /></div>
-		</form>
-              {% else %}
-                  <span>Sold Out!</span>
-              {% endif %}
-	  </div>
-	  
-	  <div class="product-description">
-		{{ product.description }}
-	  </div>
-  </div>
-</div>
-
-
-<script type="text/javascript">
-<!--
-  // mootools callback for multi variants dropdown selector
-  var selectCallback = function(variant, selector) {
-    if (variant && variant.available == true) {
-      // selected a valid variant
-      $('add').removeClass('disabled'); // remove unavailable class from add-to-cart button
-      $('add').disabled = false;           // reenable add-to-cart button
-      $('price-field').innerHTML = Shopify.formatMoney(variant.price, "{{shop.money_with_currency_format}}");  // update price field
-    } else {
-      // variant doesn't exist
-      $('add').addClass('disabled');      // set add-to-cart button to unavailable class
-      $('add').disabled = true;              // disable add-to-cart button      
-      $('price-field').innerHTML = (variant) ? "Sold Out" : "Unavailable"; // update price-field message
-    }
-  };
-
-  // initialize multi selector for product
-  window.addEvent('domready', function() {
-    new Shopify.OptionSelectors("product-select", { product: {{ product | json }}, onVariantSelected: selectCallback }); 
-  });
--->
-</script>
-
+<div id="product-page">
+  <h2 class="heading-shaded">{{ product.title }}</h2>
+  <div id="product-details">
+  <div id="product-images">
+    {% for image in product.images %}
+      {% if forloop.first %}
+        <a href="{{ image | product_img_url: 'large' }}" class="product-image" rel="lightbox[ product]" title="">
+          <img src="{{ image | product_img_url: 'medium'}}" alt="{{product.title | escape }}" />
+        </a>
+      {% else %}
+        <a href="{{ image | product_img_url: 'large' }}" class="product-image-small" rel="lightbox[ product]" title="">
+          <img src="{{ image | product_img_url: 'small'}}" alt="{{product.title | escape }}" />
+        </a>
+      {% endif %}
+    {% endfor %}
+  </div>
+
+  <ul id="product-info">
+    <li>Vendor: {{ product.vendor | link_to_vendor }}</li>
+    <li>Type: {{ product.type | link_to_type }}</li>
+    </ul>
+
+    <small>{{ product.price_min | money }}{% if product.price_varies %} - {{ product.price_max | money }}{% endif %}</small>
+
+    <div id="product-options">
+              {% if product.available %}
+
+    <form action="/cart/add" method="post">
+
+      <select id="product-select" name='id'>
+        {% for variant in product.variants %}
+          <option value="{{ variant.id }}">{{ variant.title }} - {{ variant.price | money }}</option>
+        {% endfor %}
+      </select>
+
+      <div id="price-field"></div>
+
+      <div class="add-to-cart"><input type="image" name="add" value="Add to Cart" id="add" src="{{ 'add-to-cart.gif' | asset_url }}" /></div>
+    </form>
+              {% else %}
+                  <span>Sold Out!</span>
+              {% endif %}
+    </div>
+
+    <div class="product-description">
+    {{ product.description }}
+    </div>
+  </div>
+</div>
+
+
+<script type="text/javascript">
+<!--
+  // mootools callback for multi variants dropdown selector
+  var selectCallback = function(variant, selector) {
+    if (variant && variant.available == true) {
+      // selected a valid variant
+      $('add').removeClass('disabled'); // remove unavailable class from add-to-cart button
+      $('add').disabled = false;           // reenable add-to-cart button
+      $('price-field').innerHTML = Shopify.formatMoney(variant.price, "{{shop.money_with_currency_format}}");  // update price field
+    } else {
+      // variant doesn't exist
+      $('add').addClass('disabled');      // set add-to-cart button to unavailable class
+      $('add').disabled = true;              // disable add-to-cart button
+      $('price-field').innerHTML = (variant) ? "Sold Out" : "Unavailable"; // update price-field message
+    }
+  };
+
+  // initialize multi selector for product
+  window.addEvent('domready', function() {
+    new Shopify.OptionSelectors("product-select", { product: {{ product | json }}, onVariantSelected: selectCallback });
+  });
+-->
+</script>
+

performance/tests/ripen/theme.liquid

@@ -1,85 +1,85 @@
-<!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" lang="en">
-<head>
-  <title>{{shop.name}} - {{page_title}}</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-  {{ 'main.css'     | asset_url | stylesheet_tag }}
-	{{ 'shop.js'      | asset_url | script_tag }}
-	
-	{{ 'mootools.js'         | asset_url         | script_tag }}
-	{{ 'slimbox.js'          | asset_url         | script_tag }}
-  {{ 'option_selection.js' | shopify_asset_url | script_tag }}
-	{{ 'slimbox.css'         | asset_url         | stylesheet_tag }}
-
-  {{ content_for_header }}
- </head>
- 
-<body id="page-{{template}}">
-<p class="hide"><a href="#navigation">Skip to navigation.</a></p>
-<div id="wrapper">
-	<div class="content clearfix">	
-		<div id="header">
-			<h2><a href="/">{{shop.name}}</a></h2>
-		</div>
-		<div id="left-col">
-			{{ content_for_layout }} 
-		</div>
-		<div id="right-col">
-			{% if template != 'cart' %}
-			    <div id="cart-right-col">
-					<dl id="cart-right-col-info">
-						<dt>Shopping Cart</dt>
-						<dd>
-						{% if cart.item_count != 0 %}
-							<a href="/cart">{{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }}</a> in your cart
-						{% else %}
-							Your cart is empty
-						{% endif %}
-						</dd>
-					</dl>
-				</div>
-			{% endif %}
-			<div id="search">
-				<dl id="searchbox">
-				<dt>Search</dt>
-				<dd>
-				<form action="/search" method="get">
-				<fieldset>
-				<input class="search-input" type="text" onclick="this.select()" value="Search this shop..." name="q" />
-				</fieldset>
-				</form>
-				</dd>
-				</dl>
-			</div>
-			<div id="navigation">
-				<dl class="navbar">
-				<dt>Navigation</dt>
-				{% for link in linklists.main-menu.links %}
-					<dd>{{ link.title | link_to: link.url }}</dd>
-				{% endfor %}
-				</dl>
-				
-				{% if tags %}
-				<dl class="navbar">
-				<dt>Tags</dt>
-  				{% for tag in collection.tags %} 
-					<dd>{{ tag | highlight_active_tag | link_to_tag: tag }}</dd>
-  				{% endfor %}
-  				</dl>
-				{% endif %}
-			</div>
-		</div>
-		
-	</div>
-    <div id="content-padding"></div>
-</div>
-
-<div id="footer">
-	{% for link in linklists.footer.links %}
-	{{ link.title | link_to: link.url }} {% if forloop.rindex != 1 %} | {% endif %}
-	{% endfor %}
-</div>
-
-</body>
-</html>
+<!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" lang="en">
+<head>
+  <title>{{shop.name}} - {{page_title}}</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+  {{ 'main.css'     | asset_url | stylesheet_tag }}
+  {{ 'shop.js'      | asset_url | script_tag }}
+
+  {{ 'mootools.js'         | asset_url         | script_tag }}
+  {{ 'slimbox.js'          | asset_url         | script_tag }}
+  {{ 'option_selection.js' | shopify_asset_url | script_tag }}
+  {{ 'slimbox.css'         | asset_url         | stylesheet_tag }}
+
+  {{ content_for_header }}
+ </head>
+
+<body id="page-{{template}}">
+<p class="hide"><a href="#navigation">Skip to navigation.</a></p>
+<div id="wrapper">
+  <div class="content clearfix">
+    <div id="header">
+      <h2><a href="/">{{shop.name}}</a></h2>
+    </div>
+    <div id="left-col">
+      {{ content_for_layout }}
+    </div>
+    <div id="right-col">
+      {% if template != 'cart' %}
+          <div id="cart-right-col">
+          <dl id="cart-right-col-info">
+            <dt>Shopping Cart</dt>
+            <dd>
+            {% if cart.item_count != 0 %}
+              <a href="/cart">{{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }}</a> in your cart
+            {% else %}
+              Your cart is empty
+            {% endif %}
+            </dd>
+          </dl>
+        </div>
+      {% endif %}
+      <div id="search">
+        <dl id="searchbox">
+        <dt>Search</dt>
+        <dd>
+        <form action="/search" method="get">
+        <fieldset>
+        <input class="search-input" type="text" onclick="this.select()" value="Search this shop..." name="q" />
+        </fieldset>
+        </form>
+        </dd>
+        </dl>
+      </div>
+      <div id="navigation">
+        <dl class="navbar">
+        <dt>Navigation</dt>
+        {% for link in linklists.main-menu.links %}
+          <dd>{{ link.title | link_to: link.url }}</dd>
+        {% endfor %}
+        </dl>
+
+        {% if tags %}
+        <dl class="navbar">
+        <dt>Tags</dt>
+          {% for tag in collection.tags %}
+          <dd>{{ tag | highlight_active_tag | link_to_tag: tag }}</dd>
+          {% endfor %}
+          </dl>
+        {% endif %}
+      </div>
+    </div>
+
+  </div>
+    <div id="content-padding"></div>
+</div>
+
+<div id="footer">
+  {% for link in linklists.footer.links %}
+  {{ link.title | link_to: link.url }} {% if forloop.rindex != 1 %} | {% endif %}
+  {% endfor %}
+</div>
+
+</body>
+</html>

performance/tests/tribble/404.liquid

@@ -1,56 +1,56 @@
-	<div id="page" class="innerpage clearfix">
-		
-		<div id="text-page">			
-			<div class="entry">
-				<h1>Oh no!</h1>
-				<div class="entry-post">
-					Seems like you are looking for something that just isn't here. <a href="/">Try heading back to our main page</a>. Or you can checkout some of our featured products below.
-				</div>
-			</div>
-		</div>
+  <div id="page" class="innerpage clearfix">
 
-		
-		<h1>Featured Products</h1>	
-		<ul class="item-list clearfix">
-		
-			{% for product in collections.frontpage.products %}
-			<li>
-				<form action="/cart/add" method="post">
-				<div class="item-list-item">					
-					<div class="ili-top clearfix">
-						<div class="ili-top-content">
-							<h2><a href="{{product.url}}">{{product.title}}</a></h2>
-							<p>{{ product.description | truncatewords: 15 }}</p>
-						</div>						
-						<a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>	
-					</div>
-					
-					<div class="ili-bottom clearfix">
-						<p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
-						<input type="submit" class="" value="Add to Basket" />
-						<p>
-							<a href="{{product.url}}">View Details</a>	
-							
-							<span>
-								{% if product.compare_at_price %} 			  
-									{% if product.price_min != product.compare_at_price %}			    
-										{{product.compare_at_price | money}} -
-			  						{% endif %}
-								{% endif %}
-								<strong>
-									{{product.price_min | money}}
-								</strong>
-							</span>
-						</p>
-					</div>
-				</div>
-				</form>
-			</li>
-			{% endfor %}
+    <div id="text-page">
+      <div class="entry">
+        <h1>Oh no!</h1>
+        <div class="entry-post">
+          Seems like you are looking for something that just isn't here. <a href="/">Try heading back to our main page</a>. Or you can checkout some of our featured products below.
+        </div>
+      </div>
+    </div>
 
-		</ul>
-	</div>
-	<!-- end page -->
+
+    <h1>Featured Products</h1>
+    <ul class="item-list clearfix">
+
+      {% for product in collections.frontpage.products %}
+      <li>
+        <form action="/cart/add" method="post">
+        <div class="item-list-item">
+          <div class="ili-top clearfix">
+            <div class="ili-top-content">
+              <h2><a href="{{product.url}}">{{product.title}}</a></h2>
+              <p>{{ product.description | truncatewords: 15 }}</p>
+            </div>
+            <a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
+          </div>
+
+          <div class="ili-bottom clearfix">
+            <p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
+            <input type="submit" class="" value="Add to Basket" />
+            <p>
+              <a href="{{product.url}}">View Details</a>
+
+              <span>
+                {% if product.compare_at_price %}
+                  {% if product.price_min != product.compare_at_price %}
+                    {{product.compare_at_price | money}} -
+                    {% endif %}
+                {% endif %}
+                <strong>
+                  {{product.price_min | money}}
+                </strong>
+              </span>
+            </p>
+          </div>
+        </div>
+        </form>
+      </li>
+      {% endfor %}
+
+    </ul>
+  </div>
+  <!-- end page -->
 
 
 

performance/tests/tribble/article.liquid

@@ -1,19 +1,19 @@
 
-	<div id="page" class="innerpage clearfix">
-		<div id="text-page">
+  <div id="page" class="innerpage clearfix">
+    <div id="text-page">
 
-					<div class="entry">
-						<h1><span>{{article.title}}</span></h1>
-						<div class="entry-post">
-							<div class="meta">{{ article.created_at | date: "%b %d" }}</div>
-							{{ article.content }}
-						</div>
-						
-	<!-- Comments -->
+          <div class="entry">
+            <h1><span>{{article.title}}</span></h1>
+            <div class="entry-post">
+              <div class="meta">{{ article.created_at | date: "%b %d" }}</div>
+              {{ article.content }}
+            </div>
+
+  <!-- Comments -->
 {% if blog.comments_enabled? %}
 <div id="comments">
   <h2>Comments</h2>
-  
+
   <!-- List all comments -->
   <ul id="comment-list">
   {% for comment in article.comments %}
@@ -21,19 +21,19 @@
       <div class="comment">
         {{ comment.content }}
       </div>
-      
-  	  <div class="comment-details">
-  		  Posted by <span class="comment-author">{{ comment.author }}</span> on <span class="comment-date">{{ comment.created_at | date: "%B %d, %Y" }}</span>
+
+      <div class="comment-details">
+        Posted by <span class="comment-author">{{ comment.author }}</span> on <span class="comment-date">{{ comment.created_at | date: "%B %d, %Y" }}</span>
       </div>
-  	</li>
+    </li>
   {% endfor %}
   </ul>
-  
+
   <!-- Comment Form -->
   <div id="comment-form">
   {% form article %}
     <h2>Leave a comment</h2>
-    
+
     <!-- Check if a comment has been submitted in the last request, and if yes display an appropriate message -->
     {% if form.posted_successfully? %}
       {% if blog.moderated? %}
@@ -45,11 +45,11 @@
         <div class="notice">Successfully posted your comment.</div>
       {% endif %}
     {% endif %}
-    
+
     {% if form.errors %}
       <div class="notice error">Not all the fields have been filled out correctly!</div>
     {% endif %}
-    
+
     <dl>
       <dt class="{% if form.errors contains 'author' %}error{% endif %}"><label for="comment_author">Your name</label></dt>
       <dd><input type="text" id="comment_author" name="comment[author]" size="40" value="{{form.author}}" class="{% if form.errors contains 'author' %}input-error{% endif %}" /></dd>
@@ -60,39 +60,39 @@
       <dt class="{% if form.errors contains 'body' %}error{% endif %}"><label for="comment_body">Your comment</label></dt>
       <dd><textarea id="comment_body" name="comment[body]" cols="40" rows="5" class="{% if form.errors contains 'body' %}input-error{% endif %}">{{form.body}}</textarea></dd>
     </dl>
-    
+
     {% if blog.moderated? %}
       <p class="hint">comments have to be approved before showing up</p>
-    {% endif %}    
+    {% endif %}
 
     <input type="submit" value="Post comment" id="comment-submit" />
   {% endform %}
   </div>
   <!-- END Comment Form -->
-  
+
 </div>
 {% endif %}
-<!-- END Comments -->					
-						
-						
-					</div>
-		</div>
-		
-		<div id="three-reasons" class="clearfix">
-			<h3>Why Shop With Us?</h3>
-			<ul>
-				<li class="two-a">
-					<h4>24 Hours</h4>
-					<p>We're always here to help.</p>
-				</li>
-				<li class="two-c">
-					<h4>No Spam</h4>
-					<p>We'll never share your info.</p>
-				</li>
-				<li class="two-d">
-					<h4>Secure Servers</h4>
-					<p>Checkout is 256bit encrypted.</p>
-				</li>
-			</ul>
-		</div>
-	</div>
+<!-- END Comments -->
+
+
+          </div>
+    </div>
+
+    <div id="three-reasons" class="clearfix">
+      <h3>Why Shop With Us?</h3>
+      <ul>
+        <li class="two-a">
+          <h4>24 Hours</h4>
+          <p>We're always here to help.</p>
+        </li>
+        <li class="two-c">
+          <h4>No Spam</h4>
+          <p>We'll never share your info.</p>
+        </li>
+        <li class="two-d">
+          <h4>Secure Servers</h4>
+          <p>Checkout is 256bit encrypted.</p>
+        </li>
+      </ul>
+    </div>
+  </div>

performance/tests/tribble/blog.liquid

@@ -1,41 +1,41 @@
-	<div id="page" class="innerpage clearfix">
-		<div id="text-page">
-			<h1>Post from our blog...</h1>
-			{% paginate blog.articles by 20 %}
-  				{% for article in blog.articles  %}
-	
-					<div class="entry">
-						<h1><span><a href="{{ article.url }}">{{ article.title }}</a></span></h1>
-						<div class="entry-post">
-							<div class="meta">{{ article.created_at | date: "%b %d" }}</div>
-							{{ article.content }}
-						</div>
-					</div>
+  <div id="page" class="innerpage clearfix">
+    <div id="text-page">
+      <h1>Post from our blog...</h1>
+      {% paginate blog.articles by 20 %}
+          {% for article in blog.articles  %}
 
-				{% endfor %}
+          <div class="entry">
+            <h1><span><a href="{{ article.url }}">{{ article.title }}</a></span></h1>
+            <div class="entry-post">
+              <div class="meta">{{ article.created_at | date: "%b %d" }}</div>
+              {{ article.content }}
+            </div>
+          </div>
 
-				<div class="paginate clearfix">
-  					{{ paginate | default_pagination }}
-				</div>
+        {% endfor %}
 
-			{% endpaginate %}
-		</div>
-		
-		<div id="three-reasons" class="clearfix">
-			<h3>Why Shop With Us?</h3>
-			<ul>
-				<li class="two-a">
-					<h4>24 Hours</h4>
-					<p>We're always here to help.</p>
-				</li>
-				<li class="two-c">
-					<h4>No Spam</h4>
-					<p>We'll never share your info.</p>
-				</li>
-				<li class="two-d">
-					<h4>Secure Servers</h4>
-					<p>Checkout is 256bit encrypted.</p>
-				</li>
-			</ul>
-		</div>
-	</div>
+        <div class="paginate clearfix">
+            {{ paginate | default_pagination }}
+        </div>
+
+      {% endpaginate %}
+    </div>
+
+    <div id="three-reasons" class="clearfix">
+      <h3>Why Shop With Us?</h3>
+      <ul>
+        <li class="two-a">
+          <h4>24 Hours</h4>
+          <p>We're always here to help.</p>
+        </li>
+        <li class="two-c">
+          <h4>No Spam</h4>
+          <p>We'll never share your info.</p>
+        </li>
+        <li class="two-d">
+          <h4>Secure Servers</h4>
+          <p>Checkout is 256bit encrypted.</p>
+        </li>
+      </ul>
+    </div>
+  </div>

performance/tests/tribble/cart.liquid

@@ -1,134 +1,134 @@
-<script type="text/javascript">
-  function remove_item(id) {
-      document.getElementById('updates_'+id).value = 0;
-      document.getElementById('cart').submit();
-  }
-</script>
-
-	<div id="page" class="innerpage clearfix">.
-		{% if cart.item_count == 0 %} 
-   			<h1>Your cart is currently empty.</h1>
-  		{% else %}
-  		
-		<h1>Your Cart <span>({{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }}, {{cart.total_price | money_with_currency }} total)</span></h1>		
-		
-		<form action="/cart" method="post" id="cart-form">
-		
-		<div id="cart-wrap">
-			<table width="100%" border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<th scope="col" class="td-image"><label>Image</label></th>
-					<th scope="col" class="td-title"><label>Product Title</label></th>
-					<th scope="col" class="td-count"><label>Count</label></th>
-					<th scope="col" class="td-price"><label>Cost</label></th>
-					<th scope="col" class="td-delete"><label>Remove</label></th>
-				</tr>      
-				
-				{% for item in cart.items %}
-				<tr class="{% cycle 'reg', 'alt' %}">
-					<td colspan="5">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<tr>
-								<td class="td-image"><a href="{{item.product.url}}">{{ item.product.featured_image |  product_img_url: 'thumb' | img_tag }}</a></td>
-								<td class="td-title"><p>{{ item.title }}</p></td>
-								<td class="td-count"><label>Count:</label> <input type="text" class="quantity item-count" name="updates[{{item.variant.id}}]" id="updates_{{item.variant.id}}" value="{{item.quantity}}" onfocus="this.select();"/></td>
-								<td class="td-price">{{item.line_price | money }}</td>
-								<td class="td-delete"><a href="#" onclick="remove_item({{item.variant.id}}); return false;">Remove</a></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-				{% endfor %}
-			</table>		
-			
-			<div id="finish-up"> 
-						
-				<div class="latest-news-box">
-					{{ pages.shopping-cart.content }}
-				</div>				
-				
-				<p class="order-total">
-					<span><strong>Order Total:</strong> {{cart.total_price | money_with_currency }}</span>
-				</p>
-				
-				<p class="update-cart"><input type="submit" value="Refresh Cart" name="update" /></p>
-				
- 	 			<p class="go-checkout"><input type="submit" value="Proceed to Checkout" name="checkout"  /></p>
-
-        {% if additional_checkout_buttons %}
-        <div class="additional-checkout-buttons">
-          <p>- or -</p>
-          {{ content_for_additional_checkout_buttons }}
-        </div>
-        {% endif %}
-
-			</div>			
-				
-		</div>
-		
-		</form>
-		
-		{% endif %}
-		
-		
-		
-		<h1 class="other-products"><span>Other Products You Might Enjoy</span></h1>
-		<ul class="item-list clearfix">
-		
-			{% for product in collections.frontpage.products limit:2 %}
-			<li>
-				<form action="/cart/add" method="post">
-				<div class="item-list-item">					
-					<div class="ili-top clearfix">
-						<div class="ili-top-content">
-							<h2><a href="{{product.url}}">{{product.title}}</a></h2>
-							<p>{{ product.description | truncatewords: 15 }}</p>
-						</div>						
-						<a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>	
-					</div>
-					
-					<div class="ili-bottom clearfix">
-						<p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
-						<input type="submit" class="" value="Add to Basket" />
-						<p>
-							<a href="{{product.url}}">View Details</a>	
-							
-							<span>
-								{% if product.compare_at_price %} 			  
-									{% if product.price_min != product.compare_at_price %}			    
-										{{product.compare_at_price | money}} -
-			  						{% endif %}
-								{% endif %}
-								<strong>
-									{{product.price_min | money}}
-								</strong>
-							</span>
-						</p>
-					</div>
-				</div>
-				</form>
-			</li>
-			{% endfor %}
-
-		</ul>
-		
-		<div id="three-reasons" class="clearfix">
-			<h3>Why Shop With Us?</h3>
-			<ul>
-				<li class="two-a">
-					<h4>24 Hours</h4>
-					<p>We're always here to help.</p>
-				</li>
-				<li class="two-c">
-					<h4>No Spam</h4>
-					<p>We'll never share your info.</p>
-				</li>
-				<li class="two-d">
-					<h4>Secure Servers</h4>
-					<p>Checkout is 256bit encrypted.</p>
-				</li>
-			</ul>
-		</div>
-		
-	</div>
-	<!-- end page -->
+<script type="text/javascript">
+  function remove_item(id) {
+      document.getElementById('updates_'+id).value = 0;
+      document.getElementById('cart').submit();
+  }
+</script>
+
+  <div id="page" class="innerpage clearfix">.
+    {% if cart.item_count == 0 %}
+         <h1>Your cart is currently empty.</h1>
+      {% else %}
+
+    <h1>Your Cart <span>({{ cart.item_count }} {{ cart.item_count | pluralize: 'item', 'items' }}, {{cart.total_price | money_with_currency }} total)</span></h1>
+
+    <form action="/cart" method="post" id="cart-form">
+
+    <div id="cart-wrap">
+      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+        <tr>
+          <th scope="col" class="td-image"><label>Image</label></th>
+          <th scope="col" class="td-title"><label>Product Title</label></th>
+          <th scope="col" class="td-count"><label>Count</label></th>
+          <th scope="col" class="td-price"><label>Cost</label></th>
+          <th scope="col" class="td-delete"><label>Remove</label></th>
+        </tr>
+
+        {% for item in cart.items %}
+        <tr class="{% cycle 'reg', 'alt' %}">
+          <td colspan="5">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0">
+              <tr>
+                <td class="td-image"><a href="{{item.product.url}}">{{ item.product.featured_image |  product_img_url: 'thumb' | img_tag }}</a></td>
+                <td class="td-title"><p>{{ item.title }}</p></td>
+                <td class="td-count"><label>Count:</label> <input type="text" class="quantity item-count" name="updates[{{item.variant.id}}]" id="updates_{{item.variant.id}}" value="{{item.quantity}}" onfocus="this.select();"/></td>
+                <td class="td-price">{{item.line_price | money }}</td>
+                <td class="td-delete"><a href="#" onclick="remove_item({{item.variant.id}}); return false;">Remove</a></td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        {% endfor %}
+      </table>
+
+      <div id="finish-up">
+
+        <div class="latest-news-box">
+          {{ pages.shopping-cart.content }}
+        </div>
+
+        <p class="order-total">
+          <span><strong>Order Total:</strong> {{cart.total_price | money_with_currency }}</span>
+        </p>
+
+        <p class="update-cart"><input type="submit" value="Refresh Cart" name="update" /></p>
+
+          <p class="go-checkout"><input type="submit" value="Proceed to Checkout" name="checkout"  /></p>
+
+        {% if additional_checkout_buttons %}
+        <div class="additional-checkout-buttons">
+          <p>- or -</p>
+          {{ content_for_additional_checkout_buttons }}
+        </div>
+        {% endif %}
+
+      </div>
+
+    </div>
+
+    </form>
+
+    {% endif %}
+
+
+
+    <h1 class="other-products"><span>Other Products You Might Enjoy</span></h1>
+    <ul class="item-list clearfix">
+
+      {% for product in collections.frontpage.products limit:2 %}
+      <li>
+        <form action="/cart/add" method="post">
+        <div class="item-list-item">
+          <div class="ili-top clearfix">
+            <div class="ili-top-content">
+              <h2><a href="{{product.url}}">{{product.title}}</a></h2>
+              <p>{{ product.description | truncatewords: 15 }}</p>
+            </div>
+            <a href="{{product.url}}" class="ili-top-image"><img src="{{ product.featured_image | product_img_url: 'small' }}" alt="{{ product.title | escape }}"/></a>
+          </div>
+
+          <div class="ili-bottom clearfix">
+            <p class="hiddenvariants" style="display: none">{% for variant in product.variants %}<span><input type="radio" name="id" value="{{variant.id}}" id="radio_{{variant.id}}" style="vertical-align: middle;" {%if forloop.first%} checked="checked" {%endif%} /><label for="radio_{{variant.id}}">{{ variant.price | money_with_currency }} - {{ variant.title }}</label></span>{% endfor %}</p>
+            <input type="submit" class="" value="Add to Basket" />
+            <p>
+              <a href="{{product.url}}">View Details</a>
+
+              <span>
+                {% if product.compare_at_price %}
+                  {% if product.price_min != product.compare_at_price %}
+                    {{product.compare_at_price | money}} -
+                    {% endif %}
+                {% endif %}
+                <strong>
+                  {{product.price_min | money}}
+                </strong>
+              </span>
+            </p>
+          </div>
+        </div>
+        </form>
+      </li>
+      {% endfor %}
+
+    </ul>
+
+    <div id="three-reasons" class="clearfix">
+      <h3>Why Shop With Us?</h3>
+      <ul>
+        <li class="two-a">
+          <h4>24 Hours</h4>
+          <p>We're always here to help.</p>
+        </li>
+        <li class="two-c">
+          <h4>No Spam</h4>
+          <p>We'll never share your info.</p>
+        </li>
+        <li class="two-d">
+          <h4>Secure Servers</h4>
+          <p>Checkout is 256bit encrypted.</p>
+        </li>
+      </ul>
+    </div>
+
+  </div>
+  <!-- end page -->