add logging and bug fixes

Author: fawaf

cloudflare_v4/__init__.py

@@ -1,6 +1,3 @@
-# because everything logs
-import logging
-
 # all the exceptions
 from exceptions import CloudFlareError, CloudFlareAPIError
 
@@ -9,8 +6,6 @@
 # depends on exceptions
 from util import call
 
-# depends on util
-from zones import get
-from user import get
-
-__all__ = [ 'CloudFlareError', 'CloudFlareAPIError' ]
+__all__ = [ 'CloudFlareError', 'CloudFlareAPIError',
+            'zones', 'user',
+            'util' ]

cloudflare_v4/construct.py

@@ -1,3 +1,6 @@
+import zones
+import user
+
 class CloudFlare(object):
     def __init__(self, email, token):
         self.EMAIL = email

cloudflare_v4/logger.py

@@ -0,0 +1,34 @@
+import logging
+
+DEBUG = 0
+INFO = 1
+
+class Logger:
+    def __init__(self, level):
+        self.logger_level = self.get_level(level)
+
+    def getLogger(self):
+        # create logger
+        logger = logging.getLogger('Python CloudFlare API v4')
+        logger.setLevel(self.logger_level)
+
+        # create console handler and set level to debug
+        ch = logging.StreamHandler()
+        ch.setLevel(logging.DEBUG)
+
+        # create formatter
+        formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+
+        # add formatter to ch
+        ch.setFormatter(formatter)
+
+        # add ch to logger
+        logger.addHandler(ch)
+
+        return logger
+
+    def get_level(self, level):
+        if level == 0:
+            return logging.DEBUG
+        else:
+            return logging.INFO

cloudflare_v4/util.py

@@ -1,13 +1,16 @@
 from . import CloudFlareError, CloudFlareAPIError
+from . import logger
 
 import json
 import requests
 
+logger = logger.Logger(logger.DEBUG).getLogger()
+
 def call(auth, method, endpoint, params=None):
-    logging.debug('auth')
-    logging.debug('method')
-    logging.debug('endpoint')
-    logging.debug('params')
+    logger.debug(auth)
+    logger.debug(method)
+    logger.debug(endpoint)
+    logger.debug(params)
     if (auth is None) or (method is None) or (endpoint is None):
         raise CloudFlareError('You must specify auth, method, and endpoint')
     else:
@@ -18,7 +21,7 @@ def call(auth, method, endpoint, params=None):
                 params=params
                 )
         data = response.text
-        logging.debug('data')
+        logger.debug(data)
         try:
             data = json.loads(data)
             return data

cloudflare_v4/zones/__init__.py

@@ -6,4 +6,4 @@ def get(auth, params=None):
     if type(params) is dict:
         return util.call(auth, 'GET', ENDPOINT, params)
     elif type(params) is str:
-        return util.call(auth)
+        return util.call(auth, 'GET', ENDPOINT + '/' + params)