Factories and exceptions cleanup

Author: p1c2u

openapi_core/__init__.py

@@ -1,14 +1,10 @@
 """OpenAPI core module"""
 from openapi_core.shortcuts import create_spec
-from openapi_core.wrappers import RequestParametersFactory, RequestBodyFactory
 
 __author__ = 'Artur Maciąg'
 __email__ = 'maciag.artur@gmail.com'
 __version__ = '0.2.2'
 __url__ = 'https://github.com/p1c2u/openapi-core'
 __license__ = 'BSD 3-Clause License'
 
-__all__ = ['create_spec', 'request_parameters_factory', 'request_body_factory']
-
-request_parameters_factory = RequestParametersFactory()
-request_body_factory = RequestBodyFactory()
+__all__ = ['create_spec', ]

openapi_core/exceptions.py

@@ -9,41 +9,65 @@ class OpenAPIMappingError(OpenAPIError):
     pass
 
 
-class MissingParameterError(OpenAPIMappingError):
+class OpenAPIServerError(OpenAPIMappingError):
     pass
 
 
-class MissingBodyError(OpenAPIMappingError):
+class OpenAPIOperationError(OpenAPIMappingError):
     pass
 
 
-class MissingPropertyError(OpenAPIMappingError):
+class InvalidValueType(OpenAPIMappingError):
     pass
 
 
-class InvalidContentTypeError(OpenAPIMappingError):
+class OpenAPIParameterError(OpenAPIMappingError):
     pass
 
 
-class InvalidOperationError(OpenAPIMappingError):
+class OpenAPIBodyError(OpenAPIMappingError):
     pass
 
 
-class InvalidServerError(OpenAPIMappingError):
+class InvalidServer(OpenAPIServerError):
     pass
 
 
-class InvalidValueType(OpenAPIMappingError):
+class InvalidOperation(OpenAPIOperationError):
     pass
 
 
-class InvalidValue(OpenAPIMappingError):
+class EmptyValue(OpenAPIParameterError):
+    pass
+
+
+class MissingParameter(OpenAPIParameterError):
+    pass
+
+
+class InvalidParameterValue(OpenAPIParameterError):
+    pass
+
+
+class MissingBody(OpenAPIBodyError):
+    pass
+
+
+class InvalidMediaTypeValue(OpenAPIBodyError):
     pass
 
 
-class EmptyValue(OpenAPIMappingError):
+class UndefinedSchemaProperty(OpenAPIBodyError):
     pass
 
 
-class UndefinedSchemaProperty(OpenAPIMappingError):
+class MissingProperty(OpenAPIBodyError):
+    pass
+
+
+class InvalidContentType(OpenAPIBodyError):
+    pass
+
+
+class InvalidValue(OpenAPIMappingError):
     pass

openapi_core/media_types.py

@@ -1,6 +1,8 @@
 """OpenAPI core mediaTypes module"""
 from six import iteritems
 
+from openapi_core.exceptions import InvalidValueType, InvalidMediaTypeValue
+
 
 class MediaType(object):
     """Represents an OpenAPI MediaType."""
@@ -13,7 +15,10 @@ def unmarshal(self, value):
         if not self.schema:
             return value
 
-        return self.schema.unmarshal(value)
+        try:
+            return self.schema.unmarshal(value)
+        except InvalidValueType as exc:
+            raise InvalidMediaTypeValue(str(exc))
 
 
 class MediaTypeGenerator(object):

openapi_core/parameters.py

@@ -2,7 +2,9 @@
 import logging
 import warnings
 
-from openapi_core.exceptions import EmptyValue
+from openapi_core.exceptions import (
+    EmptyValue, InvalidValueType, InvalidParameterValue,
+)
 
 log = logging.getLogger(__name__)
 
@@ -35,12 +37,15 @@ def unmarshal(self, value):
         if (self.location == "query" and value == "" and
                 not self.allow_empty_value):
             raise EmptyValue(
-                "Value of {0} parameter cannot be empty.".format(self.name))
+                "Value of {0} parameter cannot be empty".format(self.name))
 
         if not self.schema:
             return value
 
-        return self.schema.unmarshal(value)
+        try:
+            return self.schema.unmarshal(value)
+        except InvalidValueType as exc:
+            raise InvalidParameterValue(str(exc))
 
 
 class ParametersGenerator(object):

openapi_core/request_bodies.py

@@ -1,7 +1,7 @@
 """OpenAPI core requestBodies module"""
 from functools import lru_cache
 
-from openapi_core.exceptions import InvalidContentTypeError
+from openapi_core.exceptions import InvalidContentType
 from openapi_core.media_types import MediaTypeGenerator
 
 
@@ -16,7 +16,7 @@ def __getitem__(self, mimetype):
         try:
             return self.content[mimetype]
         except KeyError:
