Any schema type

p1c2u · p1c2u · commit 5879e18ace84 · 2018-08-02T19:30:51.000+01:00
diff --git a/openapi_core/schema/schemas/enums.py b/openapi_core/schema/schemas/enums.py
@@ -4,6 +4,7 @@
 
 class SchemaType(Enum):
 
+    ANY = None
     INTEGER = 'integer'
     NUMBER = 'number'
     STRING = 'string'
diff --git a/openapi_core/schema/schemas/factories.py b/openapi_core/schema/schemas/factories.py
@@ -16,7 +16,7 @@ def __init__(self, dereferencer):
     def create(self, schema_spec):
         schema_deref = self.dereferencer.dereference(schema_spec)
 
-        schema_type = schema_deref.get('type', 'object')
+        schema_type = schema_deref.get('type', None)
         schema_format = schema_deref.get('format')
         model = schema_deref.get('x-model', None)
         required = schema_deref.get('required', False)
diff --git a/openapi_core/schema/schemas/models.py b/openapi_core/schema/schemas/models.py
@@ -20,6 +20,7 @@ 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,
@@ -30,7 +31,7 @@ def __init__(
             schema_format=None, required=None, default=None, nullable=False,
             enum=None, deprecated=False, all_of=None, one_of=None,
             additional_properties=None):
-        self.type = schema_type and SchemaType(schema_type)
+        self.type = SchemaType(schema_type)
         self.model = model
         self.properties = properties and dict(properties) or {}
         self.items = items
diff --git a/tests/integration/data/v3.0/petstore.yaml b/tests/integration/data/v3.0/petstore.yaml
@@ -155,6 +155,12 @@ paths:
           $ref: "#/components/responses/ErrorResponse"
 components:
   schemas:
+    Utctime:
+      oneOf:
+        - type: string
+          enum: [always, now]
+        - type: string
+          format: date-time
     Address:
       type: object
       x-model: Address
@@ -189,6 +195,7 @@ components:
           type: integer
           format: int64
     PetCreate:
+      type: object
       x-model: PetCreate
       allOf:
         - $ref: "#/components/schemas/PetCreatePartOne"
@@ -271,6 +278,8 @@ components:
       required:
         - name
       properties:
+        created:
+          $ref: "#/components/schemas/Utctime"
         name:
           type: string
           format: custom
diff --git a/tests/integration/test_petstore.py b/tests/integration/test_petstore.py
@@ -829,3 +829,75 @@ def test_post_tags_additional_properties(
 
         assert response_result.errors == []
         assert response_result.data == data_json
+
+    def test_post_tags_created_now(
+            self, spec, response_validator):
+        host_url = 'http://petstore.swagger.io/v1'
+        path_pattern = '/v1/tags'
+        pet_name = 'Dog'
+        data_json = {
+            'created': 'now',
+            '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 response_result.data == data_json
+
+    def test_post_tags_created_datetime(
+            self, spec, response_validator):
+        host_url = 'http://petstore.swagger.io/v1'
+        path_pattern = '/v1/tags'
+        pet_name = 'Dog'
+        data_json = {
+            'created': '2016-04-16T16:06:05Z',
+            '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 response_result.data == data_json
