Resolve issues and improve result (#32)

* Update requirements for python3

* Fix token handling, logging spelling

* Improve __handle_result

---------

Co-authored-by: Jason Welch <[email protected]>

Author: drjwelch

README.md

@@ -7,7 +7,6 @@ A simple SendPulse REST client library and example for Python.
 ## Install using pipy
 
 ```sh
-# version 0.0.3
 pip install pysendpulse
 ```
 

pysendpulse/pysendpulse.py

@@ -83,7 +83,7 @@ def __init__(self, user_id, secret, storage_type="FILE", token_file_path="", mem
                     self.__token = f.readline()
 
             else:
-                logger.error("Can't find file '{}' to read security token.".format(filepath))
+                logger.warning("Can't find file '{}' to read security token.".format(filepath))
         logger.debug("Got: '{}'".format(self.__token, ))
         if not self.__token and not self.__get_token():
             raise Exception("Could not connect to API. Please, check your ID and SECRET")
@@ -173,38 +173,40 @@ def __send_request(self, path, method="GET", params=None, use_token=True, use_js
     def __handle_result(self, data):
         """ Process request results
 
-        @param data:
+        @param data: a Response object from the Python Requests package
         @return: dictionary with response message and/or http code
         """
-        if 'status_code' not in data:
-            if data.status_code == 200:
-                logger.debug("Hanle result: {}".format(data.json(), ))
-                return data.json()
-            elif data.status_code == 404:
-                response = {
-                    'is_error': True,
-                    'http_code': data.status_code,
-                    'message': "Sorry, the page you are looking for {} could not be found.".format(data.url, )
-                }
-            elif data.status_code == 500:
-                response = {
-                    'is_error': True,
-                    'http_code': data.status_code,
-                    'message': "Whoops, looks like something went wrong on the server. Please contact with out support [email protected]."
-                }
-            else:
-                response = {
-                    'is_error': True,
-                    'http_code': data.status_code
-                }
-                response.update(data.json())
+        try:
+            result = data.json()
+        except:
+            result = {
+                'is_error': True,
+                'http_code': data.status_code,
+                'message': "Response is empty, invalid or not JSON."
+            }
+
+        if data.ok:
+            errors = {
+                'is_error': False,
+                'http_code': data.status_code
+            }
+            logger.debug("Handle result: {}".format(result, ))
         else:
-            response = {
+            errors = {
                 'is_error': True,
-                'http_code': data
+                'http_code': data.status_code
             }
-        logger.debug("Hanle result: {}".format(response, ))
-        return {'data': response}
+            if data.status_code == 404:
+                errors['message'] = "Sorry, the page you are looking for {} could not be found.".format(data.url, )
+            elif data.status_code == 500:
+                errors['message'] = "Whoops, looks like something went wrong on the server. Please contact with out support [email protected]."
+
+        logger.debug("Handle result: {}".format(errors, ))
+
+        # return object that maintains backward-compatibility
+        result.update(errors)
+        result.update({'data': result.copy()})
+        return result
 
     def __handle_error(self, custom_message=None):
         """ Process request errors
@@ -215,7 +217,7 @@ def __handle_error(self, custom_message=None):
         message = {'is_error': True}
         if custom_message is not None:
             message['message'] = custom_message
-        logger.error("Hanle error: {}".format(message, ))
+        logger.error("Handle error: {}".format(message, ))
         return message
 
     # ------------------------------------------------------------------ #
@@ -681,8 +683,8 @@ def smtp_send_mail(self, email):
         @return: dictionary with response message
         """
         logger.info("Function call: smtp_send_mail")
-        if (not email.get('html') or not email.get('text')) and not email.get('template'):
-            return self.__handle_error('Seems we have empty body')
+        if not email.get('template') and not email.get('html') and not email.get('text'):
+            return self.__handle_error('Missing email body - specify a template, html or text content')
         elif not email.get('subject'):
             return self.__handle_error('Seems we have empty subject')
         elif not email.get('from') or not email.get('to'):

setup.py

@@ -6,7 +6,7 @@
     __version__
 )
 
-install_requires = ['python3-memcached', ]
+install_requires = ['python3-memcached', 'requests', 'deprecated']
 
 if version_info.major == 2:
     install_requires = ['python-memcached', 'requests', 'simplejson']