Handling RelationshipView

Author: jsenecal

rest_framework_json_api/parsers.py

@@ -2,6 +2,7 @@
 Parsers
 """
 from rest_framework import parsers
+from rest_framework.exceptions import ParseError
 
 from . import utils, renderers, exceptions
 
@@ -31,12 +32,20 @@ def parse(self, stream, media_type=None, parser_context=None):
         Parses the incoming bytestream as JSON and returns the resulting data
         """
         result = super(JSONParser, self).parse(stream, media_type=media_type, parser_context=parser_context)
-        data = result.get('data', {})
+        data = result.get('data')
 
         if data:
             from rest_framework_json_api.views import RelationshipView
             if isinstance(parser_context['view'], RelationshipView):
-                return data  # temporary workaround
+                # We skip parsing the object as JSONAPI Resource Identifier Object and not a regular Resource Object
+                if isinstance(data, list):
+                    for resource_identifier_object in data:
+                        if not (resource_identifier_object.get('id') and resource_identifier_object.get('type')):
+                            raise ParseError('Received data contains a malformed JSONAPI Resource Identifier Object')
+                elif not (data.get('id') and data.get('type')):
+                    raise ParseError('Received data is not a valid JSONAPI Resource Identifier Object')
+
+                return data
             # Check for inconsistencies
             resource_name = utils.get_resource_name(parser_context)
             if data.get('type') != resource_name:
@@ -70,3 +79,6 @@ def parse(self, stream, media_type=None, parser_context=None):
             parsed_data.update(attributes)
             parsed_data.update(parsed_relationships)
             return parsed_data
+
+        else:
+            raise ParseError('Received document does not contain primary data')

rest_framework_json_api/renderers.py

@@ -55,11 +55,15 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
 
         json_api_included = list()
 
-        # If detail view then json api spec expects dict, otherwise a list
-        # - http://jsonapi.org/format/#document-top-level
-        # The `results` key may be missing if unpaginated or an OPTIONS request
-        if view and hasattr(view, 'action') and view.action == 'list' and \
+        from rest_framework_json_api.views import RelationshipView
+        if isinstance(view, RelationshipView):
+            # Special case for RelationshipView
+            json_api_data = data
+        elif view and hasattr(view, 'action') and view.action == 'list' and \
                 isinstance(data, dict) and 'results' in data:
+            # If detail view then json api spec expects dict, otherwise a list
+            # - http://jsonapi.org/format/#document-top-level
+            # The `results` key may be missing if unpaginated or an OPTIONS request
 
             results = data["results"]