ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-24 23:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #210 from tpitale/master

Browse Source 
Reduce double map to once; Fixes datamapper eager loading.
This commit is contained in:
Steve Klabnik 2013-02-18 09:04:37 -08:00
commit 0114e49238
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/active_model/array_serializer.rb
View File

@ -27,10 +27,12 @@ module ActiveModel
serializer = item.active_model_serializer serializer = item.active_model_serializer
end end
if serializer serializable = serializer ? serializer.new(item, @options) : item
serializer.new(item, @options)
if serializable.respond_to?(:serializable_hash)
serializable.serializable_hash
else else
item serializable.as_json
end end
end end
end end
@ -47,20 +49,12 @@ module ActiveModel
@options[:hash] = hash = {} @options[:hash] = hash = {}
@options[:unique_values] = {} @options[:unique_values] = {}
array = serializable_array.map do |item|
if item.respond_to?(:serializable_hash)
item.serializable_hash
else
item.as_json
end
end
if root = @options[:root] if root = @options[:root]
hash.merge!(root => array) hash.merge!(root => serializable_array)
include_meta hash include_meta hash
hash hash
else else
array serializable_array
end end
end end
end end