Improve code according to review

Author: joaosimbiose

pyslicer/client.py

@@ -82,7 +82,7 @@ class SlicingDice(SlicingDiceAPI):
     """
     def __init__(
         self, write_key=None, read_key=None, master_key=None,
-            custom_key=None, use_ssl=True, timeout=60, test=False):
+            custom_key=None, use_ssl=True, timeout=60, uses_test_endpoint=False):
         """Instantiate a new SlicingDice object.
 
         Keyword arguments:
@@ -95,7 +95,7 @@ def __init__(
         """
         super(SlicingDice, self).__init__(
             master_key, write_key, read_key, custom_key, use_ssl, timeout)
-        self.test = test
+        self.uses_test_endpoint = uses_test_endpoint
 
     def _count_query_wrapper(self, url, query):
         """Validate count query and make request.
@@ -129,7 +129,7 @@ def _data_extraction_wrapper(self, url, query):
 
     def _wrapper_test(self):
         base_url = SlicingDice.BASE_URL
-        if self.test:
+        if self.uses_test_endpoint:
             base_url += "/test"
         return base_url
 

pyslicer/utils/validators.py

@@ -7,17 +7,42 @@
 
 from pyslicer.utils.data_utils import is_str_empty
 
+MAX_QUERY_SIZE = 10
+
+MAX_INDEXATION_SIZE = 1000
+
 
 class SDBaseValidator(object):
     """Base field, query and index validator."""
     __metaclass__ = abc.ABCMeta
 
+    def check_dictionary_value(self, dictionary_value):
+        print dictionary_value
+        if isinstance(dictionary_value, dict):
+            self.check_dictionary(dictionary_value)
+        elif isinstance(dictionary_value, list):
+            self.check_list(dictionary_value)
+        else:
+            if dictionary_value is None or dictionary_value == "":
+                raise exceptions.InvalidQueryException(
+                    "This query has invalid keys or values.")
+
+    def check_dictionary(self, dictionary):
+        for key in dictionary:
+            dictionary_value = dictionary[key]
+            self.check_dictionary_value(dictionary_value)
+
+    def check_list(self, dictionary):
+        for dictionary_value in dictionary:
+            self.check_dictionary_value(dictionary_value)
+
     def __init__(self, dictionary):
         if not dictionary:
-            for key in dictionary:
-                if not dictionary[key]:
-                    raise exceptions.InvalidQueryException(
-                        "This query has invalid keys or values.")
+            raise exceptions.InvalidQueryException(
+                "This query has invalid keys or values.")
+
+        self.check_dictionary(dictionary)
+
         self.data = dictionary
 
     @abc.abstractmethod
@@ -76,7 +101,7 @@ def validator(self):
         if "bypass-cache" in self.data:
             query_size -= 1
 
-        if query_size > 10:
+        if query_size > MAX_QUERY_SIZE:
             raise exceptions.MaxLimitException(
                 "The query count entity has a limit of 10 queries by request.")
         return True
@@ -193,11 +218,6 @@ def _has_empty_field(self):
         Returns:
             false if dictionary don't have empty fields
         """
-        if not self.data:
-            for key in self.data:
-                if not self.data[key]:
-                    raise exceptions.InvalidIndexException(
-                        "This index has invalid keys or values.")
         for value in self.data.values():
             # Value is a dictionary when it is an entity being indexed:
             # "my-entity": {"year": 2016}
@@ -217,7 +237,7 @@ def check_indexation_size(self):
         if "auto-create-fields" in self.data:
             indexation_size -= 1
 
-        if indexation_size > 1000:
+        if indexation_size > MAX_INDEXATION_SIZE:
             raise exceptions.InvalidIndexException(
                 "Your index command shouldn't have more than 1000 values.")
 

tests_and_examples/run_query_tests.py

@@ -33,9 +33,10 @@
 
 class SlicingDiceTester(object):
     """Test orchestration class."""
-    def __init__(self, api_key, verbose=False, endpoint_test=True):
+    def __init__(self, api_key, verbose=False, uses_test_endpoint=True):
         # The Slicing Dice API client
-        self.client = SlicingDice(master_key=api_key, test=endpoint_test)
+        self.client = SlicingDice(master_key=api_key,
+                                  uses_test_endpoint=uses_test_endpoint)
 
         # Translation table for fields with timestamp
         self.field_translation = {}
@@ -300,11 +301,11 @@ def main():
 
     # MODE_TEST give us if you want to use endpoint Test or Prod
     mode_test = os.environ.get("MODE_TEST", "test")
-    endpoint_test = False if mode_test.lower() == 'prod' else True
+    uses_test_endpoint = False if mode_test.lower() == 'prod' else True
     sd_tester = SlicingDiceTester(
         api_key=api_key,
         verbose=False,
-        endpoint_test=endpoint_test)
+        uses_test_endpoint=uses_test_endpoint)
 
     try:
         for query_type in query_types: