Always set a serializer for each item of an Array

model.active_model_serializer could return nil so we need to ensure that
if serializer is not setted we set DefaultSerializer to it.

This reverts commit 64ed05c484.

Fixes #318
This commit is contained in:
Santiago Pastorino
2013-05-28 18:03:19 -07:00
parent 8795f2bc1e
commit c97acfd9ba
2 changed files with 19 additions and 3 deletions

View File

@@ -49,9 +49,8 @@ module ActiveModel
serializer = options[:each_serializer]
elsif item.respond_to?(:active_model_serializer)
serializer = item.active_model_serializer
else
serializer = DefaultSerializer
end
serializer ||= DefaultSerializer
serializable = serializer.new(item, options.merge(:root => nil))