0
@@ -7,6 +7,20 @@ module Liquid
0
   #   c.evaluate #=> true
0
   #
0
   class Condition
0
+    @@operators = {
0
+      '==' => lambda { |cond, left, right|  cond.send(:equal_variables, left, right) },
0
+      '!=' => lambda { |cond, left, right| !cond.send(:equal_variables, left, right) },
0
+      '<>' => lambda { |cond, left, right| !cond.send(:equal_variables, left, right) },
0
+      '<'  => :<,
0
+      '>'  => :>,
0
+      '>=' => :>=,
0
+      '<=' => :<=
0
+    }
0
+    
0
+    def self.operators
0
+      @@operators
0
+    end
0
+
0
     attr_reader :attachment
0
     attr_accessor :left, :operator, :right
0
   
0
@@ -57,20 +71,12 @@ module Liquid
0
 
0
       left, right = context[left], context[right]
0
 
0
-      operation = case op
0
-      when '==' then return equal_variables(left, right)
0
-      when '!=' then return !equal_variables(left, right)
0
-      when '<>' then return !equal_variables(left, right)
0
-      when '>'  then :>
0
-      when '<'  then :<
0
-      when '>=' then :>=
0
-      when '<=' then :<=
0
-      else
0
-        raise ArgumentError.new("Error in tag '#{name}' - Unknown operator #{op}")        
0
-      end
0
+      operation = self.class.operators[op] || raise(ArgumentError.new("Error in tag '#{name}' - Unknown operator #{op}"))
0
 
0
-      if left.respond_to?(operation) and right.respond_to?(operation)
0
-        left.send(operation, right)      
0
+      if operation.respond_to?(:call)
0
+        operation.call(self, left, right)
0
+      elsif left.respond_to?(operation) and right.respond_to?(operation)
0
+        left.send(operation, right)
0
       else
0
         nil
0
       end

0
@@ -1,6 +1,6 @@
0
 module Liquid
0
   class If < Block
0
-    Syntax = /(#{QuotedFragment})\s*([=!<>]+)?\s*(#{QuotedFragment})?/
0
+    Syntax = /(#{QuotedFragment})\s*([=!<>a-z_]+)?\s*(#{QuotedFragment})?/
0
     
0
     def initialize(tag_name, markup, tokens)    
0
     

0
@@ -6,23 +6,27 @@ module Liquid
0
     attr_accessor :filters, :name
0
     
0
     def initialize(markup)
0
-      @markup = markup                            
0
-      @name = markup.match(/\s*(#{QuotedFragment})/)[1]
0
+      @markup  = markup                            
0
+      @name    = nil
0
       @filters = []
0
-      if markup.match(/#{FilterSperator}\s*(.*)/)
0
-        filters = Regexp.last_match(1).split(/#{FilterSperator}/)
0
-        
0
-        filters.each do |f|    
0
-          if matches = f.match(/\s*(\w+)/)
0
-            filtername = matches[1]
0
-            filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*(#{QuotedFragment})/).flatten            
0
-            @filters << [filtername.to_sym, filterargs]
0
+      if match = markup.match(/\s*(#{QuotedFragment})/)
0
+        @name = match[1]
0
+        if markup.match(/#{FilterSperator}\s*(.*)/)
0
+          filters = Regexp.last_match(1).split(/#{FilterSperator}/)
0
+
0
+          filters.each do |f|    
0
+            if matches = f.match(/\s*(\w+)/)
0
+              filtername = matches[1]
0
+              filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*(#{QuotedFragment})/).flatten            
0
+              @filters << [filtername.to_sym, filterargs]
0
+            end
0
           end
0
         end
0
       end
0
     end                        
0
 
0
     def render(context)      
0
+      return '' if @name.nil?
0
       output = context[@name]
0
       @filters.inject(output) do |output, filter|
0
         filterargs = filter[1].to_a.collect do |a|

0
@@ -92,4 +92,13 @@ class IfElseTest < Test::Unit::TestCase
0
   def test_syntax_error_no_variable
0
     assert_raise(SyntaxError){ assert_template_result('', '{% if jerry == 1 %}')}
0
   end
0
+  
0
+  def test_if_with_custom_condition
0
+    Condition.operators['contains'] = :[]
0
+    
0
+    assert_template_result('yes', %({% if 'bob' contains 'o' %}yes{% endif %}))
0
+    assert_template_result('no', %({% if 'bob' contains 'f' %}yes{% else %}no{% endif %}))
0
+  ensure
0
+    Condition.operators.delete 'contains'
0
+  end
0
 end
0
\ No newline at end of file

0
@@ -45,7 +45,8 @@ class StandardFiltersTest < Test::Unit::TestCase
0
   def test_truncatewords
0
     assert_equal 'one two three', @filters.truncatewords('one two three', 4)
0
     assert_equal 'one two...', @filters.truncatewords('one two three', 2)
0
-    assert_equal 'one two three', @filters.truncatewords('one two three')    
0
+    assert_equal 'one two three', @filters.truncatewords('one two three')
0
+    assert_equal 'Two small (13&#8221; x 5.5&#8221; x 10&#8221; high) baskets fit inside one large basket (13&#8221;...', @filters.truncatewords('Two small (13&#8221; x 5.5&#8221; x 10&#8221; high) baskets fit inside one large basket (13&#8221; x 16&#8221; x 10.5&#8221; high) with cover.', 15)    
0
   end
0
   
0
   def test_strip_html