From f8c553a0edeae111533050c109b0cd0565ff4348 Mon Sep 17 00:00:00 2001 From: Lucas Hosseini Date: Tue, 1 Sep 2015 21:18:27 +0200 Subject: [PATCH] Cleanup. --- lib/active_model/serializer/adapter/json_api.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/active_model/serializer/adapter/json_api.rb b/lib/active_model/serializer/adapter/json_api.rb index 767c9c26..6b87caaa 100644 --- a/lib/active_model/serializer/adapter/json_api.rb +++ b/lib/active_model/serializer/adapter/json_api.rb @@ -36,10 +36,11 @@ module ActiveModel add_links(options) else - @hash[:data] = resource_objects_for(serializer, options) + resource_objects = resource_objects_for(serializer, options) relationships = relationships_for(serializer) - @hash[:data][:relationships] = relationships if relationships.any? included = included_for(serializer) + @hash[:data] = resource_objects + @hash[:data][:relationships] = relationships if relationships.any? @hash[:included] = included if included.any? end @hash @@ -109,7 +110,7 @@ module ActiveModel end 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 def included_for(serializer)