Revert rails_to_json -> to_json so we don't break compatibility

[#2753 state:resolved]

Author: jeremy

activesupport/lib/active_support/json/encoders/date.rb

@@ -11,7 +11,7 @@ class Date
   #   # With ActiveSupport.use_standard_json_time_format = false
   #   Date.new(2005,2,1).to_json
   #   # => "2005/02/01"
-  def rails_to_json(options = nil)
+  def to_json(options = nil)
     if ActiveSupport.use_standard_json_time_format
       %("#{strftime("%Y-%m-%d")}")
     else

activesupport/lib/active_support/json/encoders/date_time.rb

@@ -11,7 +11,7 @@ class DateTime
   #   # With ActiveSupport.use_standard_json_time_format = false
   #   DateTime.civil(2005,2,1,15,15,10).to_json
   #   # => "2005/02/01 15:15:10 +0000"
-  def rails_to_json(options = nil)
+  def to_json(options = nil)
     if ActiveSupport.use_standard_json_time_format
       xmlschema.inspect
     else

activesupport/lib/active_support/json/encoders/enumerable.rb

@@ -6,7 +6,13 @@ module Enumerable
   #   # => users.to_json(:only => :name)
   #
   # will pass the <tt>:only => :name</tt> option to each user.
-  def rails_to_json(options = nil) #:nodoc:
+  def to_json(options = nil) #:nodoc:
+    to_a.to_json(options)
+  end
+end
+
+class Array
+  def to_json(options = nil) #:nodoc:
     "[#{map { |value| ActiveSupport::JSON.encode(value, options) } * ','}]"
   end
 end

activesupport/lib/active_support/json/encoders/false_class.rb

@@ -1,5 +1,5 @@
 class FalseClass
-  def rails_to_json(options = nil) #:nodoc:
+  def to_json(options = nil) #:nodoc:
     'false'
   end
 end

activesupport/lib/active_support/json/encoders/hash.rb

@@ -28,7 +28,7 @@ class Hash
   # would pass the <tt>:include => :posts</tt> option to <tt>users</tt>,
   # allowing the posts association in the User model to be converted to JSON
   # as well.
-  def rails_to_json(options = nil) #:nodoc:
+  def to_json(options = nil) #:nodoc:
     hash_keys = self.keys
 
     if options

activesupport/lib/active_support/json/encoders/nil_class.rb

@@ -1,5 +1,5 @@
 class NilClass
-  def rails_to_json(options = nil) #:nodoc:
+  def to_json(options = nil) #:nodoc:
     'null'
   end
 end

activesupport/lib/active_support/json/encoders/numeric.rb

@@ -1,5 +1,17 @@
 class Numeric
-  def rails_to_json(options = nil) #:nodoc:
+  def to_json(options = nil) #:nodoc:
+    to_s
+  end
+end
+
+class Float
+  def to_json(options = nil) #:nodoc:
+    to_s
+  end
+end
+
+class Integer
+  def to_json(options = nil) #:nodoc:
     to_s
   end
 end

activesupport/lib/active_support/json/encoders/object.rb

@@ -1,10 +1,6 @@
 class Object
   # Dumps object in JSON (JavaScript Object Notation). See www.json.org for more info.
-  def rails_to_json(options = nil)
+  def to_json(options = nil)
     ActiveSupport::JSON.encode(instance_values, options)
   end
-
-  def to_json(*args)
-    rails_to_json(*args)
-  end
 end

activesupport/lib/active_support/json/encoders/regexp.rb

@@ -1,5 +1,5 @@
 class Regexp
-  def rails_to_json(options = nil) #:nodoc:
+  def to_json(options = nil) #:nodoc:
     inspect
   end
 end

activesupport/lib/active_support/json/encoders/string.rb

@@ -1,5 +1,5 @@
 class String
-  def rails_to_json(options = nil) #:nodoc:
+  def to_json(options = nil) #:nodoc:
     ActiveSupport::JSON::Encoding.escape(self)
   end
 end