From 74bf8afb9fb92b4c45ffdd37b91e0580b86c1590 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Tue, 16 Oct 2012 12:05:00 +0200
Subject: Revert "remove unnecessary object/conversions file"

This file is used at least by Active Merchant, its existence
is maybe not necessary but no big deal either.

This reverts commit ae9b3d7cecd77b9ace38671b183e1a360bf632b6.
---
 activesupport/lib/active_support/core_ext/object.rb             | 7 +++++--
 activesupport/lib/active_support/core_ext/object/conversions.rb | 4 ++++
 activesupport/test/core_ext/array_ext_test.rb                   | 1 +
 activesupport/test/core_ext/hash_ext_test.rb                    | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 activesupport/lib/active_support/core_ext/object/conversions.rb

(limited to 'activesupport')

diff --git a/activesupport/lib/active_support/core_ext/object.rb b/activesupport/lib/active_support/core_ext/object.rb
index ab01d7787a..ec2157221f 100644
--- a/activesupport/lib/active_support/core_ext/object.rb
+++ b/activesupport/lib/active_support/core_ext/object.rb
@@ -1,11 +1,14 @@
 require 'active_support/core_ext/object/acts_like'
 require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/object/deep_dup'
 require 'active_support/core_ext/object/duplicable'
+require 'active_support/core_ext/object/deep_dup'
+require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/object/inclusion'
+
+require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext/object/instance_variables'
+
 require 'active_support/core_ext/object/to_json'
 require 'active_support/core_ext/object/to_param'
 require 'active_support/core_ext/object/to_query'
-require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/object/with_options'
diff --git a/activesupport/lib/active_support/core_ext/object/conversions.rb b/activesupport/lib/active_support/core_ext/object/conversions.rb
new file mode 100644
index 0000000000..540f7aadb0
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/object/conversions.rb
@@ -0,0 +1,4 @@
+require 'active_support/core_ext/object/to_param'
+require 'active_support/core_ext/object/to_query'
+require 'active_support/core_ext/array/conversions'
+require 'active_support/core_ext/hash/conversions'
diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb
index 0b33a63460..9dfa2cbf11 100644
--- a/activesupport/test/core_ext/array_ext_test.rb
+++ b/activesupport/test/core_ext/array_ext_test.rb
@@ -1,6 +1,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/array'
 require 'active_support/core_ext/big_decimal'
+require 'active_support/core_ext/object/conversions'
 
 require 'active_support/core_ext' # FIXME: pulling in all to_xml extensions
 require 'active_support/hash_with_indifferent_access'
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index b208767490..7cfe7b0ea7 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -3,6 +3,7 @@ require 'active_support/core_ext/hash'
 require 'bigdecimal'
 require 'active_support/core_ext/string/access'
 require 'active_support/ordered_hash'
+require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext/object/deep_dup'
 require 'active_support/inflections'
 
-- 
cgit v1.2.3