This commit is contained in:
Lucas Hosseini 2015-09-01 21:18:27 +02:00
parent a8a0566d29
commit f8c553a0ed

View File

@ -36,10 +36,11 @@ module ActiveModel
add_links(options) add_links(options)
else else
@hash[:data] = resource_objects_for(serializer, options) resource_objects = resource_objects_for(serializer, options)
relationships = relationships_for(serializer) relationships = relationships_for(serializer)
@hash[:data][:relationships] = relationships if relationships.any?
included = included_for(serializer) included = included_for(serializer)
@hash[:data] = resource_objects
@hash[:data][:relationships] = relationships if relationships.any?
@hash[:included] = included if included.any? @hash[:included] = included if included.any?
end end
@hash @hash
@ -109,7 +110,7 @@ module ActiveModel
end end
def relationships_for(serializer) def relationships_for(serializer)
serializer.associations.map { |association| [ association.key, { data: relationship_value_for(association.serializer, association.options) } ] }.to_h Hash[serializer.associations.map { |association| [ association.key, { data: relationship_value_for(association.serializer, association.options) } ] }]
end end
def included_for(serializer) def included_for(serializer)