Merge pull request #65 from lmignon/fix-load-nested-many

FIx load of nested many models

Author: SVilgelm

marshmallow_objects/models.py

@@ -25,7 +25,9 @@
 
 @marshmallow.post_load
 def __make_object__(self, data, **kwargs):
-    return self.__model_class__(__post_load__=True, __schema__=self, **data)
+    data["many"] = kwargs.pop("many", None)
+    return self.__model_class__(
+        __post_load__=True, __schema__=self, **data)
 
 
 class ModelMeta(type):
@@ -69,6 +71,7 @@ def __new__(mcs, name, parents, dct):
 
     def __call__(cls, *args, **kwargs):
         if kwargs.pop('__post_load__', False):
+            kwargs.pop("many")
             schema = kwargs.pop('__schema__')
             obj = cls.__new__(cls, *args, **kwargs)
             obj.__dump_lock__ = threading.RLock()
@@ -83,7 +86,8 @@ def __call__(cls, *args, **kwargs):
         else:
             context = kwargs.pop('context', None)
             partial = kwargs.pop('partial', None)
-            obj = cls.load(kwargs, context=context, partial=partial)
+            many = kwargs.pop("many", None)
+            obj = cls.load(kwargs, many=many, context=context, partial=partial)
         return obj
 
 
@@ -92,6 +96,8 @@ def __init__(self, nested, **kwargs):
         super(NestedModel, self).__init__(nested.__schema_class__, **kwargs)
 
     def _deserialize(self, value, attr, data, **kwargs):
+        if self.many and value and isinstance(value[0], Model):
+            return value
         if isinstance(value, Model):
             return value
         return super(NestedModel, self)._deserialize(value, attr, data,

tests/test_models.py

@@ -148,6 +148,19 @@ def test_nested_dict_many(self):
         c = C(a=[dict(test_field='1'), dict(test_field='2')])
         self.assertEqual(2, len(c.a))
 
+    def test_nested_model_many(self):
+        c = C(a=[A(test_field='1'), A(test_field='2')])
+        self.assertEqual(2, len(c.a))
+
+    def test_load_model_many(self):
+        a_list = A.load(
+            [dict(test_field='1'), dict(test_field='2')],
+            many=True
+        )
+        self.assertEqual(2, len(a_list))
+        self.assertEqual('1', a_list[0].test_field)
+        self.assertEqual('2', a_list[1].test_field)
+
     def test_partial(self):
         self.assertRaises(marshmallow.ValidationError, B)
         b = B(partial=True)