kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-01 15:55:40 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #958 from Shopify/minmax

Browse Source 
Rename min/max filters for clarity
This commit is contained in:
Thibaut Courouble
2017-12-06 11:41:12 -05:00
committed by GitHub
parent 282d42f98d 147d7ae24d
commit 0c802aba17
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/liquid/standardfilters.rb
View File

@@ -353,19 +353,19 @@ module Liquid
raise Liquid::FloatDomainError, e.message
end
def max(input, n)
max_value = Utils.to_number(n)
result = Utils.to_number(input)
result = max_value if max_value > result
result.is_a?(BigDecimal) ? result.to_f : result
end
def min(input, n)
def at_least(input, n)
min_value = Utils.to_number(n)
result = Utils.to_number(input)
result = min_value if min_value < result
result = min_value if min_value > result
result.is_a?(BigDecimal) ? result.to_f : result
end
def at_most(input, n)
max_value = Utils.to_number(n)
result = Utils.to_number(input)
result = max_value if max_value < result
result.is_a?(BigDecimal) ? result.to_f : result
end

32
test/integration/standard_filter_test.rb
View File

@@ -496,26 +496,26 @@ class StandardFiltersTest < Minitest::Test
assert_template_result "5", "{{ price | floor }}", 'price' => NumberLikeThing.new(5.4)
end
def test_min
assert_template_result "4", "{{ 5 | min:4 }}"
assert_template_result "5", "{{ 5 | min:5 }}"
assert_template_result "5", "{{ 5 | min:6 }}"
def test_at_most
assert_template_result "4", "{{ 5 | at_most:4 }}"
assert_template_result "5", "{{ 5 | at_most:5 }}"
assert_template_result "5", "{{ 5 | at_most:6 }}"
assert_template_result "4.5", "{{ 4.5 | min:5 }}"
assert_template_result "5", "{{ width | min:5 }}", 'width' => NumberLikeThing.new(6)
assert_template_result "4", "{{ width | min:5 }}", 'width' => NumberLikeThing.new(4)
assert_template_result "4", "{{ 5 | min: width }}", 'width' => NumberLikeThing.new(4)
assert_template_result "4.5", "{{ 4.5 | at_most:5 }}"
assert_template_result "5", "{{ width | at_most:5 }}", 'width' => NumberLikeThing.new(6)
assert_template_result "4", "{{ width | at_most:5 }}", 'width' => NumberLikeThing.new(4)
assert_template_result "4", "{{ 5 | at_most: width }}", 'width' => NumberLikeThing.new(4)
end
def test_max
assert_template_result "5", "{{ 5 | max:4 }}"
assert_template_result "5", "{{ 5 | max:5 }}"
assert_template_result "6", "{{ 5 | max:6 }}"
def test_at_least
assert_template_result "5", "{{ 5 | at_least:4 }}"
assert_template_result "5", "{{ 5 | at_least:5 }}"
assert_template_result "6", "{{ 5 | at_least:6 }}"
assert_template_result "5", "{{ 4.5 | max:5 }}"
assert_template_result "6", "{{ width | max:5 }}", 'width' => NumberLikeThing.new(6)
assert_template_result "5", "{{ width | max:5 }}", 'width' => NumberLikeThing.new(4)
assert_template_result "6", "{{ 5 | max: width }}", 'width' => NumberLikeThing.new(6)
assert_template_result "5", "{{ 4.5 | at_least:5 }}"
assert_template_result "6", "{{ width | at_least:5 }}", 'width' => NumberLikeThing.new(6)
assert_template_result "5", "{{ width | at_least:5 }}", 'width' => NumberLikeThing.new(4)
assert_template_result "6", "{{ 5 | at_least: width }}", 'width' => NumberLikeThing.new(6)
end
def test_append