Merge branch 'develop' of github.com:django-json-api/django-rest-framework-json-api into feature/parsers

Author: jsenecal

requirements-development.txt

@@ -1,5 +1,5 @@
 -e .
-pytest
+pytest==2.7.2
 pytest-django
 pytest-factoryboy
 tox

rest_framework_json_api/exceptions.py

@@ -1,7 +1,7 @@
-from django.utils import encoding
+import inspect
+from django.utils import six, encoding
 from django.utils.translation import ugettext_lazy as _
-from rest_framework import status
-from rest_framework.exceptions import APIException
+from rest_framework import status, exceptions
 from rest_framework.views import exception_handler as drf_exception_handler
 
 from rest_framework_json_api.utils import format_value
@@ -32,11 +32,17 @@ def exception_handler(exc, context):
             # see if they passed a dictionary to ValidationError manually
             if isinstance(error, dict):
                 errors.append(error)
-            # or a string in case of AuthenticationError
-            elif isinstance(error, str):
-                # An error MUST be a JSON object in JSON API spec
+            elif isinstance(error, six.string_types):
+                classes = inspect.getmembers(exceptions, inspect.isclass)
+                # DRF sets the `field` to 'detail' for its own exceptions
+                if isinstance(exc, tuple(x[1] for x in classes)):
+                    pointer = '/data'
                 errors.append({
-                    'detail': error
+                    'detail': error,
+                    'source': {
+                        'pointer': pointer,
+                    },
+                    'status': encoding.force_text(response.status_code),
                 })
             elif isinstance(error, list):
                 for message in error:
@@ -49,7 +55,7 @@ def exception_handler(exc, context):
                     })
             else:
                 errors.append({
-                    'detail': message,
+                    'detail': error,
                     'source': {
                         'pointer': pointer,
                     },
@@ -62,6 +68,7 @@ def exception_handler(exc, context):
     return response
 
 
-class Conflict(APIException):
+class Conflict(exceptions.APIException):
     status_code = status.HTTP_409_CONFLICT
     default_detail = _('Conflict.')
+

rest_framework_json_api/metadata.py

@@ -86,8 +86,8 @@ def get_field_info(self, field, serializer):
         else:
             field_info['type'] = self.type_lookup[field]
 
-        serializer_model = getattr(serializer.Meta, 'model')
         try:
+            serializer_model = getattr(serializer.Meta, 'model')
             field_info['relationship_type'] = self.relation_type_lookup[getattr(serializer_model, field.field_name)]
         except KeyError:
             pass

rest_framework_json_api/renderers.py

@@ -99,7 +99,12 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
         if isinstance(data, dict) and data.get('links'):
             render_data['links'] = data.get('links')
 
-        render_data['data'] = json_api_data
+        # format the api root link list
+        if view.__class__ and view.__class__.__name__ == 'APIRoot':
+            render_data['data'] = None
+            render_data['links'] = json_api_data
+        else:
+            render_data['data'] = json_api_data
 
         if len(json_api_included) > 0:
             # Iterate through compound documents to remove duplicates