Skip to content
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

Add and test Hashie::Mash#reverse_merge #281

Merged
merged 1 commit into from
Feb 26, 2015
Merged

Add and test Hashie::Mash#reverse_merge #281

merged 1 commit into from
Feb 26, 2015

Conversation

mgold
Copy link
Contributor

@mgold mgold commented Feb 25, 2015

Fixes #270. I had to bump Rubocop's max class length. If that's a problem, some refactoring will be necessary.

This will define reverse_merge even when ActiveSupport is not included. One solution is to wrap the definition with if method_defined? :reverse_merge.

@dblock
Copy link
Member

dblock commented Feb 25, 2015

This is good, thanks. Can you squash these commits, please? Thanks.

@mgold
Copy link
Contributor Author

mgold commented Feb 25, 2015

Squashed. Thanks.

dblock added a commit that referenced this pull request Feb 26, 2015
Add and test Hashie::Mash#reverse_merge
@dblock dblock merged commit 693de89 into hashie:master Feb 26, 2015
@dblock
Copy link
Member

dblock commented Feb 26, 2015

Merged.

@mgold mgold deleted the reverse-merge branch February 26, 2015 00:23
jsonn pushed a commit to jsonn/pkgsrc that referenced this pull request Jun 9, 2015
## 3.4.2 (6/2/2015)

* [#292](hashie/hashie#292): Removed `Mash#id` and `Mash#type` - [@jrochkind](https://github.com/jrochkind).
* [#297](hashie/hashie#297): Extracted `Trash`'s behavior into a new `Dash::PropertyTranslation` extension - [@michaelherold](https://github.com/michaelherold).

## 3.4.1

* [#269](hashie/hashie#272): Added Hashie::Extensions::DeepLocate - [@msievers](https://github.com/msievers).
* [#270](hashie/hashie#277): Fixed ArgumentError raised when using IndifferentAccess and HashWithIndifferentAccess - [@gardenofwine](https://github.com/gardenofwine).
* [#281](hashie/hashie#281): Added #reverse_merge to Mash to override ActiveSupport's version - [@mgold](https://github.com/mgold).
* [#282](hashie/hashie#282): Fixed coercions in a subclass accumulating in the superclass - [@maxlinc](https://github.com/maxlinc), [@martinstreicher](https://github.com/martinstreicher).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ActiveSupport's Hash#reverse_merge doesn't get along with Hashie::Mash
2 participants