1 files changed, 10 insertions, 32 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index dd94315111..2f9588e0f4 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -1,20 +1,18 @@
-# encoding: utf-8
+require 'active_support/core_ext/object/to_json'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/deprecation'
+require 'active_support/json/variable'
+
 require 'bigdecimal'
-require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/big_decimal/conversions' # for #to_s
+require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/hash/slice'
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/instance_variables'
-require 'active_support/deprecation'
-
-require 'active_support/time'
-
-# Hack to load json gem first so we can overwrite its to_json.
-begin
-  require 'json'
-rescue LoadError
-end
+require 'time'
+require 'active_support/core_ext/time/conversions'
+require 'active_support/core_ext/date_time/conversions'
+require 'active_support/core_ext/date/conversions'
 
 module ActiveSupport
   class << self
@@ -128,20 +126,6 @@ module ActiveSupport
   end
 end
 
-# The JSON gem adds a few modules to Ruby core classes containing :to_json definition, overwriting
-# their default behavior. That said, we need to define the basic to_json method in all of them,
-# otherwise they will always use to_json gem implementation, which is backwards incompatible in
-# several cases (for instance, the JSON implementation for Hash does not work) with inheritance
-# and consequently classes as ActiveSupport::OrderedHash cannot be serialized to json.
-[Object, Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass].each do |klass|
-  klass.class_eval <<-RUBY, __FILE__, __LINE__
-    # Dumps object in JSON (JavaScript Object Notation). See www.json.org for more info.
-    def to_json(options = nil)
-      ActiveSupport::JSON.encode(self, options)
-    end
-  RUBY
-end
-
 class Object
   def as_json(options = nil) #:nodoc:
     if respond_to?(:to_hash)
@@ -152,12 +136,6 @@ class Object
   end
 end
 
-# A string that returns itself as its JSON-encoded form.
-class ActiveSupport::JSON::Variable < String
-  def as_json(options = nil) self end #:nodoc:
-  def encode_json(encoder) self end #:nodoc:
-end
-
 class TrueClass
   AS_JSON = ActiveSupport::JSON::Variable.new('true').freeze
   def as_json(options = nil) AS_JSON end #:nodoc: