diff options
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/core_ext/hash/indifferent_access.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb index 1f645fabc9..9af626c8da 100644 --- a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb +++ b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb @@ -11,9 +11,10 @@ class HashWithIndifferentAccess < Hash end end - def default(key) - self[key.to_s] if key.is_a?(Symbol) - end + def default(key = nil) + value = self[key.to_s] if key.is_a?(Symbol) + value ? value : super + end alias_method :regular_writer, :[]= unless method_defined?(:regular_writer) alias_method :regular_update, :update unless method_defined?(:regular_update) @@ -74,7 +75,9 @@ module ActiveSupport #:nodoc: module Hash #:nodoc: module IndifferentAccess #:nodoc: def with_indifferent_access - HashWithIndifferentAccess.new(self) + hash = HashWithIndifferentAccess.new(self) + hash.default = self.default + hash end end end |