diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-28 16:48:14 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-21 04:35:15 -0700 |
| commit | a4e3aac40a7545285e4d1ccd78adfc41ca3d5f83 (patch) | |
| tree | 1cf432cdb6fb06c24faceee1a8554b75daaf5bc5 /activesupport/lib/active_support/core_ext/hash.rb | |
| parent | 6ed42ebdff05f9d28a60e91093d8f9afad03a958 (diff) | |
| download | rails-a4e3aac40a7545285e4d1ccd78adfc41ca3d5f83.tar.gz rails-a4e3aac40a7545285e4d1ccd78adfc41ca3d5f83.tar.bz2 rails-a4e3aac40a7545285e4d1ccd78adfc41ca3d5f83.zip | |
* Introduce ActiveSupport.core_ext Integer, %w(conversions time etc)
* Convert some extension modules to simply reopening the class
* Remove deprecated Float time extensions
* Fold Base64 extension into ActiveSupport::Base64 since stdlib Base64 is gone
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash.rb | 16 |
1 files changed, 2 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..d940812d34 100644 --- a/activesupport/lib/active_support/core_ext/hash.rb +++ b/activesupport/lib/active_support/core_ext/hash.rb @@ -1,14 +1,2 @@ -%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/util' +ActiveSupport.core_ext Hash, %w(keys indifferent_access deep_merge reverse_merge conversions diff slice except) |