Add support for GET lists.

luhn · Jul 26, 2024 · 4cffd1f · 4cffd1f
1 parent deb0c00
commit 4cffd1f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/pyramid_marshmallow/__init__.py b/pyramid_marshmallow/__init__.py
@@ -1,4 +1,4 @@
-from marshmallow import Schema, ValidationError
+from marshmallow import Schema, ValidationError, fields
 from pyramid.response import Response
 from pyramid.viewderivers import VIEW
 
@@ -48,7 +48,11 @@ def wrapped(context, request):
         if request.method == "GET":
             data = dict()
             for k, v in request.GET.items():
-                data[k] = v
+                field = schema.fields.get(k)
+                if isinstance(field, fields.List):
+                    data.setdefault(k, []).append(v)
+                else:
+                    data[k] = v
         else:
             data = request.json_body
         request.data = schema.load(data)

diff --git a/tests/sampleapp.py b/tests/sampleapp.py
@@ -14,8 +14,9 @@ class AlbumSchema(Schema):
 
     """
 
-    title = fields.Str()
+    title = fields.String()
     release_date = fields.Date(allow_null=True)
+    artists = fields.List(fields.String())
 
 
 class Root(dict):
@@ -73,6 +74,14 @@ def validate(request):
     return Response(request.data["title"])
 
 
+def validate_list(request):
+    assert request.data == {
+        "title": "Hunky Dory",
+        "artists": ["Bowie", "Wowie"],
+    }
+    return Response(", ".join(request.data["artists"]))
+
+
 def marshal(request):
     """
     Returns JSON-serialized information about the album.
@@ -131,6 +140,14 @@ def config():
             request_method=("GET", "POST"),
         )
 
+        config.add_route("validate-list", "/validate-list")
+        config.add_view(
+            validate_list,
+            route_name="validate-list",
+            validate=AlbumSchema(),
+            request_method=("GET", "POST"),
+        )
+
         # Marshaller
         config.add_route("marshal", "/marshal")
         config.add_view(

diff --git a/tests/test_integration.py b/tests/test_integration.py
@@ -35,6 +35,19 @@ def test_get_validate_integration(app):
     )
 
 
+def test_get_validate_list_integration(app):
+    assert (
+        app.get(
+            "/validate-list",
+            {
+                "title": "Hunky Dory",
+                "artists": ["Bowie", "Wowie"],
+            },
+        ).text
+        == "Bowie, Wowie"
+    )
+
+
 def test_marshal_integration(app):
     assert app.get("/marshal").json == {
         "title": "Hunky Dory",