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
8 changes: 4 additions & 4 deletions lib/serpapi/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,12 @@ def get(endpoint, decoder = :json, params = {})
# parse JSON response with Ruby standard library
data = JSON.parse(response.body, symbolize_names: symbolize_names)
if data.instance_of?(Hash) && data.key?(:error)
raise SerpApiError, "HTTP request failed with error: #{data[:error]} from url: https://#{BACKEND}#{endpoint}, params: #{params}, decoder: #{decoder}, response status: #{response.status} "
raise SerpApiError, "HTTP request failed with error: #{data[:error]}, from url: https://#{BACKEND}#{endpoint}, params: #{params}, decoder: #{decoder}, response status: #{response.status} "
elsif response.status != 200
raise SerpApiError, "HTTP request failed with response status: #{response.status} reponse: #{data} on get url: https://#{BACKEND}#{endpoint}, params: #{params}, decoder: #{decoder}"
raise SerpApiError, "HTTP request failed with response status: #{response.status}, response: #{data} on get url: https://#{BACKEND}#{endpoint}, params: #{params}, decoder: #{decoder}"
end
rescue JSON::ParserError
raise SerpApiError, "JSON parse error: #{response.body} on get url: https://#{BACKEND}#{endpoint}, params: #{params}, decoder: #{decoder}, response status: #{response.status}"
raise SerpApiError, "JSON parse error: #{response.body}, on get url: https://#{BACKEND}#{endpoint}, params: #{params}, decoder: #{decoder}, response status: #{response.status}"
end

# discard response body
Expand All @@ -244,7 +244,7 @@ def get(endpoint, decoder = :json, params = {})
when :html
# html decoder
if response.status != 200
raise SerpApiError, "HTTP request failed with response status: #{response.status} reponse: #{data} on get url: https://#{BACKEND}#{endpoint}, params: #{params}, decoder: #{decoder}"
raise SerpApiError, "HTTP request failed with response status: #{response.status}, response: #{data}, on get url: https://#{BACKEND}#{endpoint}, params: #{params}, decoder: #{decoder}"
end

response.body
Expand Down
2 changes: 1 addition & 1 deletion spec/serpapi/client/client_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
begin
client.send(:get, '/invalid', :html, {})
rescue SerpApi::SerpApiError => e
expect(e.message).to include(/HTTP request failed with response status: 404 Not Found reponse/), "got #{e.message}"
expect(e.message).to include(/HTTP request failed with response status: 404 Not Found response/), "got #{e.message}"
rescue => e
raise("wrong exception: #{e}")
end
Expand Down
Loading