Fix most tests

Author: telles-simbiose

README.md

@@ -22,7 +22,7 @@ In order to install the Python client, you only need to use [`pip`](https://pack
 **IMPORTANT:** Currently we only support Python 2.7
 
 ```bash
-pip install pyslicer --extra-insert-url=https://packagecloud.io/slicingdice/clients/pypi/simple
+pip install pyslicer --extra-index-url=https://packagecloud.io/slicingdice/clients/pypi/simple
 ```
 
 ## Usage
@@ -40,7 +40,7 @@ from pyslicer import SlicingDice
 # Configure the client
 client = SlicingDice(master_key='API_KEY', uses_test_endpoint=False)
 
-# insertion data
+# Inserting data
 insert_data = {
     "user1@slicingdice.com": {
         "age": 22
@@ -100,22 +100,10 @@ print client.get_database()
 
 ```json
 {
-    "active": [
-        {
-            "name": "Database 1",
-            "description": "My first database",
-            "data-expiration": 30,
-            "created-at": "2016-04-05T10:20:30Z"
-        }
-    ],
-    "inactive": [
-        {
-            "name": "Database 2",
-            "description": "My second database",
-            "data-expiration": 90,
-            "created-at": "2016-04-05T10:20:30Z"
-        }
-    ]
+    "name": "Database 1",
+    "description": "My first database",
+    "data-expiration": 30,
+    "created-at": "2016-04-05T10:20:30Z"
 }
 ```
 

pyslicer/client.py

@@ -168,9 +168,9 @@ def create_column(self, data):
             format.
         """
         base_url = self._wrapper_test()
-        sd_data = validators.columnValidator(data)
+        sd_data = validators.ColumnValidator(data)
         if sd_data.validator():
-            url = base_url + URLResources.column
+            url = base_url + URLResources.COLUMN
             return self._make_request(
                 url=url,
                 req_type="post",
@@ -180,7 +180,7 @@ def create_column(self, data):
     def get_columns(self):
         """Get a list of columns"""
         base_url = self._wrapper_test()
-        url = base_url + URLResources.column
+        url = base_url + URLResources.COLUMN
         return self._make_request(
             url=url,
             req_type="get",

pyslicer/core/helper_handler_exceptions.py

@@ -82,13 +82,13 @@
     82: exceptions.QueryMissingTypeParamException,
     83: exceptions.QueryInvalidOperatorException,
     84: exceptions.QueryIncorrectOperatorUsageException,
-    85: exceptions.QuerycolumnNotActiveException,
+    85: exceptions.QueryColumnNotActiveException,
     86: exceptions.QueryMissingOperatorException,
     87: exceptions.QueryIncompleteException,
     88: exceptions.QueryEventCountQueryException,
     89: exceptions.QueryInvalidMetricException,
     90: exceptions.QueryIntegerException,
-    91: exceptions.QuerycolumnLimitException,
+    91: exceptions.QueryColumnLimitException,
     92: exceptions.QueryLevelLimitException,
     93: exceptions.QueryBadAggsFormationException,
     94: exceptions.QueryInvalidAggFilterException,

pyslicer/exceptions.py

@@ -425,9 +425,9 @@ def __init__(self, *args, **kwargs):
             self, *args, **kwargs)
 
 
-class QuerycolumnNotActiveException(SlicingDiceException):
+class QueryColumnNotActiveException(SlicingDiceException):
     def __init__(self, *args, **kwargs):
-        super(QuerycolumnNotActiveException, self).__init__(
+        super(QueryColumnNotActiveException, self).__init__(
             self, *args, **kwargs)
 
 
@@ -461,9 +461,9 @@ def __init__(self, *args, **kwargs):
             self, *args, **kwargs)
 
 
-class QuerycolumnLimitException(SlicingDiceException):
+class QueryColumnLimitException(SlicingDiceException):
     def __init__(self, *args, **kwargs):
-        super(QuerycolumnLimitException, self).__init__(
+        super(QueryColumnLimitException, self).__init__(
             self, *args, **kwargs)
 
 

pyslicer/url_resources.py

@@ -4,7 +4,7 @@
 
 class URLResources(object):
     DATABASE = "/database/"
-    column = "/column/"
+    COLUMN = "/column/"
     INSERT = "/insert/"
     QUERY_COUNT_ENTITY = "/query/count/entity/"
     QUERY_COUNT_ENTITY_TOTAL = "/query/count/entity/total/"

pyslicer/utils/validators.py

@@ -259,7 +259,7 @@ def validator(self):
             return True
 
 
-class columnValidator(SDBaseValidator):
+class ColumnValidator(SDBaseValidator):
     def __init__(self, data_column):
         """
         Parameters:
@@ -268,7 +268,7 @@ def __init__(self, data_column):
         if not isinstance(data_column, list):
             data_column = [data_column]
         for dictionary_column in data_column:
-            super(columnValidator, self).__init__(dictionary_column)
+            super(ColumnValidator, self).__init__(dictionary_column)
             self._valid_type_columns = [
                 "unique-id", "boolean", "string", "integer", "decimal",
                 "enumerated", "date", "integer-time-series",

tests_and_examples/run_query_tests.py

@@ -75,7 +75,7 @@ def run_tests(self, query_type):
 
             print '  Query type: {}'.format(query_type)
 
-            auto_create = test['insert'].get('auto-create', ["table", "column"])
+            auto_create = test['insert'].get('auto-create', [])
             try:
                 if auto_create:
                     self.get_columns_from_insertion_data(test)