Adding BadGatewayError (502) and ServiceUnavailableError(503).

jkeyes · jkeyes · commit 154814eff883 · 2014-01-05T22:20:20.000Z
diff --git a/intercom/__init__.py b/intercom/__init__.py
@@ -36,9 +36,11 @@ def wrapper(instance, value):
     return wrapper
 
 from .intercom import AuthenticationError
+from .intercom import BadGatewayError
 from .intercom import Intercom
 from .intercom import ResourceNotFound
 from .intercom import ServerError
+from .intercom import ServiceUnavailableError
 
 from .impression import Impression
 from .message_thread import MessageThread
@@ -47,6 +49,7 @@ def wrapper(instance, value):
 from .tag import Tag
 
 __all__ = (
-    AuthenticationError, Intercom, ResourceNotFound, ServerError,
-    Impression, MessageThread, Note, User, Tag
+    AuthenticationError, BadGatewayError, Intercom, ResourceNotFound,
+    ServerError, ServiceUnavailableError, Impression, MessageThread,
+    Note, User, Tag
 )
diff --git a/intercom/intercom.py b/intercom/intercom.py
@@ -35,6 +35,11 @@ class AuthenticationError(IntercomError):
     pass
 
 
+class BadGatewayError(IntercomError):
+    """ Raised when a request does not reach the API due to a 502. """
+    pass
+
+
 class ResourceNotFound(IntercomError):
     """ Raised when a resource cannot be found e.g. a non-existant User. """
     pass
@@ -46,35 +51,36 @@ class ServerError(IntercomError):
     pass
 
 
+class ServiceUnavailableError(IntercomError):
+    """ Raised when the API cannot be handle a request. """
+    pass
+
+
 def api_call(func_to_decorate):
     """ Decorator for handling AWS credentials. """
     @functools.wraps(func_to_decorate)
     def wrapper(*args, **kwargs):
         """ Decorator closure. """
         response = func_to_decorate(*args, **kwargs)
-        if response.status_code == 401:
-            raise AuthenticationError("Invalid API key/username provided.")
-        try:
-            result = json.loads(response.content)
-        except ValueError as err:
-            if response.status_code == 404:
-                raise ResourceNotFound("Not found.")
-            raise ServerError(err.message)
-        if response.status_code in (200, 201):
-            pass
-        else:
-            # an error state try to get the error message
-            error = result.get('error', {})
-            message = error.get('message', 'Unknown error')
-
-            if response.status_code == 404:
-                raise ResourceNotFound(message, result)
-            else:
-                raise ServerError(message, result)
+        raise_errors_on_failure(response)
+        result = json.loads(response.content)
         return result
     return wrapper
 
 
+def raise_errors_on_failure(response):
+    if response.status_code == 404:
+        raise ResourceNotFound("Not found.")
+    elif response.status_code == 401:
+        raise AuthenticationError("Invalid API key/username provided.")
+    elif response.status_code == 500:
+        raise ServerError("Server error.")
+    elif response.status_code == 502:
+        raise BadGatewayError("Bad gateway.")
+    elif response.status_code == 503:
+        raise ServiceUnavailableError("Service unavailable.")
+
+
 class Intercom(object):
     """ Intercom API Wrapper """
 
diff --git a/tests/integration/test.py b/tests/integration/test.py
@@ -13,8 +13,10 @@
 FIXTURES = os.path.join(DIRPATH, 'fixtures')
 
 from intercom import AuthenticationError
+from intercom import BadGatewayError
 from intercom import ResourceNotFound
 from intercom import ServerError
+from intercom import ServiceUnavailableError
 from intercom import Intercom
 from intercom import User
 from intercom import MessageThread
@@ -167,7 +169,7 @@ def test_endpoints():
 
 @nottest
 @httpretty.activate
-def test_unreachable():
+def test_unreachable_endpoints():
     class ServiceUnavailableError(Exception):
         pass
     httpretty.register_uri(
@@ -181,9 +183,18 @@ class ServiceUnavailableError(Exception):
         .should.throw(ServiceUnavailableError)
 
 
+@httpretty.activate
+@raises(ServiceUnavailableError)
+def test_unreachable():
+    httpretty.register_uri(
+        get, r(r"/v1/users\?email="),
+        status=503, match_querystring=True)
+    User.find(email='somebody@example.com')
+
+
 @nottest
 @httpretty.activate
-def test_bad_gateway():
+def test_bad_gateway_endpoints():
     class BadGatewayError(Exception):
         pass
     httpretty.register_uri(
@@ -197,6 +208,15 @@ class BadGatewayError(Exception):
         .should.throw(BadGatewayError)
 
 
+@httpretty.activate
+@raises(BadGatewayError)
+def test_bad_gateway():
+    httpretty.register_uri(
+        get, r(r"/v1/users\?email="),
+        status=502, match_querystring=True)
+    User.find(email='somebody@example.com')
+
+
 @httpretty.activate
 def test_doctest():
     import doctest
