Merge branch 'master' into patch-1

Author: lovasoa

marshmallow_dataclass/__init__.py

@@ -34,11 +34,9 @@ class User:
       })
       Schema: ClassVar[Type[Schema]] = Schema # For the type checker
 """
-import dataclasses
 import inspect
-import typing
-from functools import lru_cache
 from enum import EnumMeta
+from functools import lru_cache
 from typing import (
     overload,
     Dict,
@@ -55,6 +53,7 @@ class User:
     Set,
 )
 
+import dataclasses
 import marshmallow
 import typing_inspect
 
@@ -63,9 +62,6 @@ class User:
 NoneType = type(None)
 _U = TypeVar("_U")
 
-T_Schema = TypeVar("T_Schema", bound=marshmallow.Schema)
-T_SchemaType = Type[T_Schema]
-
 # Whitelist of dataclass members that will be copied to generated schema.
 MEMBERS_WHITELIST: Set[str] = {"Meta"}
 
@@ -165,12 +161,15 @@ def decorator(clazz: Type[_U]) -> Type[_U]:
     return decorator(_cls) if _cls else decorator
 
 
-@typing.overload
+T_Schema = TypeVar("T_Schema", bound=marshmallow.Schema)
+T_SchemaType = Type[T_Schema]
+
+@overload
 def class_schema(clazz: type, base_schema: None = None) -> Type[marshmallow.Schema]:
     ...
 
 
-@typing.overload
+@overload
 def class_schema(clazz: type, base_schema: T_SchemaType) -> T_SchemaType:
     ...
 
@@ -469,12 +468,17 @@ def _base_schema(
     Base schema factory that creates a schema for `clazz` derived either from `base_schema`
     or `BaseSchema`
     """
+
     # Remove `type: ignore` when mypy handles dynamic base classes
     # https://github.com/python/mypy/issues/2813
     class BaseSchema(base_schema or marshmallow.Schema):  # type: ignore
-        @marshmallow.post_load
-        def make_data_class(self, data, **_):
-            return clazz(**data)
+        def load(self, data: Mapping, *, many: bool = None, **kwargs):
+            all_loaded = super().load(data, many=many, **kwargs)
+            many = self.many if many is None else bool(many)
+            if many:
+                return [clazz(**loaded) for loaded in all_loaded]
+            else:
+                return clazz(**all_loaded)
 
     return BaseSchema
 

tests/test_post_load.py

@@ -0,0 +1,44 @@
+import unittest
+
+import marshmallow
+
+import marshmallow_dataclass
+
+
+# Regression test for https://github.com/lovasoa/marshmallow_dataclass/issues/75
+class TestPostLoad(unittest.TestCase):
+    @marshmallow_dataclass.dataclass
+    class Named:
+        first_name: str
+        last_name: str
+
+        @marshmallow.post_load
+        def a(self, data, **_kwargs):
+            data["first_name"] = data["first_name"].capitalize()
+            return data
+
+        @marshmallow.post_load
+        def z(self, data, **_kwargs):
+            data["last_name"] = data["last_name"].capitalize()
+            return data
+
+    def test_post_load_method_naming_does_not_affect_data(self):
+        actual = self.Named.Schema().load(
+            {"first_name": "matt", "last_name": "groening"}
+        )
+        expected = self.Named(first_name="Matt", last_name="Groening")
+        self.assertEqual(actual, expected)
+
+    def test_load_many(self):
+        actual = self.Named.Schema().load(
+            [
+                {"first_name": "matt", "last_name": "groening"},
+                {"first_name": "bart", "last_name": "simpson"},
+            ],
+            many=True,
+        )
+        expected = [
+            self.Named(first_name="Matt", last_name="Groening"),
+            self.Named(first_name="Bart", last_name="Simpson"),
+        ]
+        self.assertEqual(actual, expected)