Renamed utils.build_root for reusability

Author: jsenecal

rest_framework_json_api/renderers.py

@@ -66,7 +66,7 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
             json_api_data = list()
             for resource in results:
                 json_api_data.append(
-                    utils.build_root(fields, resource, resource_name))
+                    utils.build_json_data(fields, resource, resource_name))
                 included = utils.extract_included(fields, resource)
                 if included:
                     json_api_included.extend(included)
@@ -75,7 +75,7 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
             if fields is None:
                 json_api_data = data
             else:
-                json_api_data = utils.build_root(fields, data, resource_name)
+                json_api_data = utils.build_json_data(fields, data, resource_name)
 
         # Make sure we render data in a specific order
         render_data = OrderedDict()

rest_framework_json_api/utils.py

@@ -118,7 +118,7 @@ def format_keys(obj, format_type=None):
         return obj
 
 
-def build_root(fields, resource, resource_name):
+def build_json_data(fields, resource, resource_name):
     resource_data = [
         ('type', resource_name),
         ('id', extract_id(fields, resource)),
@@ -219,16 +219,6 @@ def extract_included(fields, resource):
             serializer_data = resource[field_name]
             if isinstance(serializer_data, list):
                 for serializer_resource in serializer_data:
-                    resource_data = [
-                        ('type', relation_type),
-                        ('id', extract_id(serializer_fields, serializer_resource)),
-                        ('attributes', extract_attributes(serializer_fields, serializer_resource)),
-                        ('relationships', extract_relationships(serializer_fields, serializer_resource)),
-                    ]
-                    # Add 'self' link if field is present and valid
-                    if api_settings.URL_FIELD_NAME in serializer_resource and \
-                            isinstance(serializer_fields[api_settings.URL_FIELD_NAME], RelatedField):
-                        resource_data.append(('links', {'self': serializer_resource[api_settings.URL_FIELD_NAME]}))
-                    included_data.append(OrderedDict(resource_data))
+                    included_data.append(build_json_data(serializer_fields, serializer_resource, relation_type))
 
     return format_keys(included_data)