Merge branch 'master' of git://github.com/mhw/liquid into mhw/master

lib/liquid.rb

@@ -22,7 +22,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 module Liquid
-  FilterSperator              = /\|/
+  FilterSeparator             = /\|/
   ArgumentSeparator           = ','
   FilterArgumentSeparator     = ':'
   VariableAttributeSeparator  = '.'
@@ -60,11 +60,3 @@ require 'liquid/module_ex'
 # Load all the tags of the standard library
 #
 Dir[File.dirname(__FILE__) + '/liquid/tags/*.rb'].each { |f| require f }
-
-
-
-
-
-
-
-

lib/liquid/variable.rb

@@ -19,8 +19,8 @@ module Liquid
       @filters = []
       if match = markup.match(/\s*(#{QuotedFragment})/)
         @name = match[1]
-        if markup.match(/#{FilterSperator}\s*(.*)/)
+        if markup.match(/#{FilterSeparator}\s*(.*)/)
-          filters = Regexp.last_match(1).split(/#{FilterSperator}/)
+          filters = Regexp.last_match(1).split(/#{FilterSeparator}/)
 
           filters.each do |f|
             if matches = f.match(/\s*(\w+)/)

test/filter_test.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/helper'
 
-
 module MoneyFilter
   def money(input)
     sprintf(' %d$ ', input)
@@ -18,7 +17,6 @@ module CanadianMoneyFilter
   end
 end
 
-
 class FiltersTest < Test::Unit::TestCase
   include Liquid
 
@@ -94,5 +92,4 @@ class FiltersInTemplate < Test::Unit::TestCase
     assert_equal " 1000$ CAD ", Template.parse("{{1000 | money}}").render(nil, CanadianMoneyFilter)
     assert_equal " 1000$ CAD ", Template.parse("{{1000 | money}}").render(nil, [CanadianMoneyFilter])
   end
-  
 end