diff options
| author | Teddy Wing | 2018-05-03 18:21:04 +0200 |
|---|---|---|
| committer | Teddy Wing | 2018-05-03 18:25:57 +0200 |
| commit | ad49ad52ee8e7cfbf4dc3f1bc34c533e186100b9 (patch) | |
| tree | 39db53abcf7877b395c525a2743760f064387633 /lib/tom_tom | |
| parent | bfc4fab8943a28d2f30084a38d88678d7bfbbac4 (diff) | |
| download | chouette-core-ad49ad52ee8e7cfbf4dc3f1bc34c533e186100b9.tar.bz2 | |
TomTom::Matrix#check_for_error_response: Handle HTTP error status codes
We might not always get a nicely formatted JSON
`['error']['description']` response body. Sometimes, like for example
when you use an incorrect API key, even with an 'application/json'
content type, TomTom will respond with:
<h1>Developer Inactive</h1>
What?
In that case, the response has a 403 status. In addition to checking for
an error in the response, should also be checking for the HTTP status
code.
Log the status code in the exception to give us more information about
what went wrong.
Update our existing tests now that `#check_for_error_response` takes a
response object instead of a JSON string.
Refs #6884
Diffstat (limited to 'lib/tom_tom')
| -rw-r--r-- | lib/tom_tom/matrix.rb | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/lib/tom_tom/matrix.rb b/lib/tom_tom/matrix.rb index 40191aa56..d0b476d84 100644 --- a/lib/tom_tom/matrix.rb +++ b/lib/tom_tom/matrix.rb @@ -24,14 +24,12 @@ module TomTom req.body = build_request_body(points) end - matrix_json = JSON.parse(response.body) - - check_for_error_response(matrix_json) + check_for_error_response(response) extract_costs_to_way_costs!( way_costs, points_with_ids, - matrix_json + JSON.parse(response.body) ) end @@ -84,9 +82,16 @@ module TomTom }) end - def check_for_error_response(matrix_json) - if matrix_json.has_key?('error') - raise RemoteError, matrix_json['error']['description'] + def check_for_error_response(response) + if response.status != 200 + raise RemoteError, "status: #{response.status}, body: #{response.body}" + end + + json = JSON.parse(response.body) + + if json.has_key?('error') + raise RemoteError, + "status: #{response.status}, message: #{json['error']['description']}" end end |
