Merge pull request #207 from stantona/create-default-serializer

Create DefaultSerializer so that as_json uses same interface.
This commit is contained in:
Steve Klabnik 2013-03-06 15:26:35 -08:00
commit 7b86838fa6
3 changed files with 17 additions and 2 deletions

View File

@ -31,7 +31,7 @@ module ActiveModel
serializer = item.active_model_serializer
end
serializable = serializer ? serializer.new(item, @options) : item
serializable = serializer ? serializer.new(item, @options) : DefaultSerializer.new(item)
if serializable.respond_to?(:serializable_hash)
serializable.serializable_hash

View File

@ -395,4 +395,20 @@ module ActiveModel
ActiveSupport::Notifications.instrument(event_name, payload, &block)
end
end
# DefaultSerializer
#
# Provides a constant interface for all items, particularly
# for ArraySerializer.
class DefaultSerializer
attr_reader :object, :options
def initialize(object, options={})
@object, @options = object, options
end
def serializable_hash
@object.as_json
end
end
end

View File

@ -51,5 +51,4 @@ class ArraySerializerTest < ActiveModel::TestCase
{ :title => "Post2" }
], serializer.as_json)
end
end