diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-10-09 21:55:43 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-10-09 21:55:43 +0200 |
| commit | 0787cea3bb5e6f2c216e71090732bc55ee03c7dc (patch) | |
| tree | c1c258d732b54b5928b30dde09c2f4364582e8ce /activesupport | |
| parent | 3395633a5045fce1f9a9d25f86ba897491874d15 (diff) | |
| download | rails-0787cea3bb5e6f2c216e71090732bc55ee03c7dc.tar.gz rails-0787cea3bb5e6f2c216e71090732bc55ee03c7dc.tar.bz2 rails-0787cea3bb5e6f2c216e71090732bc55ee03c7dc.zip | |
let (array|hash)/conversions.rb load the extensions in object/to_(param|query).rb
Diffstat (limited to 'activesupport')
3 files changed, 5 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb index 7f37c459c1..6a0c4a015a 100644 --- a/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -1,6 +1,8 @@ require 'active_support/xml_mini' require 'active_support/core_ext/hash/keys' require 'active_support/core_ext/string/inflections' +require 'active_support/core_ext/object/to_param' +require 'active_support/core_ext/object/to_query' class Array # Converts the array to a comma-separated sentence where the last element is diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb index 5ba8197006..828f03ad62 100644 --- a/activesupport/lib/active_support/core_ext/hash/conversions.rb +++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb @@ -1,8 +1,10 @@ require 'active_support/xml_mini' require 'active_support/time' +require 'active_support/core_ext/object/blank' +require 'active_support/core_ext/object/to_param' +require 'active_support/core_ext/object/to_query' require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/hash/reverse_merge' -require 'active_support/core_ext/object/blank' require 'active_support/core_ext/string/inflections' class Hash diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb index b32f0772e2..53ea2aad16 100644 --- a/activesupport/test/core_ext/hash_ext_test.rb +++ b/activesupport/test/core_ext/hash_ext_test.rb @@ -5,8 +5,6 @@ require 'active_support/core_ext/string/access' require 'active_support/ordered_hash' require 'active_support/core_ext/object/deep_dup' require 'active_support/inflections' -require 'active_support/core_ext/object/to_param' -require 'active_support/core_ext/object/to_query' class HashExtTest < ActiveSupport::TestCase class IndifferentHash < HashWithIndifferentAccess |