liquid 2.1.0 → 2.1.2

data/Rakefile

@@ -18,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
 
   

data/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)    
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: liquid
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 15
   prerelease: false
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-13 00:00:00 -04:00
+date: 2010-07-09 00:00:00 -04:00
 default_executable: 
 dependencies: []