Merge pull request #5 from evenicoulddoit/fix-nested-non-model-serial…

…izers

Fix implicit ModelSerializer assumption for expanded fields

CHANGELOG.md

@@ -1,2 +1,5 @@
-### 0.5.0
+### 0.5.1 (2017-04-11)
+* Bugfix to support expanding non-model serializers
+
+### 0.5.0 (2017-01-20)
 * Added `read_only=False` field definition support

rest_framework_serializer_extensions/__init__.py

@@ -1 +1 @@
-__version__ = '0.5.0'
+__version__ = '0.5.1'

rest_framework_serializer_extensions/serializers.py

@@ -212,7 +212,10 @@ def _standardise_expandable_definition(self, definition):
             return definition
 
         # The model used for the HashId (defaults to the serializer's model)
-        if 'id_model' not in definition:
+        if (
+            definition.get('id_source') is not False and
+            'id_model' not in definition
+        ):
             definition['id_model'] = definition['serializer'].Meta.model
 
         # read_only defaults to True

tests/test_serializers__expandable_fields_mixin.py

@@ -152,6 +152,29 @@ class Meta:
         )
 
 
+class NonModelTestSerializer(ExpandableFieldsMixin, serializers.Serializer):
+    is_model = serializers.SerializerMethodField()
+
+    def get_is_model(self, obj):
+        return False
+
+    def get_sku(self, obj):
+        sku = models.Sku.objects.get(variant='P100D')
+        serializer = SkuTestSerializer(instance=sku, context=self.context)
+        serializer.bind('sku', self)
+        return serializer.data
+
+    class Meta:
+        expandable_fields = dict(
+            non_model=dict(
+                serializer='{0}.NonModelTestSerializer'.format(MODULE),
+                source='*',
+                id_source=False
+            ),
+            sku=serializers.SerializerMethodField
+        )
+
+
 """
 END TEST SERIALIZERS
 """
@@ -742,6 +765,49 @@ def test_read_only_field_not_required(self):
         serializer = CarModelTestSerializer(data=dict(name='Ka'))
         self.assertTrue(serializer.is_valid())
 
+    def test_unexpanded_non_model_serializer(self):
+        """
+        Non-model serializers should support the mixin.
+        """
+        serializer = NonModelTestSerializer({})
+        self.assertDictEqual(serializer.data, dict(is_model=False))
+
+    def test_expanded_non_model_serializer_with_non_model_serializer(self):
+        """
+        Non-model to non-model expansion should work as expected.
+        """
+        serializer = NonModelTestSerializer(
+            {}, context=dict(expand={'non_model'})
+        )
+        self.assertDictEqual(
+            serializer.data,
+            dict(
+                is_model=False,
+                non_model=dict(
+                    is_model=False
+                )
+            )
+        )
+
+    def test_expanded_non_model_serializer_with_model_serializer(self):
+        """
+        Non-model to model expansion should work as expected.
+        """
+        serializer = NonModelTestSerializer(
+            {}, context=dict(expand={'sku'})
+        )
+        self.assertDictEqual(
+            serializer.data,
+            dict(
+                is_model=False,
+                sku=dict(
+                    id=self.sku_p100d.pk,
+                    variant=self.sku_p100d.variant,
+                    model_id=self.expand_instance_id(self.carmodel_model_s)
+                )
+            )
+        )
+
 
 @override_settings(
     REST_FRAMEWORK=dict(