diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 01:09:27 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 01:09:27 +0100 |
| commit | 5a1fe9039b33414b7088813712e03bbe38567cff (patch) | |
| tree | 10e3a15c06494dd09c0324dca894ddcbb68ce582 /activesupport/lib/active_support/core_ext/hash.rb | |
| parent | 3384f073e35c5391deaeb209a62a485a0c4dd7b1 (diff) | |
| parent | 7f6779c1d5e4ec7f642839caa7e86320720f77c8 (diff) | |
| download | rails-5a1fe9039b33414b7088813712e03bbe38567cff.tar.gz rails-5a1fe9039b33414b7088813712e03bbe38567cff.tar.bz2 rails-5a1fe9039b33414b7088813712e03bbe38567cff.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash.rb | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash.rb b/activesupport/lib/active_support/core_ext/hash.rb index a6065ab48e..501483498d 100644 --- a/activesupport/lib/active_support/core_ext/hash.rb +++ b/activesupport/lib/active_support/core_ext/hash.rb @@ -1,14 +1,8 @@ -%w(keys indifferent_access deep_merge reverse_merge conversions diff slice except).each do |ext| - require "active_support/core_ext/hash/#{ext}" -end - -class Hash #:nodoc: - include ActiveSupport::CoreExtensions::Hash::Keys - include ActiveSupport::CoreExtensions::Hash::IndifferentAccess - include ActiveSupport::CoreExtensions::Hash::DeepMerge - include ActiveSupport::CoreExtensions::Hash::ReverseMerge - include ActiveSupport::CoreExtensions::Hash::Conversions - include ActiveSupport::CoreExtensions::Hash::Diff - include ActiveSupport::CoreExtensions::Hash::Slice - include ActiveSupport::CoreExtensions::Hash::Except -end +require 'active_support/core_ext/hash/conversions' +require 'active_support/core_ext/hash/deep_merge' +require 'active_support/core_ext/hash/diff' +require 'active_support/core_ext/hash/except' +require 'active_support/core_ext/hash/indifferent_access' +require 'active_support/core_ext/hash/keys' +require 'active_support/core_ext/hash/reverse_merge' +require 'active_support/core_ext/hash/slice' |