Merge pull request #434 from gabisurita/top-level-body-arrays

Add support for arrays on request body top level (fixes #433)

CHANGES.txt

@@ -6,7 +6,9 @@ CHANGELOG
 2.4.0 (unreleased)
 ==================
 
-- Nothing changed yet.
+**Enhancements**
+
+- Add support for arrays on request body top level.
 
 
 2.3.0 (2016-12-15)

cornice/validators/__init__.py

@@ -46,8 +46,9 @@ def extract_cstruct(request):
                 request.errors.add('body', '', 'Invalid JSON: %s' % e)
                 return {}
             else:
-                if not hasattr(body, 'items'):
-                    request.errors.add('body', '', 'Should be a JSON object')
+                if not hasattr(body, 'items') and not isinstance(body, list):
+                    request.errors.add('body', '',
+                                       'Should be a JSON object or an array')
                     return {}
         else:
             body = {}

cornice/validators/_colander.py

@@ -32,11 +32,8 @@ def body_validator(request, schema=None, deserializer=None, **kwargs):
     class RequestSchema(colander.MappingSchema):
         body = _ensure_instantiated(schema)
 
-        def deserialize(self, cstruct=colander.null):
-            appstruct = super(RequestSchema, self).deserialize(cstruct)
-            return appstruct['body']
-
     validator(request, RequestSchema(), deserializer, **kwargs)
+    request.validated = request.validated.get('body', {})
 
 
 def validator(request, schema=None, deserializer=None, **kwargs):

tests/test_validation.py

@@ -405,6 +405,15 @@ def test_valid_nonstandard_json(self):
         )
         self.assertEqual(response.json['username'], 'man')
 
+    def test_valid_json_array(self):
+        app = self.make_ordinary_app()
+        response = app.post_json(
+            '/group_signup',
+            [{'username': 'hey'}, {'username': 'how'}]
+        )
+        self.assertEqual(response.json['data'],
+                         [{'username': 'hey'}, {'username': 'how'}])
+
     def test_invalid_json(self):
         app = self.make_ordinary_app()
         response = app.post('/signup',

tests/validationapp.py

@@ -174,6 +174,16 @@ class SignupSchema(MappingSchema):
     def signup_post(request):
         return request.validated
 
+    group_signup = Service(name="group signup", path="/group_signup")
+
+    class GroupSignupSchema(SequenceSchema):
+        user = SignupSchema()
+
+    @group_signup.post(schema=GroupSignupSchema(),
+                       validators=(colander_body_validator,))
+    def group_signup_post(request):
+        return {'data': request.validated}
+
     def validate_bar(node, value):
         if value != 'open':
             raise Invalid(node, "The bar is not open.")