bump version to v3.0.0.rc1

Update History log
Bring latest History from 2-6-stable and 2-5-stable
2026-01-01 15:55:40 +03:00 · 2014-07-24 15:04:39 +00:00 · 2014-07-24 11:01:19 -04:00 · 2014-07-24 10:54:28 -04:00 · 2014-07-24 10:51:02 -04:00 · 2014-07-24 14:44:02 +00:00
95 changed files with 1186 additions and 948 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ pkg
 *.rbc
 .rvmrc
 .ruby-version
+Gemfile.lock
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,13 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 1.9
+  - 2.0
+  - 2.1
  - jruby-19mode
  - jruby-head
-  - rbx-19mode
+  - rbx-2
 matrix:
  allow_failures:
-    - rvm: rbx-19mode
+    - rvm: rbx-2
    - rvm: jruby-head

 script: "rake test"
--- a/8
+++ b/8
@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gemspec
+gem 'stackprof', platforms: :mri_21
+
+group :test do
+  gem 'spy', '0.4.1'
+end
--- a/History.md
+++ b/History.md
@@ -3,6 +3,16 @@
 ## 3.0.0 / not yet released / branch "master"

 * ...
+* Add exception_handler feature, see #397 and #254 [Bogdan Gusiev, bogdan and Florian Weingarten, fw42]
+* Optimize variable parsing to avoid repeated regex evaluation during template rendering #383 [Jason Hiltz-Laforge, jasonhl]
+* Optimize checking for block interrupts to reduce object allocation #380 [Jason Hiltz-Laforge, jasonhl] 
+* Properly set context rethrow_errors on render! #349 [Thierry Joyal, tjoyal]
+* Fix broken rendering of variables which are equal to false, see #345 [Florian Weingarten, fw42]
+* Remove ActionView template handler [Dylan Thacker-Smith, dylanahsmith]
+* Freeze lots of string literals for new Ruby 2.1 optimization, see #297 [Florian Weingarten, fw42]
+* Allow newlines in tags and variables, see #324 [Dylan Thacker-Smith, dylanahsmith]
+* Tag#parse is called after initialize, which now takes options instead of tokens as the 3rd argument. See #321 [Dylan Thacker-Smith, dylanahsmith]
+* Raise `Liquid::ArgumentError` instead of `::ArgumentError` when filter has wrong number of arguments #309 [Bogdan Gusiev, bogdan]
 * 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]
@@ -21,9 +31,14 @@
 * 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"
+## 2.6.1 / 2014-01-10 / branch "2-6-stable"
+
+Security fix, cherry-picked from master (4e14a65):
+* Don't call to_sym when creating conditions for security reasons, see #273 [Bouke van der Bijl, bouk]
+* Prevent arbitrary method invocation on condition objects, see #274 [Dylan Thacker-Smith, dylanahsmith]
+
+## 2.6.0 / 2013-11-25

 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.
@@ -47,7 +62,13 @@ The following releases will only be tested against Ruby 1.9 and Ruby 2.0 and are
 * 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"
+## 2.5.5 / 2014-01-10 / branch "2-5-stable"
+
+Security fix, cherry-picked from master (4e14a65):
+* Don't call to_sym when creating conditions for security reasons, see #273 [Bouke van der Bijl, bouk]
+* Prevent arbitrary method invocation on condition objects, see #274 [Dylan Thacker-Smith, dylanahsmith]
+
+## 2.5.4 / 2013-11-11

 * Fix "can't convert Fixnum into String" for "replace", see #173, [wǒ_is神仙, jsw0528]

--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 [![Build Status](https://secure.travis-ci.org/Shopify/liquid.png?branch=master)](http://travis-ci.org/Shopify/liquid)
+[![Inline docs](http://inch-ci.org/github/Shopify/liquid.png)](http://inch-ci.org/github/Shopify/liquid)
+
 # Liquid template engine

 * [Contributing guidelines](CONTRIBUTING.md)
--- a/8
+++ b/8
@@ -8,7 +8,7 @@ task :default => 'test'
 desc 'run test suite with default parser'
 Rake::TestTask.new(:base_test) do |t|
  t.libs << '.' << 'lib' << 'test'
-  t.test_files = FileList['test/liquid/**/*_test.rb']
+  t.test_files = FileList['test/{integration,unit}/**/*_test.rb']
  t.verbose = false
 end

@@ -64,9 +64,9 @@ namespace :profile do
    ruby "./performance/profile.rb"
  end

-  desc "Run KCacheGrind"
-  task :grind => :run  do
-    system "qcachegrind /tmp/liquid.rubyprof_calltreeprinter.txt"
+  desc "Run the liquid profile/performance coverage with strict parsing"
+  task :strict do
+    ruby "./performance/profile.rb strict"
  end

 end
--- a/example/server/liquid_servlet.rb
+++ b/example/server/liquid_servlet.rb
@@ -13,7 +13,7 @@ class LiquidServlet < WEBrick::HTTPServlet::AbstractServlet
  def handle(type, req, res)
    @request, @response = req, res

-    @request.path_info =~ /(\w+)$/
+    @request.path_info =~ /(\w+)\z/
    @action = $1 || 'index'
    @assigns = send(@action) if respond_to?(@action)

--- a/example/server/templates/index.liquid
+++ b/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="/products">Products</a> screen </p>
--- a/init.rb
+++ b/init.rb
@@ -1,8 +0,0 @@
-require 'liquid'
-require 'extras/liquid_view'
-
-if defined? ActionView::Template and ActionView::Template.respond_to? :register_template_handler
-  ActionView::Template
-else
-  ActionView::Base
-end.register_template_handler(:liquid, LiquidView)
--- a/lib/extras/liquid_view.rb
+++ b/lib/extras/liquid_view.rb
@@ -1,51 +0,0 @@
-# LiquidView is a action view extension class. You can register it with rails
-# and use liquid as an template system for .liquid files
-#
-# Example
-#
-#   ActionView::Base::register_template_handler :liquid, LiquidView
-class LiquidView
-  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
-                                     @helpers @assigns_added @template @_render_stack @template_format @assigns )
-
-  def self.call(template)
-    "LiquidView.new(self).render(template, local_assigns)"
-  end
-
-  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|
-                  hash[ivar[1..-1]] = @view.instance_variable_get(ivar)
-                  hash
-                end
-    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
-
-  def compilable?
-    false
-  end
-
-end
--- a/lib/liquid.rb
+++ b/lib/liquid.rb
@@ -21,9 +21,9 @@

 module Liquid
  FilterSeparator             = /\|/
-  ArgumentSeparator           = ','
-  FilterArgumentSeparator     = ':'
-  VariableAttributeSeparator  = '.'
+  ArgumentSeparator           = ','.freeze
+  FilterArgumentSeparator     = ':'.freeze
+  VariableAttributeSeparator  = '.'.freeze
  TagStart                    = /\{\%/
  TagEnd                      = /\%\}/
  VariableSignature           = /\(?[\w\-\.\[\]]\)?/
@@ -33,16 +33,14 @@ module Liquid
  VariableIncompleteEnd       = /\}\}?/
  QuotedString                = /"[^"]*"|'[^']*'/
  QuotedFragment              = /#{QuotedString}|(?:[^\s,\|'"]|#{QuotedString})+/o
