Merge pull request #4 from dealertrack/enforce

Fixed a bug in EnforceValidationFieldMixin

drf_braces/serializers/enforce_validation_serializer.py

@@ -2,11 +2,12 @@
 import inspect
 
 from rest_framework import fields, serializers
+from rest_framework.fields import empty
 
 from ..utils import add_base_class_to_instance, get_class_name_with_new_suffix
 
 
-class EnforceValidationFieldMixin(fields.Field):
+class EnforceValidationFieldMixin(object):
     """
     Custom DRF field mixin which allows to ignore validation error
     if the field is not mandatory.
@@ -17,9 +18,9 @@ class EnforceValidationFieldMixin(fields.Field):
     fields in that serializer are mandatory and must validate.
     """
 
-    def to_internal_value(self, data):
+    def run_validation(self, data=empty):
         try:
-            return super(EnforceValidationFieldMixin, self).to_internal_value(data)
+            return super(EnforceValidationFieldMixin, self).run_validation(data)
         except serializers.ValidationError:
             must_validate_fields = getattr(self.parent, 'must_validate_fields', None)
             field_name = getattr(self, 'field_name')
@@ -30,7 +31,10 @@ def to_internal_value(self, data):
             if must_validate_fields is None or field_name in must_validate_fields:
                 raise
             else:
-                raise fields.SkipField
+                raise fields.SkipField(
+                    'This field "{}" is being skipped as per enforce validation logic.'
+                    ''.format(field_name)
+                )
 
 
 def _create_enforce_validation_serializer(serializer, strict_mode_by_default=True):

drf_braces/tests/fields/test_fields.py

@@ -2,7 +2,10 @@
 import unittest
 
 from drf_braces.fields import _fields
-from drf_braces.fields.mixins import AllowBlankNullFieldMixin, EmptyStringFieldMixin
+from drf_braces.fields.mixins import (
+    AllowBlankNullFieldMixin,
+    EmptyStringFieldMixin,
+)
 
 
 class TestFields(unittest.TestCase):

drf_braces/tests/serializers/test_enforce_validation_serializer.py

@@ -35,36 +35,36 @@ class TestEnforceValidationFieldMixin(unittest.TestCase):
     class Field(EnforceValidationFieldMixin, fields.IntegerField):
         pass
 
-    def test_field_from_native_must_validate(self):
+    def test_run_validation_must_validate(self):
         field = self.Field()
         field.field_name = 'field'
         field.parent = mock.MagicMock(must_validate_fields=None)
 
-        self.assertEqual(field.to_internal_value('5'), 5)
+        self.assertEqual(field.run_validation('5'), 5)
 
-    def test_field_from_native_must_validate_all(self):
+    def test_run_validation_must_validate_all(self):
         field = self.Field()
         field.field_name = 'field'
         field.parent = mock.MagicMock(must_validate_fields=None)
 
         with self.assertRaises(serializers.ValidationError):
-            field.to_internal_value('hello')
+            field.run_validation('hello')
 
-    def test_field_from_native_must_validate_invalid(self):
+    def test_run_validation_must_validate_invalid(self):
         field = self.Field()
         field.field_name = 'field'
         field.parent = mock.MagicMock(must_validate_fields=['field'])
 
         with self.assertRaises(serializers.ValidationError):
-            field.to_internal_value('hello')
+            field.run_validation('hello')
 
-    def test_field_from_native_must_validate_ignore(self):
+    def test_run_validation_must_validate_ignore(self):
         field = self.Field()
         field.field_name = 'field'
         field.parent = mock.MagicMock(must_validate_fields=[])
 
         with self.assertRaises(serializers.SkipField):
-            field.to_internal_value('hello')
+            field.run_validation('hello')
 
 
 class TestUtils(unittest.TestCase):

drf_braces/tests/test_utils.py

@@ -1,12 +1,14 @@
 from __future__ import print_function, unicode_literals
-
 import unittest
 
+from rest_framework import fields
+
 from drf_braces.utils import (
-    get_class_name_with_new_suffix,
+    find_class_args,
+    find_function_args,
     get_attr_from_base_classes,
+    get_class_name_with_new_suffix,
 )
-from rest_framework import fields
 
 
 class TestUtils(unittest.TestCase):
@@ -48,3 +50,24 @@ def test_get_attr_from_base_classes(self):
             get_attr_from_base_classes(
                 (Parent,), {'fields': 'mushrooms'}, 'catchmeifyoucan'
             )
+
+    def test_find_function_args(self):
+        def foo(a, b, c):
+            pass
+
+        self.assertListEqual(find_function_args(foo), ['a', 'b', 'c'])
+
+    def test_find_function_args_invalid(self):
+        self.assertListEqual(find_function_args(None), [])
+
+    def test_find_class_args(self):
+        class Bar(object):
+            def __init__(self, a, b):
+                pass
+
+        class Foo(Bar):
+            def __init__(self, c, d):
+                super(Foo, self).__init__(None, None)
+                pass
+
+        self.assertSetEqual(set(find_class_args(Foo)), {'a', 'b', 'c', 'd'})