Merge pull request #45 from lendingblock/master

0.3.0

dev/requirements.txt

@@ -20,6 +20,8 @@ python-dotenv
 pytz
 pyyaml
 pyjwt
+phonenumbers
+email_validator
 #
 # required for python 3.6
 dataclasses

openapi/__init__.py

@@ -1,3 +1,3 @@
 """Minimal OpenAPI asynchronous server application
 """
-__version__ = '0.2.6'
+__version__ = '0.3.0'

openapi/data/fields.py

@@ -1,15 +1,14 @@
-import re
 from decimal import Decimal
 from uuid import UUID
 from datetime import datetime
 from dataclasses import field, Field
 
+from email_validator import validate_email, EmailNotValidError
+
 from dateutil.parser import parse as parse_date
 
 from ..utils import compact_dict
 
-email_pattern = re.compile("^[a-zA-Z0-9-_]+@[a-zA-Z0-9]+\.[a-z]{1,3}$")
-
 
 DEFAULT = 'default'
 REQUIRED = 'required'
@@ -115,8 +114,11 @@ def field_ops(field):
 
 def email_validator(field, value, data=None):
     value = str(value)
-    if not email_pattern.match(value):
-        raise ValidationError(field.name, '%s not a valid email' % value)
+    try:
+        validate_email(value, check_deliverability=False)
+    except EmailNotValidError:
+        raise ValidationError(
+            field.name, '%s not a valid email' % value) from None
     return value
 
 

openapi/db/path.py

@@ -41,7 +41,7 @@ async def get_list(
         """Get a list of models
         """
         table = table if table is not None else self.db_table
-        params = self.get_filters(query, query_schema=query_schema)
+        params = self.get_filters(query=query, query_schema=query_schema)
         limit = params.pop('limit', DEF_PAGINATION_LIMIT)
         offset = params.pop('offset', 0)
         query = self.get_query(table.select(), params, table=table)
@@ -104,7 +104,7 @@ async def get_one(
         """Get a single model
         """
         table = table if table is not None else self.db_table
-        filters = self.get_filters(query, query_schema=query_schema)
+        filters = self.get_filters(query=query, query_schema=query_schema)
         query = self.get_query(table.select(), filters, table=table)
         sql, args = compile_query(query)
 
@@ -149,7 +149,7 @@ async def delete_one(self, conn=None):
     async def delete_list(self, query=None, conn=None):
         """delete multiple models
         """
-        filters = self.get_filters(query)
+        filters = self.get_filters(query=query)
         delete = self.get_query(self.db_table.delete(), filters)
         sql, args = compile_query(delete)
 

openapi/spec/path.py

@@ -21,7 +21,7 @@ def insert_data(self, data, strict=True, body_schema='body_schema'):
             data.update(path)
         return data
 
-    def get_filters(self, query=None, query_schema='query_schema'):
+    def get_filters(self, *, query=None, query_schema='query_schema'):
         combined = dict(self.request.query)
         combined.update(query or {})
         try:

tests/data/test_fields.py

@@ -179,15 +179,13 @@ def test_email_validator_valid():
     field = email_field()
     assert email_validator(field, '[email protected]') == '[email protected]'
     assert email_validator(field, '[email protected]') == '[email protected]'
-    assert email_validator(field, '[email protected]') == '[email protected]'
+    assert email_validator(field, '[email protected]') == '[email protected]'
 
 
 def test_email_validator_invalid():
     field = email_field()
     with pytest.raises(ValidationError):
-        email_validator(field, '[email protected]')
-    with pytest.raises(ValidationError):
-        email_validator(field, '#$%@email.com')
+        email_validator(field, 'a@email')
     with pytest.raises(ValidationError):
         email_validator(field, 'email.com')
     with pytest.raises(ValidationError):