Renamed the errors. fixes intercom#1

jkeyes · jkeyes · commit 8a67ad2a05f0 · 2012-03-23T14:42:07.000Z
diff --git a/intercom/__init__.py b/intercom/__init__.py
@@ -26,6 +26,9 @@ def wrapper(instance, value):
     return wrapper
 
 
+from .intercom import AuthenticationError
+from .intercom import ResourceNotFound
+from .intercom import ServerError
 from .intercom import Intercom
 from .user import User
 from .message_thread import MessageThread
diff --git a/intercom/intercom.py b/intercom/intercom.py
@@ -16,16 +16,13 @@ def __init__(self, message, result=None):
         super(IntercomError, self).__init__(message)
         self.result = result
 
-class AuthConfigError(IntercomError):
+class AuthenticationError(IntercomError):
     pass
 
-class AuthError(IntercomError):
+class ResourceNotFound(IntercomError):
     pass
 
-class NotFoundError(IntercomError):
-    pass
-
-class APIError(IntercomError):
+class ServerError(IntercomError):
     pass
 
 def api_call(func_to_decorate):
@@ -35,16 +32,16 @@ def wrapper(*args, **kwargs):
         """ Decorator closure. """
         response = func_to_decorate(*args, **kwargs)
         if response.status_code == 401:
-            raise AuthError("Invalid API key/username provided.")
+            raise AuthenticationError("Invalid API key/username provided.")
         result = json.loads(response.content)
         if response.status_code in (200, 201):
             pass
         else:
             message = result['error']['message']
             if response.status_code == 404:
-                raise NotFoundError(message, result)
+                raise ResourceNotFound(message, result)
             else:
-                raise APIError(message, result)
+                raise ServerError(message, result)
         return result
     return wrapper
 
diff --git a/tests/integration/test.py b/tests/integration/test.py
@@ -1,8 +1,8 @@
 from unittest import TestCase
 
-from intercom.intercom import AuthError
-from intercom.intercom import APIError
-from intercom.intercom import NotFoundError
+from intercom import AuthenticationError
+from intercom import ResourceNotFound
+from intercom import ServerError
 from intercom import Intercom
 from intercom import User
 from intercom import MessageThread
@@ -19,15 +19,15 @@ def test_user(self):
         user = User.find(email='somebody@example.com')
         self.assertEqual('Somebody', user.name)
 
-    @raises(NotFoundError)
+    @raises(ResourceNotFound)
     def test_not_found(self):
         User.find(email='not-found@example.com')
 
-    @raises(APIError)
+    @raises(ServerError)
     def test_server_error(self):
         User.find(email='server-error@example.com')
 
-    @raises(AuthError)
+    @raises(AuthenticationError)
     def test_bad_api_key(self):
         try:
             Intercom.app_id = 'bad-app-id'
diff --git a/tests/unit/test_impression.py b/tests/unit/test_impression.py
@@ -14,12 +14,12 @@
 
 from . import create_response
 
-from intercom.intercom import AuthError
+from intercom.intercom import AuthenticationError
 from intercom import Impression
 
 class ImpressionTest(TestCase):
 
-    @raises(AuthError)
+    @raises(AuthenticationError)
     @patch('requests.request', create_response(401))
     def test_create_impression_identifiers(self):
         Impression.create()
diff --git a/tests/unit/test_intercom.py b/tests/unit/test_intercom.py
@@ -11,17 +11,17 @@
 from nose.tools import raises
 from unittest import TestCase
 
-from intercom.intercom import APIError
-from intercom.intercom import AuthError
-from intercom.intercom import NotFoundError
+from intercom import ServerError
+from intercom import AuthenticationError
+from intercom import ResourceNotFound
 from intercom import Intercom
 from intercom.user import CustomData
 from intercom.user import SocialProfile
 from intercom.user import User
 
 class IntercomUsersTest(TestCase):
 
-    @raises(AuthError)
+    @raises(AuthenticationError)
     @patch('requests.request', create_response(401))
     def test_create_user_identifiers(self):
         Intercom.create_user()
@@ -32,7 +32,7 @@ def test_create_valid(self):
         self.assertEqual(None, resp['user_id'])
         self.assertEqual('xxx@example.com', resp['email'])
 
-    @raises(AuthError)
+    @raises(AuthenticationError)
     @patch('requests.request', create_response(401))
     def test_get_user_identifiers(self):
         Intercom.get_user()
@@ -43,7 +43,7 @@ def test_get_user_valid(self):
         self.assertEqual(None, resp['user_id'])
         self.assertEqual('xxx@example.com', resp['email'])
 
-    @raises(AuthError)
+    @raises(AuthenticationError)
     @patch('requests.request', create_response(401))
     def test_create_user_identifiers(self):
         Intercom.update_user()
@@ -56,7 +56,7 @@ def test_update_user_valid(self):
         self.assertEqual('xxx@example.com', resp['email'])
         self.assertEqual('42', resp['custom_data']['age'])
 
-    @raises(AuthError)
+    @raises(AuthenticationError)
     @patch('requests.request', create_response(401))
     def test_get_users_identifiers(self):
         Intercom.create_user()
@@ -68,12 +68,12 @@ def test_get_users_valid(self):
         self.assertEqual(3, resp['total_count'])
         self.assertEqual(1, resp['total_pages'])
 
-    @raises(NotFoundError)
+    @raises(ResourceNotFound)
     @patch('requests.request', create_response(404, '404.json'))
     def test_not_found(self):
         resp = Intercom.get_users()
 
-    @raises(APIError)
+    @raises(ServerError)
     @patch('requests.request', create_response(500, '500.json'))
     def test_api_error(self):
         resp = Intercom.get_users()
diff --git a/tests/unit/test_message_thread.py b/tests/unit/test_message_thread.py
@@ -16,11 +16,11 @@
 
 from intercom import Intercom
 from intercom.message_thread import MessageThread
-from intercom.intercom import AuthError
+from intercom import AuthenticationError
 
 class MessageThreadTest(TestCase):
 
-    @raises(AuthError)
+    @raises(AuthenticationError)
     @patch('requests.request', create_response(401))
     def test_get_message_threads_identifiers(self):
         MessageThread.find_all()
diff --git a/tests/unit/test_user.py b/tests/unit/test_user.py
@@ -14,7 +14,7 @@
 
 from . import create_response
 
-from intercom.intercom import AuthError
+from intercom import AuthenticationError
 from intercom.user import CustomData
 from intercom.user import LocationData
 from intercom.user import SocialProfile
@@ -105,7 +105,7 @@ def test_create(self):
         self.assertEqual(None, user.user_id)
         self.assertEqual('xxx@example.com', user.email)
 
-    @raises(AuthError)
+    @raises(AuthenticationError)
     @patch('requests.request', create_response(401))
     def test_find_identifiers(self):
         User.find()
