diff --git a/lib/zendesk2/error.rb b/lib/zendesk2/error.rb index e1f980d..bc6cf26 100644 --- a/lib/zendesk2/error.rb +++ b/lib/zendesk2/error.rb @@ -4,9 +4,9 @@ class Zendesk2::Error < StandardError def initialize(wrapped_exception) @wrapped_exception = wrapped_exception @response = wrapped_exception.response - message = if wrapped_exception.is_a?(Faraday::Error::ParsingError) + message = if wrapped_exception.is_a?(Faraday::ParsingError) wrapped_exception.message - elsif wrapped_exception.is_a?(Faraday::Error::ClientError) + elsif wrapped_exception.is_a?(Faraday::ClientError) wrapped_exception.response.inspect else wrapped_exception.instance_variable_get(:@wrapped_exception).inspect diff --git a/lib/zendesk2/real.rb b/lib/zendesk2/real.rb index 22308e4..c07e9ca 100644 --- a/lib/zendesk2/real.rb +++ b/lib/zendesk2/real.rb @@ -66,7 +66,7 @@ def request(options = {}) end rescue Faraday::ConnectionFailed raise - rescue Faraday::Error::ClientError => e + rescue Faraday::ClientError => e raise Zendesk2::Error, e end end diff --git a/lib/zendesk2/request.rb b/lib/zendesk2/request.rb index f9a23d1..3310be4 100644 --- a/lib/zendesk2/request.rb +++ b/lib/zendesk2/request.rb @@ -265,6 +265,7 @@ def response(options = {}) method: method, url: URI.parse(url), body: body, + response_body: body, # added compatibility with faraday ~> 1.16.0 request_headers: request_headers, response_headers: response_headers, status: status, @@ -272,7 +273,7 @@ def response(options = {}) Faraday::Response::RaiseError.new.on_complete(env) || Faraday::Response.new(env) - rescue Faraday::Error::ClientError => e + rescue Faraday::ClientError => e raise Zendesk2::Error, e end end