Fixes #12

di · Nov 20, 2015 · 776f054 · 776f054
1 parent bfce112
commit 776f054
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/vladiate/test/test_validators.py b/vladiate/test/test_validators.py
@@ -101,6 +101,10 @@ def test_regex_validator_works(pattern, field):
     RegexValidator(pattern).validate(field)
 
 
+def test_regex_validator_allows_empty():
+    RegexValidator(r'foo.*', empty_ok=True).validate('')
+
+
 @pytest.mark.parametrize('pattern, field', [
     (r'foo.*', 'afoo'),
     (r'^$', 'foo'),

diff --git a/vladiate/validators.py b/vladiate/validators.py
@@ -119,13 +119,14 @@ def bad(self):
 class RegexValidator(Validator):
     ''' Validates that a field matches a given regex '''
 
-    def __init__(self, pattern=r'di^'):
+    def __init__(self, pattern=r'di^', empty_ok=False):
         super(RegexValidator, self).__init__()
         self.regex = re.compile(pattern)
+        self.empty_ok = empty_ok
         self.failures = set([])
 
     def validate(self, field, row={}):
-        if not self.regex.match(field):
+        if not self.regex.match(field) and (field or not self.empty_ok):
             self.failures.add(field)
             raise ValidationException(
                 "'{}' does not match pattern /{}/".format(field, self.regex))