Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion intercom/intercom.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ class ServerError(IntercomError):
pass


class ApiRateLimitExceededError(IntercomError):
""" Raised when the API rate limit is exceeded. """
pass


class ServiceUnavailableError(IntercomError):
""" Raised when the API cannot be handle a request. """
pass
Expand Down Expand Up @@ -82,6 +87,8 @@ def raise_errors_on_failure(response):
raise BadGatewayError("Bad gateway.")
elif response.status_code == 503:
raise ServiceUnavailableError("Service unavailable.")
elif response.status_code == 429:
raise ApiRateLimitExceededError("API rate limit exceeded.")


class Intercom(object):
Expand Down Expand Up @@ -453,7 +460,7 @@ def create_event(cls, event_name=None, user_id=None, email=None, metadata=None):
'event_name': event_name,
'user_id': user_id,
'email': email,
'created': int(time.time())
'created': int(time.time())
}

if isinstance(metadata, dict):
Expand Down
16 changes: 16 additions & 0 deletions tests/integration/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,22 @@ class ServiceUnavailableError(Exception):
.should.throw(ServiceUnavailableError)


@nottest
@httpretty.activate
def test_api_rate_limit_exceeded():
class ApiRateLimitExceededError(Exception):
pass
httpretty.register_uri(
get, r(r"example\.com"),
body=fixture('v1-user'), status=429)
Intercom.endpoints = ("http://example.com")
User.find.when.called_with(email='somebody@example.com')\
.should.throw(ApiRateLimitExceededError)
Intercom.endpoints = ("http://example.com", "http://api.example.com")
User.find.when.called_with(email='not-found@example.com')\
.should.throw(ApiRateLimitExceededError)


@httpretty.activate
@raises(ServiceUnavailableError)
def test_unreachable():
Expand Down