New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Yield array from AC::Parameters#each for block with one arg #27790

Merged
merged 1 commit into from Dec 6, 2017

Conversation

Projects
None yet
4 participants
@domcleal
Contributor

domcleal commented Jan 24, 2017

Matches Hash#each behaviour as used in Rails 4.

Other Information

Reproducer: https://gist.github.com/df6296853a73ca3f714174278ec01138 (passes on 4-2-stable, fails on 5-0-stable or master)

Ruby's Hash#each_pair implementation, which also switches on the block arity: https://github.com/ruby/ruby/blob/v2_4_0/hash.c#L1810

@rails-bot

This comment has been minimized.

rails-bot commented Jan 24, 2017

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @rafaelfranca (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

actionpack/lib/action_controller/metal/strong_parameters.rb Outdated
@@ -265,7 +265,12 @@ def to_unsafe_h
# the same way as <tt>Hash#each_pair</tt>.
def each_pair(&block)
@parameters.each_pair do |key, value|
yield key, convert_hashes_to_parameters(key, value)
converted_value = convert_hashes_to_parameters(key, value)
if block.arity == 1

This comment has been minimized.

@rafaelfranca

rafaelfranca Dec 5, 2017

Member

We can always yield an array since the block will rake care of destructing the array in two argument.

This comment has been minimized.

@domcleal

domcleal Dec 6, 2017

Contributor

Ah neat. Thanks, updated and rebased the PR.

Yield array from AC::Parameters#each for block with one arg
Matches Hash#each behaviour as used in Rails 4.

@rafaelfranca rafaelfranca merged commit 5d337fe into rails:master Dec 6, 2017

2 checks passed

codeclimate All good!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment