Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions lib/active_model/array_serializer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ def serialize_object
end

def serializable_array
serializers_array.map do |serializable|
if serializable.respond_to?(:serializable_hash)
serializable.serializable_hash
else
serializable.as_json
end
end
end

def serializers_array
object.map do |item|
if options.has_key? :each_serializer
serializer = options[:each_serializer]
Expand All @@ -52,13 +62,7 @@ def serializable_array
end
serializer ||= DefaultSerializer

serializable = serializer.new(item, options.merge(root: nil))

if serializable.respond_to?(:serializable_hash)
serializable.serializable_hash
else
serializable.as_json
end
serializer.new(item, options.merge(root: nil))
end
end
end
Expand Down