Adding HTTP error support.

jkeyes · jkeyes · commit eabf204f297f · 2015-03-20T11:49:37.000Z
diff --git a/intercom/__init__.py b/intercom/__init__.py
@@ -1,21 +1,22 @@
 # -*- coding: utf-8 -*-
 
 from datetime import datetime
-from .errors import ArgumentError
-from .errors import HttpError  # noqa
+from .errors import (ArgumentError, HttpError, IntercomError, # noqa
+    ResourceNotFound, AuthenticationError, ServerError, BadGatewayError,
+    ServiceUnavailableError)  # noqa
 from .lib.setter_property import SetterProperty
 from .request import Request
-from .admin import Admin
-from .company import Company
-from .conversation import Conversation
-from .event import Event
-from .message import Message
-from .note import Note
-from .notification import Notification
-from .user import User
-from .segment import Segment
-from .subscription import Subscription
-from .tag import Tag
+from .admin import Admin  # noqa
+from .company import Company  # noqa
+from .conversation import Conversation  # noqa
+from .event import Event  # noqa
+from .message import Message  # noqa
+from .note import Note  # noqa
+from .notification import Notification  # noqa
+from .user import User  # noqa
+from .segment import Segment  # noqa
+from .subscription import Subscription  # noqa
+from .tag import Tag  # noqa
 
 import copy
 import random
@@ -24,11 +25,6 @@
 
 __version__ = '2.0.alpha'
 
-__all__ = (
-    Admin, Company, Conversation, Event, Message, Note, Notification,
-    Segment, Subscription, Tag, User
-)
-
 
 RELATED_DOCS_TEXT = "See https://github.com/jkeyes/python-intercom \
 for usage examples."
diff --git a/intercom/errors.py b/intercom/errors.py
@@ -7,3 +7,27 @@ class ArgumentError(ValueError):
 
 class HttpError(Exception):
     pass
+
+
+class IntercomError(Exception):
+    pass
+
+
+class ResourceNotFound(IntercomError):
+    pass
+
+
+class AuthenticationError(IntercomError):
+    pass
+
+
+class ServerError(IntercomError):
+    pass
+
+
+class BadGatewayError(IntercomError):
+    pass
+
+
+class ServiceUnavailableError(IntercomError):
+    pass
diff --git a/intercom/request.py b/intercom/request.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from .errors import HttpError  # noqa
+from . import errors
 
 import json
 import requests
@@ -32,9 +32,26 @@ def send_request_to_path(cls, method, url, auth, params=None):
             method, url, timeout=cls.timeout,
             auth=auth, **req_params)
 
+        cls.raise_errors_on_failure(resp)
+
         if resp.content:
             return json.loads(resp.content)
 
+    @classmethod
+    def raise_errors_on_failure(cls, resp):
+        if resp.status_code == 404:
+            raise errors.ResourceNotFound('Resource Not Found')
+        elif resp.status_code == 401:
+            raise errors.AuthenticationError('Unauthorized')
+        elif resp.status_code == 403:
+            raise errors.AuthenticationError('Forbidden')
+        elif resp.status_code == 500:
+            raise errors.ServerError('Server Error')
+        elif resp.status_code == 502:
+            raise errors.BadGatewayError('Bad Gateway Error')
+        elif resp.status_code == 503:
+            raise errors.ServiceUnavailableError('Service Unavailable')
+
 
 class ResourceEncoder(json.JSONEncoder):
     def default(self, o):
diff --git a/tests/unit/request_spec.py b/tests/unit/request_spec.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+
+import httpretty
+import intercom
+import re
+from describe import expect
+from intercom import Intercom
+
+get = httpretty.GET
+post = httpretty.POST
+r = re.compile
+
+
+class DescribeRequest:
+
+    @httpretty.activate
+    def it_raises_resource_not_found(self):
+        httpretty.register_uri(
+            get, r(r'/notes$'), body='', status=404)
+        with expect.to_raise_error(intercom.ResourceNotFound):
+            Intercom.get('/notes')
+
+    @httpretty.activate
+    def it_raises_authentication_error_unauthorized(self):
+        httpretty.register_uri(
+            get, r(r'/notes$'), body='', status=401)
+        with expect.to_raise_error(intercom.AuthenticationError):
+            Intercom.get('/notes')
+
+    @httpretty.activate
+    def it_raises_authentication_error_forbidden(self):
+        httpretty.register_uri(
+            get, r(r'/notes$'), body='', status=403)
+        with expect.to_raise_error(intercom.AuthenticationError):
+            Intercom.get('/notes')
+
+    @httpretty.activate
+    def it_raises_server_error(self):
+        httpretty.register_uri(
+            get, r(r'/notes$'), body='', status=500)
+        with expect.to_raise_error(intercom.ServerError):
+            Intercom.get('/notes')
+
+    @httpretty.activate
+    def it_raises_bad_gateway_error(self):
+        httpretty.register_uri(
+            get, r(r'/notes$'), body='', status=502)
+        with expect.to_raise_error(intercom.BadGatewayError):
+            Intercom.get('/notes')
+
+    @httpretty.activate
+    def it_raises_service_unavailable_error(self):
+        httpretty.register_uri(
+            get, r(r'/notes$'), body='', status=503)
+        with expect.to_raise_error(intercom.ServiceUnavailableError):
+            Intercom.get('/notes')
