Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-10-03 09:05:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update syntax

Browse Source
This commit is contained in:
Mike Angell
2019-10-07 17:45:47 +11:00
parent a04c23eb38
commit c109615da7
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/standardfilters.rb
+2 -5
View File
@@ -423,11 +423,8 @@ module Liquid
def default(input, default_value = '', options = {}) def default(input, default_value = '', options = {})
options = {} unless options.is_a?(Hash) options = {} unless options.is_a?(Hash)
if (options["allow_false"] == true ? input.nil? : !input) || (input.respond_to?(:empty?) && input.empty?) false_check = options['allow_false'] ? input.nil? : !input
default_value false_check || (input.respond_to?(:empty?) && input.empty?) ? default_value : input
else
input
end
end end
private private
test/integration/standard_filter_test.rb
+12 -12
View File
@@ -679,22 +679,22 @@ class StandardFiltersTest < Minitest::Test
end end
def test_default def test_default
assert_equal "foo", @filters.default("foo", "bar") assert_equal("foo", @filters.default("foo", "bar"))
assert_equal "bar", @filters.default(nil, "bar") assert_equal("bar", @filters.default(nil, "bar"))
assert_equal "bar", @filters.default("", "bar") assert_equal("bar", @filters.default("", "bar"))
assert_equal "bar", @filters.default(false, "bar") assert_equal("bar", @filters.default(false, "bar"))
assert_equal "bar", @filters.default([], "bar") assert_equal("bar", @filters.default([], "bar"))
assert_equal "bar", @filters.default({}, "bar") assert_equal("bar", @filters.default({}, "bar"))
assert_template_result('bar', "{{ false | default: 'bar' }}") assert_template_result('bar', "{{ false | default: 'bar' }}")
end end
def test_default_handle_false def test_default_handle_false
assert_equal "foo", @filters.default("foo", "bar", "allow_false" => true) 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(nil, "bar", "allow_false" => true))
assert_equal "bar", @filters.default("", "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(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_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 }}") assert_template_result('false', "{{ false | default: 'bar', allow_false: true }}")
end end