Change regular expressions for email validation

Note that it does not work for all email addresses according to the
standard.

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.3.1] - 2017-08-03
+### Fixed
+- Regular expressions for validating email addresses.
+
 ## [0.3] - 2017-03-24
 ### Added
 - Specification can now specify multiple endpoints.

apimas-drf/version.txt

@@ -1 +1 @@
-apimas-drf 0.3
+apimas-drf 0.3.1

apimas/apimas/cli/custom_types.py

@@ -9,10 +9,7 @@
 class Email(StringParamType):
     name = 'email'
 
-    # http://haacked.com/archive/2007/08/21/i-knew-how-to-validate-an-email-address-until-i.aspx/
-    regex = re.compile(r"^(?!\.)(""([^""\r\\]|\\[""\r\\])*""|"
-                       r"([-a-z0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)"
-                       r"@[a-z0-9][\w\.-]*[a-z0-9]\.[a-z][a-z\.]*[a-z]$")
+    regex = re.compile(r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)")
 
     def convert(self, value, param, ctx):
         value = super(Email, self).convert(value, param, ctx)

apimas/apimas/clients/extensions.py

@@ -1,6 +1,5 @@
 import random
 import re
-from collections import Iterable
 from datetime import datetime, date
 from cerberus import Validator
 from requests.compat import urljoin
@@ -70,8 +69,6 @@ def _validate_type_file(self, value):
     def _validate_type_email(self, value):
         if not isinstance(value, (str, unicode)):
             return False
-        # http://haacked.com/archive/2007/08/21/i-knew-how-to-validate-an-email-address-until-i.aspx/
-        regex = re.compile(r"^(?!\.)(""([^""\r\\]|\\[""\r\\])*""|"
-                           r"([-a-z0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)"
-                           r"@[a-z0-9][\w\.-]*[a-z0-9]\.[a-z][a-z\.]*[a-z]$")
+        regex = re.compile(
+            r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)")
         return bool(regex.match(value))

apimas/version.txt

@@ -1 +1 @@
-apimas 0.3
+apimas 0.3.1