Further cleanup add_included.

Author: beauby

lib/active_model/serializer/adapter/json_api.rb

@@ -36,7 +36,7 @@ def serializable_hash(options = nil)
 
             add_links(options)
           else
-            @hash[:data] = attributes_for(serializer, options)
+            @hash[:data] = resource_objects_for(serializer, options)
             relationships = relationships_for(serializer)
             @hash[:data][:relationships] = relationships if relationships.any?
             included = included_for(serializer)
@@ -75,15 +75,7 @@ def resource_identifier_for(serializer)
           { id: id.to_s, type: type }
         end
 
-        def attributes_for(serializer, options)
-          if serializer.respond_to?(:each)
-            serializer.map { |s| resource_object_for(s, options) }
-          else
-            resource_object_for(serializer, options)
-          end
-        end
-
-        def resource_object_for(serializer, options)
+        def resource_object_for(serializer, options = {})
           options[:fields] = @fieldset && @fieldset.fields_for(serializer)
 
           cache_check(serializer) do
@@ -94,6 +86,14 @@ def resource_object_for(serializer, options)
           end
         end
 
+        def resource_objects_for(serializer, options)
+          if serializer.respond_to?(:each)
+            serializer.map { |s| resource_object_for(s, options) }
+          else
+            resource_object_for(serializer, options)
+          end
+        end
+
         def relationship_value_for(serializer, options = {})
           if serializer.respond_to?(:each)
             serializer.map { |s| resource_identifier_for(s) }
@@ -130,10 +130,10 @@ def _included_for(resource_name, serializer, parent = nil)
               resource_path = [parent, resource_name].compact.join('.')
 
               if include_assoc?(resource_path)
-                attrs = attributes_for(serializer, @options)
+                resource_object = resource_object_for(serializer, @options)
                 relationships = relationships_for(serializer)
-                attrs[:relationships] = relationships if relationships.any?
-                result.push(attrs)
+                resource_object[:relationships] = relationships if relationships.any?
+                result.push(resource_object)
               end
 
               if include_nested_assoc?(resource_path)