Add domain validator, refs #9

vanzhiganov · kvesteri · commit 7a773733fa2a · 2015-10-10T09:42:00.000+03:00
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,7 +1,14 @@
 Changelog
 ---------
 
-0.8.0 (unreleased)
+
+0.9.0 (2015-10-10)
+^^^^^^^^^^^^^^^^^^
+
+- Added new validator: ``domain``
+
+
+0.8.0 (2015-06-24)
 ^^^^^^^^^^^^^^^^^^
 
 - Added new validator: ``iban``
diff --git a/docs/index.rst b/docs/index.rst
@@ -68,6 +68,14 @@ between
 .. autofunction:: between
 
 
+domain
+------
+
+.. module:: validators.domain
+
+.. autofunction:: domain
+
+
 email
 -----
 
diff --git a/tests/test_domain.py b/tests/test_domain.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+import pytest
+from validators import domain, ValidationFailure
+
+
+@pytest.mark.parametrize(('value',), [
+    ('example.com',),
+])
+def test_returns_true_on_valid_domain(value):
+    assert domain(value)
+
+
+@pytest.mark.parametrize(('value',), [
+    ('example.com/',),
+    ('example.com:4444',),
+    ('example.-com',),
+    ('example.',),
+    ('example',),
+])
+def test_returns_failed_validation_on_invalid_domain(value):
+    assert isinstance(domain(value), ValidationFailure)
diff --git a/validators/__init__.py b/validators/__init__.py
@@ -1,15 +1,16 @@
-from .between import between
-from .email import email
-from .extremes import Min, Max
-from .iban import iban
-from .ip_address import ipv4, ipv6
-from .i18n import fi_business_id, fi_ssn
-from .length import length
-from .mac_address import mac_address
-from .slug import slug
-from .truthy import truthy
-from .url import url
-from .utils import ValidationFailure, validator
-from .uuid import uuid
+from .between import between  # noqa
+from .domain import domain  # noqa
+from .email import email  # noqa
+from .extremes import Min, Max  # noqa
+from .iban import iban  # noqa
+from .ip_address import ipv4, ipv6  # noqa
+from .i18n import fi_business_id, fi_ssn  # noqa
+from .length import length  # noqa
+from .mac_address import mac_address  # noqa
+from .slug import slug  # noqa
+from .truthy import truthy  # noqa
+from .url import url  # noqa
+from .utils import ValidationFailure, validator  # noqa
+from .uuid import uuid  # noqa
 
 __version__ = '0.8'
diff --git a/validators/domain.py b/validators/domain.py
@@ -0,0 +1,28 @@
+import re
+from .utils import validator
+
+pattern = re.compile(
+    r'^(?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.)'
+    r'{1,126}(?!\d+)[a-zA-Z\d]{1,63}$'
+)
+
+
+@validator
+def domain(value):
+    """
+    Return whether or not given value is a valid domain.
+
+    If the value is valid domain name this function returns ``True``, otherwise
+    :class:`~validators.utils.ValidationFailure`.
+
+    Examples::
+
+        >>> domain('example.com')
+        True
+
+        >>> domain('example.com/')
+        ValidationFailure(func=domain, ...)
+
+    :param value: domain string to validate
+    """
+    return pattern.match(value)
diff --git a/validators/i18n/__init__.py b/validators/i18n/__init__.py
@@ -1 +1 @@
-from .fi import fi_ssn, fi_business_id
+from .fi import fi_ssn, fi_business_id  # noqa

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from .fi import fi_ssn, fi_business_id`
	`1`	`+from .fi import fi_ssn, fi_business_id # noqa`