Merge b717821 into bded0ba

AUTHORS.rst

@@ -18,3 +18,4 @@ Contributors
 * Élysson MR `@elyssonmr <https://github.com/elyssonmr>`_
 * Mandar Upadhye `@mandarup <https://github.com/mandarup>`_
 * Pavel Kulyov `@pkulev <https://github.com/pkulev>`_
+* Felix Sonntag `@fsonntag <https://github.com/fsonntag>`_

tests/test_fields.py

@@ -88,6 +88,20 @@ class MyDoc(Document):
         doc.required_validate()
 
 
+    def test_required_nested_allow_none(self):
+        @self.instance.register
+        class MyEmbedded(EmbeddedDocument):
+            field = fields.IntField()
+
+        @self.instance.register
+        class MyDoc(Document):
+            embedded_list = fields.ListField(fields.EmbeddedField(MyEmbedded), allow_none=True)
+            embedded_dict = fields.DictField(values=fields.EmbeddedField(MyEmbedded), allow_none=True)
+            embedded = fields.EmbeddedField(MyEmbedded, allow_none=True)
+
+        MyDoc(embedded_list=None, embedded_dict=None, embedded=None).required_validate()
+
+
 class TestFields(BaseTest):
 
     def test_basefields(self):

umongo/data_proxy.py

@@ -169,6 +169,8 @@ def required_validate(self):
             value = self._data[field.attribute or name]
             if field.required and value is ma.missing:
                 errors[name] = [_("Missing data for required field.")]
+            elif value is ma.missing or value is None:
+                continue
             elif hasattr(field, '_required_validate'):
                 try:
                     field._required_validate(value)

umongo/fields.py

@@ -230,7 +230,7 @@ def as_marshmallow_field(self, mongo_world=False, **kwargs):
         return ma.fields.Dict(self.key_field, inner_ma_schema, **field_kwargs)
 
     def _required_validate(self, value):
-        if value is ma.missing or not hasattr(self.value_field, '_required_validate'):
+        if not hasattr(self.value_field, '_required_validate'):
             return
         required_validate = self.value_field._required_validate
         errors = collections.defaultdict(dict)
@@ -291,7 +291,7 @@ def as_marshmallow_field(self, mongo_world=False, **kwargs):
         return ma.fields.List(inner_ma_schema, **field_kwargs)
 
     def _required_validate(self, value):
-        if value is ma.missing or not hasattr(self.inner, '_required_validate'):
+        if not hasattr(self.inner, '_required_validate'):
             return
         required_validate = self.inner._required_validate
         errors = {}
@@ -561,5 +561,4 @@ def as_marshmallow_field(self, mongo_world=False, **kwargs):
         return ma.fields.Nested(nested_ma_schema, **field_kwargs)
 
     def _required_validate(self, value):
-        if value is not ma.missing:
-            value.required_validate()
+        value.required_validate()