Unmarshal any schema type

p1c2u · p1c2u · commit cf53e1957882 · 2018-08-22T14:29:15.000+01:00
diff --git a/openapi_core/schema/schemas/exceptions.py b/openapi_core/schema/schemas/exceptions.py
@@ -5,6 +5,14 @@ class OpenAPISchemaError(OpenAPIMappingError):
     pass
 
 
+class NoValidSchema(OpenAPISchemaError):
+     pass
+
+
+class UndefinedItemsSchema(OpenAPISchemaError):
+    pass
+
+
 class InvalidSchemaValue(OpenAPISchemaError):
     pass
 
diff --git a/openapi_core/schema/schemas/models.py b/openapi_core/schema/schemas/models.py
@@ -10,7 +10,8 @@
 from openapi_core.schema.schemas.enums import SchemaFormat, SchemaType
 from openapi_core.schema.schemas.exceptions import (
     InvalidSchemaValue, UndefinedSchemaProperty, MissingSchemaProperty,
-    OpenAPISchemaError, NoOneOfSchema, MultipleOneOfSchema,
+    OpenAPISchemaError, NoOneOfSchema, MultipleOneOfSchema, NoValidSchema,
+    UndefinedItemsSchema,
 )
 from openapi_core.schema.schemas.util import (
     forcebool, format_date, format_datetime,
@@ -26,7 +27,6 @@ class Schema(object):
     """Represents an OpenAPI Schema."""
 
     DEFAULT_CAST_CALLABLE_GETTER = {
-        SchemaType.ANY: lambda x: x,
         SchemaType.INTEGER: int,
         SchemaType.NUMBER: float,
         SchemaType.BOOLEAN: forcebool,
@@ -47,7 +47,7 @@ class Schema(object):
     }
 
     TYPE_VALIDATOR_CALLABLE_GETTER = {
-        None: lambda x: True,
+        SchemaType.ANY: lambda x: x,
         SchemaType.BOOLEAN: TypeValidator(bool),
         SchemaType.INTEGER: TypeValidator(integer_types, exclude=bool),
         SchemaType.NUMBER: TypeValidator(integer_types, float, exclude=bool),
@@ -108,7 +108,7 @@ def _get_all_required_properties(self):
 
         return dict(
             (prop_name, val)
-            for prop_name, val in all_properties.items()
+            for prop_name, val in iteritems(all_properties)
             if prop_name in required
         )
 
@@ -125,6 +125,7 @@ def get_cast_mapping(self):
         mapping = self.DEFAULT_CAST_CALLABLE_GETTER.copy()
         mapping.update({
             SchemaType.STRING: self._unmarshal_string,
+            SchemaType.ANY: self._unmarshal_any,
             SchemaType.ARRAY: self._unmarshal_collection,
             SchemaType.OBJECT: self._unmarshal_object,
         })
@@ -188,7 +189,26 @@ def _unmarshal_string(self, value):
                     value, self.format)
             )
 
+    def _unmarshal_any(self, value):
+        types_resolve_order = [
+            SchemaType.OBJECT, SchemaType.ARRAY, SchemaType.BOOLEAN,
+            SchemaType.INTEGER, SchemaType.NUMBER, SchemaType.STRING,
+        ]
+        cast_mapping = self.get_cast_mapping()
+        for schema_type in types_resolve_order:
+            cast_callable = cast_mapping[schema_type]
+            try:
+                return cast_callable(value)
+            # @todo: remove ValueError when validation separated
+            except (OpenAPISchemaError, ValueError):
+                pass
+        raise NoValidSchema(
+            "No valid schema found for value {0}".format(value))
+
     def _unmarshal_collection(self, value):
+        if self.items is None:
+            raise UndefinedItemsSchema("Undefined items' schema")
+
         return list(map(self.items.unmarshal, value))
 
     def _unmarshal_object(self, value, model_factory=None):
diff --git a/tests/integration/data/v3.0/petstore.yaml b/tests/integration/data/v3.0/petstore.yaml
@@ -172,8 +172,7 @@ components:
       oneOf:
         - type: string
           enum: [always, now]
-        - type: string
-          format: date-time
+        - type: integer
     Address:
       type: object
       x-model: Address
diff --git a/tests/integration/test_petstore.py b/tests/integration/test_petstore.py
@@ -1108,3 +1108,43 @@ def test_post_tags_created_datetime(
         assert response_result.data.message == message
         assert response_result.data.rootCause == rootCause
         assert response_result.data.additionalinfo == additionalinfo
+
+    def test_post_tags_created_invalid_type(
+            self, spec, response_validator):
+        host_url = 'http://petstore.swagger.io/v1'
+        path_pattern = '/v1/tags'
+        pet_name = 'Dog'
+        data_json = {
+            'created': 'long time ago',
+            'name': pet_name,
+        }
+        data = json.dumps(data_json)
+
+        request = MockRequest(
+            host_url, 'POST', '/tags',
+            path_pattern=path_pattern, data=data,
+        )
+
+        parameters = request.get_parameters(spec)
+        body = request.get_body(spec)
+
+        assert parameters == {}
+        assert body == data_json
+
+        data_json = {
+            'code': 400,
+            'message': 'Bad request',
+            'rootCause': 'Tag already exist',
+            'additionalinfo': 'Tag Dog already exist',
+        }
+        data = json.dumps(data_json)
+        response = MockResponse(data, status_code=404)
+
+        response_result = response_validator.validate(request, response)
+
+        assert response_result.errors == []
+        assert isinstance(response_result.data, BaseModel)
+        assert response_result.data.code == code
+        assert response_result.data.message == message
+        assert response_result.data.rootCause == rootCause
+        assert response_result.data.additionalinfo == additionalinfo