-            raise InvalidContentTypeError(
+            raise InvalidContentType(
                 "Invalid mime type `{0}`".format(mimetype))
 
 

openapi_core/schemas.py

@@ -10,8 +10,7 @@
 from six import iteritems
 
 from openapi_core.exceptions import (
-    InvalidValueType, UndefinedSchemaProperty, MissingPropertyError,
-    InvalidValue,
+    InvalidValueType, UndefinedSchemaProperty, MissingProperty, InvalidValue,
 )
 from openapi_core.models import ModelFactory
 
@@ -59,7 +58,8 @@ def cast(self, value):
         if value is None:
             if not self.nullable:
                 raise InvalidValueType(
-                    "Failed to cast value of %s to %s", value, self.type,
+                    "Failed to cast value of {0} to {1}".format(
+                        value, self.type)
                 )
             return self.default
 
@@ -73,7 +73,7 @@ def cast(self, value):
             return cast_callable(value)
         except ValueError:
             raise InvalidValueType(
-                "Failed to cast value of %s to %s", value, self.type,
+                "Failed to cast value of {0} to {1}".format(value, self.type)
             )
 
     def unmarshal(self, value):
@@ -88,7 +88,8 @@ def unmarshal(self, value):
 
         if self.enum and casted not in self.enum:
             raise InvalidValue(
-                "Value of %s not in enum choices: %s", value, str(self.enum),
+                "Value of {0} not in enum choices: {1}".format(
+                    value, self.enum)
             )
 
         return casted
@@ -115,7 +116,7 @@ def _unmarshal_object(self, value):
                 prop_value = value[prop_name]
             except KeyError:
                 if prop_name in self.required:
-                    raise MissingPropertyError(
+                    raise MissingProperty(
                         "Missing schema property {0}".format(prop_name))
                 if not prop.nullable and not prop.default:
                     continue

openapi_core/specs.py

@@ -6,7 +6,7 @@
 from openapi_spec_validator import openapi_v3_spec_validator
 
 from openapi_core.components import ComponentsFactory
-from openapi_core.exceptions import InvalidOperationError, InvalidServerError
+from openapi_core.exceptions import InvalidOperation, InvalidServer
 from openapi_core.infos import InfoFactory
 from openapi_core.paths import PathsGenerator
 from openapi_core.schemas import SchemaRegistry
@@ -37,7 +37,7 @@ def get_server(self, full_url_pattern):
             if spec_server.default_url in full_url_pattern:
                 return spec_server
 
-        raise InvalidServerError(
+        raise InvalidServer(
             "Invalid request server {0}".format(full_url_pattern))
 
     def get_server_url(self, index=0):
@@ -47,7 +47,7 @@ def get_operation(self, path_pattern, http_method):
         try:
             return self.paths[path_pattern].operations[http_method]
         except KeyError:
-            raise InvalidOperationError(
+            raise InvalidOperation(
                 "Unknown operation path {0} with method {1}".format(
                     path_pattern, http_method))
 

openapi_core/validators.py

@@ -2,7 +2,7 @@
 from six import iteritems
 
 from openapi_core.exceptions import (
-    OpenAPIMappingError, MissingParameterError, MissingBodyError,
+    OpenAPIMappingError, MissingParameter, MissingBody,
 )
 
 
@@ -45,13 +45,6 @@ def __init__(self, errors, body=None, parameters=None):
 
 class RequestValidator(object):
 
-    SPEC_LOCATION_TO_REQUEST_LOCATION = {
-        'path': 'view_args',
-        'query': 'args',
-        'headers': 'headers',
-        'cookies': 'cookies',
-    }
-
     def __init__(self, spec):
         self.spec = spec
 
@@ -69,10 +62,10 @@ def validate(self, request):
 
         operation_pattern = request.full_url_pattern.replace(
             server.default_url, '')
-        method = request.method.lower()
 
         try:
-            operation = self.spec.get_operation(operation_pattern, method)
+            operation = self.spec.get_operation(
+                operation_pattern, request.method)
         # don't process if operation errors
         except OpenAPIMappingError as exc:
             errors.append(exc)
@@ -81,17 +74,20 @@ def validate(self, request):
         for param_name, param in iteritems(operation.parameters):
             try:
                 raw_value = self._get_raw_value(request, param)
-            except MissingParameterError as exc:
+            except MissingParameter as exc:
                 if param.required:
                     errors.append(exc)
 
                 if not param.schema or param.schema.default is None:
                     continue
                 raw_value = param.schema.default
 
-            value = param.unmarshal(raw_value)
-
-            parameters[param.location][param_name] = value
+            try:
+                value = param.unmarshal(raw_value)
+            except OpenAPIMappingError as exc:
+                errors.append(exc)
+            else:
+                parameters[param.location][param_name] = value
 
         if operation.request_body is not None:
             try:
@@ -101,29 +97,26 @@ def validate(self, request):
             else:
                 try:
                     raw_body = self._get_raw_body(request)
-                except MissingBodyError as exc:
+                except MissingBody as exc:
                     if operation.request_body.required:
                         errors.append(exc)
                 else:
-                    body = media_type.unmarshal(raw_body)
+                    try:
+                        body = media_type.unmarshal(raw_body)
+                    except OpenAPIMappingError as exc:
+                        errors.append(exc)
 
         return RequestValidationResult(errors, body, parameters)
 
-    def _get_request_location(self, spec_location):
-        return self.SPEC_LOCATION_TO_REQUEST_LOCATION[spec_location]
-
     def _get_raw_value(self, request, param):
-        request_location = self._get_request_location(param.location)
-        request_attr = getattr(request, request_location)
-
         try:
-            return request_attr[param.name]
+            return request.parameters[param.location][param.name]
         except KeyError:
-            raise MissingParameterError(
+            raise MissingParameter(
                 "Missing required `{0}` parameter".format(param.name))
 
     def _get_raw_body(self, request):
-        if not request.data:
-            raise MissingBodyError("Missing required request body")
+        if not request.body:
+            raise MissingBody("Missing required request body")
 
-        return request.data
+        return request.body