diff options
author | Eugene Kenny <elkenny@gmail.com> | 2019-05-18 22:49:32 +0100 |
---|---|---|
committer | Eugene Kenny <elkenny@gmail.com> | 2019-05-18 22:49:32 +0100 |
commit | 46e84d5b104ca5dca88829c9db7941f0e6ce7aaa (patch) | |
tree | b2c70a0e4044bbbf2e73d1ca8470c403a9763664 /actionpack/lib | |
parent | 88b12b2f605b5fbeefdfb4da7e6141de5b85a18f (diff) | |
download | rails-46e84d5b104ca5dca88829c9db7941f0e6ce7aaa.tar.gz rails-46e84d5b104ca5dca88829c9db7941f0e6ce7aaa.tar.bz2 rails-46e84d5b104ca5dca88829c9db7941f0e6ce7aaa.zip |
Return parameters enumerator from transform_keys/!
Previously calling `ActionController::Parameters#transform_keys/!`
without passing a block would return an enumerator for the underlying
hash, which was inconsistent with the behaviour when a block was passed:
ActionController::Parameters.new(foo: "bar").transform_keys { |k| k }
=> <ActionController::Parameters {"foo"=>"bar"} permitted: false>
ActionController::Parameters.new(foo: "bar").transform_keys.each { |k| k }
=> {"foo"=>"bar"}
An enumerator for the parameters is now returned instead, ensuring that
evaluating it produces another parameters object instead of a hash:
ActionController::Parameters.new(foo: "bar").transform_keys.each { |k| k }
=> <ActionController::Parameters {"foo"=>"bar"} permitted: false>
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb index 8bde82ccca..016a633f71 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -679,18 +679,16 @@ module ActionController # Returns a new <tt>ActionController::Parameters</tt> instance with the # results of running +block+ once for every key. The values are unchanged. def transform_keys(&block) - if block - new_instance_with_inherited_permitted_status( - @parameters.transform_keys(&block) - ) - else - @parameters.transform_keys - end + return to_enum(:transform_keys) unless block_given? + new_instance_with_inherited_permitted_status( + @parameters.transform_keys(&block) + ) end # Performs keys transformation and returns the altered # <tt>ActionController::Parameters</tt> instance. def transform_keys!(&block) + return to_enum(:transform_keys!) unless block_given? @parameters.transform_keys!(&block) self end |