diff --git a/lib/liquid/standardfilters.rb b/lib/liquid/standardfilters.rb index 65b5150..9540478 100644 --- a/lib/liquid/standardfilters.rb +++ b/lib/liquid/standardfilters.rb @@ -421,8 +421,9 @@ module Liquid result.is_a?(BigDecimal) ? result.to_f : result end - def default(input, default_value = '', allow_false: false) - if (allow_false ? input.nil? : !input) || (input.respond_to?(:empty?) && input.empty?) + def default(input, default_value = '', options = {}) + options = {} unless options.is_a?(Hash) + if (options["allow_false"] == true ? input.nil? : !input) || (input.respond_to?(:empty?) && input.empty?) default_value else input diff --git a/test/integration/standard_filter_test.rb b/test/integration/standard_filter_test.rb index 7cd3e31..e807c88 100644 --- a/test/integration/standard_filter_test.rb +++ b/test/integration/standard_filter_test.rb @@ -682,15 +682,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_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