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

Embed objects should return singular and not wrap in array

Browse Source 
Closes #437
This commit is contained in:
Santiago Pastorino
2013-11-01 14:22:48 -02:00
parent 78cceb4113
commit 66f9256534
4 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/active_model/serializer.rb
View File

@@ -131,7 +131,8 @@ end
if association.embed_ids?
hash[association.key] = serialize_ids association
elsif association.embed_objects?
hash[association.embedded_key] = serialize association
associated_data = send(association.name)
hash[association.embedded_key] = serialize(association, associated_data)
end
end
end
@@ -147,15 +148,15 @@ end
associations.each_with_object({}) do |(name, association), hash|
if included_associations.include? name
if association.embed_in_root?
hash[association.embedded_key] = serialize association
associated_data = Array(send(association.name))
hash[association.root_key] = serialize(association, associated_data)
end
end
end
end
def serialize(association)
associated_data = send(association.name)
association.build_serializer(associated_data).serializable_object
def serialize(association, object)
association.build_serializer(object).serializable_object
end
def serialize_ids(association)