Merge branch 'master' into deploy

openapi/__init__.py

@@ -1,4 +1,4 @@
 """Minimal OpenAPI asynchronous server application
 """
 
-__version__ = '0.8.3'
+__version__ = '0.8.4'

openapi/data/fields.py

@@ -1,17 +1,15 @@
 import decimal
+from datetime import date, datetime
+from numbers import Number
 from uuid import UUID
-from datetime import datetime, date
-from dataclasses import dataclass, field, Field
-
-from email_validator import validate_email, EmailNotValidError
 
+from dataclasses import Field, dataclass, field
 from dateutil.parser import parse as parse_date
+from email_validator import EmailNotValidError, validate_email
 
 from .. import json
-
 from ..utils import compact_dict
 
-
 DEFAULT = 'default'
 REQUIRED = 'required'
 VALIDATOR = 'OPENAPI_VALIDATOR'
@@ -326,13 +324,20 @@ def __init__(self, min_value=None, max_value=None, precision=None):
 
     def __call__(self, field, value, data=None):
         try:
-            value = round(value, self.precision)
+            if not isinstance(value, Number):
+                raise TypeError
+
+            if self.precision is not None:
+                value = round(value, self.precision)
+
         except (ValueError, TypeError):
             raise ValidationError(field.name, '%s not valid number' % value)
         return super().__call__(field, value, data=data)
 
     def dump(self, value):
-        return round(value, self.precision)
+        if self.precision is not None:
+            return round(value, self.precision)
+        return value
 
 
 class IntegerValidator(BoundedNumberValidator):
@@ -349,6 +354,8 @@ def __call__(self, field, value, data=None):
 class DecimalValidator(NumberValidator):
     def __call__(self, field, value, data=None):
         try:
+            if isinstance(value, float):
+                value = str(value)
             value = decimal.Decimal(value)
         except (TypeError, decimal.InvalidOperation):
             raise ValidationError(field.name, '%s not valid Decimal' % value)

tests/data/test_fields.py

@@ -190,9 +190,17 @@ def test_DecimalValidator_valid():
     assert validator(field, 10) == 10
     assert validator(field, -10) == -10
     assert validator(field, 5.55) == Decimal('5.55')
-    # assert validator(field, 5.555) == Decimal(5.55)
-    # assert validator(field, '5.555') == Decimal(5.55)
-    # assert validator(field, (5, 555)) == Decimal(5.55)
+    assert validator(field, 5.555) == Decimal('5.56')
+    assert validator(field, '5.555') == Decimal('5.56')
+
+
+def test_DecimalValidator_precision_None():
+    field = decimal_field()
+    validator = DecimalValidator(min_value=-10, max_value=10)
+    assert validator(field, 10) == 10
+    assert validator(field, -10) == -10
+    assert validator(field, 5.555) == Decimal('5.555')
+    assert validator(field, 5.555555555555555) == Decimal('5.555555555555555')
 
 
 def test_DecimalValidator_invalid():
@@ -208,10 +216,10 @@ def test_DecimalValidator_invalid():
 
 def test_DecimalValidator_dump():
     validator = DecimalValidator(min_value=-10, max_value=10, precision=2)
-    assert validator.dump(10) == 10
-    assert validator.dump(-10) == -10
-    assert validator.dump(5.55) == 5.55
-    assert validator.dump(5.556) == 5.56
+    assert validator.dump(Decimal(10)) == Decimal('10')
+    assert validator.dump(Decimal(-10)) == Decimal('-10')
+    assert validator.dump(Decimal('5.55')) == Decimal('5.55')
+    assert validator.dump(Decimal('5.556')) == Decimal('5.56')
 
 
 def test_email_validator_valid():

tests/example/endpoints.py

@@ -44,7 +44,7 @@ async def get(self):
                 description: Authenticated tasks
         """
         data = await self.get_list()
-        return web.json_response(data)
+        return self.json_response(data)
 
     @op(response_schema=Task, body_schema=TaskAdd)
     async def post(self):
@@ -59,7 +59,7 @@ async def post(self):
                 description: Failed validation
         """
         data = await self.create_one()
-        return web.json_response(data, status=201)
+        return self.json_response(data, status=201)
 
     @op(query_schema=TaskQuery)
     async def delete(self):