ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 07:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'create-default-serializer' into HEAD

Browse Source 
Conflicts:
	lib/active_model/array_serializer.rb
This commit is contained in:
Adam Stanton
2013-03-05 21:48:58 -08:00
parent fabdc621ff b4616d737c
commit da26ebd26f
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/active_model/array_serializer.rb
View File

@@ -31,7 +31,8 @@ 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