Merge pull request #247 from KMahoney/default-serializer-options

Pass options through when using default serializer
This commit is contained in:
Steve Klabnik 2013-03-22 08:46:16 -07:00
commit 6a54b892c8
2 changed files with 2 additions and 2 deletions

View File

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

View File

@ -504,7 +504,7 @@ module ActiveModel
end
def serializable_hash
@object.as_json
@object.as_json(@options)
end
end
end