Gem v2.1.2

Rakefile

@@ -4,6 +4,8 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/gempackagetask'
 
+task :default => 'test'
+
 Rake::TestTask.new(:test) do |t|
   t.libs << "lib"
   t.libs << "test"
@@ -16,6 +18,11 @@ Rake::GemPackageTask.new(gemspec) do |pkg|
   pkg.gem_spec = gemspec
 end
 
+desc "build the gem and release it to rubygems.org"
+task :release => :gem do
+  sh "gem push pkg/liquid-#{gemspec.version}.gem"
+end
+
 namespace :profile do
 
   

lib/liquid/tags/if.rb

@@ -14,7 +14,7 @@ module Liquid
   class If < Block
     SyntaxHelp = "Syntax Error in tag 'if' - Valid syntax: if [expression]"
     Syntax = /(#{QuotedFragment})\s*([=!<>a-z_]+)?\s*(#{QuotedFragment})?/
-    ExpressionsAndOperators = /(?:and|or|(?:\s*(?!\b(?:and|or)\b)(?:#{QuotedFragment}|\S+)\s*)+)/
+    ExpressionsAndOperators = /(?:\b(?:and|or)\b|(?:\s*(?!\b(?:and|or)\b)(?:#{QuotedFragment}|\S+)\s*)+)/
     
     def initialize(tag_name, markup, tokens)    
     

liquid.gemspec

@@ -1,10 +1,9 @@
 Gem::Specification.new do |s|
   s.name = %q{liquid}
-  s.version = "2.1.0"
+  s.version = "2.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Luetke"]
-  s.date = %q{2009-04-13}
   s.description = %q{A secure, non-evaling end user template engine with aesthetic markup.}
   s.email = %q{tobi@leetsoft.com}
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]

test/if_else_test.rb

@@ -44,6 +44,20 @@ class IfElseTest < Test::Unit::TestCase
     end
   end
   
+  def test_comparison_of_expressions_starting_with_and_or_or
+    assigns = {'order' => {'items_count' => 0}, 'android' => {'name' => 'Roy'}}
+    assert_nothing_raised do
+      assert_template_result( "YES",
+                              "{% if android.name == 'Roy' %}YES{% endif %}",
+                              assigns)
+    end
+    assert_nothing_raised do
+      assert_template_result( "YES",
+                              "{% if order.items_count == 0 %}YES{% endif %}",
+                              assigns)
+    end
+  end
+  
   def test_if_and
     assert_template_result(' YES ','{% if true and true %} YES {% endif %}')    
     assert_template_result('','{% if false and true %} YES {% endif %}')