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

Clean up HasOne array wrapping logic

Browse Source 
Introduce private _wrap_in_array option for now.
This commit is contained in:
Adrian Mugnolo and Santiago Pastorino
2013-12-17 15:39:15 -02:00
committed by Santiago Pastorino
parent 28fbb62ec4
commit f14f931957
3 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/active_model/serializer.rb
View File

@@ -133,8 +133,7 @@ end
if association.embed_ids?
hash[association.key] = serialize_ids association
elsif association.embed_objects?
associated_data = send(association.name)
hash[association.embedded_key] = serialize(association, associated_data)
hash[association.embedded_key] = serialize association
end
end
end
@@ -150,14 +149,14 @@ end
associations.each_with_object({}) do |(name, association), hash|
if included_associations.include? name
if association.embed_in_root?
associated_data = Array(send(association.name))
hash[association.root_key] = serialize(association, associated_data)
hash[association.root_key] = serialize association
end
end
end
end
def serialize(association, object)
def serialize(association)
object = send(association.name)
association.build_serializer(object, scope: scope).serializable_object
end
@@ -174,6 +173,7 @@ end
return nil if object.nil?
hash = attributes
hash.merge! associations
@options[:_wrap_in_array] ? [hash] : hash
end
alias_method :serializable_object, :serializable_hash
end