Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-15 08:50:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Switch to named inputs

Browse Source
This commit is contained in:
Mike Angell
2019-09-16 12:36:37 +10:00
parent bfe4f60e13
commit 917ae7a6ab
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/standardfilters.rb
+8 -7
View File
@@ -392,13 +392,14 @@ module Liquid
end
# Defaults are passed as nil so systems can easily override
def format(input, n = nil, thousands = nil, decimal = nil)
n = 2 if n.nil?
thousands = " ".freeze if thousands.nil?
decimal = ".".freeze if decimal.nil?
return input if (precision = Utils.to_number(n).to_i) < 0
whole_part, decimal_part = Kernel.format("%.#{precision}f", Utils.to_number(input)).split('.')
[whole_part.gsub(/(\d)(?=\d{3}+$)/, "\\1#{thousands}"), decimal_part].compact.join(decimal.to_s)
def format_number(input, options = {})
options = {} unless options.is_a?(Hash)
precision = options['precision'] || 2
delimiter = options['delimiter'] || " ".freeze
separator = options['separator'] || ".".freeze
return input if (prec = Utils.to_number(precision).to_i) < 0
whole_part, decimal_part = Kernel.format("%.#{prec}f", Utils.to_number(input)).split('.')
[whole_part.gsub(/(\d)(?=\d{3}+$)/, "\\1#{delimiter}"), decimal_part].compact.join(separator.to_s)
end
def ceil(input)
test/integration/standard_filter_test.rb
+17 -16
View File
@@ -610,22 +610,23 @@ class StandardFiltersTest < Minitest::Test
assert_template_result "4", "{{ price | round }}", 'price' => NumberLikeThing.new(4.3)
end
def test_format
assert_template_result "4.60", "{{ input | format }}", 'input' => 4.6
assert_template_result "4.30", "{{ '4.3' | format }}"
assert_template_result "4.56", "{{ input | format: 2 }}", 'input' => 4.5612
assert_template_result "5", "{{ price | format: 0 }}", 'price' => NumberLikeThing.new(4.6)
assert_template_result "4", "{{ price | format: 0 }}", 'price' => NumberLikeThing.new(4.3)
assert_template_result "4.30", "{{ price | format: 2 }}", 'price' => NumberLikeThing.new(4.3)
assert_template_result "5.0000000", "{{ price | format: 7 }}", 'price' => 5
assert_template_result "50", "{{ price | format: -1 }}", 'price' => 50
assert_template_result "50.00", "{{ price | format: A }}", 'price' => 50
assert_template_result "50.00", "{{ price | format: '2e' }}", 'price' => 50
assert_template_result "50 000 000", "{{ price | format: 0 }}", 'price' => 50000000
assert_template_result "50 000 000.00", "{{ price | format }}", 'price' => 50000000
assert_template_result "50000000.00", "{{ price | format: 2, '', '.'}}", 'price' => 50000000
assert_template_result "50$000$000#00", "{{ price | format: 2, '$', '#'}}", 'price' => 50000000
assert_template_result "-50$000$000#00", "{{ price | format: 2, '$', '#'}}", 'price' => -50000000
def test_format_number
assert_template_result "4.60", "{{ input | format_number }}", 'input' => 4.6
assert_template_result "4.30", "{{ '4.3' | format_number }}"
assert_template_result "4.56", "{{ input | format_number: precision: 2 }}", 'input' => 4.5612
assert_template_result "5", "{{ price | format_number: precision: 0 }}", 'price' => NumberLikeThing.new(4.6)
assert_template_result "4", "{{ price | format_number: precision: 0 }}", 'price' => NumberLikeThing.new(4.3)
assert_template_result "4.30", "{{ price | format_number: precision: 2 }}", 'price' => NumberLikeThing.new(4.3)
assert_template_result "5.0000000", "{{ price | format_number: precision: 7 }}", 'price' => 5
assert_template_result "50", "{{ price | format_number: precision: -1 }}", 'price' => 50
assert_template_result "50.00", "{{ price | format_number: precision: A }}", 'price' => 50
assert_template_result "50.00", "{{ price | format_number: precision: '2e' }}", 'price' => 50
assert_template_result "50 000 000", "{{ price | format_number: precision: 0 }}", 'price' => 50000000
assert_template_result "50 000 000.00", "{{ price | format_number }}", 'price' => 50000000
assert_template_result "50000000.00", "{{ price | format_number: precision: 2, delimiter: '', separator: '.'}}", 'price' => 50000000
assert_template_result "50$000$000#00", "{{ price | format_number: precision: 2, delimiter: '$', separator:'#'}}", 'price' => 50000000
assert_template_result "-50$000$000#00", "{{ price | format_number: precision: 2, delimiter: '$',separator: '#'}}", 'price' => -50000000
assert_template_result "-50 000 000.00", "{{ price | format_number: precision: A, delimiter: A,separator: A}}", 'price' => -50000000
end
def test_ceil