Cleanup.

Author: beauby

lib/active_model/serializer/adapter/json_api.rb

@@ -127,19 +127,18 @@ def fragment_cache(cached_hash, non_cached_hash)
         # @api private
         def resource_objects_for(serializer)
           resources = _resource_objects_for(serializer, @include_tree, true).values
-          resources.each_with_object([[], []]) do |(resource, is_primary), (primary, included)|
-            if is_primary
-              primary.push(resource)
+          resources.each_with_object([[], []]) do |resource, (primary, included)|
+            if resource[:is_primary]
+              primary.push(resource[:resource_object])
             else
-              included.push(resource)
+              included.push(resource[:resource_object])
             end
           end
         end
 
         # Recursively build all requested resource objects and flag them as primary when applicable.
-        # @return [Hash<ApiObjects::ResourceIdentifierObject, [ApiObjects::ResourceObject, bool]>]
-        #   Hash of pairs of a resource object and a boolean describing whether the corresponding
-        #   resource is primary or included, keyed by resource identifiers.
+        # @return [Hash<ApiObjects::ResourceIdentifierObject, Hash>]
+        #   Hash of hashes each describing a resource object and whether it is primary or included.
         #
         # @api private
         def _resource_objects_for(serializer, include_tree, is_primary, hashes = {})
@@ -152,11 +151,15 @@ def _resource_objects_for(serializer, include_tree, is_primary, hashes = {})
 
           key = resource_identifier_for(serializer)
           if hashes[key]
-            hashes[key][1] ||= is_primary
+            hashes[key][:is_primary] ||= is_primary
             return hashes
           end
 
-          hashes[key] = [resource_object_for(serializer), is_primary]
+          resource_object = ApiObjects::ResourceObject.new(
+            resource_identifier_for(serializer),
+            attributes_for(serializer),
+            relationships_for(serializer))
+          hashes[key] = { resource_object: resource_object, is_primary: is_primary }
 
           serializer.associations(include_tree).each do |association|
             _resource_objects_for(association.serializer, include_tree[association.key], false, hashes)
@@ -165,16 +168,6 @@ def _resource_objects_for(serializer, include_tree, is_primary, hashes = {})
           hashes
         end
 
-        # Transform a serializer into a resource object.
-        # @return [ApiObjects::ResourceObject] resource object
-        #
-        # @api private
-        def resource_object_for(serializer)
-          ApiObjects::ResourceObject.new(resource_identifier_for(serializer),
-                                         attributes_for(serializer),
-                                         relationships_for(serializer))
-        end
-
         # Get resource type.
         # @return [String] type
         #