Skip to content

Commit

Permalink
#48 ParameterValidator
Browse files Browse the repository at this point in the history
  • Loading branch information
hjacobs committed Aug 13, 2015
1 parent 6222fe8 commit 571781c
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ __pycache__
.coverage
*.egg
htmlcov/
*.pyc
20 changes: 20 additions & 0 deletions connexion/decorators/validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,23 @@ def validate_schema(self, data, schema):
error = func(schema, data)
if error:
return problem(400, 'Bad Request', error)


class ParameterValidator():
def __init__(self, parameters):
self.parameters = {p.get('in'): p for p in parameters}

def __call__(self, function):
"""
:type function: types.FunctionType
:rtype: types.FunctionType
"""

@functools.wraps(function)
def wrapper(*args, **kwargs):
logger.debug("%s validating parameters...", flask.request.url)

response = function(*args, **kwargs)
return response

return wrapper
11 changes: 6 additions & 5 deletions connexion/operation.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

from connexion.decorators.produces import BaseSerializer, Produces, Jsonifier
from connexion.decorators.security import security_passthrough, verify_oauth
from connexion.decorators.validation import RequestBodyValidator
from connexion.decorators.validation import RequestBodyValidator, ParameterValidator
from connexion.exceptions import InvalidSpecification
from connexion.utils import flaskify_endpoint, get_function_from_name, produces_json

Expand Down Expand Up @@ -147,8 +147,7 @@ def function(self):
logger.debug('... Adding security decorator (%r)', security_decorator, extra=vars(self))
function = security_decorator(function)

validation_decorator = self.__validation_decorator
if validation_decorator:
for validation_decorator in self.__validation_decorators:
function = validation_decorator(function)

return function
Expand Down Expand Up @@ -238,9 +237,11 @@ def __security_decorator(self):
return security_passthrough

@property
def __validation_decorator(self):
def __validation_decorators(self):
"""
:rtype: types.FunctionType
"""
if self.parameters:
yield ParameterValidator(self.parameters)
if self.body_schema:
return RequestBodyValidator(self.body_schema)
yield RequestBodyValidator(self.body_schema)

0 comments on commit 571781c

Please sign in to comment.