mirror of
https://github.com/kemko/liquid.git
synced 2026-01-01 15:55:40 +03:00
Compare commits
9 Commits
template-f
...
default-fi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
12d047aef0 | ||
|
|
c109615da7 | ||
|
|
a04c23eb38 | ||
|
|
afbe7b930f | ||
|
|
f7076e1682 | ||
|
|
135a4bc84d | ||
|
|
7ebf1aeef2 | ||
|
|
9bd5362ca1 | ||
|
|
e3fba19de0 |
@@ -421,13 +421,20 @@ module Liquid
|
||||
result.is_a?(BigDecimal) ? result.to_f : result
|
||||
end
|
||||
|
||||
def default(input, default_value = '')
|
||||
if !input || input.respond_to?(:empty?) && input.empty?
|
||||
Usage.increment("default_filter_received_false_value") if input == false # See https://github.com/Shopify/liquid/issues/1127
|
||||
default_value
|
||||
else
|
||||
input
|
||||
end
|
||||
# Set a default value when the input is nil, false or empty
|
||||
#
|
||||
# Example:
|
||||
# {{ product.title | default: "No Title" }}
|
||||
#
|
||||
# Use `allow_false` when an input should only be tested against nil or empty and not false.
|
||||
#
|
||||
# Example:
|
||||
# {{ product.title | default: "No Title", allow_false: true }}
|
||||
#
|
||||
def default(input, default_value = '', options = {})
|
||||
options = {} unless options.is_a?(Hash)
|
||||
false_check = options['allow_false'] ? input.nil? : !input
|
||||
false_check || (input.respond_to?(:empty?) && input.empty?) ? default_value : input
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
@@ -685,6 +685,17 @@ class StandardFiltersTest < Minitest::Test
|
||||
assert_equal("bar", @filters.default(false, "bar"))
|
||||
assert_equal("bar", @filters.default([], "bar"))
|
||||
assert_equal("bar", @filters.default({}, "bar"))
|
||||
assert_template_result('bar', "{{ false | default: 'bar' }}")
|
||||
end
|
||||
|
||||
def test_default_handle_false
|
||||
assert_equal("foo", @filters.default("foo", "bar", "allow_false" => true))
|
||||
assert_equal("bar", @filters.default(nil, "bar", "allow_false" => true))
|
||||
assert_equal("bar", @filters.default("", "bar", "allow_false" => true))
|
||||
assert_equal(false, @filters.default(false, "bar", "allow_false" => true))
|
||||
assert_equal("bar", @filters.default([], "bar", "allow_false" => true))
|
||||
assert_equal("bar", @filters.default({}, "bar", "allow_false" => true))
|
||||
assert_template_result('false', "{{ false | default: 'bar', allow_false: true }}")
|
||||
end
|
||||
|
||||
def test_cannot_access_private_methods
|
||||
|
||||
Reference in New Issue
Block a user