Skip to content

Commit f42eef9

Browse files
authored
Merge pull request #43 from yujideveloper/bugfix/handle-response
Handle service unavailable error
2 parents 5b988d9 + e53f27b commit f42eef9

3 files changed

Lines changed: 30 additions & 6 deletions

File tree

lib/phaxio/client.rb

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,17 @@ def conn
5252
def handle_response response
5353
content_type = response.headers[:content_type]
5454

55-
if content_type.start_with? 'application/json'
56-
body = JSON.parse(response.body).with_indifferent_access
55+
if content_type
56+
if content_type.start_with? 'application/json'
57+
body = JSON.parse(response.body).with_indifferent_access
58+
else
59+
extension = MimeTypeHelper.extension_for_mimetype content_type
60+
filename = File.join Dir.tmpdir, tmpname(extension)
61+
File.open(filename, 'wb') { |file| file.write response.body }
62+
body = {'success' => response.success?, 'data' => File.open(filename, 'rb')}
63+
end
5764
else
58-
extension = MimeTypeHelper.extension_for_mimetype content_type
59-
filename = File.join Dir.tmpdir, tmpname(extension)
60-
File.open(filename, 'wb') { |file| file.write response.body }
61-
body = {'success' => response.success?, 'data' => File.open(filename, 'rb')}
65+
body = {}
6266
end
6367

6468
if response.success?
@@ -85,6 +89,8 @@ def handle_response response
8589
raise Error::InvalidRequestError, "#{status}: #{message}"
8690
when 429
8791
raise Error::RateLimitExceededError, "#{status}: #{message}"
92+
when 503
93+
raise Error::ServiceUnavailableError, "#{status}: #{message}"
8894
else
8995
raise Error::GeneralError, "#{status}: #{message}"
9096
end

lib/phaxio/error.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ module Error
66
NotFoundError
77
InvalidRequestError
88
RateLimitExceededError
9+
ServiceUnavailableError
910
GeneralError
1011
ApiConnectionError
1112
].each { |error_klass_name| const_set error_klass_name, Class.new(PhaxioError) }

spec/client_spec.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ def test_response status_code, message: 'This is a test.'
1919
)
2020
end
2121

22+
def test_response_503
23+
instance_double(
24+
Faraday::Response,
25+
status: 503,
26+
success?: false,
27+
headers: {},
28+
body: nil
29+
)
30+
end
31+
2232
describe 'making a request' do
2333
it 'sends the request to Phaxio' do
2434
endpoint = 'public/countries/'
@@ -118,6 +128,13 @@ def test_response status_code, message: 'This is a test.'
118128
}.to raise_error(Phaxio::Error::RateLimitExceededError, '429: This is a test.')
119129
end
120130

131+
it 'raises a service unavailable error if the response status is 503' do
132+
expect(test_connection).to receive(:get) { test_response_503 }
133+
expect {
134+
client.request :get, 'test'
135+
}.to raise_error(Phaxio::Error::ServiceUnavailableError, '503: ')
136+
end
137+
121138
it 'raises a general error for if the response status is 5XX' do
122139
expect(test_connection).to receive(:get) { test_response 500 }
123140
expect {

0 commit comments

Comments
 (0)