Merge pull request #49 from django-json-api/jsenecal-bugfix

Various bugfixes

Author: jerel

rest_framework_json_api/renderers.py

@@ -76,6 +76,9 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
             if hasattr(data, 'serializer'):
                 fields = utils.get_serializer_fields(data.serializer)
                 json_api_data = utils.build_json_resource_obj(fields, data, resource_name)
+                included = utils.extract_included(fields, data)
+                if included:
+                    json_api_included.extend(included)
             else:
                 json_api_data = data
 

rest_framework_json_api/utils.py

@@ -139,6 +139,29 @@ def build_json_resource_obj(fields, resource, resource_name):
     return OrderedDict(resource_data)
 
 
+def get_related_resource_type(relation):
+    queryset = relation.queryset
+    if queryset is not None:
+        relation_model = queryset.model
+    else:
+        parent_serializer = relation.parent
+        if hasattr(parent_serializer, 'Meta'):
+            parent_model = parent_serializer.Meta.model
+        else:
+            parent_model = parent_serializer.parent.Meta.model
+        parent_model_relation = getattr(
+            parent_model,
+            (relation.field_name if relation.field_name else parent_serializer.field_name)
+        )
+        if hasattr(parent_model_relation, 'related'):
+            relation_model = parent_model_relation.related.model
+        elif hasattr(parent_model_relation, 'field'):
+            relation_model = parent_model_relation.field.related.model
+        else:
+            raise APIException('Unable to find related model for relation {relation}'.format(relation=relation))
+    return inflection.pluralize(relation_model.__name__).lower()
+
+
 def extract_id_from_url(url):
     http_prefix = url.startswith(('http:', 'https:'))
     if http_prefix:
@@ -170,7 +193,7 @@ def extract_attributes(fields, resource):
         if isinstance(field, (RelatedField, BaseSerializer, ManyRelatedField)):
             continue
         data.update({
-            field_name: (encoding.force_text(resource[field_name]) if resource[field_name] is not None else None)
+            field_name: resource[field_name]
         })
 
     return format_keys(data)
@@ -188,8 +211,7 @@ def extract_relationships(fields, resource):
             continue
 
         if isinstance(field, (PrimaryKeyRelatedField, HyperlinkedRelatedField)):
-            relation_model = field.queryset.model
-            relation_type = inflection.pluralize(relation_model.__name__).lower()
+            relation_type = get_related_resource_type(field)
 
             if resource[field_name] is not None:
                 if isinstance(field, PrimaryKeyRelatedField):
@@ -214,16 +236,8 @@ def extract_relationships(fields, resource):
             relation_data = list()
 
             relation = field.child_relation
-            queryset = relation.queryset
-            if queryset is not None:
-                relation_model = queryset.model
-            else:
-                parent_serializer = field.parent
-                parent_model = parent_serializer.Meta.model
-                parent_model_relation = getattr(parent_model, field_name)
-                relation_model = parent_model_relation.related.model
 
-            relation_type = inflection.pluralize(relation_model.__name__).lower()
+            relation_type = get_related_resource_type(relation)
 
             if isinstance(relation, HyperlinkedRelatedField):
                 for link in resource[field_name]: