Permalink
Browse files

Fix differing rails_to_json arity

  • Loading branch information...
1 parent 706f313 commit 6e3e00219b6910ec39b84844c845e0e237ff15a6 @jeremy jeremy committed Apr 27, 2009
View
9 activerecord/lib/active_record/serializers/json_serializer.rb
@@ -82,14 +82,17 @@ def to_json(options = {})
end
end
- # For compatibility with ActiveSupport::JSON.encode
- alias rails_to_json to_json
-
def from_json(json)
self.attributes = ActiveSupport::JSON.decode(json)
self
end
+ private
+ # For compatibility with ActiveSupport::JSON.encode
+ def rails_to_json(options, *args)
+ to_json(options)
+ end
+
class JsonSerializer < ActiveRecord::Serialization::Serializer #:nodoc:
def serialize
ActiveSupport::JSON.encode(serializable_record)
View
8 activeresource/lib/active_resource/base.rb
@@ -890,9 +890,6 @@ def to_json(options={})
ActiveSupport::JSON.encode(attributes, options)
end
- # For compatibility with ActiveSupport::JSON.encode
- alias rails_to_json to_json
-
# Returns the serialized string representation of the resource in the configured
# serialization format specified in ActiveResource::Base.format. The options
# applicable depend on the configured encoding format.
@@ -1064,6 +1061,11 @@ def split_options(options = {})
self.class.__send__(:split_options, options)
end
+ # For compatibility with ActiveSupport::JSON.encode
+ def rails_to_json(options, *args)
+ to_json(options)
+ end
+
def method_missing(method_symbol, *arguments) #:nodoc:
method_name = method_symbol.to_s

0 comments on commit 6e3e002

Please sign in to comment.