Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-10-02 16:45:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix conditions using negative number comparisons

Browse Source
This commit is contained in:
Dennis Theisen
2012-03-12 16:38:34 -04:00
parent b8d7b9aeda
commit 0e3b522fe2
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/context.rb
+2 -2
View File
@@ -136,11 +136,11 @@ module Liquid
$1 $1
when /^"(.*)"$/ # Double quoted strings when /^"(.*)"$/ # Double quoted strings
$1 $1
when /^(\d+)$/ # Integer and floats when /^(-?\d+)$/ # Integer and floats
$1.to_i $1.to_i
when /^\((\S+)\.\.(\S+)\)$/ # Ranges when /^\((\S+)\.\.(\S+)\)$/ # Ranges
(resolve($1).to_i..resolve($2).to_i) (resolve($1).to_i..resolve($2).to_i)
when /^(\d[\d\.]+)$/ # Floats when /^(-?\d[\d\.]+)$/ # Floats
$1.to_f $1.to_f
else else
variable(key) variable(key)
test/liquid/condition_test.rb
+5
View File
@@ -18,6 +18,11 @@ class ConditionTest < Test::Unit::TestCase
assert_evalutes_true '2', '>=', '1' assert_evalutes_true '2', '>=', '1'
assert_evalutes_true '1', '<=', '2' assert_evalutes_true '1', '<=', '2'
assert_evalutes_true '1', '<=', '1' assert_evalutes_true '1', '<=', '1'
# negative numbers
assert_evalutes_true '1', '>', '-1'
assert_evalutes_true '-1', '<', '1'
assert_evalutes_true '1.0', '>', '-1.0'
assert_evalutes_true '-1.0', '<', '1.0'
end end
def test_default_operators_evalute_false def test_default_operators_evalute_false