-  StrictQuotedFragment        = /"[^"]+"|'[^']+'|[^\s|:,]+/
-  FirstFilterArgument         = /#{FilterArgumentSeparator}(?:#{StrictQuotedFragment})/o
-  OtherFilterArgument         = /#{ArgumentSeparator}(?:#{StrictQuotedFragment})/o
-  SpacelessFilter             = /^(?:'[^']+'|"[^"]+"|[^'"])*#{FilterSeparator}(?:#{StrictQuotedFragment})(?:#{FirstFilterArgument}(?:#{OtherFilterArgument})*)?/o
-  Expression                  = /(?:#{QuotedFragment}(?:#{SpacelessFilter})*)/o
  TagAttributes               = /(\w+)\s*\:\s*(#{QuotedFragment})/o
  AnyStartingTag              = /\{\{|\{\%/
-  PartialTemplateParser       = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/o
-  TemplateParser              = /(#{PartialTemplateParser}|#{AnyStartingTag})/o
+  PartialTemplateParser       = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/om
+  TemplateParser              = /(#{PartialTemplateParser}|#{AnyStartingTag})/om
  VariableParser              = /\[[^\]]+\]|#{VariableSegment}+\??/o
+
+  singleton_class.send(:attr_accessor, :cache_classes)
+  self.cache_classes = true
 end

 require "liquid/version"
@@ -61,7 +59,6 @@ require 'liquid/document'
 require 'liquid/variable'
 require 'liquid/file_system'
 require 'liquid/template'
-require 'liquid/htmltags'
 require 'liquid/standardfilters'
 require 'liquid/condition'
 require 'liquid/module_ex'
--- a/lib/liquid/block.rb
+++ b/lib/liquid/block.rb
@@ -1,12 +1,12 @@
 module Liquid
  class Block < Tag
-    IsTag             = /^#{TagStart}/o
-    IsVariable        = /^#{VariableStart}/o
-    FullToken         = /^#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}$/o
-    ContentOfVariable = /^#{VariableStart}(.*)#{VariableEnd}$/o
+    FullToken         = /\A#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}\z/om
+    ContentOfVariable = /\A#{VariableStart}(.*)#{VariableEnd}\z/om
+    TAGSTART = "{%".freeze
+    VARSTART = "{{".freeze

    def blank?
-      @blank || false
+      @blank
    end

    def parse(tokens)
@@ -18,41 +18,41 @@ module Liquid
      @children = []

      while token = tokens.shift
-        case token
-        when IsTag
-          if token =~ FullToken
+        unless token.empty?
+          case
+          when token.start_with?(TAGSTART)
+            if token =~ FullToken

-            # if we found the proper block delimiter just end parsing here and let the outer block
-            # proceed
-            if block_delimiter == $1
-              end_tag
-              return
-            end
+              # if we found the proper block delimiter 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]
-              new_tag = tag.new_with_options($1, $2, tokens, @options || {})
-              @blank &&= new_tag.blank?
-              @nodelist << new_tag
-              @children << new_tag
+              # fetch the tag from registered blocks
+              if tag = Template.tags[$1]
+                new_tag = tag.parse($1, $2, tokens, @options)
+                @blank &&= new_tag.blank?
+                @nodelist << new_tag
+                @children << new_tag
+              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
-              # 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)
+              raise SyntaxError.new(options[:locale].t("errors.syntax.tag_termination".freeze, :token => token, :tag_end => TagEnd.inspect))
            end
+          when token.start_with?(VARSTART)
+            new_var = create_variable(token)
+            @nodelist << new_var
+            @children << new_var
+            @blank = false
          else
-            raise SyntaxError.new(options[:locale].t("errors.syntax.tag_termination", :token => token, :tag_end => TagEnd.inspect))
+            @nodelist << token
+            @blank &&= (token =~ /\A\s*\z/)
          end
-        when IsVariable
-          new_var = create_variable(token)
-          @nodelist << new_var
-          @children << new_var
-          @blank = false
-        when ''
-          # pass
-        else
-          @nodelist << token
-          @blank &&= (token =~ /\A\s*\z/)
        end
      end

@@ -79,31 +79,31 @@ module Liquid

    def unknown_tag(tag, params, tokens)
      case tag
-      when 'else'
-        raise SyntaxError.new(options[:locale].t("errors.syntax.unexpected_else", 
+      when 'else'.freeze
+        raise SyntaxError.new(options[:locale].t("errors.syntax.unexpected_else".freeze,
                                                 :block_name => block_name))
-      when 'end'
-        raise SyntaxError.new(options[:locale].t("errors.syntax.invalid_delimiter", 
-                                                 :block_name => block_name, 
+      when 'end'.freeze
+        raise SyntaxError.new(options[:locale].t("errors.syntax.invalid_delimiter".freeze,
+                                                 :block_name => block_name,
                                                 :block_delimiter => block_delimiter))
      else
-        raise SyntaxError.new(options[:locale].t("errors.syntax.unknown_tag", :tag => tag))
+        raise SyntaxError.new(options[:locale].t("errors.syntax.unknown_tag".freeze, :tag => tag))
      end
    end

-    def block_delimiter
-      "end#{block_name}"
-    end
-
    def block_name
      @tag_name
    end

+    def block_delimiter
+      @block_delimiter ||= "end#{block_name}"
+    end
+
    def create_variable(token)
      token.scan(ContentOfVariable) do |content|
        return Variable.new(content.first, @options)
      end
-      raise SyntaxError.new(options[:locale].t("errors.syntax.variable_termination", :token => token, :tag_end => VariableEnd.inspect))
+      raise SyntaxError.new(options[:locale].t("errors.syntax.variable_termination".freeze, :token => token, :tag_end => VariableEnd.inspect))
    end

    def render(context)
@@ -113,7 +113,7 @@ module Liquid
    protected

    def assert_missing_delimitation!
-      raise SyntaxError.new(options[:locale].t("errors.syntax.tag_never_closed", :block_name => block_name))
+      raise SyntaxError.new(options[:locale].t("errors.syntax.tag_never_closed".freeze, :block_name => block_name))
    end

    def render_all(list, context)
@@ -138,7 +138,7 @@ module Liquid
          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")
+            raise MemoryError.new("Memory limits exceeded".freeze)
          end
          unless token.is_a?(Block) && token.blank?
            output << token_output
--- a/lib/liquid/condition.rb
+++ b/lib/liquid/condition.rb
@@ -8,14 +8,14 @@ module Liquid
  #
  class Condition #:nodoc:
    @@operators = {
-      '==' => lambda { |cond, left, right|  cond.send(:equal_variables, left, right) },
-      '!=' => lambda { |cond, left, right| !cond.send(:equal_variables, left, right) },
-      '<>' => lambda { |cond, left, right| !cond.send(:equal_variables, left, right) },
-      '<'  => :<,
-      '>'  => :>,
-      '>=' => :>=,
-      '<=' => :<=,
-      'contains' => lambda { |cond, left, right| left && right ? left.include?(right) : false }
+      '=='.freeze => lambda { |cond, left, right|  cond.send(:equal_variables, left, right) },
+      '!='.freeze => lambda { |cond, left, right| !cond.send(:equal_variables, left, right) },
+      '<>'.freeze => lambda { |cond, left, right| !cond.send(:equal_variables, left, right) },
+      '<'.freeze  => :<,
+      '>'.freeze  => :>,
+      '>='.freeze => :>=,
+      '<='.freeze => :<=,
+      'contains'.freeze => lambda { |cond, left, right| left && right ? left.include?(right) : false }
    }

    def self.operators
@@ -61,7 +61,7 @@ module Liquid
    end

    def inspect
-      "#<Condition #{[@left, @operator, @right].compact.join(' ')}>"
+      "#<Condition #{[@left, @operator, @right].compact.join(' '.freeze)}>"
    end

    private
@@ -94,12 +94,16 @@ module Liquid

      left, right = context[left], context[right]

-      operation = self.class.operators[op] || raise(ArgumentError.new("Unknown operator #{op}"))
+      operation = self.class.operators[op] || raise(Liquid::ArgumentError.new("Unknown operator #{op}"))

      if operation.respond_to?(:call)
        operation.call(self, left, right)
      elsif left.respond_to?(operation) and right.respond_to?(operation)
-        left.send(operation, right)
+        begin
+          left.send(operation, right)
+        rescue ::ArgumentError => e
+          raise Liquid::ArgumentError.new(e.message)
+        end
      else
        nil
      end
--- a/lib/liquid/context.rb
+++ b/lib/liquid/context.rb
@@ -14,18 +14,25 @@ module Liquid
  #   context['bob']  #=> nil  class Context
  class Context
    attr_reader :scopes, :errors, :registers, :environments, :resource_limits
+    attr_accessor :exception_handler
+
+    SQUARE_BRACKETED = /\A\[(.*)\]\z/m

    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

+      if rethrow_errors
+        self.exception_handler = ->(e) { true }
+      end
+
      @interrupts = []
      @filters = []
+      @parsed_variables = Hash.new{ |cache, markup| cache[markup] = variable_parse(markup) } 
    end

    def increment_used_resources(key, obj)
@@ -71,7 +78,7 @@ module Liquid

    # are there any not handled interrupts?
    def has_interrupt?
-      @interrupts.any?
+      !@interrupts.empty?
    end

    # push an interrupt to the stack. this interrupt is considered not handled.
@@ -86,7 +93,8 @@ module Liquid

    def handle_error(e)
      errors.push(e)
-      raise if @rethrow_errors
+
+      raise if exception_handler && exception_handler.call(e)

      case e
      when SyntaxError
@@ -103,7 +111,7 @@ module Liquid
    # Push new local scope on the stack. use <tt>Context#stack</tt> instead
    def push(new_scope={})
      @scopes.unshift(new_scope)
-      raise StackLevelError, "Nesting too deep" if @scopes.length > 100
+      raise StackLevelError, "Nesting too deep".freeze if @scopes.length > 100
    end

    # Merge a hash of variables in the current local scope
@@ -151,11 +159,11 @@ module Liquid

    private
      LITERALS = {
-        nil => nil, 'nil' => nil, 'null' => nil, '' => nil,
-        'true'  => true,
-        'false' => false,
-        'blank' => :blank?,
-        'empty' => :empty?
+        nil => nil, 'nil'.freeze => nil, 'null'.freeze => nil, ''.freeze => nil,
+        'true'.freeze  => true,
+        'false'.freeze => false,
+        'blank'.freeze => :blank?,
+        'empty'.freeze => :empty?
      }

      # Look up variable, either resolve directly after considering the name. We can directly handle
@@ -171,15 +179,15 @@ module Liquid
          LITERALS[key]
        else
          case key
-          when /^'(.*)'$/ # Single quoted strings
+          when /\A'(.*)'\z/m # Single quoted strings
            $1
-          when /^"(.*)"$/ # Double quoted strings
+          when /\A"(.*)"\z/m # Double quoted strings
            $1
-          when /^(-?\d+)$/ # Integer and floats
+          when /\A(-?\d+)\z/ # Integer and floats
            $1.to_i
-          when /^\((\S+)\.\.(\S+)\)$/ # Ranges
+          when /\A\((\S+)\.\.(\S+)\)\z/ # Ranges
            (resolve($1).to_i..resolve($2).to_i)
-          when /^(-?\d[\d\.]+)$/ # Floats
+          when /\A(-?\d[\d\.]+)\z/ # Floats
            $1.to_f
          else
            variable(key)
@@ -189,12 +197,18 @@ module Liquid

      # 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) }
+
+        # This was changed from find() to find_index() because this is a very hot
+        # path and find_index() is optimized in MRI to reduce object allocation
+        index = @scopes.find_index { |s| s.has_key?(key) }
+        scope = @scopes[index] if index
+
        variable = nil

        if scope.nil?
          @environments.each do |e|
-            if variable = lookup_and_evaluate(e, key)
+            variable = lookup_and_evaluate(e, key)
+            unless variable.nil?
              scope = e
              break
            end
@@ -210,6 +224,16 @@ module Liquid
        return variable
      end

+      def variable_parse(markup)
+        parts = markup.scan(VariableParser)
+        needs_resolution = false
+        if parts.first =~ SQUARE_BRACKETED 
+          needs_resolution = true
+          parts[0] = $1
+        end
+        {:first => parts.shift, :needs_resolution => needs_resolution, :rest => parts} 
+      end
+
      # Resolves namespaced queries gracefully.
      #
      # Example
@@ -217,19 +241,17 @@ module Liquid
      #  assert_equal 'tobi', @context['hash.name']
      #  assert_equal 'tobi', @context['hash["name"]']
      def variable(markup)
-        parts = markup.scan(VariableParser)
-        square_bracketed = /^\[(.*)\]$/
+        parts = @parsed_variables[markup]

-        first_part = parts.shift
-
-        if first_part =~ square_bracketed
-          first_part = resolve($1)
+        first_part = parts[:first] 
+        if parts[:needs_resolution]
+          first_part = resolve(parts[:first])
        end

        if object = find_variable(first_part)

-          parts.each do |part|
-            part = resolve($1) if part_resolved = (part =~ square_bracketed)
+          parts[:rest].each do |part|
+            part = resolve($1) if part_resolved = (part =~ SQUARE_BRACKETED)

            # If object is a hash- or array-like object we look for the
            # presence of the key and if its available we return it
@@ -244,7 +266,7 @@ module Liquid
              # Some special cases. If the part wasn't in square brackets and
              # no key with the same name was found we interpret following calls
              # as commands and call them on the current object
-            elsif !part_resolved and object.respond_to?(part) and ['size', 'first', 'last'].include?(part)
+            elsif !part_resolved and object.respond_to?(part) and ['size'.freeze, 'first'.freeze, 'last'.freeze].include?(part)

              object = object.send(part.intern).to_liquid

@@ -281,5 +303,4 @@ module Liquid
        end
      end # squash_instance_assigns_with_environments
  end # Context
-
 end # Liquid
--- a/lib/liquid/document.rb
+++ b/lib/liquid/document.rb
@@ -1,9 +1,8 @@
 module Liquid
  class Document < Block
-    # we don't need markup to open this block
-    def initialize(tokens, options = {})
-      @options = options
-      parse(tokens)
+    def self.parse(tokens, options={})
+      # we don't need markup to open this block
+      super(nil, nil, tokens, options)
    end

    # There isn't a real delimiter
--- a/lib/liquid/file_system.rb
+++ b/lib/liquid/file_system.rb
@@ -44,7 +44,7 @@ module Liquid
  class LocalFileSystem
    attr_accessor :root

-    def initialize(root, pattern = "_%s.liquid")
+    def initialize(root, pattern = "_%s.liquid".freeze)
      @root = root
      @pattern = pattern
    end
@@ -57,15 +57,15 @@ module Liquid
    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?('/')
+      full_path = if template_path.include?('/'.freeze)
        File.join(root, File.dirname(template_path), @pattern % File.basename(template_path))
      else
        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
--- a/lib/liquid/i18n.rb
+++ b/lib/liquid/i18n.rb
@@ -6,7 +6,7 @@ module Liquid

    class TranslationError < StandardError
    end
-    
+
    attr_reader :path

    def initialize(path = DEFAULT_LOCALE)
@@ -31,7 +31,7 @@ module Liquid
    end

    def deep_fetch_translation(name)
-      name.split('.').reduce(locale) do |level, cur|
+      name.split('.'.freeze).reduce(locale) do |level, cur|
        level[cur] or raise TranslationError, "Translation for #{name} does not exist in locale #{path}"
      end
    end
--- a/lib/liquid/interrupts.rb
+++ b/lib/liquid/interrupts.rb
@@ -5,7 +5,7 @@ module Liquid
    attr_reader :message

    def initialize(message=nil)
-      @message = message || "interrupt"
+      @message = message || "interrupt".freeze
    end
  end

--- a/lib/liquid/lexer.rb
+++ b/lib/liquid/lexer.rb
@@ -2,14 +2,14 @@ require "strscan"
 module Liquid
  class Lexer
    SPECIALS = {
-      '|' => :pipe,
-      '.' => :dot,
-      ':' => :colon,
-      ',' => :comma,
-      '[' => :open_square,
-      ']' => :close_square,
-      '(' => :open_round,
-      ')' => :close_round
+      '|'.freeze => :pipe,
+      '.'.freeze => :dot,
+      ':'.freeze => :colon,
+      ','.freeze => :comma,
+      '['.freeze => :open_square,
+      ']'.freeze => :close_square,
+      '('.freeze => :open_round,
+      ')'.freeze => :close_round
    }
    IDENTIFIER = /[\w\-?!]+/
    SINGLE_STRING_LITERAL = /'[^\']*'/
--- a/lib/liquid/parser.rb
+++ b/lib/liquid/parser.rb
@@ -66,10 +66,11 @@ module Liquid
      str = ""
      # might be a keyword argument (identifier: expression)
      if look(:id) && look(:colon, 1)
-        str << consume << consume << ' '
+        str << consume << consume << ' '.freeze
      end

      str << expression
+      str
    end

    def variable_signature
--- a/lib/liquid/standardfilters.rb
+++ b/lib/liquid/standardfilters.rb
@@ -4,12 +4,17 @@ require 'bigdecimal'
 module Liquid

  module StandardFilters
-    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;', "'" => '&#39;' }
+    HTML_ESCAPE = {
+      '&'.freeze => '&amp;'.freeze,
+      '>'.freeze => '&gt;'.freeze,
+      '<'.freeze => '&lt;'.freeze,
+      '"'.freeze => '&quot;'.freeze,
+      "'".freeze => '&#39;'.freeze
+    }
    HTML_ESCAPE_ONCE_REGEXP = /["><']|&(?!([a-zA-Z]+|(#\d+));)/

    # Return the size of an array or of an string
    def size(input)
-
      input.respond_to?(:size) ? input.size : 0
    end

@@ -39,19 +44,19 @@ module Liquid
    alias_method :h, :escape

    # Truncate a string down to x characters
-    def truncate(input, length = 50, truncate_string = "...")
+    def truncate(input, length = 50, truncate_string = "...".freeze)
      if input.nil? then return end
      l = length.to_i - truncate_string.length
      l = 0 if l < 0
      input.length > length.to_i ? input[0...l] + truncate_string : input
    end

-    def truncatewords(input, words = 15, truncate_string = "...")
+    def truncatewords(input, words = 15, truncate_string = "...".freeze)
      if input.nil? then return end
      wordlist = input.to_s.split
      l = words.to_i - 1
      l = 0 if l < 0
-      wordlist.length > l ? wordlist[0..l].join(" ") + truncate_string : input
+      wordlist.length > l ? wordlist[0..l].join(" ".freeze) + truncate_string : input
    end

    # Split input string into an array of substrings separated by given pattern.
@@ -76,26 +81,27 @@ module Liquid
    end

    def strip_html(input)
-      input.to_s.gsub(/<script.*?<\/script>/m, '').gsub(/<!--.*?-->/m, '').gsub(/<style.*?<\/style>/m, '').gsub(/<.*?>/m, '')
+      empty = ''.freeze
+      input.to_s.gsub(/<script.*?<\/script>/m, empty).gsub(/<!--.*?-->/m, empty).gsub(/<style.*?<\/style>/m, empty).gsub(/<.*?>/m, empty)
    end

    # Remove all newlines from the string
    def strip_newlines(input)
-      input.to_s.gsub(/\r?\n/, '')
+      input.to_s.gsub(/\r?\n/, ''.freeze)
    end

    # Join elements of the array with certain character between them
-    def join(input, glue = ' ')
-      [input].flatten.join(glue)
+    def join(input, glue = ' '.freeze)
+      InputIterator.new(input).join(glue)
    end

    # Sort elements of the array
    # provide optional property with which to sort an array of hashes or drops
    def sort(input, property = nil)
-      ary = flatten_if_necessary(input)
+      ary = InputIterator.new(input)
      if property.nil?
        ary.sort
-      elsif ary.first.respond_to?('[]') and !ary.first[property].nil?
+      elsif ary.first.respond_to?('[]'.freeze) && !ary.first[property].nil?
        ary.sort {|a,b| a[property] <=> b[property] }
      elsif ary.first.respond_to?(property)
        ary.sort {|a,b| a.send(property) <=> b.send(property) }
@@ -104,16 +110,16 @@ module Liquid

    # Reverse the elements of an array
    def reverse(input)
-      ary = [input].flatten
+      ary = InputIterator.new(input)
      ary.reverse
    end

    # map/collect on a given property
    def map(input, property)
-      flatten_if_necessary(input).map do |e|
+      InputIterator.new(input).map do |e|
        e = e.call if e.is_a?(Proc)

-        if property == "to_liquid"
+        if property == "to_liquid".freeze
          e
        elsif e.respond_to?(:[])
          e[property]
@@ -122,23 +128,23 @@ module Liquid
    end

    # Replace occurrences of a string with another
-    def replace(input, string, replacement = '')
+    def replace(input, string, replacement = ''.freeze)
      input.to_s.gsub(string, replacement.to_s)
    end

    # Replace the first occurrences of a string with another
-    def replace_first(input, string, replacement = '')
+    def replace_first(input, string, replacement = ''.freeze)
      input.to_s.sub(string, replacement.to_s)
    end

    # remove a substring
    def remove(input, string)
-      input.to_s.gsub(string, '')
+      input.to_s.gsub(string, ''.freeze)
    end

    # remove the first occurrences of a substring
    def remove_first(input, string)
-      input.to_s.sub(string, '')
+      input.to_s.sub(string, ''.freeze)
    end

    # add one string to another
@@ -153,10 +159,10 @@ module Liquid

    # Add <br /> tags in front of all newlines in input string
    def newline_to_br(input)
-      input.to_s.gsub(/\n/, "<br />\n")
+      input.to_s.gsub(/\n/, "<br />\n".freeze)
    end

-    # Reformat a date
+    # Reformat a date using Ruby's core Time#strftime( string ) -> string
    #
    #   %a - The abbreviated weekday name (``Sun'')
    #   %A - The  full  weekday  name (``Sunday'')
@@ -170,6 +176,7 @@ module Liquid
    #   %m - Month of the year (01..12)
    #   %M - Minute of the hour (00..59)
    #   %p - Meridian indicator (``AM''  or  ``PM'')
+    #   %s - Number of seconds since 1970-01-01 00:00:00 UTC.
    #   %S - Second of the minute (00..60)
    #   %U - Week  number  of the current year,
    #           starting with the first Sunday as the first
@@ -184,34 +191,14 @@ module Liquid
    #   %Y - Year with century
    #   %Z - Time zone name
    #   %% - Literal ``%'' character
+    #
+    #   See also: http://www.ruby-doc.org/core/Time.html#method-i-strftime
    def date(input, format)
+      return input if format.to_s.empty?

-      if format.to_s.empty?
-        return input.to_s
-      end
+      return input unless date = to_date(input)

-      if ((input.is_a?(String) && !/^\d+$/.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
-      input
+      date.strftime(format.to_s)
    end

    # Get the first element of the passed in array
@@ -256,24 +243,28 @@ module Liquid
      apply_operation(input, operand, :%)
    end

-    def default(input, default_value = "")
+    def round(input, n = 0)
+      result = to_number(input).round(to_number(n))
+      result = result.to_f if result.is_a?(BigDecimal)
+      result = result.to_i if n == 0
+      result
+    end
+
+    def ceil(input)
+      to_number(input).ceil.to_i
+    end
+
+    def floor(input)
+      to_number(input).floor.to_i
+    end
+
+    def default(input, default_value = "".freeze)
      is_blank = input.respond_to?(:empty?) ? input.empty? : !input
      is_blank ? default_value : input
    end

    private

-    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
@@ -281,16 +272,63 @@ module Liquid
      when Numeric
        obj
      when String
-        (obj.strip =~ /^\d+\.\d+$/) ? BigDecimal.new(obj) : obj.to_i
+        (obj.strip =~ /\A\d+\.\d+\z/) ? BigDecimal.new(obj) : obj.to_i
      else
        0
      end
    end

+    def to_date(obj)
+      return obj if obj.respond_to?(:strftime)
+
+      case obj
+      when 'now'.freeze, 'today'.freeze
+        Time.now
+      when /\A\d+\z/, Integer
+        Time.at(obj.to_i)
+      when String
+        Time.parse(obj)
+      else
+        nil
+      end
+    rescue ArgumentError
+      nil
+    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
+
+    class InputIterator
+      include Enumerable
+
+      def initialize(input)
+        @input = if input.is_a?(Array)
+          input.flatten
+        elsif input.is_a?(Hash)
+          [input]
+        elsif input.is_a?(Enumerable)
+          input
+        else
+          Array(input)
+        end
+      end
+
+      def join(glue)
+        to_a.join(glue)
+      end
+
+      def reverse
+        reverse_each.to_a
+      end
+
+      def each
+        @input.each do |e|
+          yield(e.respond_to?(:to_liquid) ? e.to_liquid : e)
+        end
+      end
+    end
  end

  Template.register_filter(StandardFilters)
--- a/lib/liquid/tag.rb
+++ b/lib/liquid/tag.rb
@@ -3,20 +3,20 @@ module Liquid
    attr_accessor :options
    attr_reader :nodelist, :warnings

-    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
+    class << self
+      def parse(tag_name, markup, tokens, options)
+        tag = new(tag_name, markup, options)
+        tag.parse(tokens)
+        tag
+      end
+
+      private :new
    end

-    def initialize(tag_name, markup, tokens)
+    def initialize(tag_name, markup, options)
      @tag_name   = tag_name
      @markup     = markup
-      @options    ||= {} # needs || because might be set before initialize
-      parse(tokens)
+      @options    = options
    end

    def parse(tokens)
@@ -27,11 +27,11 @@ module Liquid
    end

    def render(context)
-      ''
+      ''.freeze
    end

    def blank?
-      @blank || false
+      false
    end

    def parse_with_selected_parser(markup)
@@ -50,11 +50,12 @@ module Liquid
    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
+  end
+end
--- a/lib/liquid/tags/assign.rb
+++ b/lib/liquid/tags/assign.rb
@@ -9,24 +9,23 @@ module Liquid
  #  {{ foo }}
  #
  class Assign < Tag
-    Syntax = /(#{VariableSignature}+)\s*=\s*(.*)\s*/o
+    Syntax = /(#{VariableSignature}+)\s*=\s*(.*)\s*/om

-    def initialize(tag_name, markup, tokens)
+    def initialize(tag_name, markup, options)
+      super
      if markup =~ Syntax
        @to = $1
        @from = Variable.new($2)
      else
-        raise SyntaxError.new options[:locale].t("errors.syntax.assign")
+        raise SyntaxError.new options[:locale].t("errors.syntax.assign".freeze)
      end
-
-      super
    end

    def render(context)
      val = @from.render(context)
      context.scopes.last[@to] = val
      context.increment_used_resources(:assign_score_current, val)
-      ''
+      ''.freeze
    end

    def blank?
@@ -34,5 +33,5 @@ module Liquid
    end
  end

-  Template.register_tag('assign', Assign)
+  Template.register_tag('assign'.freeze, Assign)
 end
--- a/lib/liquid/tags/break.rb
+++ b/lib/liquid/tags/break.rb
@@ -17,5 +17,5 @@ module Liquid

  end

-  Template.register_tag('break', Break)
+  Template.register_tag('break'.freeze, Break)
 end
--- a/lib/liquid/tags/capture.rb
+++ b/lib/liquid/tags/capture.rb
@@ -1,5 +1,4 @@
 module Liquid
-
  # Capture stores the result of a block into a variable without rendering it inplace.
  #
  #   {% capture heading %}
@@ -14,21 +13,20 @@ module Liquid
  class Capture < Block
    Syntax = /(\w+)/

-    def initialize(tag_name, markup, tokens)
+    def initialize(tag_name, markup, options)
+      super
      if markup =~ Syntax
        @to = $1
      else
        raise SyntaxError.new(options[:locale].t("errors.syntax.capture"))
      end
-
-      super
    end

    def render(context)
      output = super
      context.scopes.last[@to] = output
      context.increment_used_resources(:assign_score_current, output)
-      ''
+      ''.freeze
    end

    def blank?
@@ -36,5 +34,5 @@ module Liquid
    end
  end

-  Template.register_tag('capture', Capture)
+  Template.register_tag('capture'.freeze, Capture)
 end
--- a/lib/liquid/tags/case.rb
+++ b/lib/liquid/tags/case.rb
@@ -1,18 +1,17 @@
 module Liquid
  class Case < Block
    Syntax     = /(#{QuotedFragment})/o
-    WhenSyntax = /(#{QuotedFragment})(?:(?:\s+or\s+|\s*\,\s*)(#{QuotedFragment}.*))?/o
+    WhenSyntax = /(#{QuotedFragment})(?:(?:\s+or\s+|\s*\,\s*)(#{QuotedFragment}.*))?/om

-    def initialize(tag_name, markup, tokens)
+    def initialize(tag_name, markup, options)
+      super
      @blocks = []

      if markup =~ Syntax
        @left = $1
      else
-        raise SyntaxError.new(options[:locale].t("errors.syntax.case"))
+        raise SyntaxError.new(options[:locale].t("errors.syntax.case".freeze))
      end
-
-      super
    end

    def nodelist
@@ -22,9 +21,9 @@ module Liquid
    def unknown_tag(tag, markup, tokens)
      @nodelist = []
      case tag
-      when 'when'
+      when 'when'.freeze
        record_when_condition(markup)
-      when 'else'
+      when 'else'.freeze
        record_else_condition(markup)
      else
        super
@@ -54,12 +53,12 @@ module Liquid
      while markup
        # 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"))
+          raise SyntaxError.new(options[:locale].t("errors.syntax.case_invalid_when".freeze))
        end

        markup = $2

-        block = Condition.new(@left, '==', $1)
+        block = Condition.new(@left, '=='.freeze, $1)
        block.attach(@nodelist)
        @blocks.push(block)
      end
@@ -67,7 +66,7 @@ module Liquid

    def record_else_condition(markup)
      if not markup.strip.empty?
-        raise SyntaxError.new(options[:locale].t("errors.syntax.case_invalid_else"))
+        raise SyntaxError.new(options[:locale].t("errors.syntax.case_invalid_else".freeze))
      end

      block = ElseCondition.new
@@ -76,5 +75,5 @@ module Liquid
    end
  end

-  Template.register_tag('case', Case)
+  Template.register_tag('case'.freeze, Case)
 end
--- a/lib/liquid/tags/comment.rb
+++ b/lib/liquid/tags/comment.rb
@@ -1,7 +1,7 @@
 module Liquid
  class Comment < Block
    def render(context)
-      ''
+      ''.freeze
    end

    def unknown_tag(tag, markup, tokens)
@@ -12,5 +12,5 @@ module Liquid
    end
  end

-  Template.register_tag('comment', Comment)
+  Template.register_tag('comment'.freeze, Comment)
 end
--- a/lib/liquid/tags/continue.rb
+++ b/lib/liquid/tags/continue.rb
@@ -1,5 +1,4 @@
 module Liquid
-
  # Continue tag to be used to break out of a for loop.
  #
  # == Basic Usage:
@@ -10,12 +9,10 @@ module Liquid
  #    {% endfor %}
  #
  class Continue < Tag
-
    def interrupt
      ContinueInterrupt.new
    end
-
  end

-  Template.register_tag('continue', Continue)
+  Template.register_tag('continue'.freeze, Continue)
 end
--- a/lib/liquid/tags/cycle.rb
+++ b/lib/liquid/tags/cycle.rb
@@ -12,10 +12,11 @@ module Liquid
  #    <div class="green"> Item five</div>
  #
  class Cycle < Tag
-    SimpleSyntax = /^#{QuotedFragment}+/o
-    NamedSyntax  = /^(#{QuotedFragment})\s*\:\s*(.*)/o
+    SimpleSyntax = /\A#{QuotedFragment}+/o
+    NamedSyntax  = /\A(#{QuotedFragment})\s*\:\s*(.*)/om

-    def initialize(tag_name, markup, tokens)
+    def initialize(tag_name, markup, options)
+      super
      case markup
      when NamedSyntax
        @variables = variables_from_string($2)
@@ -24,9 +25,8 @@ module Liquid
        @variables = variables_from_string(markup)
        @name = "'#{@variables.to_s}'"
      else
-        raise SyntaxError.new(options[:locale].t("errors.syntax.cycle"))
+        raise SyntaxError.new(options[:locale].t("errors.syntax.cycle".freeze))
      end
-      super
    end

    def render(context)
@@ -43,11 +43,8 @@ module Liquid
      end
    end

-    def blank?
-      false
-    end
-
    private
+
    def variables_from_string(markup)
      markup.split(',').collect do |var|
        var =~ /\s*(#{QuotedFragment})\s*/o
--- a/lib/liquid/tags/decrement.rb
+++ b/lib/liquid/tags/decrement.rb
@@ -19,10 +19,9 @@ module Liquid
  #    Hello: -3
  #
  class Decrement < Tag
-    def initialize(tag_name, markup, tokens)
-      @variable = markup.strip
-
+    def initialize(tag_name, markup, options)
      super
+      @variable = markup.strip
    end

    def render(context)
@@ -35,5 +34,5 @@ module Liquid
    private
  end

-  Template.register_tag('decrement', Decrement)
+  Template.register_tag('decrement'.freeze, Decrement)
 end
--- a/lib/liquid/tags/for.rb
+++ b/lib/liquid/tags/for.rb
@@ -46,10 +46,10 @@ module Liquid
  class For < Block
    Syntax = /\A(#{VariableSegment}+)\s+in\s+(#{QuotedFragment}+)\s*(reversed)?/o

-    def initialize(tag_name, markup, tokens)
+    def initialize(tag_name, markup, options)
+      super
      parse_with_selected_parser(markup)
      @nodelist = @for_block = []
-      super
    end

    def nodelist
@@ -61,7 +61,7 @@ module Liquid
    end

    def unknown_tag(tag, markup, tokens)
-      return super unless tag == 'else'
+      return super unless tag == 'else'.freeze
      @nodelist = @else_block = []
    end

@@ -74,13 +74,13 @@ module Liquid
      # Maintains Ruby 1.8.7 String#each behaviour on 1.9
      return render_else(context) unless iterable?(collection)

-      from = if @attributes['offset'] == 'continue'
+      from = if @attributes['offset'.freeze] == 'continue'.freeze
        context.registers[:for][@name].to_i
      else
-        context[@attributes['offset']].to_i
+        context[@attributes['offset'.freeze]].to_i
      end

-      limit = context[@attributes['limit']]
+      limit = context[@attributes['limit'.freeze]]
      to    = limit ? limit.to_i + from : nil

      segment = Utils.slice_collection(collection, from, to)
@@ -99,15 +99,16 @@ module Liquid
      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,
-            'rindex'  => length - index,
-            'rindex0' => length - index - 1,
-            'first'   => (index == 0),
-          'last'    => (index == length - 1) }
+          context['forloop'.freeze] = {
+            'name'.freeze    => @name,
+            'length'.freeze  => length,
+            'index'.freeze   => index + 1,
+            'index0'.freeze  => index,
+            'rindex'.freeze  => length - index,
+            'rindex0'.freeze => length - index - 1,
+            'first'.freeze   => (index == 0),
+            'last'.freeze    => (index == length - 1)
+          }

          result << render_all(@for_block, context)

@@ -135,22 +136,22 @@ module Liquid
          @attributes[key] = value
        end
      else
-        raise SyntaxError.new(options[:locale].t("errors.syntax.for"))
+        raise SyntaxError.new(options[:locale].t("errors.syntax.for".freeze))
      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')
+      raise SyntaxError.new(options[:locale].t("errors.syntax.for_invalid_in".freeze))  unless p.id?('in'.freeze)
      @collection_name = p.expression
      @name = "#{@variable_name}-#{@collection_name}"
-      @reversed = p.id?('reversed')
+      @reversed = p.id?('reversed'.freeze)

      @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"))
+        unless attribute = p.id?('limit'.freeze) || p.id?('offset'.freeze)
+          raise SyntaxError.new(options[:locale].t("errors.syntax.for_invalid_attribute".freeze))
        end
        p.consume
        val = p.expression
@@ -161,14 +162,14 @@ module Liquid

    private

-      def render_else(context)
-        return @else_block ? [render_all(@else_block, context)] : ''
-      end
+    def render_else(context)
+      return @else_block ? [render_all(@else_block, context)] : ''.freeze
+    end

-      def iterable?(collection)
-        collection.respond_to?(:each) || Utils.non_blank_string?(collection)
-      end
+    def iterable?(collection)
+      collection.respond_to?(:each) || Utils.non_blank_string?(collection)
+    end
  end

-  Template.register_tag('for', For)
+  Template.register_tag('for'.freeze, For)
 end
--- a/lib/liquid/tags/if.rb
+++ b/lib/liquid/tags/if.rb
@@ -14,10 +14,10 @@ module Liquid
    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)
+    def initialize(tag_name, markup, options)
      super
+      @blocks = []
+      push_block('if'.freeze, markup)
    end

    def nodelist
@@ -25,7 +25,7 @@ module Liquid
    end

    def unknown_tag(tag, markup, tokens)
-      if ['elsif', 'else'].include?(tag)
+      if ['elsif'.freeze, 'else'.freeze].include?(tag)
        push_block(tag, markup)
      else
        super
@@ -39,14 +39,14 @@ module Liquid
            return render_all(block.attachment, context)
          end
        end
-        ''
+        ''.freeze
      end
    end

    private

      def push_block(tag, markup)
-        block = if tag == 'else'
+        block = if tag == 'else'.freeze
          ElseCondition.new
        else
          parse_with_selected_parser(markup)
@@ -58,17 +58,17 @@ module Liquid

      def lax_parse(markup)
        expressions = markup.scan(ExpressionsAndOperators).reverse
-        raise(SyntaxError.new(options[:locale].t("errors.syntax.if"))) unless expressions.shift =~ Syntax
+        raise(SyntaxError.new(options[:locale].t("errors.syntax.if".freeze))) 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
+          raise(SyntaxError.new(options[:locale].t("errors.syntax.if".freeze))) 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)
+          raise(SyntaxError.new(options[:locale].t("errors.syntax.if".freeze))) unless BOOLEAN_OPERATORS.include?(operator)
          new_condition.send(operator, condition)
          condition = new_condition
        end
@@ -81,7 +81,7 @@ module Liquid

        condition = parse_comparison(p)

-        while op = (p.id?('and') || p.id?('or'))
+        while op = (p.id?('and'.freeze) || p.id?('or'.freeze))
          new_cond = parse_comparison(p)
          new_cond.send(op, condition)
          condition = new_cond
@@ -102,5 +102,5 @@ module Liquid
      end
  end

-  Template.register_tag('if', If)
+  Template.register_tag('if'.freeze, If)
 end
--- a/lib/liquid/tags/ifchanged.rb
+++ b/lib/liquid/tags/ifchanged.rb
@@ -10,11 +10,11 @@ module Liquid
          context.registers[:ifchanged] = output
          output
        else
-          ''
+          ''.freeze
        end
      end
    end
  end

-  Template.register_tag('ifchanged', Ifchanged)
+  Template.register_tag('ifchanged'.freeze, Ifchanged)
 end
--- a/lib/liquid/tags/include.rb
+++ b/lib/liquid/tags/include.rb
@@ -17,7 +17,9 @@ module Liquid
  class Include < Tag
    Syntax = /(#{QuotedFragment}+)(\s+(?:with|for)\s+(#{QuotedFragment}+))?/o

-    def initialize(tag_name, markup, tokens)
+    def initialize(tag_name, markup, options)
+      super
+
      if markup =~ Syntax

        @template_name = $1
@@ -29,19 +31,13 @@ module Liquid
        end

      else
-        raise SyntaxError.new(options[:locale].t("errors.syntax.include"))
+        raise SyntaxError.new(options[:locale].t("errors.syntax.include".freeze))
      end
-
-      super
    end

    def parse(tokens)
    end

-    def blank?
-      false
-    end
-
    def render(context)
      partial = load_cached_partial(context)
      variable = context[@variable_name || @template_name[1..-2]]
@@ -51,7 +47,7 @@ module Liquid
          context[key] = context[value]
        end

-        context_variable_name = @template_name[1..-2].split('/').last
+        context_variable_name = @template_name[1..-2].split('/'.freeze).last
        if variable.is_a?(Array)
          variable.collect do |var|
            context[context_variable_name] = var
@@ -94,5 +90,5 @@ module Liquid
      end
  end

-  Template.register_tag('include', Include)
+  Template.register_tag('include'.freeze, Include)
 end
--- a/lib/liquid/tags/increment.rb
+++ b/lib/liquid/tags/increment.rb
@@ -15,9 +15,9 @@ module Liquid
  #    Hello: 2
  #
  class Increment < Tag
-    def initialize(tag_name, markup, tokens)
-      @variable = markup.strip
+    def initialize(tag_name, markup, options)
      super
+      @variable = markup.strip
    end

    def render(context)
@@ -25,11 +25,7 @@ module Liquid
      context.environments.first[@variable] = value + 1
      value.to_s
    end
-
-    def blank?
-      false
-    end
  end

-  Template.register_tag('increment', Increment)
+  Template.register_tag('increment'.freeze, Increment)
 end
--- a/lib/liquid/tags/raw.rb
+++ b/lib/liquid/tags/raw.rb
@@ -1,13 +1,13 @@
 module Liquid
  class Raw < Block
-    FullTokenPossiblyInvalid = /^(.*)#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}$/o
+    FullTokenPossiblyInvalid = /\A(.*)#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}\z/om

    def parse(tokens)
      @nodelist ||= []
      @nodelist.clear
      while token = tokens.shift
        if token =~ FullTokenPossiblyInvalid
-          @nodelist << $1 if $1 != ""
+          @nodelist << $1 if $1 != "".freeze
          if block_delimiter == $2
            end_tag
            return
@@ -18,5 +18,5 @@ module Liquid
    end
  end

-  Template.register_tag('raw', Raw)
+  Template.register_tag('raw'.freeze, Raw)
 end
--- a/lib/liquid/tags/table_row.rb
+++ b/lib/liquid/tags/table_row.rb
@@ -2,7 +2,8 @@ module Liquid
  class TableRow < Block
    Syntax = /(\w+)\s+in\s+(#{QuotedFragment}+)/o

-    def initialize(tag_name, markup, tokens)
+    def initialize(tag_name, markup, options)
+      super
      if markup =~ Syntax
        @variable_name = $1
        @collection_name = $2
@@ -11,23 +12,21 @@ module Liquid
          @attributes[key] = value
        end
      else
-        raise SyntaxError.new(options[:locale].t("errors.syntax.table_row"))
+        raise SyntaxError.new(options[:locale].t("errors.syntax.table_row".freeze))
      end
-
-      super
    end

    def render(context)
-      collection = context[@collection_name] or return ''
+      collection = context[@collection_name] or return ''.freeze

-      from = @attributes['offset'] ? context[@attributes['offset']].to_i : 0
-      to = @attributes['limit'] ? from + context[@attributes['limit']].to_i : nil
+      from = @attributes['offset'.freeze] ? context[@attributes['offset'.freeze]].to_i : 0
+      to = @attributes['limit'.freeze] ? from + context[@attributes['limit'.freeze]].to_i : nil

      collection = Utils.slice_collection(collection, from, to)

      length = collection.length

-      cols = context[@attributes['cols']].to_i
+      cols = context[@attributes['cols'.freeze]].to_i

      row = 1
      col = 0
@@ -37,19 +36,19 @@ module Liquid

        collection.each_with_index do |item, index|
          context[@variable_name] = item
-          context['tablerowloop'] = {
-            'length'  => length,
-            'index'   => index + 1,
-            'index0'  => index,
-            'col'     => col + 1,
-            'col0'    => col,
-            'index0'  => index,
-            'rindex'  => length - index,
-            'rindex0' => length - index - 1,
-            'first'   => (index == 0),
-            'last'    => (index == length - 1),
-            'col_first' => (col == 0),
-            'col_last'  => (col == cols - 1)
+          context['tablerowloop'.freeze] = {
+            'length'.freeze    => length,
+            'index'.freeze     => index + 1,
+            'index0'.freeze    => index,
+            'col'.freeze       => col + 1,
+            'col0'.freeze      => col,
+            'index0'.freeze    => index,
+            'rindex'.freeze    => length - index,
+            'rindex0'.freeze   => length - index - 1,
+            'first'.freeze     => (index == 0),
+            'last'.freeze      => (index == length - 1),
+            'col_first'.freeze => (col == 0),
+            'col_last'.freeze  => (col == cols - 1)
          }


@@ -70,5 +69,5 @@ module Liquid
    end
  end

-  Template.register_tag('tablerow', TableRow)
+  Template.register_tag('tablerow'.freeze, TableRow)
 end
--- a/lib/liquid/tags/unless.rb
+++ b/lib/liquid/tags/unless.rb
@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/if'

 module Liquid
-
  # Unless is a conditional just like 'if' but works on the inverse logic.
  #
  #   {% unless x < 0 %} x is greater than zero {% end %}
@@ -23,11 +22,10 @@ module Liquid
          end
        end

-        ''
+        ''.freeze
      end
    end
  end

-
-  Template.register_tag('unless', Unless)
+  Template.register_tag('unless'.freeze, Unless)
 end
--- a/lib/liquid/template.rb
+++ b/lib/liquid/template.rb
@@ -21,7 +21,43 @@ module Liquid
    attr_accessor :root, :resource_limits
    @@file_system = BlankFileSystem.new

+    class TagRegistry
+      def initialize
+        @tags  = {}
+        @cache = {}
+      end
+
+      def [](tag_name)
+        return nil unless @tags.has_key?(tag_name)
+        return @cache[tag_name] if Liquid.cache_classes
+
+        lookup_class(@tags[tag_name]).tap { |o| @cache[tag_name] = o }
+      end
+
+      def []=(tag_name, klass)
+        @tags[tag_name]  = klass.name
+        @cache[tag_name] = klass
+      end
+
+      def delete(tag_name)
+        @tags.delete(tag_name)
+        @cache.delete(tag_name)
+      end
+
+      private
+
+      def lookup_class(name)
+        name.split("::").reject(&:empty?).reduce(Object) { |scope, const| scope.const_get(const) }
+      end
+    end
+
    class << self
+      # 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.
+      attr_writer :error_mode
+
      def file_system
        @@file_system
      end
@@ -35,15 +71,7 @@ module Liquid
      end

      def tags
-        @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
+        @tags ||= TagRegistry.new
      end

      def error_mode
@@ -60,7 +88,6 @@ module Liquid
      def parse(source, options = {})
        template = Template.new
        template.parse(source, options)
-        template
      end
    end

@@ -72,7 +99,7 @@ module Liquid
    # Parse source code.
    # Returns self for easy chaining
    def parse(source, options = {})
-      @root = Document.new(tokenize(source), DEFAULT_OPTIONS.merge(options))
+      @root = Document.parse(tokenize(source), DEFAULT_OPTIONS.merge(options))
      @warnings = nil
      self
    end
@@ -110,11 +137,17 @@ module Liquid
    #    filters and tags and might be useful to integrate liquid more with its host application
    #
    def render(*args)
-      return '' if @root.nil?
+      return ''.freeze if @root.nil?

      context = case args.first
      when Liquid::Context
-        args.shift
+        c = args.shift
+
+        if @rethrow_errors
+          c.exception_handler = ->(e) { true }
+        end
+
+        c
      when Liquid::Drop
        drop = args.shift
        drop.context = Context.new([drop, assigns], instance_assigns, registers, @rethrow_errors, @resource_limits)
@@ -138,6 +171,9 @@ module Liquid
          context.add_filters(options[:filters])
        end

+        if options[:exception_handler]
+          context.exception_handler = options[:exception_handler]
+        end
      when Module
        context.add_filters(args.pop)
      when Array
@@ -157,7 +193,8 @@ module Liquid
    end

    def render!(*args)
-      @rethrow_errors = true; render(*args)
+      @rethrow_errors = true
+      render(*args)
    end

    private
--- a/lib/liquid/utils.rb
+++ b/lib/liquid/utils.rb
@@ -10,7 +10,7 @@ module Liquid
    end

    def self.non_blank_string?(collection)
-      collection.is_a?(String) && collection != ''
+      collection.is_a?(String) && collection != ''.freeze
    end

    def self.slice_collection_using_each(collection, from, to)
--- a/lib/liquid/variable.rb
+++ b/lib/liquid/variable.rb
@@ -12,14 +12,13 @@ module Liquid
  #
  class Variable
    FilterParser = /(?:#{FilterSeparator}|(?:\s*(?:#{QuotedFragment}|#{ArgumentSeparator})\s*)+)/o
-    EasyParse = /^ *(\w+(?:\.\w+)*) *$/
+    EasyParse = /\A *(\w+(?:\.\w+)*) *\z/
    attr_accessor :filters, :name, :warnings

    def initialize(markup, options = {})
      @markup  = markup
      @name    = nil
      @options = options || {}
-      

      case @options[:error_mode] || Template.error_mode
      when :strict then strict_parse(markup)
@@ -37,13 +36,13 @@ module Liquid

    def lax_parse(markup)
      @filters = []
-      if match = markup.match(/\s*(#{QuotedFragment})(.*)/o)
-        @name = match[1]
-        if match[2].match(/#{FilterSeparator}\s*(.*)/o)
+      if markup =~ /\s*(#{QuotedFragment})(.*)/om
+        @name = Regexp.last_match(1)
+        if Regexp.last_match(2) =~ /#{FilterSeparator}\s*(.*)/om
          filters = Regexp.last_match(1).scan(FilterParser)
          filters.each do |f|
-            if matches = f.match(/\s*(\w+)/)
-              filtername = matches[1]
+            if f =~ /\s*(\w+)/
+              filtername = Regexp.last_match(1)
              filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*((?:\w+\s*\:\s*)?#{QuotedFragment})/o).flatten
              @filters << [filtername, filterargs]
            end
@@ -63,7 +62,7 @@ module Liquid
      @filters = []
      p = Parser.new(markup)
      # Could be just filters with no input
-      @name = p.look(:pipe) ? '' : p.expression
+      @name = p.look(:pipe) ? ''.freeze : p.expression
      while p.consume?(:pipe)
        filtername = p.consume(:id)
        filterargs = p.consume?(:colon) ? parse_filterargs(p) : []
@@ -86,7 +85,7 @@ module Liquid
    end

    def render(context)
-      return '' if @name.nil?
+      return ''.freeze if @name.nil?
      @filters.inject(context[@name]) do |output, filter|
        filterargs = []
        keyword_args = {}
--- a/lib/liquid/version.rb
+++ b/lib/liquid/version.rb
@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Liquid
-  VERSION = "3.0.0"
+  VERSION = "3.0.0.rc1"
 end
--- a/liquid.gemspec
+++ b/liquid.gemspec
@@ -23,4 +23,6 @@ Gem::Specification.new do |s|
  s.extra_rdoc_files  = ["History.md", "README.md"]

  s.require_path = "lib"
+
+  s.add_development_dependency 'rake'
 end
--- a/performance/benchmark.rb
+++ b/performance/benchmark.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'benchmark'
 require File.dirname(__FILE__) + '/theme_runner'

--- a/performance/profile.rb
+++ b/performance/profile.rb
@@ -1,19 +1,17 @@
-require 'rubygems'
-require 'ruby-prof' rescue fail("install ruby-prof extension/gem")
+require 'stackprof' rescue fail("install stackprof extension/gem")
 require File.dirname(__FILE__) + '/theme_runner'

+Liquid::Template.error_mode = ARGV.first.to_sym if ARGV.first
 profiler = ThemeRunner.new
+profiler.run

-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}"
+[:cpu, :object].each do |profile_type|
+  puts "Profiling in #{profile_type.to_s} mode..."
+  results = StackProf.run(mode: profile_type) do
+    100.times do
+      profiler.run
+    end
+  end
+  StackProf::Report.new(results).print_text(false, 20)
+  File.write(ENV['FILENAME'] + "." + profile_type.to_s, Marshal.dump(results)) if ENV['FILENAME']
 end
--- a/performance/shopify/comment_form.rb
+++ b/performance/shopify/comment_form.rb
@@ -1,15 +1,15 @@
 class CommentForm < Liquid::Block
  Syntax = /(#{Liquid::VariableSignature}+)/

-  def initialize(tag_name, markup, tokens)
+  def initialize(tag_name, markup, options)
+    super
+
    if markup =~ Syntax
      @variable_name = $1
      @attributes = {}
    else
      raise SyntaxError.new("Syntax Error in 'comment_form' - Valid syntax: comment_form [article]")
    end
-
-    super
  end

  def render(context)
--- a/performance/shopify/database.rb
+++ b/performance/shopify/database.rb
@@ -1,6 +1,6 @@
 require 'yaml'
-module Database

+module Database
  # 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
--- a/performance/shopify/json_filter.rb
+++ b/performance/shopify/json_filter.rb
@@ -1,7 +1,9 @@
+require 'json'
+
 module JsonFilter

  def json(object)
-    object.reject {|k,v| k == "collections" }.to_json
+    JSON.dump(object.reject {|k,v| k == "collections" })
  end

 end
--- a/performance/shopify/paginate.rb
+++ b/performance/shopify/paginate.rb
@@ -1,7 +1,9 @@
 class Paginate < Liquid::Block
  Syntax     = /(#{Liquid::QuotedFragment})\s*(by\s*(\d+))?/

-  def initialize(tag_name, markup, tokens)
+  def initialize(tag_name, markup, options)
+    super
+
    @nodelist = []

    if markup =~ Syntax
@@ -19,8 +21,6 @@ class Paginate < Liquid::Block
    else
      raise SyntaxError.new("Syntax Error in tag 'paginate' - Valid syntax: paginate [collection] by number")
    end
-
-    super
  end

  def render(context)
--- a/performance/shopify/shop_filter.rb
+++ b/performance/shopify/shop_filter.rb
@@ -45,16 +45,16 @@ module ShopFilter
  end

  def url_for_vendor(vendor_title)
-    "/collections/#{vendor_title.to_handle}"
+    "/collections/#{to_handle(vendor_title)}"
  end

  def url_for_type(type_title)
-    "/collections/#{type_title.to_handle}"
+    "/collections/#{to_handle(type_title)}"
  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

@@ -95,4 +95,16 @@ module ShopFilter
    input == 1 ? singular : plural
  end

+  private
+
+  def to_handle(str)
+    result = str.dup
+    result.downcase!
+    result.delete!("'\"()[]")
+    result.gsub!(/\W+/, '-')
+    result.gsub!(/-+\z/, '') if result[-1] == '-'
+    result.gsub!(/\A-+/, '') if result[0] == '-'
+    result
+  end
+
 end
--- a/performance/theme_runner.rb
+++ b/performance/theme_runner.rb
@@ -6,10 +6,6 @@
 # Shopify which is likely the biggest user of liquid in the world which something to the tune of several
 # million Template#render calls a day.

-require 'rubygems'
-require 'active_support'
-require 'yaml'
-require 'digest/md5'
 require File.dirname(__FILE__) + '/shopify/liquid'
 require File.dirname(__FILE__) + '/shopify/database.rb'

@@ -64,57 +60,19 @@ class ThemeRunner
  end


-  def run_profile
-    RubyProf.measure_mode = RubyProf::WALL_TIME
-
-    # Dup assigns because will make some changes to them
-    assigns = Database.tables.dup
-
-    @tests.each do |liquid, layout, template_name|
-
-      # Compute page_tempalte outside of profiler run, uninteresting to profiler
-      html = nil
-      page_template = File.basename(template_name, File.extname(template_name))
-
-      unless @started
-        RubyProf.start
-        RubyProf.pause
-        @started = true
-      end
-
-      html = nil
-
-      RubyProf.resume
-      html = compile_and_render(liquid, layout, assigns, page_template, template_name)
-      RubyProf.pause
-
-
-      # return the result and the MD5 of the content, this can be used to detect regressions between liquid version
-      $stdout.puts "* rendered template %s, content: %s" % [template_name, Digest::MD5.hexdigest(html)]
-
-      # Uncomment to dump html files to /tmp so that you can inspect for errors
-      # File.open("/tmp/#{File.basename(template_name)}.html", "w+") { |fp| fp <<html}
-    end
-
-    RubyProf.stop
-  end
-
  def compile_and_render(template, layout, assigns, page_template, template_file)
    tmpl = Liquid::Template.new
    tmpl.assigns['page_title'] = 'Page title'
    tmpl.assigns['template'] = page_template
    tmpl.registers[:file_system] = ThemeRunner::FileSystem.new(File.dirname(template_file))

-    content_for_layout = tmpl.parse(template).render(assigns)
+    content_for_layout = tmpl.parse(template).render!(assigns)

    if layout
      assigns['content_for_layout'] = content_for_layout
-      tmpl.parse(layout).render(assigns)
+      tmpl.parse(layout).render!(assigns)
    else
      content_for_layout
    end
  end
 end
-
-
-
--- a/test/integration/assign_test.rb
+++ b/test/integration/assign_test.rb
--- a/test/integration/blank_test.rb
+++ b/test/integration/blank_test.rb
@@ -93,9 +93,9 @@ class BlankTest < Test::Unit::TestCase

  def test_include_is_blank
    Liquid::Template.file_system = BlankTestFileSystem.new
-    assert_equal "foobar"*(N+1), Template.parse(wrap("{% include 'foobar' %}")).render()
-    assert_equal " foobar "*(N+1), Template.parse(wrap("{% include ' foobar ' %}")).render()
-    assert_equal "   ", Template.parse(" {% include ' ' %} ").render()
+    assert_template_result "foobar"*(N+1), wrap("{% include 'foobar' %}")
+    assert_template_result " foobar "*(N+1), wrap("{% include ' foobar ' %}")
+    assert_template_result "   "*(N+1), wrap(" {% include ' ' %} ")
  end

  def test_case_is_blank
--- a/test/integration/capture_test.rb
+++ b/test/integration/capture_test.rb
@@ -19,7 +19,7 @@ class CaptureTest < Test::Unit::TestCase
    {{var}}
    END_TEMPLATE
    template = Template.parse(template_source)
-    rendered = template.render
+    rendered = template.render!
    assert_equal "test-string", rendered.gsub(/\s/, '')
  end

@@ -34,7 +34,7 @@ class CaptureTest < Test::Unit::TestCase
    {{ first }}-{{ second }}
    END_TEMPLATE
    template = Template.parse(template_source)
-    rendered = template.render
+    rendered = template.render!
    assert_equal "3-3", rendered.gsub(/\s/, '')
  end
 end # CaptureTest
--- a/test/integration/context_test.rb
+++ b/test/integration/context_test.rb
@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class ContextTest < Test::Unit::TestCase
+  include Liquid
+
+  def test_override_global_filter
+    global = Module.new do
+      def notice(output)
+        "Global #{output}"
+      end
+    end
+
+    local = Module.new do
+      def notice(output)
+        "Local #{output}"
+      end
+    end
+
+    Template.register_filter(global)
+    assert_equal 'Global test', Template.parse("{{'test' | notice }}").render!
+    assert_equal 'Local test', Template.parse("{{'test' | notice }}").render!({}, :filters => [local])
+  end
+
+  def test_has_key_will_not_add_an_error_for_missing_keys
+    Template.error_mode = :strict
+
+    context = Context.new
+
+    context.has_key?('unknown')
+
+    assert_empty context.errors
+  end
+end
--- a/test/integration/drop_test.rb
+++ b/test/integration/drop_test.rb
@@ -106,140 +106,140 @@ class DropsTest < Test::Unit::TestCase
  def test_product_drop
    assert_nothing_raised do
      tpl = Liquid::Template.parse( '  '  )
-      tpl.render('product' => ProductDrop.new)
+      tpl.render!('product' => ProductDrop.new)
    end
  end

  def test_drop_does_only_respond_to_whitelisted_methods
-    assert_equal "", Liquid::Template.parse("{{ product.inspect }}").render('product' => ProductDrop.new)
-    assert_equal "", Liquid::Template.parse("{{ product.pretty_inspect }}").render('product' => ProductDrop.new)
-    assert_equal "", Liquid::Template.parse("{{ product.whatever }}").render('product' => ProductDrop.new)
-    assert_equal "", Liquid::Template.parse('{{ product | map: "inspect" }}').render('product' => ProductDrop.new)
-    assert_equal "", Liquid::Template.parse('{{ product | map: "pretty_inspect" }}').render('product' => ProductDrop.new)
-    assert_equal "", Liquid::Template.parse('{{ product | map: "whatever" }}').render('product' => ProductDrop.new)
+    assert_equal "", Liquid::Template.parse("{{ product.inspect }}").render!('product' => ProductDrop.new)
+    assert_equal "", Liquid::Template.parse("{{ product.pretty_inspect }}").render!('product' => ProductDrop.new)
+    assert_equal "", Liquid::Template.parse("{{ product.whatever }}").render!('product' => ProductDrop.new)
+    assert_equal "", Liquid::Template.parse('{{ product | map: "inspect" }}').render!('product' => ProductDrop.new)
+    assert_equal "", Liquid::Template.parse('{{ product | map: "pretty_inspect" }}').render!('product' => ProductDrop.new)
+    assert_equal "", Liquid::Template.parse('{{ product | map: "whatever" }}').render!('product' => ProductDrop.new)
  end

  def test_drops_respond_to_to_liquid
-    assert_equal "text1", Liquid::Template.parse("{{ product.to_liquid.texts.text }}").render('product' => ProductDrop.new)
-    assert_equal "text1", Liquid::Template.parse('{{ product | map: "to_liquid" | map: "texts" | map: "text" }}').render('product' => ProductDrop.new)
+    assert_equal "text1", Liquid::Template.parse("{{ product.to_liquid.texts.text }}").render!('product' => ProductDrop.new)
+    assert_equal "text1", Liquid::Template.parse('{{ product | map: "to_liquid" | map: "texts" | map: "text" }}').render!('product' => ProductDrop.new)
  end

  def test_text_drop
-    output = Liquid::Template.parse( ' {{ product.texts.text }} '  ).render('product' => ProductDrop.new)
+    output = Liquid::Template.parse( ' {{ product.texts.text }} '  ).render!('product' => ProductDrop.new)
    assert_equal ' text1 ', output
  end

  def test_unknown_method
-    output = Liquid::Template.parse( ' {{ product.catchall.unknown }} '  ).render('product' => ProductDrop.new)
+    output = Liquid::Template.parse( ' {{ product.catchall.unknown }} '  ).render!('product' => ProductDrop.new)
    assert_equal ' method: unknown ', output
  end

  def test_integer_argument_drop
-    output = Liquid::Template.parse( ' {{ product.catchall[8] }} '  ).render('product' => ProductDrop.new)
+    output = Liquid::Template.parse( ' {{ product.catchall[8] }} '  ).render!('product' => ProductDrop.new)
    assert_equal ' method: 8 ', output
  end

  def test_text_array_drop
-    output = Liquid::Template.parse( '{% for text in product.texts.array %} {{text}} {% endfor %}'  ).render('product' => ProductDrop.new)
+    output = Liquid::Template.parse( '{% for text in product.texts.array %} {{text}} {% endfor %}'  ).render!('product' => ProductDrop.new)
    assert_equal ' text1  text2 ', output
  end

  def test_context_drop
-    output = Liquid::Template.parse( ' {{ context.bar }} '  ).render('context' => ContextDrop.new, 'bar' => "carrot")
+    output = Liquid::Template.parse( ' {{ context.bar }} '  ).render!('context' => ContextDrop.new, 'bar' => "carrot")
    assert_equal ' carrot ', output
  end

  def test_nested_context_drop
-    output = Liquid::Template.parse( ' {{ product.context.foo }} '  ).render('product' => ProductDrop.new, 'foo' => "monkey")
+    output = Liquid::Template.parse( ' {{ product.context.foo }} '  ).render!('product' => ProductDrop.new, 'foo' => "monkey")
    assert_equal ' monkey ', output
  end

  def test_protected
-    output = Liquid::Template.parse( ' {{ product.callmenot }} '  ).render('product' => ProductDrop.new)
+    output = Liquid::Template.parse( ' {{ product.callmenot }} '  ).render!('product' => ProductDrop.new)
    assert_equal '  ', output
  end

  def test_object_methods_not_allowed
    [:dup, :clone, :singleton_class, :eval, :class_eval, :inspect].each do |method|
-      output = Liquid::Template.parse(" {{ product.#{method} }} ").render('product' => ProductDrop.new)
+      output = Liquid::Template.parse(" {{ product.#{method} }} ").render!('product' => ProductDrop.new)
      assert_equal '  ', output
    end
  end

  def test_scope
-    assert_equal '1', Liquid::Template.parse( '{{ context.scopes }}'  ).render('context' => ContextDrop.new)
-    assert_equal '2', Liquid::Template.parse( '{%for i in dummy%}{{ context.scopes }}{%endfor%}'  ).render('context' => ContextDrop.new, 'dummy' => [1])
-    assert_equal '3', Liquid::Template.parse( '{%for i in dummy%}{%for i in dummy%}{{ context.scopes }}{%endfor%}{%endfor%}'  ).render('context' => ContextDrop.new, 'dummy' => [1])
+    assert_equal '1', Liquid::Template.parse( '{{ context.scopes }}'  ).render!('context' => ContextDrop.new)
+    assert_equal '2', Liquid::Template.parse( '{%for i in dummy%}{{ context.scopes }}{%endfor%}'  ).render!('context' => ContextDrop.new, 'dummy' => [1])
+    assert_equal '3', Liquid::Template.parse( '{%for i in dummy%}{%for i in dummy%}{{ context.scopes }}{%endfor%}{%endfor%}'  ).render!('context' => ContextDrop.new, 'dummy' => [1])
  end

  def test_scope_though_proc
-    assert_equal '1', Liquid::Template.parse( '{{ s }}'  ).render('context' => ContextDrop.new, 's' => Proc.new{|c| c['context.scopes'] })
-    assert_equal '2', Liquid::Template.parse( '{%for i in dummy%}{{ s }}{%endfor%}'  ).render('context' => ContextDrop.new, 's' => Proc.new{|c| c['context.scopes'] }, 'dummy' => [1])
-    assert_equal '3', Liquid::Template.parse( '{%for i in dummy%}{%for i in dummy%}{{ s }}{%endfor%}{%endfor%}'  ).render('context' => ContextDrop.new, 's' => Proc.new{|c| c['context.scopes'] }, 'dummy' => [1])
+    assert_equal '1', Liquid::Template.parse( '{{ s }}'  ).render!('context' => ContextDrop.new, 's' => Proc.new{|c| c['context.scopes'] })
+    assert_equal '2', Liquid::Template.parse( '{%for i in dummy%}{{ s }}{%endfor%}'  ).render!('context' => ContextDrop.new, 's' => Proc.new{|c| c['context.scopes'] }, 'dummy' => [1])
+    assert_equal '3', Liquid::Template.parse( '{%for i in dummy%}{%for i in dummy%}{{ s }}{%endfor%}{%endfor%}'  ).render!('context' => ContextDrop.new, 's' => Proc.new{|c| c['context.scopes'] }, 'dummy' => [1])
  end

  def test_scope_with_assigns
-    assert_equal 'variable', Liquid::Template.parse( '{% assign a = "variable"%}{{a}}'  ).render('context' => ContextDrop.new)
-    assert_equal 'variable', Liquid::Template.parse( '{% assign a = "variable"%}{%for i in dummy%}{{a}}{%endfor%}'  ).render('context' => ContextDrop.new, 'dummy' => [1])
-    assert_equal 'test', Liquid::Template.parse( '{% assign header_gif = "test"%}{{header_gif}}'  ).render('context' => ContextDrop.new)
-    assert_equal 'test', Liquid::Template.parse( "{% assign header_gif = 'test'%}{{header_gif}}"  ).render('context' => ContextDrop.new)
+    assert_equal 'variable', Liquid::Template.parse( '{% assign a = "variable"%}{{a}}'  ).render!('context' => ContextDrop.new)
+    assert_equal 'variable', Liquid::Template.parse( '{% assign a = "variable"%}{%for i in dummy%}{{a}}{%endfor%}'  ).render!('context' => ContextDrop.new, 'dummy' => [1])
+    assert_equal 'test', Liquid::Template.parse( '{% assign header_gif = "test"%}{{header_gif}}'  ).render!('context' => ContextDrop.new)
+    assert_equal 'test', Liquid::Template.parse( "{% assign header_gif = 'test'%}{{header_gif}}"  ).render!('context' => ContextDrop.new)
  end

  def test_scope_from_tags
-    assert_equal '1', Liquid::Template.parse( '{% for i in context.scopes_as_array %}{{i}}{% endfor %}'  ).render('context' => ContextDrop.new, 'dummy' => [1])
-    assert_equal '12', Liquid::Template.parse( '{%for a in dummy%}{% for i in context.scopes_as_array %}{{i}}{% endfor %}{% endfor %}'  ).render('context' => ContextDrop.new, 'dummy' => [1])
-    assert_equal '123', Liquid::Template.parse( '{%for a in dummy%}{%for a in dummy%}{% for i in context.scopes_as_array %}{{i}}{% endfor %}{% endfor %}{% endfor %}'  ).render('context' => ContextDrop.new, 'dummy' => [1])
+    assert_equal '1', Liquid::Template.parse( '{% for i in context.scopes_as_array %}{{i}}{% endfor %}'  ).render!('context' => ContextDrop.new, 'dummy' => [1])
+    assert_equal '12', Liquid::Template.parse( '{%for a in dummy%}{% for i in context.scopes_as_array %}{{i}}{% endfor %}{% endfor %}'  ).render!('context' => ContextDrop.new, 'dummy' => [1])
+    assert_equal '123', Liquid::Template.parse( '{%for a in dummy%}{%for a in dummy%}{% for i in context.scopes_as_array %}{{i}}{% endfor %}{% endfor %}{% endfor %}'  ).render!('context' => ContextDrop.new, 'dummy' => [1])
  end

  def test_access_context_from_drop
-    assert_equal '123', Liquid::Template.parse( '{%for a in dummy%}{{ context.loop_pos }}{% endfor %}'  ).render('context' => ContextDrop.new, 'dummy' => [1,2,3])
+    assert_equal '123', Liquid::Template.parse( '{%for a in dummy%}{{ context.loop_pos }}{% endfor %}'  ).render!('context' => ContextDrop.new, 'dummy' => [1,2,3])
  end

  def test_enumerable_drop
-    assert_equal '123', Liquid::Template.parse( '{% for c in collection %}{{c}}{% endfor %}').render('collection' => EnumerableDrop.new)
+    assert_equal '123', Liquid::Template.parse( '{% for c in collection %}{{c}}{% endfor %}').render!('collection' => EnumerableDrop.new)
  end

  def test_enumerable_drop_size
-    assert_equal '3', Liquid::Template.parse( '{{collection.size}}').render('collection' => EnumerableDrop.new)
+    assert_equal '3', Liquid::Template.parse( '{{collection.size}}').render!('collection' => EnumerableDrop.new)
  end

  def test_enumerable_drop_will_invoke_before_method_for_clashing_method_names
    ["select", "each", "map", "cycle"].each do |method|
-      assert_equal method.to_s, Liquid::Template.parse("{{collection.#{method}}}").render('collection' => EnumerableDrop.new)
-      assert_equal method.to_s, Liquid::Template.parse("{{collection[\"#{method}\"]}}").render('collection' => EnumerableDrop.new)
-      assert_equal method.to_s, Liquid::Template.parse("{{collection.#{method}}}").render('collection' => RealEnumerableDrop.new)
-      assert_equal method.to_s, Liquid::Template.parse("{{collection[\"#{method}\"]}}").render('collection' => RealEnumerableDrop.new)
+      assert_equal method.to_s, Liquid::Template.parse("{{collection.#{method}}}").render!('collection' => EnumerableDrop.new)
+      assert_equal method.to_s, Liquid::Template.parse("{{collection[\"#{method}\"]}}").render!('collection' => EnumerableDrop.new)
+      assert_equal method.to_s, Liquid::Template.parse("{{collection.#{method}}}").render!('collection' => RealEnumerableDrop.new)
+      assert_equal method.to_s, Liquid::Template.parse("{{collection[\"#{method}\"]}}").render!('collection' => RealEnumerableDrop.new)
    end
  end

  def test_some_enumerable_methods_still_get_invoked
    [ :count, :max ].each do |method|
-      assert_equal "3", Liquid::Template.parse("{{collection.#{method}}}").render('collection' => RealEnumerableDrop.new)
-      assert_equal "3", Liquid::Template.parse("{{collection[\"#{method}\"]}}").render('collection' => RealEnumerableDrop.new)
-      assert_equal "3", Liquid::Template.parse("{{collection.#{method}}}").render('collection' => EnumerableDrop.new)
-      assert_equal "3", Liquid::Template.parse("{{collection[\"#{method}\"]}}").render('collection' => EnumerableDrop.new)
+      assert_equal "3", Liquid::Template.parse("{{collection.#{method}}}").render!('collection' => RealEnumerableDrop.new)
+      assert_equal "3", Liquid::Template.parse("{{collection[\"#{method}\"]}}").render!('collection' => RealEnumerableDrop.new)
+      assert_equal "3", Liquid::Template.parse("{{collection.#{method}}}").render!('collection' => EnumerableDrop.new)
+      assert_equal "3", Liquid::Template.parse("{{collection[\"#{method}\"]}}").render!('collection' => EnumerableDrop.new)
    end

-    assert_equal "yes", Liquid::Template.parse("{% if collection contains 3 %}yes{% endif %}").render('collection' => RealEnumerableDrop.new)
+    assert_equal "yes", Liquid::Template.parse("{% if collection contains 3 %}yes{% endif %}").render!('collection' => RealEnumerableDrop.new)

    [ :min, :first ].each do |method|
-      assert_equal "1", Liquid::Template.parse("{{collection.#{method}}}").render('collection' => RealEnumerableDrop.new)
-      assert_equal "1", Liquid::Template.parse("{{collection[\"#{method}\"]}}").render('collection' => RealEnumerableDrop.new)
-      assert_equal "1", Liquid::Template.parse("{{collection.#{method}}}").render('collection' => EnumerableDrop.new)
-      assert_equal "1", Liquid::Template.parse("{{collection[\"#{method}\"]}}").render('collection' => EnumerableDrop.new)
+      assert_equal "1", Liquid::Template.parse("{{collection.#{method}}}").render!('collection' => RealEnumerableDrop.new)
+      assert_equal "1", Liquid::Template.parse("{{collection[\"#{method}\"]}}").render!('collection' => RealEnumerableDrop.new)
+      assert_equal "1", Liquid::Template.parse("{{collection.#{method}}}").render!('collection' => EnumerableDrop.new)
+      assert_equal "1", Liquid::Template.parse("{{collection[\"#{method}\"]}}").render!('collection' => EnumerableDrop.new)
    end
  end

  def test_empty_string_value_access
-    assert_equal '', Liquid::Template.parse('{{ product[value] }}').render('product' => ProductDrop.new, 'value' => '')
+    assert_equal '', Liquid::Template.parse('{{ product[value] }}').render!('product' => ProductDrop.new, 'value' => '')
  end

  def test_nil_value_access
-    assert_equal '', Liquid::Template.parse('{{ product[value] }}').render('product' => ProductDrop.new, 'value' => nil)
+    assert_equal '', Liquid::Template.parse('{{ product[value] }}').render!('product' => ProductDrop.new, 'value' => nil)
  end

  def test_default_to_s_on_drops
-    assert_equal 'ProductDrop', Liquid::Template.parse("{{ product }}").render('product' => ProductDrop.new)
-    assert_equal 'EnumerableDrop', Liquid::Template.parse('{{ collection }}').render('collection' => EnumerableDrop.new)
+    assert_equal 'ProductDrop', Liquid::Template.parse("{{ product }}").render!('product' => ProductDrop.new)
+    assert_equal 'EnumerableDrop', Liquid::Template.parse('{{ collection }}').render!('collection' => EnumerableDrop.new)
  end
 end # DropsTest
--- a/test/integration/error_handling_test.rb
+++ b/test/integration/error_handling_test.rb
--- a/test/integration/filter_test.rb
+++ b/test/integration/filter_test.rb
@@ -67,12 +67,12 @@ class FiltersTest < Test::Unit::TestCase
    @context['value'] = 3
    @context['numbers'] = [2,1,4,3]
    @context['words'] = ['expected', 'as', 'alphabetic']
-    @context['arrays'] = [['flattened'], ['are']]
+    @context['arrays'] = ['flower', 'are']

    assert_equal [1,2,3,4], Variable.new("numbers | sort").render(@context)
    assert_equal ['alphabetic', 'as', 'expected'], Variable.new("words | sort").render(@context)
    assert_equal [3], Variable.new("value | sort").render(@context)
-    assert_equal ['are', 'flattened'], Variable.new("arrays | sort").render(@context)
+    assert_equal ['are', 'flower'], Variable.new("arrays | sort").render(@context)
  end

  def test_strip_html
@@ -113,13 +113,13 @@ class FiltersInTemplate < Test::Unit::TestCase
  def test_local_global
    Template.register_filter(MoneyFilter)

-    assert_equal " 1000$ ", Template.parse("{{1000 | money}}").render(nil, nil)
-    assert_equal " 1000$ CAD ", Template.parse("{{1000 | money}}").render(nil, :filters => CanadianMoneyFilter)
-    assert_equal " 1000$ CAD ", Template.parse("{{1000 | money}}").render(nil, :filters => [CanadianMoneyFilter])
+    assert_equal " 1000$ ", Template.parse("{{1000 | money}}").render!(nil, nil)
+    assert_equal " 1000$ CAD ", Template.parse("{{1000 | money}}").render!(nil, :filters => CanadianMoneyFilter)
+    assert_equal " 1000$ CAD ", Template.parse("{{1000 | money}}").render!(nil, :filters => [CanadianMoneyFilter])
  end

  def test_local_filter_with_deprecated_syntax
-    assert_equal " 1000$ CAD ", Template.parse("{{1000 | money}}").render(nil, CanadianMoneyFilter)
-    assert_equal " 1000$ CAD ", Template.parse("{{1000 | money}}").render(nil, [CanadianMoneyFilter])
+    assert_equal " 1000$ CAD ", Template.parse("{{1000 | money}}").render!(nil, CanadianMoneyFilter)
+    assert_equal " 1000$ CAD ", Template.parse("{{1000 | money}}").render!(nil, [CanadianMoneyFilter])
  end
 end # FiltersTest
--- a/test/integration/hash_ordering_test.rb
+++ b/test/integration/hash_ordering_test.rb
--- a/test/integration/output_test.rb
+++ b/test/integration/output_test.rb
@@ -41,76 +41,76 @@ class OutputTest < Test::Unit::TestCase
    text = %| {{best_cars}} |

    expected = %| bmw |
-    assert_equal expected, Template.parse(text).render(@assigns)
+    assert_equal expected, Template.parse(text).render!(@assigns)
  end

  def test_variable_traversing
    text = %| {{car.bmw}} {{car.gm}} {{car.bmw}} |

    expected = %| good bad good |
-    assert_equal expected, Template.parse(text).render(@assigns)
+    assert_equal expected, Template.parse(text).render!(@assigns)
  end

  def test_variable_piping
    text = %( {{ car.gm | make_funny }} )
    expected = %| LOL |

-    assert_equal expected, Template.parse(text).render(@assigns, :filters => [FunnyFilter])
+    assert_equal expected, Template.parse(text).render!(@assigns, :filters => [FunnyFilter])
  end

  def test_variable_piping_with_input
    text = %( {{ car.gm | cite_funny }} )
    expected = %| LOL: bad |

-    assert_equal expected, Template.parse(text).render(@assigns, :filters => [FunnyFilter])
+    assert_equal expected, Template.parse(text).render!(@assigns, :filters => [FunnyFilter])
  end

  def test_variable_piping_with_args
    text = %! {{ car.gm | add_smiley : ':-(' }} !
    expected = %| bad :-( |

-    assert_equal expected, Template.parse(text).render(@assigns, :filters => [FunnyFilter])
+    assert_equal expected, Template.parse(text).render!(@assigns, :filters => [FunnyFilter])
  end

  def test_variable_piping_with_no_args
    text = %! {{ car.gm | add_smiley }} !
    expected = %| bad :-) |

-    assert_equal expected, Template.parse(text).render(@assigns, :filters => [FunnyFilter])
+    assert_equal expected, Template.parse(text).render!(@assigns, :filters => [FunnyFilter])
  end

  def test_multiple_variable_piping_with_args
    text = %! {{ car.gm | add_smiley : ':-(' | add_smiley : ':-('}} !
    expected = %| bad :-( :-( |

-    assert_equal expected, Template.parse(text).render(@assigns, :filters => [FunnyFilter])
+    assert_equal expected, Template.parse(text).render!(@assigns, :filters => [FunnyFilter])
  end

  def test_variable_piping_with_multiple_args
    text = %! {{ car.gm | add_tag : 'span', 'bar'}} !
    expected = %| <span id="bar">bad</span> |

-    assert_equal expected, Template.parse(text).render(@assigns, :filters => [FunnyFilter])
+    assert_equal expected, Template.parse(text).render!(@assigns, :filters => [FunnyFilter])
  end

  def test_variable_piping_with_variable_args
    text = %! {{ car.gm | add_tag : 'span', car.bmw}} !
    expected = %| <span id="good">bad</span> |

-    assert_equal expected, Template.parse(text).render(@assigns, :filters => [FunnyFilter])
+    assert_equal expected, Template.parse(text).render!(@assigns, :filters => [FunnyFilter])
  end

  def test_multiple_pipings
    text = %( {{ best_cars | cite_funny | paragraph }} )
    expected = %| <p>LOL: bmw</p> |

-    assert_equal expected, Template.parse(text).render(@assigns, :filters => [FunnyFilter])
+    assert_equal expected, Template.parse(text).render!(@assigns, :filters => [FunnyFilter])
  end

  def test_link_to
    text = %( {{ 'Typo' | link_to: 'http://typo.leetsoft.com' }} )
    expected = %| <a href="http://typo.leetsoft.com">Typo</a> |

-    assert_equal expected, Template.parse(text).render(@assigns, :filters => [FunnyFilter])
+    assert_equal expected, Template.parse(text).render!(@assigns, :filters => [FunnyFilter])
  end
 end # OutputTest
--- a/test/integration/parsing_quirks_test.rb
+++ b/test/integration/parsing_quirks_test.rb
@@ -3,12 +3,9 @@ require 'test_helper'
 class ParsingQuirksTest < Test::Unit::TestCase
  include Liquid

-  def test_error_with_css
-    text = %| div { font-weight: bold; } |
-    template = Template.parse(text)
-
-    assert_equal text, template.render
-    assert_equal [String], template.root.nodelist.collect {|i| i.class}
+  def test_parsing_css
+    text = " div { font-weight: bold; } "
+    assert_equal text, Template.parse(text).render!
  end

  def test_raise_on_single_close_bracet
@@ -87,4 +84,11 @@ class ParsingQuirksTest < Test::Unit::TestCase
      assert_template_result('',"{% if #{markup} %} YES {% endif %}")
    end
  end
+
+  def test_raise_on_invalid_tag_delimiter
+    assert_raise(Liquid::SyntaxError) do
+      Template.new.parse('{% end %}')
+    end
+  end
+
 end # ParsingQuirksTest
--- a/test/integration/security_test.rb
+++ b/test/integration/security_test.rb
@@ -13,14 +13,14 @@ class SecurityTest < Test::Unit::TestCase
    text = %( {{ '1+1' | instance_eval }} )
    expected = %| 1+1 |

-    assert_equal expected, Template.parse(text).render(@assigns)
+    assert_equal expected, Template.parse(text).render!(@assigns)
  end

  def test_no_existing_instance_eval
    text = %( {{ '1+1' | __instance_eval__ }} )
    expected = %| 1+1 |

-    assert_equal expected, Template.parse(text).render(@assigns)
+    assert_equal expected, Template.parse(text).render!(@assigns)
  end


@@ -28,7 +28,7 @@ class SecurityTest < Test::Unit::TestCase
    text = %( {{ '1+1' | instance_eval }} )
    expected = %| 1+1 |

-    assert_equal expected, Template.parse(text).render(@assigns)
+    assert_equal expected, Template.parse(text).render!(@assigns)
  end


@@ -36,7 +36,7 @@ class SecurityTest < Test::Unit::TestCase
    text = %( {{ '1+1' | add_one | instance_eval }} )
    expected = %| 1+1 + 1 |

-    assert_equal expected, Template.parse(text).render(@assigns, :filters => SecurityFilter)
+    assert_equal expected, Template.parse(text).render!(@assigns, :filters => SecurityFilter)
  end

  def test_does_not_add_filters_to_symbol_table
@@ -47,17 +47,17 @@ class SecurityTest < Test::Unit::TestCase
    template = Template.parse(test)
    assert_equal [], (Symbol.all_symbols - current_symbols)

-    template.render
+    template.render!
    assert_equal [], (Symbol.all_symbols - current_symbols)
  end

  def test_does_not_add_drop_methods_to_symbol_table
    current_symbols = Symbol.all_symbols

-    drop = Drop.new
-    drop.invoke_drop("custom_method_1")
-    drop.invoke_drop("custom_method_2")
-    drop.invoke_drop("custom_method_3")
+    assigns = { 'drop' => Drop.new }
+    assert_equal "", Template.parse("{{ drop.custom_method_1 }}", assigns).render!
+    assert_equal "", Template.parse("{{ drop.custom_method_2 }}", assigns).render!
+    assert_equal "", Template.parse("{{ drop.custom_method_3 }}", assigns).render!

    assert_equal [], (Symbol.all_symbols - current_symbols)
  end
--- a/test/integration/standard_filter_test.rb
+++ b/test/integration/standard_filter_test.rb
@@ -7,6 +7,8 @@ class Filters
 end

 class TestThing
+  attr_reader :foo
+
  def initialize
    @foo = 0
  end
@@ -115,10 +117,25 @@ class StandardFiltersTest < Test::Unit::TestCase
    assert_equal [{"a" => 1}, {"a" => 2}, {"a" => 3}, {"a" => 4}], @filters.sort([{"a" => 4}, {"a" => 3}, {"a" => 1}, {"a" => 2}], "a")
  end

+  def test_legacy_sort_hash
+    assert_equal [{a:1, b:2}], @filters.sort({a:1, b:2})
+  end
+
+  def test_numerical_vs_lexicographical_sort
+    assert_equal [2, 10], @filters.sort([10, 2])
+    assert_equal [{"a" => 2}, {"a" => 10}], @filters.sort([{"a" => 10}, {"a" => 2}], "a")
+    assert_equal ["10", "2"], @filters.sort(["10", "2"])
+    assert_equal [{"a" => "10"}, {"a" => "2"}], @filters.sort([{"a" => "10"}, {"a" => "2"}], "a")
+  end
+
  def test_reverse
    assert_equal [4,3,2,1], @filters.reverse([1,2,3,4])
  end

+  def test_legacy_reverse_hash
+    assert_equal [{a:1, b:2}], @filters.reverse(a:1, b:2)
+  end
+
  def test_map
    assert_equal [1,2,3,4], @filters.map([{"a" => 1}, {"a" => 2}, {"a" => 3}, {"a" => 4}], 'a')
    assert_template_result 'abc', "{{ ary | map:'foo' | map:'bar' }}",
@@ -126,37 +143,45 @@ class StandardFiltersTest < Test::Unit::TestCase
  end

  def test_map_doesnt_call_arbitrary_stuff
-    assert_equal "", Liquid::Template.parse('{{ "foo" | map: "__id__" }}').render
-    assert_equal "", Liquid::Template.parse('{{ "foo" | map: "inspect" }}').render
+    assert_template_result "", '{{ "foo" | map: "__id__" }}'
+    assert_template_result "", '{{ "foo" | map: "inspect" }}'
  end

  def test_map_calls_to_liquid
    t = TestThing.new
-    assert_equal "woot: 1", Liquid::Template.parse('{{ foo | map: "whatever" }}').render("foo" => [t])
+    assert_template_result "woot: 1", '{{ foo | map: "whatever" }}', "foo" => [t]
  end

  def test_map_on_hashes
-    assert_equal "4217", Liquid::Template.parse('{{ thing | map: "foo" | map: "bar" }}').render("thing" => { "foo" => [ { "bar" => 42 }, { "bar" => 17 } ] })
+    assert_template_result "4217", '{{ thing | map: "foo" | map: "bar" }}',
+      "thing" => { "foo" => [ { "bar" => 42 }, { "bar" => 17 } ] }
+  end
+
+  def test_legacy_map_on_hashes_with_dynamic_key
+    template = "{% assign key = 'foo' %}{{ thing | map: key | map: 'bar' }}"
+    hash = { "foo" => { "bar" => 42 } }
+    assert_template_result "42", template, "thing" => hash
  end

  def test_sort_calls_to_liquid
    t = TestThing.new
-    assert_equal "woot: 1", Liquid::Template.parse('{{ foo | sort: "whatever" }}').render("foo" => [t])
+    Liquid::Template.parse('{{ foo | sort: "whatever" }}').render("foo" => [t])
+    assert t.foo > 0
  end

  def test_map_over_proc
    drop = TestDrop.new
    p = Proc.new{ drop }
    templ = '{{ procs | map: "test" }}'
-    assert_equal "testfoo", Liquid::Template.parse(templ).render("procs" => [p])
+    assert_template_result "testfoo", templ, "procs" => [p]
  end

  def test_map_works_on_enumerables
-    assert_equal "123", Liquid::Template.parse('{{ foo | map: "foo" }}').render!("foo" => TestEnumerable.new)
+    assert_template_result "123", '{{ foo | map: "foo" }}', "foo" => TestEnumerable.new
  end

  def test_sort_works_on_enumerables
-    assert_equal "213", Liquid::Template.parse('{{ foo | sort: "bar" | map: "foo" }}').render!("foo" => TestEnumerable.new)
+    assert_template_result "213", '{{ foo | sort: "bar" | map: "foo" }}', "foo" => TestEnumerable.new
  end

  def test_date
@@ -185,7 +210,6 @@ class StandardFiltersTest < Test::Unit::TestCase
    assert_equal "07/05/2006", @filters.date("1152098955", "%m/%d/%Y")
  end

-
  def test_first_last
    assert_equal 1, @filters.first([1,2,3])
    assert_equal 3, @filters.last([1,2,3])
@@ -257,7 +281,7 @@ class StandardFiltersTest < Test::Unit::TestCase
    assert_template_result "4", "{{ 14 | divided_by:3 }}"

    assert_template_result "5", "{{ 15 | divided_by:3 }}"
-    assert_template_result "Liquid error: divided by 0", "{{ 5 | divided_by:0 }}"
+    assert_equal "Liquid error: divided by 0", Template.parse("{{ 5 | divided_by:0 }}").render

    assert_template_result "0.5", "{{ 2.0 | divided_by:4 }}"
  end
@@ -266,6 +290,22 @@ class StandardFiltersTest < Test::Unit::TestCase
    assert_template_result "1", "{{ 3 | modulo:2 }}"
  end

+  def test_round
+    assert_template_result "5", "{{ input | round }}", 'input' => 4.6
+    assert_template_result "4", "{{ '4.3' | round }}"
+    assert_template_result "4.56", "{{ input | round: 2 }}", 'input' => 4.5612
+  end
+
+  def test_ceil
+    assert_template_result "5", "{{ input | ceil }}", 'input' => 4.6
+    assert_template_result "5", "{{ '4.3' | ceil }}"
+  end
+
+  def test_floor
+    assert_template_result "4", "{{ input | floor }}", 'input' => 4.6
+    assert_template_result "4", "{{ '4.3' | floor }}"
+  end
+
  def test_append
    assigns = {'a' => 'bc', 'b' => 'd' }
    assert_template_result('bcd',"{{ a | append: 'd'}}",assigns)
--- a/test/integration/tags/break_tag_test.rb
+++ b/test/integration/tags/break_tag_test.rb
--- a/test/integration/tags/continue_tag_test.rb
+++ b/test/integration/tags/continue_tag_test.rb
--- a/test/integration/tags/for_tag_test.rb
+++ b/test/integration/tags/for_tag_test.rb
@@ -1,5 +1,11 @@
 require 'test_helper'

+class ThingWithValue < Liquid::Drop
+  def value
+    3
+  end
+end
+
 class ForTagTest < Test::Unit::TestCase
  include Liquid

@@ -34,6 +40,20 @@ HERE
    assert_template_result(' 1  2  3 ','{%for item in (1..3) %} {{item}} {%endfor%}')
  end

+  def test_for_with_variable_range
+    assert_template_result(' 1  2  3 ','{%for item in (1..foobar) %} {{item}} {%endfor%}', "foobar" => 3)
+  end
+
+  def test_for_with_hash_value_range
+    foobar = { "value" => 3 }
+    assert_template_result(' 1  2  3 ','{%for item in (1..foobar.value) %} {{item}} {%endfor%}', "foobar" => foobar)
+  end
+
+  def test_for_with_drop_value_range
+    foobar = ThingWithValue.new
+    assert_template_result(' 1  2  3 ','{%for item in (1..foobar.value) %} {{item}} {%endfor%}', "foobar" => foobar)
+  end
+
  def test_for_with_variable
    assert_template_result(' 1  2  3 ','{%for item in array%} {{item}} {%endfor%}','array' => [1,2,3])
    assert_template_result('123','{%for item in array%}{{item}}{%endfor%}','array' => [1,2,3])
@@ -295,16 +315,6 @@ HERE
    assert_template_result(expected, template, assigns)
  end

-  def test_for_nodelist
-    template = Liquid::Template.parse('{% for item in items %}FOR{% endfor %}')
-    assert_equal ['FOR'], template.root.nodelist[0].nodelist
-  end
-
-  def test_for_else_nodelist
-    template = Liquid::Template.parse('{% for item in items %}FOR{% else %}ELSE{% endfor %}')
-    assert_equal ['FOR', 'ELSE'], template.root.nodelist[0].nodelist
-  end
-
  class LoaderDrop < Liquid::Drop
    attr_accessor :each_called, :load_slice_called

--- a/test/integration/tags/if_else_tag_test.rb
+++ b/test/integration/tags/if_else_tag_test.rb
@@ -158,14 +158,9 @@ class IfElseTagTest < Test::Unit::TestCase
                           %({% if 'gnomeslab-and-or-liquid' contains 'gnomeslab-and-or-liquid' %}yes{% endif %}))
  end

-  def test_if_nodelist
-    template = Liquid::Template.parse('{% if true %}IF{% else %}ELSE{% endif %}')
-    assert_equal ['IF', 'ELSE'], template.root.nodelist[0].nodelist
-  end
-
  def test_operators_are_whitelisted
    assert_raise(SyntaxError) do
      assert_template_result('', %({% if 1 or throw or or 1 %}yes{% endif %}))
    end
  end
-end # IfElseTest
+end
--- a/test/integration/tags/include_tag_test.rb
+++ b/test/integration/tags/include_tag_test.rb
@@ -60,10 +60,6 @@ class CustomInclude < Liquid::Tag
  def parse(tokens)
  end

-  def blank?
-    false
-  end
-
  def render(context)
    @template_name[1..-2]
  end
@@ -78,57 +74,52 @@ class IncludeTagTest < Test::Unit::TestCase

  def test_include_tag_looks_for_file_system_in_registers_first
    assert_equal 'from OtherFileSystem',
-      Template.parse("{% include 'pick_a_source' %}").render({}, :registers => {:file_system => OtherFileSystem.new})
+      Template.parse("{% include 'pick_a_source' %}").render!({}, :registers => {:file_system => OtherFileSystem.new})
  end


  def test_include_tag_with
-    assert_equal "Product: Draft 151cm ",
-      Template.parse("{% include 'product' with products[0] %}").render( "products" => [ {'title' => 'Draft 151cm'}, {'title' => 'Element 155cm'} ]  )
+    assert_template_result "Product: Draft 151cm ",
+      "{% include 'product' with products[0] %}", "products" => [ {'title' => 'Draft 151cm'}, {'title' => 'Element 155cm'} ]
  end

  def test_include_tag_with_default_name
-    assert_equal "Product: Draft 151cm ",
-      Template.parse("{% include 'product' %}").render( "product" => {'title' => 'Draft 151cm'}  )
+    assert_template_result "Product: Draft 151cm ",
+      "{% include 'product' %}", "product" => {'title' => 'Draft 151cm'}
  end

  def test_include_tag_for
-
-    assert_equal "Product: Draft 151cm Product: Element 155cm ",
-      Template.parse("{% include 'product' for products %}").render( "products" => [ {'title' => 'Draft 151cm'}, {'title' => 'Element 155cm'} ]  )
+    assert_template_result "Product: Draft 151cm Product: Element 155cm ",
+      "{% include 'product' for products %}", "products" => [ {'title' => 'Draft 151cm'}, {'title' => 'Element 155cm'} ]
  end

  def test_include_tag_with_local_variables
-    assert_equal "Locale: test123 ",
-      Template.parse("{% include 'locale_variables' echo1: 'test123' %}").render
+    assert_template_result "Locale: test123 ", "{% include 'locale_variables' echo1: 'test123' %}"
  end

  def test_include_tag_with_multiple_local_variables
-    assert_equal "Locale: test123 test321",
-      Template.parse("{% include 'locale_variables' echo1: 'test123', echo2: 'test321' %}").render
+    assert_template_result "Locale: test123 test321",
+      "{% include 'locale_variables' echo1: 'test123', echo2: 'test321' %}"
  end

  def test_include_tag_with_multiple_local_variables_from_context
-    assert_equal "Locale: test123 test321",
-      Template.parse("{% include 'locale_variables' echo1: echo1, echo2: more_echos.echo2 %}").render('echo1' => 'test123', 'more_echos' => { "echo2" => 'test321'})
+    assert_template_result "Locale: test123 test321",
+      "{% include 'locale_variables' echo1: echo1, echo2: more_echos.echo2 %}",
+      'echo1' => 'test123', 'more_echos' => { "echo2" => 'test321'}
  end

  def test_nested_include_tag
-    assert_equal "body body_detail",
-      Template.parse("{% include 'body' %}").render
+    assert_template_result "body body_detail", "{% include 'body' %}"

-    assert_equal "header body body_detail footer",
-      Template.parse("{% include 'nested_template' %}").render
+    assert_template_result "header body body_detail footer", "{% include 'nested_template' %}"
  end

  def test_nested_include_with_variable
+    assert_template_result "Product: Draft 151cm details ",
+      "{% include 'nested_product_template' with product %}", "product" => {"title" => 'Draft 151cm'}

-    assert_equal "Product: Draft 151cm details ",
-      Template.parse("{% include 'nested_product_template' with product %}").render("product" => {"title" => 'Draft 151cm'})
-
-    assert_equal "Product: Draft 151cm details Product: Element 155cm details ",
-      Template.parse("{% include 'nested_product_template' for products %}").render("products" => [{"title" => 'Draft 151cm'}, {"title" => 'Element 155cm'}])
-
+    assert_template_result "Product: Draft 151cm details Product: Element 155cm details ",
+      "{% include 'nested_product_template' for products %}", "products" => [{"title" => 'Draft 151cm'}, {"title" => 'Element 155cm'}]
  end

  def test_recursively_included_template_does_not_produce_endless_loop
@@ -160,34 +151,33 @@ class IncludeTagTest < Test::Unit::TestCase
  end

  def test_dynamically_choosen_template
+    assert_template_result "Test123", "{% include template %}", "template" => 'Test123'
+    assert_template_result "Test321", "{% include template %}", "template" => 'Test321'

-    assert_equal "Test123", Template.parse("{% include template %}").render("template" => 'Test123')
-    assert_equal "Test321", Template.parse("{% include template %}").render("template" => 'Test321')
-
-    assert_equal "Product: Draft 151cm ", Template.parse("{% include template for product %}").render("template" => 'product', 'product' => { 'title' => 'Draft 151cm'})
+    assert_template_result "Product: Draft 151cm ", "{% include template for product %}",
+      "template" => 'product', 'product' => { 'title' => 'Draft 151cm'}
  end

  def test_include_tag_caches_second_read_of_same_partial
    file_system = CountingFileSystem.new
    assert_equal 'from CountingFileSystemfrom CountingFileSystem',
-      Template.parse("{% include 'pick_a_source' %}{% include 'pick_a_source' %}").render({}, :registers => {:file_system => file_system})
+      Template.parse("{% include 'pick_a_source' %}{% include 'pick_a_source' %}").render!({}, :registers => {:file_system => file_system})
    assert_equal 1, file_system.count
  end

  def test_include_tag_doesnt_cache_partials_across_renders
    file_system = CountingFileSystem.new
    assert_equal 'from CountingFileSystem',
-      Template.parse("{% include 'pick_a_source' %}").render({}, :registers => {:file_system => file_system})
+      Template.parse("{% include 'pick_a_source' %}").render!({}, :registers => {:file_system => file_system})
    assert_equal 1, file_system.count

    assert_equal 'from CountingFileSystem',
-      Template.parse("{% include 'pick_a_source' %}").render({}, :registers => {:file_system => file_system})
+      Template.parse("{% include 'pick_a_source' %}").render!({}, :registers => {:file_system => file_system})
    assert_equal 2, file_system.count
  end

  def test_include_tag_within_if_statement
-    assert_equal "foo_if_true",
-      Template.parse("{% if true %}{% include 'foo_if_true' %}{% endif %}").render
+    assert_template_result "foo_if_true", "{% if true %}{% include 'foo_if_true' %}{% endif %}"
  end

  def test_custom_include_tag
@@ -195,7 +185,7 @@ class IncludeTagTest < Test::Unit::TestCase
    Liquid::Template.tags['include'] = CustomInclude
    begin
      assert_equal "custom_foo",
-        Template.parse("{% include 'custom_foo' %}").render
+        Template.parse("{% include 'custom_foo' %}").render!
    ensure
      Liquid::Template.tags['include'] = original_tag
    end
@@ -206,9 +196,17 @@ class IncludeTagTest < Test::Unit::TestCase
    Liquid::Template.tags['include'] = CustomInclude
    begin
      assert_equal "custom_foo_if_true",
-        Template.parse("{% if true %}{% include 'custom_foo_if_true' %}{% endif %}").render
+        Template.parse("{% if true %}{% include 'custom_foo_if_true' %}{% endif %}").render!
    ensure
      Liquid::Template.tags['include'] = original_tag
    end
  end
+
+  def test_does_not_add_error_in_strict_mode_for_missing_variable
+    Liquid::Template.file_system = TestFileSystem.new
+
+    a = Liquid::Template.parse(' {% include "nested_template" %}')
+    a.render!
+    assert_empty a.errors
+  end
 end # IncludeTagTest
--- a/test/integration/tags/increment_tag_test.rb
+++ b/test/integration/tags/increment_tag_test.rb
--- a/test/integration/tags/raw_tag_test.rb
+++ b/test/integration/tags/raw_tag_test.rb
@@ -20,5 +20,6 @@ class RawTagTest < Test::Unit::TestCase
    assert_template_result ' Foobar {% invalid {% {% endraw ', '{% raw %} Foobar {% invalid {% {% endraw {% endraw %}'
    assert_template_result ' Foobar {% {% {% ', '{% raw %} Foobar {% {% {% {% endraw %}'
    assert_template_result ' test {% raw %} {% endraw %}', '{% raw %} test {% raw %} {% {% endraw %}endraw %}'
+    assert_template_result ' Foobar {{ invalid 1', '{% raw %} Foobar {{ invalid {% endraw %}{{ 1 }}'
  end
 end
--- a/test/integration/tags/standard_tag_test.rb
+++ b/test/integration/tags/standard_tag_test.rb
@@ -3,12 +3,6 @@ require 'test_helper'
 class StandardTagTest < Test::Unit::TestCase
  include Liquid

-  def test_tag
-    tag = Tag.new('tag', [], [])
-    assert_equal 'liquid::tag', tag.name
-    assert_equal '', tag.render(Context.new)
-  end
-
  def test_no_transform
    assert_template_result('this text should come out of the template without change...',
                           'this text should come out of the template without change...')
@@ -180,11 +174,11 @@ class StandardTagTest < Test::Unit::TestCase
    # Example from the shopify forums
    code = %q({% case collection.handle %}{% when 'menswear-jackets' %}{% assign ptitle = 'menswear' %}{% when 'menswear-t-shirts' %}{% assign ptitle = 'menswear' %}{% else %}{% assign ptitle = 'womenswear' %}{% endcase %}{{ ptitle }})
    template = Liquid::Template.parse(code)
-    assert_equal "menswear",   template.render("collection" => {'handle' => 'menswear-jackets'})
-    assert_equal "menswear",   template.render("collection" => {'handle' => 'menswear-t-shirts'})
-    assert_equal "womenswear", template.render("collection" => {'handle' => 'x'})
-    assert_equal "womenswear", template.render("collection" => {'handle' => 'y'})
-    assert_equal "womenswear", template.render("collection" => {'handle' => 'z'})
+    assert_equal "menswear",   template.render!("collection" => {'handle' => 'menswear-jackets'})
+    assert_equal "menswear",   template.render!("collection" => {'handle' => 'menswear-t-shirts'})
+    assert_equal "womenswear", template.render!("collection" => {'handle' => 'x'})
+    assert_equal "womenswear", template.render!("collection" => {'handle' => 'y'})
+    assert_equal "womenswear", template.render!("collection" => {'handle' => 'z'})
  end

  def test_case_when_or
@@ -218,7 +212,7 @@ class StandardTagTest < Test::Unit::TestCase
  end

  def test_assign
-    assert_equal 'variable', Liquid::Template.parse( '{% assign a = "variable"%}{{a}}').render
+    assert_template_result 'variable', '{% assign a = "variable"%}{{a}}'
  end

  def test_assign_unassigned
@@ -227,12 +221,11 @@ class StandardTagTest < Test::Unit::TestCase
  end

  def test_assign_an_empty_string
-    assert_equal '', Liquid::Template.parse( '{% assign a = ""%}{{a}}'  ).render
+    assert_template_result '', '{% assign a = ""%}{{a}}'
  end

  def test_assign_is_global
-    assert_equal 'variable',
-                 Liquid::Template.parse( '{%for i in (1..2) %}{% assign a = "variable"%}{% endfor %}{{a}}'  ).render
+    assert_template_result 'variable', '{%for i in (1..2) %}{% assign a = "variable"%}{% endfor %}{{a}}'
  end

  def test_case_detects_bad_syntax
@@ -297,4 +290,8 @@ class StandardTagTest < Test::Unit::TestCase
    assigns = {'array' => [ 1, 1, 1, 1] }
    assert_template_result('1','{%for item in array%}{%ifchanged%}{{item}}{% endifchanged %}{%endfor%}',assigns)
  end
+
+  def test_multiline_tag
+    assert_template_result '0 1 2 3', "0{%\nfor i in (1..3)\n%} {{\ni\n}}{%\nendfor\n%}"
+  end
 end # StandardTagTest
--- a/test/integration/tags/statements_test.rb
+++ b/test/integration/tags/statements_test.rb
@@ -0,0 +1,113 @@
+require 'test_helper'
+
+class StatementsTest < Test::Unit::TestCase
+  include Liquid
+
+  def test_true_eql_true
+    text = ' {% if true == true %} true {% else %} false {% endif %} '
+    assert_template_result '  true  ', text
+  end
+
+  def test_true_not_eql_true
+    text = ' {% if true != true %} true {% else %} false {% endif %} '
+    assert_template_result '  false  ', text
+  end
+
+  def test_true_lq_true
+    text = ' {% if 0 > 0 %} true {% else %} false {% endif %} '
+    assert_template_result '  false  ', text
+  end
+
+  def test_one_lq_zero
+    text = ' {% if 1 > 0 %} true {% else %} false {% endif %} '
+    assert_template_result '  true  ', text
+  end
+
+  def test_zero_lq_one
+    text = ' {% if 0 < 1 %} true {% else %} false {% endif %} '
+    assert_template_result '  true  ', text
+  end
+
+  def test_zero_lq_or_equal_one
+    text = ' {% if 0 <= 0 %} true {% else %} false {% endif %} '
+    assert_template_result '  true  ', text
+  end
+
+  def test_zero_lq_or_equal_one_involving_nil
+    text = ' {% if null <= 0 %} true {% else %} false {% endif %} '
+    assert_template_result '  false  ', text
+
+
+    text = ' {% if 0 <= null %} true {% else %} false {% endif %} '
+    assert_template_result '  false  ', text
+  end
+
+  def test_zero_lqq_or_equal_one
+    text = ' {% if 0 >= 0 %} true {% else %} false {% endif %} '
+    assert_template_result '  true  ', text
+  end
+
+  def test_strings
+    text = " {% if 'test' == 'test' %} true {% else %} false {% endif %} "
+    assert_template_result '  true  ', text
+  end
+
+  def test_strings_not_equal
+    text = " {% if 'test' != 'test' %} true {% else %} false {% endif %} "
+    assert_template_result '  false  ', text
+  end
+
+  def test_var_strings_equal
+    text = ' {% if var == "hello there!" %} true {% else %} false {% endif %} '
+    assert_template_result '  true  ', text, 'var' => 'hello there!'
+  end
+
+  def test_var_strings_are_not_equal
+    text = ' {% if "hello there!" == var %} true {% else %} false {% endif %} '
+    assert_template_result '  true  ', text, 'var' => 'hello there!'
+  end
+
+  def test_var_and_long_string_are_equal
+    text = " {% if var == 'hello there!' %} true {% else %} false {% endif %} "
+    assert_template_result '  true  ', text, 'var' => 'hello there!'
+  end
+
+
+  def test_var_and_long_string_are_equal_backwards
+    text = " {% if 'hello there!' == var %} true {% else %} false {% endif %} "
+    assert_template_result '  true  ', text, 'var' => 'hello there!'
+  end
+
+  #def test_is_nil
+  #  text = %| {% if var != nil %} true {% else %} false {% end %} |
+  #  @template.assigns = { 'var' => 'hello there!'}
+  #  expected = %|  true  |
+  #  assert_equal expected, @template.parse(text)
+  #end
+
+  def test_is_collection_empty
+    text = ' {% if array == empty %} true {% else %} false {% endif %} '
+    assert_template_result '  true  ', text, 'array' => []
+  end
+
+  def test_is_not_collection_empty
+    text = ' {% if array == empty %} true {% else %} false {% endif %} '
+    assert_template_result '  false  ', text, 'array' => [1,2,3]
+  end
+
+  def test_nil
+    text = ' {% if var == nil %} true {% else %} false {% endif %} '
+    assert_template_result '  true  ', text, 'var' => nil
+
+    text = ' {% if var == null %} true {% else %} false {% endif %} '
+    assert_template_result '  true  ', text, 'var' => nil
+  end
+
+  def test_not_nil
+    text = ' {% if var != nil %} true {% else %} false {% endif %} '
+    assert_template_result '  true  ', text, 'var' => 1
+
+    text = ' {% if var != null %} true {% else %} false {% endif %} '
+    assert_template_result '  true  ', text, 'var' => 1
+  end
+end # StatementsTest
--- a/test/integration/tags/table_row_test.rb
+++ b/test/integration/tags/table_row_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'

-class HtmlTagTest < Test::Unit::TestCase
+class TableRowTest < Test::Unit::TestCase
  include Liquid

  class ArrayDrop < Liquid::Drop
@@ -15,7 +15,7 @@ class HtmlTagTest < Test::Unit::TestCase
    end
  end

-  def test_html_table
+  def test_table_row

    assert_template_result("<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 4 </td><td class=\"col2\"> 5 </td><td class=\"col3\"> 6 </td></tr>\n",
                           '{% tablerow n in numbers cols:3%} {{n}} {% endtablerow %}',
@@ -26,14 +26,14 @@ class HtmlTagTest < Test::Unit::TestCase
                           'numbers' => [])
  end

-  def test_html_table_with_different_cols
+  def test_table_row_with_different_cols
    assert_template_result("<tr class=\"row1\">\n<td class=\"col1\"> 1 </td><td class=\"col2\"> 2 </td><td class=\"col3\"> 3 </td><td class=\"col4\"> 4 </td><td class=\"col5\"> 5 </td></tr>\n<tr class=\"row2\"><td class=\"col1\"> 6 </td></tr>\n",
                           '{% tablerow n in numbers cols:5%} {{n}} {% endtablerow %}',
                           'numbers' => [1,2,3,4,5,6])

  end

-  def test_html_col_counter
+  def test_table_col_counter
    assert_template_result("<tr class=\"row1\">\n<td class=\"col1\">1</td><td class=\"col2\">2</td></tr>\n<tr class=\"row2\"><td class=\"col1\">1</td><td class=\"col2\">2</td></tr>\n<tr class=\"row3\"><td class=\"col1\">1</td><td class=\"col2\">2</td></tr>\n",
                           '{% tablerow n in numbers cols:2%}{{tablerowloop.col}}{% endtablerow %}',
                           'numbers' => [1,2,3,4,5,6])
@@ -60,4 +60,4 @@ class HtmlTagTest < Test::Unit::TestCase
                           '{% tablerow n in numbers cols:3 offset:1 limit:6%} {{n}} {% endtablerow %}',
                           'numbers' => [0,1,2,3,4,5,6,7])
  end
-end # HtmlTagTest
+end
--- a/test/integration/tags/unless_else_tag_test.rb
+++ b/test/integration/tags/unless_else_tag_test.rb
--- a/test/integration/template_test.rb
+++ b/test/integration/template_test.rb
@@ -22,82 +22,68 @@ class SomethingWithLength
  liquid_methods :length
 end

+class ErroneousDrop < Liquid::Drop
+  def bad_method
+    raise 'ruby error in drop'
+  end
+end
+
 class TemplateTest < Test::Unit::TestCase
  include Liquid

-  def test_tokenize_strings
-    assert_equal [' '], Template.new.send(:tokenize, ' ')
-    assert_equal ['hello world'], Template.new.send(:tokenize, 'hello world')
-  end
-
-  def test_tokenize_variables
-    assert_equal ['{{funk}}'], Template.new.send(:tokenize, '{{funk}}')
-    assert_equal [' ', '{{funk}}', ' '], Template.new.send(:tokenize, ' {{funk}} ')
-    assert_equal [' ', '{{funk}}', ' ', '{{so}}', ' ', '{{brother}}', ' '], Template.new.send(:tokenize, ' {{funk}} {{so}} {{brother}} ')
-    assert_equal [' ', '{{  funk  }}', ' '], Template.new.send(:tokenize, ' {{  funk  }} ')
-  end
-
-  def test_tokenize_blocks
-    assert_equal ['{%comment%}'], Template.new.send(:tokenize, '{%comment%}')
-    assert_equal [' ', '{%comment%}', ' '], Template.new.send(:tokenize, ' {%comment%} ')
-
-    assert_equal [' ', '{%comment%}', ' ', '{%endcomment%}', ' '], Template.new.send(:tokenize, ' {%comment%} {%endcomment%} ')
-    assert_equal ['  ', '{% comment %}', ' ', '{% endcomment %}', ' '], Template.new.send(:tokenize, "  {% comment %} {% endcomment %} ")
-  end
-
  def test_instance_assigns_persist_on_same_template_object_between_parses
    t = Template.new
-    assert_equal 'from instance assigns', t.parse("{% assign foo = 'from instance assigns' %}{{ foo }}").render
-    assert_equal 'from instance assigns', t.parse("{{ foo }}").render
+    assert_equal 'from instance assigns', t.parse("{% assign foo = 'from instance assigns' %}{{ foo }}").render!
+    assert_equal 'from instance assigns', t.parse("{{ foo }}").render!
  end

  def test_instance_assigns_persist_on_same_template_parsing_between_renders
    t = Template.new.parse("{{ foo }}{% assign foo = 'foo' %}{{ foo }}")
-    assert_equal 'foo', t.render
-    assert_equal 'foofoo', t.render
+    assert_equal 'foo', t.render!
+    assert_equal 'foofoo', t.render!
  end

  def test_custom_assigns_do_not_persist_on_same_template
    t = Template.new
-    assert_equal 'from custom assigns', t.parse("{{ foo }}").render('foo' => 'from custom assigns')
-    assert_equal '', t.parse("{{ foo }}").render
+    assert_equal 'from custom assigns', t.parse("{{ foo }}").render!('foo' => 'from custom assigns')
+    assert_equal '', t.parse("{{ foo }}").render!
  end

  def test_custom_assigns_squash_instance_assigns
    t = Template.new
-    assert_equal 'from instance assigns', t.parse("{% assign foo = 'from instance assigns' %}{{ foo }}").render
-    assert_equal 'from custom assigns', t.parse("{{ foo }}").render('foo' => 'from custom assigns')
+    assert_equal 'from instance assigns', t.parse("{% assign foo = 'from instance assigns' %}{{ foo }}").render!
+    assert_equal 'from custom assigns', t.parse("{{ foo }}").render!('foo' => 'from custom assigns')
  end

  def test_persistent_assigns_squash_instance_assigns
    t = Template.new
-    assert_equal 'from instance assigns', t.parse("{% assign foo = 'from instance assigns' %}{{ foo }}").render
+    assert_equal 'from instance assigns', t.parse("{% assign foo = 'from instance assigns' %}{{ foo }}").render!
    t.assigns['foo'] = 'from persistent assigns'
-    assert_equal 'from persistent assigns', t.parse("{{ foo }}").render
+    assert_equal 'from persistent assigns', t.parse("{{ foo }}").render!
  end

  def test_lambda_is_called_once_from_persistent_assigns_over_multiple_parses_and_renders
    t = Template.new
    t.assigns['number'] = lambda { @global ||= 0; @global += 1 }
-    assert_equal '1', t.parse("{{number}}").render
-    assert_equal '1', t.parse("{{number}}").render
-    assert_equal '1', t.render
+    assert_equal '1', t.parse("{{number}}").render!
+    assert_equal '1', t.parse("{{number}}").render!
+    assert_equal '1', t.render!
    @global = nil
  end

  def test_lambda_is_called_once_from_custom_assigns_over_multiple_parses_and_renders
    t = Template.new
    assigns = {'number' => lambda { @global ||= 0; @global += 1 }}
-    assert_equal '1', t.parse("{{number}}").render(assigns)
-    assert_equal '1', t.parse("{{number}}").render(assigns)
-    assert_equal '1', t.render(assigns)
+    assert_equal '1', t.parse("{{number}}").render!(assigns)
+    assert_equal '1', t.parse("{{number}}").render!(assigns)
+    assert_equal '1', t.render!(assigns)
    @global = nil
  end

  def test_resource_limits_works_with_custom_length_method
    t = Template.parse("{% assign foo = bar %}")
    t.resource_limits = { :render_length_limit => 42 }
-    assert_equal "", t.render("bar" => SomethingWithLength.new)
+    assert_equal "", t.render!("bar" => SomethingWithLength.new)
  end

  def test_resource_limits_render_length
@@ -106,7 +92,7 @@ class TemplateTest < Test::Unit::TestCase
    assert_equal "Liquid error: Memory limits exceeded", t.render()
    assert t.resource_limits[:reached]
    t.resource_limits = { :render_length_limit => 10 }
-    assert_equal "0123456789", t.render()
+    assert_equal "0123456789", t.render!()
    assert_not_nil t.resource_limits[:render_length_current]
  end

@@ -120,7 +106,7 @@ class TemplateTest < Test::Unit::TestCase
    assert_equal "Liquid error: Memory limits exceeded", t.render()
    assert t.resource_limits[:reached]
    t.resource_limits = { :render_score_limit => 200 }
-    assert_equal (" foo " * 100), t.render()
+    assert_equal (" foo " * 100), t.render!()
    assert_not_nil t.resource_limits[:render_score_current]
  end

@@ -130,7 +116,7 @@ class TemplateTest < Test::Unit::TestCase
    assert_equal "Liquid error: Memory limits exceeded", t.render()
    assert t.resource_limits[:reached]
    t.resource_limits = { :assign_score_limit => 2 }
-    assert_equal "", t.render()
+    assert_equal "", t.render!()
    assert_not_nil t.resource_limits[:assign_score_current]
  end

@@ -143,7 +129,7 @@ class TemplateTest < Test::Unit::TestCase

  def test_resource_limits_hash_in_template_gets_updated_even_if_no_limits_are_set
    t = Template.parse("{% for a in (1..100) %} {% assign foo = 1 %} {% endfor %}")
-    t.render()
+    t.render!()
    assert t.resource_limits[:assign_score_current] > 0
    assert t.resource_limits[:render_score_current] > 0
    assert t.resource_limits[:render_length_current] > 0
@@ -153,22 +139,32 @@ class TemplateTest < Test::Unit::TestCase
    t = Template.new
    t.registers['lulz'] = 'haha'
    drop = TemplateContextDrop.new
-    assert_equal 'fizzbuzz', t.parse('{{foo}}').render(drop)
-    assert_equal 'bar', t.parse('{{bar}}').render(drop)
-    assert_equal 'haha', t.parse("{{baz}}").render(drop)
+    assert_equal 'fizzbuzz', t.parse('{{foo}}').render!(drop)
+    assert_equal 'bar', t.parse('{{bar}}').render!(drop)
+    assert_equal 'haha', t.parse("{{baz}}").render!(drop)
  end

-  def test_sets_default_localization_in_document
-    t = Template.new
-    t.parse('')
-    assert_instance_of I18n, t.root.options[:locale]
+  def test_render_bang_force_rethrow_errors_on_passed_context
+    context = Context.new({'drop' => ErroneousDrop.new})
+    t = Template.new.parse('{{ drop.bad_method }}')
+
+    e = assert_raises RuntimeError do
+      t.render!(context)
+    end
+    assert_equal 'ruby error in drop', e.message
  end

-  def test_sets_default_localization_in_context_with_quick_initialization
-    t = Template.new
-    t.parse('{{foo}}', :locale => I18n.new(fixture("en_locale.yml")))
+  def test_exception_handler_doesnt_reraise_if_it_returns_false
+    exception = nil
+    Template.parse("{{ 1 | divided_by: 0 }}").render({}, exception_handler: ->(e) { exception = e; false })
+    assert exception.is_a?(ZeroDivisionError)
+  end

-    assert_instance_of I18n, t.root.options[:locale]
-    assert_equal fixture("en_locale.yml"), t.root.options[:locale].path
+  def test_exception_handler_does_reraise_if_it_returns_true
+    exception = nil
+    assert_raises(ZeroDivisionError) do
+      Template.parse("{{ 1 | divided_by: 0 }}").render({}, exception_handler: ->(e) { exception = e; true })
+    end
+    assert exception.is_a?(ZeroDivisionError)
  end
 end
--- a/test/integration/variable_test.rb
+++ b/test/integration/variable_test.rb
@@ -0,0 +1,72 @@
+require 'test_helper'
+
+class VariableTest < Test::Unit::TestCase
+  include Liquid
+
+  def test_simple_variable
+    template = Template.parse(%|{{test}}|)
+    assert_equal 'worked', template.render!('test' => 'worked')
+    assert_equal 'worked wonderfully', template.render!('test' => 'worked wonderfully')
+  end
+
+  def test_simple_with_whitespaces
+    template = Template.parse(%|  {{ test }}  |)
+    assert_equal '  worked  ', template.render!('test' => 'worked')
+    assert_equal '  worked wonderfully  ', template.render!('test' => 'worked wonderfully')
+  end
+
+  def test_ignore_unknown
+    template = Template.parse(%|{{ test }}|)
+    assert_equal '', template.render!
+  end
+
+  def test_hash_scoping
+    template = Template.parse(%|{{ test.test }}|)
+    assert_equal 'worked', template.render!('test' => {'test' => 'worked'})
+  end
+
+  def test_false_renders_as_false
+    assert_equal 'false', Template.parse("{{ foo }}").render!('foo' => false)
+  end
+
+  def test_preset_assigns
+    template = Template.parse(%|{{ test }}|)
+    template.assigns['test'] = 'worked'
+    assert_equal 'worked', template.render!
+  end
+
+  def test_reuse_parsed_template
+    template = Template.parse(%|{{ greeting }} {{ name }}|)
+    template.assigns['greeting'] = 'Goodbye'
+    assert_equal 'Hello Tobi', template.render!('greeting' => 'Hello', 'name' => 'Tobi')
+    assert_equal 'Hello ', template.render!('greeting' => 'Hello', 'unknown' => 'Tobi')
+    assert_equal 'Hello Brian', template.render!('greeting' => 'Hello', 'name' => 'Brian')
+    assert_equal 'Goodbye Brian', template.render!('name' => 'Brian')
+    assert_equal({'greeting'=>'Goodbye'}, template.assigns)
+  end
+
+  def test_assigns_not_polluted_from_template
+    template = Template.parse(%|{{ test }}{% assign test = 'bar' %}{{ test }}|)
+    template.assigns['test'] = 'baz'
+    assert_equal 'bazbar', template.render!
+    assert_equal 'bazbar', template.render!
+    assert_equal 'foobar', template.render!('test' => 'foo')
+    assert_equal 'bazbar', template.render!
+  end
+
+  def test_hash_with_default_proc
+    template = Template.parse(%|Hello {{ test }}|)
+    assigns = Hash.new { |h,k| raise "Unknown variable '#{k}'" }
+    assigns['test'] = 'Tobi'
+    assert_equal 'Hello Tobi', template.render!(assigns)
+    assigns.delete('test')
+    e = assert_raises(RuntimeError) {
+      template.render!(assigns)
+    }
+    assert_equal "Unknown variable 'test'", e.message
+  end
+
+  def test_multiline_variable
+    assert_equal 'worked', Template.parse("{{\ntest\n}}").render!('test' => 'worked')
+  end
+end
--- a/test/liquid/tags/statements_test.rb
+++ b/test/liquid/tags/statements_test.rb
@@ -1,134 +0,0 @@
-require 'test_helper'
-
-class StatementsTest < Test::Unit::TestCase
-  include Liquid
-
-  def test_true_eql_true
-    text = %| {% if true == true %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render
-  end
-
-  def test_true_not_eql_true
-    text = %| {% if true != true %} true {% else %} false {% endif %} |
-    expected = %|  false  |
-    assert_equal expected, Template.parse(text).render
-  end
-
-  def test_true_lq_true
-    text = %| {% if 0 > 0 %} true {% else %} false {% endif %} |
-    expected = %|  false  |
-    assert_equal expected, Template.parse(text).render
-  end
-
-  def test_one_lq_zero
-    text = %| {% if 1 > 0 %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render
-  end
-
-  def test_zero_lq_one
-    text = %| {% if 0 < 1 %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render
-  end
-
-  def test_zero_lq_or_equal_one
-    text = %| {% if 0 <= 0 %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render
-  end
-
-  def test_zero_lq_or_equal_one_involving_nil
-    text = %| {% if null <= 0 %} true {% else %} false {% endif %} |
-    expected = %|  false  |
-    assert_equal expected, Template.parse(text).render
-
-
-    text = %| {% if 0 <= null %} true {% else %} false {% endif %} |
-    expected = %|  false  |
-    assert_equal expected, Template.parse(text).render
-  end
-
-  def test_zero_lqq_or_equal_one
-    text = %| {% if 0 >= 0 %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render
-  end
-
-  def test_strings
-    text = %| {% if 'test' == 'test' %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render
-  end
-
-  def test_strings_not_equal
-    text = %| {% if 'test' != 'test' %} true {% else %} false {% endif %} |
-    expected = %|  false  |
-    assert_equal expected, Template.parse(text).render
-  end
-
-  def test_var_strings_equal
-    text = %| {% if var == "hello there!" %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render('var' => 'hello there!')
-  end
-
-  def test_var_strings_are_not_equal
-    text = %| {% if "hello there!" == var %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render('var' => 'hello there!')
-  end
-
-  def test_var_and_long_string_are_equal
-    text = %| {% if var == 'hello there!' %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render('var' => 'hello there!')
-  end
-
-
-  def test_var_and_long_string_are_equal_backwards
-    text = %| {% if 'hello there!' == var %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render('var' => 'hello there!')
-  end
-
-  #def test_is_nil
-  #  text = %| {% if var != nil %} true {% else %} false {% end %} |
-  #  @template.assigns = { 'var' => 'hello there!'}
-  #  expected = %|  true  |
-  #  assert_equal expected, @template.parse(text)
-  #end
-
-  def test_is_collection_empty
-    text = %| {% if array == empty %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render('array' => [])
-  end
-
-  def test_is_not_collection_empty
-    text = %| {% if array == empty %} true {% else %} false {% endif %} |
-    expected = %|  false  |
-    assert_equal expected, Template.parse(text).render('array' => [1,2,3])
-  end
-
-  def test_nil
-    text = %| {% if var == nil %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render('var' => nil)
-
-    text = %| {% if var == null %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render('var' => nil)
-  end
-
-  def test_not_nil
-    text = %| {% if var != nil %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render('var' => 1 )
-
-    text = %| {% if var != null %} true {% else %} false {% endif %} |
-    expected = %|  true  |
-    assert_equal expected, Template.parse(text).render('var' => 1 )
-  end
-end # StatementsTest
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,6 +2,7 @@

 require 'test/unit'
 require 'test/unit/assertions'
+require 'spy/integration'

 $:.unshift(File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib'))
 require 'liquid.rb'
@@ -26,13 +27,13 @@ module Test
      include Liquid

      def assert_template_result(expected, template, assigns = {}, message = nil)
-        assert_equal expected, Template.parse(template).render(assigns)
+        assert_equal expected, Template.parse(template).render!(assigns)
      end

      def assert_template_result_matches(expected, template, assigns = {}, message = nil)
        return assert_template_result(expected, template, assigns, message) unless expected.is_a? Regexp

-        assert_match expected, Template.parse(template).render(assigns)
+        assert_match expected, Template.parse(template).render!(assigns)
      end

      def assert_match_syntax_error(match, template, registers = {})
--- a/test/unit/block_unit_test.rb
+++ b/test/unit/block_unit_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'

-class BlockTest < Test::Unit::TestCase
+class BlockUnitTest < Test::Unit::TestCase
  include Liquid

  def test_blankspace
--- a/test/unit/condition_unit_test.rb
+++ b/test/unit/condition_unit_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'

-class ConditionTest < Test::Unit::TestCase
+class ConditionUnitTest < Test::Unit::TestCase
  include Liquid

  def test_basic_condition
@@ -49,6 +49,17 @@ class ConditionTest < Test::Unit::TestCase
    assert_evalutes_false "'bob'", 'contains', "'---'"
  end

+  def test_invalid_comparation_operator
+    assert_evaluates_argument_error "1", '~~', '0'
+  end
+
+  def test_comparation_of_int_and_str
+    assert_evaluates_argument_error "'1'", '>', '0'
+    assert_evaluates_argument_error "'1'", '<', '0'
+    assert_evaluates_argument_error "'1'", '>=', '0'
+    assert_evaluates_argument_error "'1'", '<=', '0'
+  end
+
  def test_contains_works_on_arrays
    @context = Liquid::Context.new
    @context['array'] = [1,2,3,4,5]
@@ -124,4 +135,11 @@ class ConditionTest < Test::Unit::TestCase
      assert !Condition.new(left, op, right).evaluate(@context || Liquid::Context.new),
             "Evaluated true: #{left} #{op} #{right}"
    end
+
+    def assert_evaluates_argument_error(left, op, right)
+      assert_raises(Liquid::ArgumentError) do
+        Condition.new(left, op, right).evaluate(@context || Liquid::Context.new)
+      end
+    end
+
 end # ConditionTest
--- a/test/unit/context_unit_test.rb
+++ b/test/unit/context_unit_test.rb
@@ -63,13 +63,17 @@ class ArrayLike
  end
 end

-class ContextTest < Test::Unit::TestCase
+class ContextUnitTest < Test::Unit::TestCase
  include Liquid

  def setup
    @context = Liquid::Context.new
  end

+  def teardown
+    Spy.teardown
+  end
+
  def test_variables
    @context['string'] = 'string'
    assert_equal 'string', @context['string']
@@ -162,24 +166,6 @@ class ContextTest < Test::Unit::TestCase

  end

-  def test_override_global_filter
-    global = Module.new do
-      def notice(output)
-        "Global #{output}"
-      end
-    end
-
-    local = Module.new do
-      def notice(output)
-        "Local #{output}"
-      end
-    end
-
-    Template.register_filter(global)
-    assert_equal 'Global test', Template.parse("{{'test' | notice }}").render
-    assert_equal 'Local test', Template.parse("{{'test' | notice }}").render({}, :filters => [local])
-  end
-
  def test_only_intended_filters_make_it_there

    filter = Module.new do
@@ -475,4 +461,26 @@ class ContextTest < Test::Unit::TestCase
    assert_kind_of CategoryDrop, @context['category']
    assert_equal @context, @context['category'].context
  end
+
+  def test_use_empty_instead_of_any_in_interrupt_handling_to_avoid_lots_of_unnecessary_object_allocations
+    mock_any = Spy.on_instance_method(Array, :any?)
+    mock_empty = Spy.on_instance_method(Array, :empty?)
+    mock_has_interrupt = Spy.on(@context, :has_interrupt?).and_call_through
+
+    @context.has_interrupt?
+
+    refute mock_any.has_been_called?
+    assert mock_empty.has_been_called?
+  end 
+
+  def test_variable_lookup_caches_markup
+    mock_scan = Spy.on_instance_method(String, :scan).and_return(["string"])
+
+    @context['string'] = 'string'
+    @context['string']
+    @context['string']
+
+    assert_equal 1, mock_scan.calls.size
+  end
+
 end # ContextTest
--- a/test/unit/file_system_unit_test.rb
+++ b/test/unit/file_system_unit_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'

-class FileSystemTest < Test::Unit::TestCase
+class FileSystemUnitTest < Test::Unit::TestCase
  include Liquid

  def test_default
--- a/test/unit/i18n_unit_test.rb
+++ b/test/unit/i18n_unit_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'

-class I18nTest < Test::Unit::TestCase
+class I18nUnitTest < Test::Unit::TestCase
  include Liquid

  def setup
--- a/test/unit/lexer_unit_test.rb
+++ b/test/unit/lexer_unit_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'

-class LexerTest < Test::Unit::TestCase
+class LexerUnitTest < Test::Unit::TestCase
  include Liquid

  def test_strings
--- a/test/unit/module_ex_unit_test.rb
+++ b/test/unit/module_ex_unit_test.rb
@@ -36,7 +36,7 @@ class TestClassC::LiquidDropClass
  end
 end

-class ModuleExTest < Test::Unit::TestCase
+class ModuleExUnitTest < Test::Unit::TestCase
  include Liquid

  def setup
@@ -77,11 +77,11 @@ class ModuleExTest < Test::Unit::TestCase
  end

  def test_should_use_regular_objects_as_drops
-    assert_equal 'allowedA', Liquid::Template.parse("{{ a.allowedA }}").render('a'=>@a)
-    assert_equal 'allowedB', Liquid::Template.parse("{{ a.chainedB.allowedB }}").render('a'=>@a)
-    assert_equal 'allowedC', Liquid::Template.parse("{{ a.chainedB.chainedC.allowedC }}").render('a'=>@a)
-    assert_equal 'another_allowedC', Liquid::Template.parse("{{ a.chainedB.chainedC.another_allowedC }}").render('a'=>@a)
-    assert_equal '', Liquid::Template.parse("{{ a.restricted }}").render('a'=>@a)
-    assert_equal '', Liquid::Template.parse("{{ a.unknown }}").render('a'=>@a)
+    assert_template_result 'allowedA', "{{ a.allowedA }}", 'a'=>@a
+    assert_template_result 'allowedB', "{{ a.chainedB.allowedB }}", 'a'=>@a
+    assert_template_result 'allowedC', "{{ a.chainedB.chainedC.allowedC }}", 'a'=>@a
+    assert_template_result 'another_allowedC', "{{ a.chainedB.chainedC.another_allowedC }}", 'a'=>@a
+    assert_template_result '', "{{ a.restricted }}", 'a'=>@a
+    assert_template_result '', "{{ a.unknown }}", 'a'=>@a
  end
 end # ModuleExTest
--- a/test/unit/parser_unit_test.rb
+++ b/test/unit/parser_unit_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'

-class ParserTest < Test::Unit::TestCase
+class ParserUnitTest < Test::Unit::TestCase
  include Liquid

  def test_consume
--- a/test/unit/regexp_unit_test.rb
+++ b/test/unit/regexp_unit_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'

-class RegexpTest < Test::Unit::TestCase
+class RegexpUnitTest < Test::Unit::TestCase
  include Liquid

  def test_empty
--- a/test/unit/strainer_unit_test.rb
+++ b/test/unit/strainer_unit_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'

-class StrainerTest < Test::Unit::TestCase
+class StrainerUnitTest < Test::Unit::TestCase
  include Liquid

  module AccessScopeFilters
--- a/test/unit/tag_unit_test.rb
+++ b/test/unit/tag_unit_test.rb
@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class TagUnitTest < Test::Unit::TestCase
+  include Liquid
+
+  def test_tag
+    tag = Tag.parse('tag', [], [], {})
+    assert_equal 'liquid::tag', tag.name
+    assert_equal '', tag.render(Context.new)
+  end
+end
--- a/test/unit/tags/case_tag_unit_test.rb
+++ b/test/unit/tags/case_tag_unit_test.rb
@@ -1,10 +1,10 @@
 require 'test_helper'

-class CaseTagTest < Test::Unit::TestCase
+class CaseTagUnitTest < Test::Unit::TestCase
  include Liquid

  def test_case_nodelist
    template = Liquid::Template.parse('{% case var %}{% when true %}WHEN{% else %}ELSE{% endcase %}')
    assert_equal ['WHEN', 'ELSE'], template.root.nodelist[0].nodelist
  end
-end # CaseTest
+end
--- a/test/unit/tags/for_tag_unit_test.rb
+++ b/test/unit/tags/for_tag_unit_test.rb
@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class ForTagUnitTest < Test::Unit::TestCase
+  def test_for_nodelist
+    template = Liquid::Template.parse('{% for item in items %}FOR{% endfor %}')
+    assert_equal ['FOR'], template.root.nodelist[0].nodelist
+  end
+
+  def test_for_else_nodelist
+    template = Liquid::Template.parse('{% for item in items %}FOR{% else %}ELSE{% endfor %}')
+    assert_equal ['FOR', 'ELSE'], template.root.nodelist[0].nodelist
+  end
+end
--- a/test/unit/tags/if_tag_unit_test.rb
+++ b/test/unit/tags/if_tag_unit_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class IfTagUnitTest < Test::Unit::TestCase
+  def test_if_nodelist
+    template = Liquid::Template.parse('{% if true %}IF{% else %}ELSE{% endif %}')
+    assert_equal ['IF', 'ELSE'], template.root.nodelist[0].nodelist
+  end
+end
--- a/test/unit/template_unit_test.rb
+++ b/test/unit/template_unit_test.rb
@@ -0,0 +1,69 @@
+require 'test_helper'
+
+class TemplateUnitTest < Test::Unit::TestCase
+  include Liquid
+
+  def test_sets_default_localization_in_document
+    t = Template.new
+    t.parse('')
+    assert_instance_of I18n, t.root.options[:locale]
+  end
+
+  def test_sets_default_localization_in_context_with_quick_initialization
+    t = Template.new
+    t.parse('{{foo}}', :locale => I18n.new(fixture("en_locale.yml")))
+
+    assert_instance_of I18n, t.root.options[:locale]
+    assert_equal fixture("en_locale.yml"), t.root.options[:locale].path
+  end
+
+  def test_with_cache_classes_tags_returns_the_same_class
+    original_cache_setting = Liquid.cache_classes
+    Liquid.cache_classes = true
+
+    original_klass = Class.new
+    Object.send(:const_set, :CustomTag, original_klass)
+    Template.register_tag('custom', CustomTag)
+
+    Object.send(:remove_const, :CustomTag)
+
+    new_klass = Class.new
+    Object.send(:const_set, :CustomTag, new_klass)
+
+    assert Template.tags['custom'].equal?(original_klass)
+  ensure
+    Object.send(:remove_const, :CustomTag)
+    Template.tags.delete('custom')
+    Liquid.cache_classes = original_cache_setting
+  end
+
+  def test_without_cache_classes_tags_reloads_the_class
+    original_cache_setting = Liquid.cache_classes
+    Liquid.cache_classes = false
+
+    original_klass = Class.new
+    Object.send(:const_set, :CustomTag, original_klass)
+    Template.register_tag('custom', CustomTag)
+
+    Object.send(:remove_const, :CustomTag)
+
+    new_klass = Class.new
+    Object.send(:const_set, :CustomTag, new_klass)
+
+    assert Template.tags['custom'].equal?(new_klass)
+  ensure
+    Object.send(:remove_const, :CustomTag)
+    Template.tags.delete('custom')
+    Liquid.cache_classes = original_cache_setting
+  end
+
+  class FakeTag; end
+
+  def test_tags_delete
+    Template.register_tag('fake', FakeTag)
+    assert_equal FakeTag, Template.tags['fake']
+
+    Template.tags.delete('fake')
+    assert_nil Template.tags['fake']
+  end
+end
--- a/test/unit/tokenizer_unit_test.rb
+++ b/test/unit/tokenizer_unit_test.rb
@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class TokenizerTest < Test::Unit::TestCase
+  def test_tokenize_strings
+    assert_equal [' '], tokenize(' ')
+    assert_equal ['hello world'], tokenize('hello world')
+  end
+
+  def test_tokenize_variables
+    assert_equal ['{{funk}}'], tokenize('{{funk}}')
+    assert_equal [' ', '{{funk}}', ' '], tokenize(' {{funk}} ')
+    assert_equal [' ', '{{funk}}', ' ', '{{so}}', ' ', '{{brother}}', ' '], tokenize(' {{funk}} {{so}} {{brother}} ')
+    assert_equal [' ', '{{  funk  }}', ' '], tokenize(' {{  funk  }} ')
+  end
+
+  def test_tokenize_blocks
+    assert_equal ['{%comment%}'], tokenize('{%comment%}')
+    assert_equal [' ', '{%comment%}', ' '], tokenize(' {%comment%} ')
+
+    assert_equal [' ', '{%comment%}', ' ', '{%endcomment%}', ' '], tokenize(' {%comment%} {%endcomment%} ')
+    assert_equal ['  ', '{% comment %}', ' ', '{% endcomment %}', ' '], tokenize("  {% comment %} {% endcomment %} ")
+  end
+
+  private
+
+  def tokenize(source)
+    Liquid::Template.new.send(:tokenize, source)
+  end
+end
--- a/test/unit/variable_unit_test.rb
+++ b/test/unit/variable_unit_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'

-class VariableTest < Test::Unit::TestCase
+class VariableUnitTest < Test::Unit::TestCase
  include Liquid

  def test_variable
@@ -134,67 +134,3 @@ class VariableTest < Test::Unit::TestCase
    end
  end
 end
-
-
-class VariableResolutionTest < Test::Unit::TestCase
-  include Liquid
-
-  def test_simple_variable
-    template = Template.parse(%|{{test}}|)
-    assert_equal 'worked', template.render('test' => 'worked')
-    assert_equal 'worked wonderfully', template.render('test' => 'worked wonderfully')
-  end
-
-  def test_simple_with_whitespaces
-    template = Template.parse(%|  {{ test }}  |)
-    assert_equal '  worked  ', template.render('test' => 'worked')
-    assert_equal '  worked wonderfully  ', template.render('test' => 'worked wonderfully')
-  end
-
-  def test_ignore_unknown
-    template = Template.parse(%|{{ test }}|)
-    assert_equal '', template.render
-  end
-
-  def test_hash_scoping
-    template = Template.parse(%|{{ test.test }}|)
-    assert_equal 'worked', template.render('test' => {'test' => 'worked'})
-  end
-
-  def test_preset_assigns
-    template = Template.parse(%|{{ test }}|)
-    template.assigns['test'] = 'worked'
-    assert_equal 'worked', template.render
-  end
-
-  def test_reuse_parsed_template
-    template = Template.parse(%|{{ greeting }} {{ name }}|)
-    template.assigns['greeting'] = 'Goodbye'
-    assert_equal 'Hello Tobi', template.render('greeting' => 'Hello', 'name' => 'Tobi')
-    assert_equal 'Hello ', template.render('greeting' => 'Hello', 'unknown' => 'Tobi')
-    assert_equal 'Hello Brian', template.render('greeting' => 'Hello', 'name' => 'Brian')
-    assert_equal 'Goodbye Brian', template.render('name' => 'Brian')
-    assert_equal({'greeting'=>'Goodbye'}, template.assigns)
-  end
-
-  def test_assigns_not_polluted_from_template
-    template = Template.parse(%|{{ test }}{% assign test = 'bar' %}{{ test }}|)
-    template.assigns['test'] = 'baz'
-    assert_equal 'bazbar', template.render
-    assert_equal 'bazbar', template.render
-    assert_equal 'foobar', template.render('test' => 'foo')
-    assert_equal 'bazbar', template.render
-  end
-
-  def test_hash_with_default_proc
-    template = Template.parse(%|Hello {{ test }}|)
-    assigns = Hash.new { |h,k| raise "Unknown variable '#{k}'" }
-    assigns['test'] = 'Tobi'
-    assert_equal 'Hello Tobi', template.render!(assigns)
-    assigns.delete('test')
-    e = assert_raises(RuntimeError) {
-      template.render!(assigns)
-    }
-    assert_equal "Unknown variable 'test'", e.message
-  end
-end # VariableTest
Author	SHA1	Message	Date
Florian Weingarten	17db93cf6f	bump version to v3.0.0.rc1	2014-07-24 15:04:39 +00:00
Arthur Neves	d07b12dc7d	Update History log Bring latest History from 2-6-stable and 2-5-stable	2014-07-24 11:01:19 -04:00
Arthur Nogueira Neves	32e4f2d3b1	Merge pull request #240 from Shopify/remove_flatten remove .flatten on standard filters	2014-07-24 10:54:28 -04:00
Arthur Nogueira Neves	2cb1483d54	Merge pull request #397 from Shopify/bogdan-excetion-handling-for-humans Excetion handling for humans (2)	2014-07-24 10:51:02 -04:00
Florian Weingarten	6c6350f18b	Exception handling for humans Ability to pass exception_handler as a block to #render and provide whatever behavior you want on handling exceptions https://github.com/Shopify/liquid/pull/254	2014-07-24 14:44:02 +00:00
Florian Weingarten	eae24373e6	remove unnecessary flatten filter	2014-07-24 02:56:57 +00:00
Jason Hiltz-Laforge	034a47a6cf	Merge pull request #395 from Shopify/fix_block_delimiter Forgot an error message case	2014-07-23 22:35:13 -04:00
Jason Hiltz-Laforge	51c1165f26	Forgot an error message case	2014-07-24 02:27:26 +00:00
Florian Weingarten	0b45ffeada	add more legacy tests	2014-07-24 00:33:39 +00:00
Arthur Neves	b7b243a13d	Fix regression on map	2014-07-23 17:16:21 -04:00
Arthur Neves	18e8ce1eb0	add flatten filter	2014-07-23 17:16:20 -04:00
Florian Weingarten	994f309465	Fix broken standardfilter test	2014-07-23 17:15:39 -04:00
Arthur Neves	02d42a1475	Array is a Enumerable	2014-07-23 17:14:27 -04:00
Arthur Neves	d099878385	add a input iterator to standard filter	2014-07-23 17:14:27 -04:00
Arthur Neves	6a061cbe81	remove .flatten on standard filters	2014-07-23 17:14:26 -04:00
Arthur Nogueira Neves	c864a75903	Merge pull request #341 from curebit/comparation_argument_error Raise Liquid::ArugmentError when condition has wrong usage	2014-07-23 17:03:31 -04:00
Jason Hiltz-Laforge	d6fdf86acd	Merge pull request #393 from Shopify/fix_block_delimiter Fixing regression from block delimiter enhancement	2014-07-23 16:24:24 -04:00
Jason Hiltz-Laforge	55597b8398	Fixing regression from block delimiter enhancement	2014-07-23 19:18:02 +00:00
Florian Weingarten	c75522026b	Merge pull request #389 from Shopify/remove_unnecessary_blank_stuf Remove unnecessary blank? code	2014-07-23 15:07:26 +02:00
Florian Weingarten	1e0e9f1f31	Remove unnecessary blank? code	2014-07-22 21:19:12 +00:00
Jason Hiltz-Laforge	5fc1929b73	Merge pull request #384 from Shopify/optimize_block_parsing Optimize block parsing -- don't recreate delimiter, use strings instead of regex	2014-07-22 12:59:05 -04:00
Jason Hiltz-Laforge	746a800475	Merge pull request #386 from Shopify/optimize_variable_parsing Reduce temporary objects during variable/filter parsing	2014-07-22 11:22:57 -04:00
Jason Hiltz-Laforge	85dc7ef610	Merge pull request #385 from Shopify/optimize_scope_variable_resolution Remove block in favour of for loop to reduce temporary object allocation during variable context resolution	2014-07-22 11:22:33 -04:00
Jason Hiltz-Laforge	bc3b066ba8	Remove block in favour of for loop to reduce temporary object allocation during variable context resolution	2014-07-22 14:54:50 +00:00
Jason Hiltz-Laforge	3c2de7737d	Optimize block parsing -- don't recreate delimiter, use strings instead of regex	2014-07-22 02:43:20 +00:00
Jason Hiltz-Laforge	adb7d2bbb8	Reduce temporary objects during variable/filter parsing	2014-07-21 21:13:59 +00:00
Jason Hiltz-Laforge	0e56cf99ab	Merge pull request #383 from Shopify/optimize_variable_lookup Cache parsed markup parts to avoid repeated calls during template render	2014-07-21 12:29:58 -04:00
Jason Hiltz-Laforge	0df3f1c372	Cache parsed markup parts to avoid repeated calls during template render	2014-07-21 15:55:06 +00:00
Jason Hiltz-Laforge	44b9ad604f	Merge pull request #381 from Shopify/add_object_profiling Add object profiling in addition to cpu profiling	2014-07-16 16:41:31 -04:00
Jason Hiltz-Laforge	535d549978	Merge pull request #380 from Shopify/optimize_interrupt_handling Optimize checking for interrupts by replacing any? with NOT empty?	2014-07-16 11:36:32 -04:00
Jason Hiltz-Laforge	32349033a9	Add object profiling in addition to cpu profiling	2014-07-16 15:32:04 +00:00
Jason Hiltz-Laforge	fd8c30070a	Adding tests, spy dependency	2014-07-16 15:05:45 +00:00
Jason Hiltz-Laforge	4cfc05e32a	Optimize checking for interrupts by replacing any? with NOT empty?	2014-07-15 18:31:40 +00:00
Florian Weingarten	c4bc6cf3db	Merge pull request #378 from Shopify/revert_352 Revert: Add error messages for missing variables when :strict	2014-07-08 17:31:19 +02:00
Florian Weingarten	0ac3ec7834	Revert "Merge pull request #352 from gaiottino/master" This reverts commit `553b0926ae`, reversing changes made to `628ab3dc6a`.	2014-07-08 14:48:19 +00:00
Florian Weingarten	8909c9f27a	add regression tests for #377	2014-07-08 14:47:39 +00:00
David Cornu	51c708c8f8	Merge pull request #376 from Shopify/tag-class-reloading Avoid holding on to stale tag classes	2014-07-03 12:01:50 -04:00
David Cornu	f57383af37	Allow tag classes to be reloaded when using Liquid.cache_classes is false Because Liquid keeps a reference to tag classes, Rails class reloading may cause problems with custom tags. This commit introduces a setting that allows these classes to be resolved when required.	2014-07-02 20:03:18 +00:00
Jean Boussier	d007c50856	Merge pull request #374 from Shopify/remove-duplicate-ruby-version Give some ❤️ to travis.yml	2014-07-02 11:04:38 -04:00
Tobias Lütke	101f125a69	Merge pull request #375 from Shopify/relative-link Fixed relative link	2014-06-30 17:19:37 -04:00
Tony Zou	5110ca906c	Fixed relative link	2014-06-30 16:43:37 -04:00
Jean Boussier	ac0f63eda9	rbx-19mode is not supported anymore	2014-06-28 16:21:08 -04:00
Jean Boussier	1372274fca	Do not intall stackprof under jruby nor rubinius	2014-06-28 16:09:14 -04:00
Jean Boussier	69951be173	Canonicalize travis ruby versions	2014-06-28 16:02:37 -04:00
Arthur Nogueira Neves	c9863836cd	Merge pull request #371 from Shopify/unfreeze-version-string Unfreeze version string	2014-06-24 09:59:46 -05:00
Jean Boussier	14b8d824d7	Unfreeze version string It breaks gem installation on ruby 1.9.x (older rubygem?)	2014-06-23 10:47:10 -04:00
Florian Weingarten	114a37d9ba	add additional tests for https://github.com/jekyll/jekyll/pull/2505	2014-06-23 09:28:24 -04:00
Arthur Nogueira Neves	30bd9ad957	Merge pull request #368 from Shopify/add-round-ceil-and-floor [Liquid] Add round, ceil and floor standard filters	2014-06-16 10:32:17 -05:00
Christian Blais	2239921804	[Liquid] Add round, ceil and floor standard filters	2014-06-16 11:15:53 -04:00
Florian Weingarten	1ea178e7a8	Merge pull request #363 from rrrene/patch-2 Update docs badge in README	2014-06-05 10:32:47 -04:00
René Föhring	5650c7eea1	Update docs badge in README Update the URL of the docs badge to include it from inch-ci.org instead of inch-pages.github.io (the former being the successor of the Inch Pages project). [ci skip]	2014-06-05 12:25:26 +02:00
Arthur Neves	553b0926ae	Merge pull request #352 from gaiottino/master Add error messages for missing variables when :strict Conflicts: History.md	2014-05-06 10:16:45 -04:00
Daniel Gaiottino	2bac6267f9	Add error messages for missing variables when :strict	2014-05-06 16:12:46 +02:00
Florian Weingarten	628ab3dc6a	add test for numerical sort	2014-05-04 19:50:38 -04:00
Florian Weingarten	2eb552c65d	Merge pull request #354 from Dillon-Benson/patch-3 use attr_writer instead of error_mode= method	2014-05-02 18:15:33 -04:00
Dillon Benson	6e40746ce4	use attr_writer instead of error_mode= method	2014-05-02 17:18:56 -04:00
Thierry Joyal	75068e8fa4	Merge pull request #349 from Shopify/render_bang_allow_not_safe_contexts render! will properly force rethrow of errors if context is passed as an argument	2014-05-01 12:52:06 -04:00
Thierry Joyal	ad1152853a	render! will properly force rethrow of errors if context is passed as an argument	2014-05-01 16:44:00 +00:00
David Cornu	73098ac5bc	Merge pull request #351 from Shopify/date-cleanup Move date coercion to #to_date	2014-04-30 20:47:39 -04:00
David Cornu	8bc3792c0e	Move date coercion to `#to_date`	2014-04-30 22:32:36 +00:00
Florian Weingarten	3ef29c624c	Merge pull request #347 from Dillon-Benson/patch-1 remove template return	2014-04-30 08:23:36 -04:00
Dillon Benson	a85fb38769	remove template return	2014-04-30 03:00:16 -04:00
Florian Weingarten	6a1c3cff1a	update history.md	2014-04-29 15:26:22 -04:00
Florian Weingarten	bde32018dd	Merge pull request #346 from Shopify/false_rendering Fix broken rendering of variables which are equal to false (closes #345)	2014-04-29 15:21:30 -04:00
Florian Weingarten	2a12f253bf	Fix broken rendering of variables which are equal to false (closes #345 )	2014-04-29 14:33:30 -04:00
Bogdan Gusiev	fa14fd02e7	Raise Liquid::ArugmentError when condition has wrong usage Condition now raises ::ArgumentError when built wrongly. This patch make it raise Liquid::ArgumentError instead to indicate a liquid markup error instead of ruby error.	2014-04-21 16:42:37 +03:00
Arthur Nogueira Neves	f15d24509d	Merge pull request #338 from here/docs-filter-date-strftime Update standardfilters.rb add docs to date filter	2014-04-12 20:14:44 -04:00
mikey dubs	09e4378cfb	Update standardfilters.rb add docs to date filter Added '%s' - Number of seconds since 1970-01-01 00:00:00 UTC to included list of flags Added link to Ruby docs on Time#strftime() to allow easier discovery of unlisted filter options.	2014-04-12 15:21:06 -07:00
Dylan Thacker-Smith	af0e26fb16	Merge pull request #337 from Shopify/remove-rails-dev-dependancy Remove active_support from the development dependancies.	2014-04-11 15:08:34 -04:00
Dylan Thacker-Smith	f5502e8152	Remove active_support from the development dependancies.	2014-04-11 14:26:40 -04:00
Arthur Nogueira Neves	c098235baa	Merge pull request #335 from rrrene/patch-1 Add docs badge to README	2014-04-05 11:46:32 -04:00
René Föhring	0e2bf768ba	Add docs badge to README	2014-04-05 12:24:56 +02:00
Dylan Thacker-Smith	4c477c2087	Merge pull request #333 from Shopify/remove-liquid-view Remove ActionView template handler	2014-03-31 10:16:37 -04:00
Dylan Thacker-Smith	cd7fc050b1	Remove ActionView template handler Fixes #21	2014-03-29 15:59:42 -04:00
Dylan Thacker-Smith	8291c5e72c	Merge pull request #329 from Shopify/seperate-integration-tests Separate unit and integration tests.	2014-03-26 16:04:39 -04:00
Dylan Thacker-Smith	7e45155aa9	Seperate unit and integration tests. This makes it easier to re-use the integration tests in a seperate gem that optimizes parts of liquid with a native implementation.	2014-03-26 15:47:07 -04:00
Florian Weingarten	3dbb35d823	Merge branch 'freeze_all_the_things' Conflicts: History.md lib/liquid/tags/assign.rb lib/liquid/tags/capture.rb lib/liquid/tags/decrement.rb lib/liquid/tags/if.rb	2014-03-24 12:39:34 -04:00
Florian Weingarten	44f29a87a8	Update history	2014-03-24 12:35:47 -04:00
Dylan Thacker-Smith	f0afbc27e0	Add regression test for raw tags with open variable tags.	2014-03-24 10:01:03 -04:00
Dylan Thacker-Smith	fdf03076e0	Revert "Merge pull request #325 from Shopify/remove-variable-incomplete-end" That pull request broke raw tags with open variable tags. E.g. {% raw %} {{ {% endraw %} {{ 1 }} This reverts commit `fbaabf3b59`, reversing changes made to `af24d2c2ab`.	2014-03-24 09:59:07 -04:00
Dylan Thacker-Smith	d1bfda15e3	Add profile:strict rake task.	2014-03-21 21:54:53 -04:00
Dylan Thacker-Smith	d8d9984a7b	Remove some unused regexes.	2014-03-21 15:50:14 -04:00
Dylan Thacker-Smith	fbaabf3b59	Merge pull request #325 from Shopify/remove-variable-incomplete-end Allow quoted single curly braces in variables.	2014-03-21 13:48:47 -04:00
Dylan Thacker-Smith	7e0ef867d2	Make tag/variable termination error clearer.	2014-03-21 02:04:01 -04:00
Dylan Thacker-Smith	3682414cc4	Allow quoted single curly braces in variables.	2014-03-21 02:04:01 -04:00
Dylan Thacker-Smith	af24d2c2ab	Add missing PR reference and author to a History.md entry.	2014-03-21 02:03:31 -04:00
Dylan Thacker-Smith	4ee43bc5d2	Merge pull request #324 from Shopify/multiline-tags-and-vars Allow newlines in tags and variables.	2014-03-21 00:26:14 -04:00
Dylan Thacker-Smith	1320a69fca	Merge pull request #323 from Shopify/render_bang_in_tests Use render! in tests to make debugging test failures easier.	2014-03-20 18:33:40 -04:00
Dylan Thacker-Smith	3b14e27f55	Allow newlines in tags and variables.	2014-03-20 17:27:03 -04:00
Dylan Thacker-Smith	face33a137	Merge pull request #321 from Shopify/move-tag-parse-out-of-initialize Refactor to create tags with a parse class method instead of new.	2014-03-20 16:15:58 -04:00
Dylan Thacker-Smith	d4ecaff8b8	Refactor to create tags with a parse class method instead of new. By moving parse out of the initializer, we can call super at the start of the initializers for subclasses, and avoid the nasty allocate hack.	2014-03-20 16:10:10 -04:00
Dylan Thacker-Smith	a5990042ff	Use render! in tests to make debugging test failures easier.	2014-03-20 12:04:17 -04:00
Florian Weingarten	e190bbba9e	move change to top	2014-03-19 18:15:31 -04:00
Dylan Thacker-Smith	4b5e41d04e	Merge pull request #322 from Shopify/use-render-bang-in-benchmarks Use render! in benchmarks to avoid making it faster by breaking things.	2014-03-19 18:06:15 -04:00
Dylan Thacker-Smith	4b69f6ae83	Use render! in benchmarks to avoid making it faster by breaking things.	2014-03-19 18:01:33 -04:00
Dylan Thacker-Smith	b9feb415f6	Merge pull request #320 from Shopify/move-table-row-tag Move definition for TableRow to the tags folder.	2014-03-18 17:16:32 -04:00
Dylan Thacker-Smith	92781ec43b	Move definition for TableRow to the tags folder.	2014-03-18 17:13:39 -04:00
Dylan Thacker-Smith	ff5c1f83f7	Merge pull request #318 from Shopify/stackprof Use stackprof for profiling.	2014-03-14 10:27:46 -04:00
Dylan Thacker-Smith	e2b337af2f	Merge pull request #317 from Shopify/string-anchors Use start and end of string rather than line matching in regexes.	2014-03-14 10:17:33 -04:00
Dylan Thacker-Smith	f373b1003d	Use stackprof for profiling.	2014-03-14 10:03:50 -04:00
Dylan Thacker-Smith	503d924274	Use start and end of string rather than line matching in regexes.	2014-03-13 17:56:42 -04:00
Florian Weingarten	0a7de51e2b	Revert some freezes on non-literals	2014-01-27 14:56:07 -05:00
Florian Weingarten	43ac8d560b	Freeze all the things	2014-01-07 12:35:16 -05:00