Moved the root object formatting to a function

Author: jerel

example/tests/test_model_viewsets.py

@@ -3,6 +3,7 @@
 from example.tests import TestBase
 
 from django.contrib.auth import get_user_model
+from django.utils import encoding
 from django.core.urlresolvers import reverse
 from django.conf import settings
 
@@ -32,7 +33,7 @@ def test_key_in_list_result(self):
         expected = {
             u'data': [{
                 u'type': u'users',
-                u'id': user.pk,
+                u'id': encoding.force_text(user.pk),
                 u'attributes': {
                     u'first-name': user.first_name,
                     u'last-name': user.last_name,
@@ -44,10 +45,8 @@ def test_key_in_list_result(self):
         json_content = json.loads(response.content.decode('utf8'))
         links = json_content.get('links')
         meta = json_content.get('meta').get('pagination')
-
-        self.assertEquals(sorted(expected.get('data')), sorted(
-            json_content.get('data')))
-        self.assertEquals(meta.get('total'), 2)
+        self.assertEquals(expected.get('data'), json_content.get('data'))
+        self.assertEquals(meta.get('pages'), 2)
         self.assertEquals(meta.get('count', 0),
             get_user_model().objects.count())
         self.assertEqual(u'http://testserver/identities?page=2',
@@ -66,7 +65,7 @@ def test_page_two_in_list_result(self):
         expected = {
             u'data': [{
                 u'type': u'users',
-                u'id': user.pk,
+                u'id': encoding.force_text(user.pk),
                 u'attributes': {
                     u'first-name': user.first_name,
                     u'last-name': user.last_name,
@@ -141,7 +140,7 @@ def test_key_in_detail_result(self):
         expected = {
             u'data': {
                 u'type': u'users',
-                u'id': self.miles.pk,
+                u'id': encoding.force_text(self.miles.pk),
                 u'attributes': {
                     u'first-name': self.miles.first_name,
                     u'last-name': self.miles.last_name,

rest_framework_json_api/renderers.py

@@ -66,35 +66,22 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
 
             json_api_data = []
             for resource in results:
-                resource_data = [
-                    ('type', resource_name),
-                    ('id', utils.extract_id(fields, resource)),
-                    ('attributes', utils.extract_attributes(fields, resource)),
-                    ('relationships', utils.extract_relationships(fields, resource)),
-                ]
-                # Add 'self' link if field is present and valid
-                if api_settings.URL_FIELD_NAME in resource and \
-                        isinstance(fields[api_settings.URL_FIELD_NAME], RelatedField):
-                        resource_data.append(('links', {'self': resource[api_settings.URL_FIELD_NAME]}))
-                json_api_data.append(OrderedDict(resource_data))
+                json_api_data.append(
+                    utils.build_root(fields, resource, resource_name))
         else:
-            result_id = data.pop('id', None)
-            json_api_data = {
-                'type': resource_name,
-                'id': result_id,
-                'attributes': utils.format_keys(data),
-            }
+            fields = data.serializer.fields
+            json_api_data = utils.build_root(fields, data, resource_name)
 
-        # remove results from the dict
-        data.pop('results', None)
-        if renderer_context.get('view').action == 'list':
-            # allow top level data to be added from list views
-            rendered_data = data
-        else:
-            # on detail views we don't render anything but serializer data
-            rendered_data = {}
-        rendered_data['data'] = json_api_data
+        render_data = {
+            'data': json_api_data
+        }
+
+        if data.get('meta'):
+            render_data['meta'] = data.get('meta')
+
+        if data.get('links'):
+            render_data['links'] = data.get('links')
 
         return super(JSONRenderer, self).render(
-            rendered_data, accepted_media_type, renderer_context
+            render_data, accepted_media_type, renderer_context
         )

rest_framework_json_api/utils.py

@@ -115,6 +115,22 @@ def format_keys(obj, format_type=None):
         return obj
 
 
+def build_root(fields, resource, resource_name):
+    resource_data = [
+        ('type', resource_name),
+        ('id', extract_id(fields, resource)),
+        ('attributes', extract_attributes(fields, resource)),
+    ]
+    relationships = extract_relationships(fields, resource)
+    if relationships:
+        resource_data.append(('relationships', relationships))
+    # Add 'self' link if field is present and valid
+    if api_settings.URL_FIELD_NAME in resource and \
+            isinstance(fields[api_settings.URL_FIELD_NAME], RelatedField):
+            resource_data.append(('links', {'self': resource[api_settings.URL_FIELD_NAME]}))
+    return OrderedDict(resource_data)
+
+
 def extract_id_from_url(url):
     http_prefix = url.startswith(('http:', 'https:'))
     if http_prefix: