Merge pull request #67 from Aparna-BS/fixer

Validate the data type of iterable and number.

Author: eterey

pyvalid/validators/__iterable.py

@@ -27,6 +27,26 @@ def example([1, 3, 7, 10]):
 
     """
 
+    @classmethod
+    def iterable_type_checker(cls, val, iterable_type):
+        """Checks if the iterable is of required data type.
+
+        Args:
+            val (Iterable):
+                Tensor whose type is to be validated.
+            iterable_type (type):
+                Expected data type of iterable.
+                Ex: list, tuple, dict.
+
+        Returns (bool):
+            True:
+                If the type of given iterable matches the required type.
+            False:
+                If the type of given iterable does not match the required type.
+
+        """
+        return type(val) == iterable_type
+
     @classmethod
     def empty_checker(cls, val, empty_allowed):
         """Checks if the iterable is empty or not.
@@ -143,11 +163,14 @@ def __init__(self, **kwargs):
         max_val = kwargs.get('max_val', None)
         if min_val is not None and max_val is not None and min_val > max_val:
             raise ValueError('Min value can\'t be greater than max value!')
+        iterable_type = kwargs.get('iterable_type', None)
         empty_allowed = kwargs.get('empty_allowed', None)
         elements_type = kwargs.get('elements_type', None)
+
         self.__checkers = {
             IterableValidator.empty_checker: [empty_allowed],
             IterableValidator.element_type_checker: [elements_type],
+            IterableValidator.iterable_type_checker: [iterable_type],
             IterableValidator.elements_min_val_checker: [min_val],
             IterableValidator.elements_max_val_checker: [max_val]
         }

pyvalid/validators/__number.py

@@ -14,6 +14,26 @@ class NumberValidator(AbstractValidator):
     if version_info < (3, 0, 0):
         number_types += (long, )  # noqa: F821
 
+    @classmethod
+    def number_type_checker(cls, val, number_type):
+        """Checks if the number is of required data type.
+
+        Args:
+            val (number):
+                Tensor whose type is to be validated.
+            number_type (type):
+                Expected data type of number.
+                Ex: int, float, long.
+
+        Returns (bool):
+            True:
+                If the type of given number matches the required type.
+            False:
+                If the type of given number does not match the required type.
+
+        """
+        return type(val) == number_type
+
     @classmethod
     def min_val_checker(cls, val, min_val):
         return val >= min_val
@@ -51,11 +71,14 @@ def __init__(self, **kwargs):
         max_val = kwargs.get('max_val', None)
         if min_val is not None and max_val is not None and min_val > max_val:
             raise ValueError('Min value can\'t be greater than max value!')
+        number_type = kwargs.get('number_type', None)
         in_range = kwargs.get('in_range', None)
         not_in_range = kwargs.get('not_in_range', None)
+
         self.__checkers = {
             NumberValidator.min_val_checker: [min_val],
             NumberValidator.max_val_checker: [max_val],
+            NumberValidator.number_type_checker: [number_type],
             NumberValidator.in_range_checker: [in_range],
             NumberValidator.not_in_range_checker: [not_in_range]
         }

tests/test_iterable_validator.py

@@ -5,6 +5,18 @@
 
 class IterableValidatorTestCase(unittest.TestCase):
 
+    def test_iterable_type(self):
+        """
+        Verify iterable_type_checker() method.
+        """
+        validator = IterableValidator(iterable_type=list)
+        self.assertTrue(validator([1, 3, 25, 14]))
+        self.assertFalse(validator({1: 'a', 2: 'b'}))
+
+        validator = IterableValidator(iterable_type=tuple)
+        self.assertTrue(validator((1, 3, 25, 14)))
+        self.assertFalse(validator([1, 3, 25, 14]))
+
     def test_empty_allowed(self):
         """
         Verify empty_checker() method.
@@ -96,7 +108,7 @@ def test_mixed(self):
         self.assertTrue(validator([1, 3, 25, 120]))  # List
         self.assertTrue(validator((1, 3, 25, 3)))  # Tuple
         self.assertTrue(validator({1: 'pyvalid', 2: 'cython'}))  # Dictionary
-        self.assertTrue(validator((1, 3, 25, 120)))  # Set
+        self.assertTrue(validator({1, 3, 25, 120}))  # Set
         self.assertFalse(validator(8))  # Integer
         self.assertFalse(None)
 

tests/test_number_validator.py

@@ -5,6 +5,15 @@
 
 class NumberValidatorTestCase(unittest.TestCase):
 
+    def test_number_type(self):
+        validator = NumberValidator(number_type=int)
+        self.assertTrue(validator(12))
+        self.assertFalse(validator(10.56))
+
+        validator = NumberValidator(number_type=float)
+        self.assertTrue(validator(10.56))
+        self.assertFalse(validator(12))
+
     def test_min_val(self):
         validator = NumberValidator(min_val=-3.14)
         self.assertTrue(validator(3.14))