diff options
author | Andrew White <andrew.white@unboxed.co> | 2016-11-02 12:06:51 +0000 |
---|---|---|
committer | Andrew White <andrew.white@unboxed.co> | 2016-11-02 16:15:00 +0000 |
commit | 03e3aed60264ae0d12dfdf7a0c57044da49af148 (patch) | |
tree | 033860ff40461beae42a76a5f50ed601c851072f /activesupport/lib/active_support/hash_with_indifferent_access.rb | |
parent | 21186270288ef3f8816cecf0aad1e1c537493bee (diff) | |
download | rails-03e3aed60264ae0d12dfdf7a0c57044da49af148.tar.gz rails-03e3aed60264ae0d12dfdf7a0c57044da49af148.tar.bz2 rails-03e3aed60264ae0d12dfdf7a0c57044da49af148.zip |
Fix AS::HWIA#select and #reject on Ruby 2.1.1+
In Ruby 2.1.1 and later select and reject return a new instance of
Hash rather than the subclass so we need to override them to return
an instance of the correct class.
Diffstat (limited to 'activesupport/lib/active_support/hash_with_indifferent_access.rb')
-rw-r--r-- | activesupport/lib/active_support/hash_with_indifferent_access.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb index 9dc93de5a9..f89704d906 100644 --- a/activesupport/lib/active_support/hash_with_indifferent_access.rb +++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb @@ -153,6 +153,20 @@ module ActiveSupport def symbolize_keys; to_hash.symbolize_keys end def to_options!; self end + if RUBY_VERSION > '2.1.0' + # On Ruby 2.1.1 and later the behavior of .select and reject changed to + # return a new Hash instance so we need to override them to return an + # instance of the correct class. + + def select(*args, &block) + dup.tap { |hash| hash.select!(*args, &block) } + end + + def reject(*args, &block) + dup.tap { |hash| hash.reject!(*args, &block) } + end + end + # Convert to a Hash with String keys. def to_hash Hash.new(default).merge!(self) |