kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #36370 from ptoomey3/master

Browse source 
Add support for Proc based parameter filtering on arrays of values
This commit is contained in:
Rafael França 2019-07-23 13:19:18 -04:00 committed by GitHub
commit d3327ca40e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
activesupport/lib/active_support/parameter_filter.rb
View file

@ -109,7 +109,12 @@ module ActiveSupport
elsif value.is_a?(Hash) elsif value.is_a?(Hash)
value = call(value, parents, original_params) value = call(value, parents, original_params)
elsif value.is_a?(Array) elsif value.is_a?(Array)
value = value.map { |v| v.is_a?(Hash) ? call(v, parents, original_params) : v } # If we don't pop the current parent it will be duplicated as we
# process each array value.
parents.pop if deep_regexps
value = value.map { |v| value_for_key(key, v, parents, original_params) }
# Restore the parent stack after processing the array.
parents.push(key) if deep_regexps
elsif blocks.any? elsif blocks.any?
key = key.dup if key.duplicable? key = key.dup if key.duplicable?
value = value.dup if value.duplicable? value = value.dup if value.duplicable?

7
activesupport/test/parameter_filter_test.rb
View file

@ -28,10 +28,17 @@ class ParameterFilterTest < ActiveSupport::TestCase
value.replace("world!") if original_params["barg"]["blah"] == "bar" && key == "hello" value.replace("world!") if original_params["barg"]["blah"] == "bar" && key == "hello"
} }
filter_words << lambda { |key, value|
value.upcase! if key == "array_elements"
}
parameter_filter = ActiveSupport::ParameterFilter.new(filter_words) parameter_filter = ActiveSupport::ParameterFilter.new(filter_words)
before_filter["barg"] = { :bargain => "gain", "blah" => "bar", "bar" => { "bargain" => { "blah" => "foo", "hello" => "world" } } } before_filter["barg"] = { :bargain => "gain", "blah" => "bar", "bar" => { "bargain" => { "blah" => "foo", "hello" => "world" } } }
after_filter["barg"] = { :bargain => "niag", "blah" => "[FILTERED]", "bar" => { "bargain" => { "blah" => "[FILTERED]", "hello" => "world!" } } } after_filter["barg"] = { :bargain => "niag", "blah" => "[FILTERED]", "bar" => { "bargain" => { "blah" => "[FILTERED]", "hello" => "world!" } } }
before_filter["array_elements"] = %w(element1 element2)
after_filter["array_elements"] = %w(ELEMENT1 ELEMENT2)
assert_equal after_filter, parameter_filter.filter(before_filter) assert_equal after_filter, parameter_filter.filter(before_filter)
end end
end end