From 04a84675860d4399fa5887db4d99f8c8a63eddd7 Mon Sep 17 00:00:00 2001 From: davedkg Date: Mon, 9 Aug 2021 19:23:34 -0400 Subject: [PATCH] pin Farady to ~> 1.0 and update errors --- diffbot-ruby-client.gemspec | 2 +- lib/diffbot/api_client.rb | 4 ++-- lib/diffbot/api_client/version.rb | 6 +++--- spec/api_client_spec.rb | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/diffbot-ruby-client.gemspec b/diffbot-ruby-client.gemspec index d6dcb15..88a7343 100644 --- a/diffbot-ruby-client.gemspec +++ b/diffbot-ruby-client.gemspec @@ -22,5 +22,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rspec' spec.add_development_dependency 'guard-rspec' - spec.add_runtime_dependency 'faraday' + spec.add_runtime_dependency 'faraday', '~> 1.0' end diff --git a/lib/diffbot/api_client.rb b/lib/diffbot/api_client.rb index eae655e..83d1fca 100644 --- a/lib/diffbot/api_client.rb +++ b/lib/diffbot/api_client.rb @@ -191,9 +191,9 @@ def request(method, path, data = {}, headers = {}) raise(Diffbot::APIClient::Unauthorized.new(code)) if code == 401 response.env - rescue Faraday::Error::TimeoutError, Timeout::Error => error + rescue Faraday::TimeoutError, Timeout::Error => error raise(Diffbot::APIClient::RequestTimeout.new(error)) - rescue Faraday::Error::ClientError, JSON::ParserError => error + rescue Faraday::ClientError, JSON::ParserError => error fail(Diffbot::APIClient::Error.new(error)) end end diff --git a/lib/diffbot/api_client/version.rb b/lib/diffbot/api_client/version.rb index ec21e92..2e1e3c4 100644 --- a/lib/diffbot/api_client/version.rb +++ b/lib/diffbot/api_client/version.rb @@ -5,9 +5,9 @@ class APIClient ## # Version compatible with SemVer v2.0.0 module VERSION - MAJOR = 0 - MINOR = 1 - TINY = 1 + MAJOR = 1 + MINOR = 2 + TINY = 0 PATCH = nil STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.') end diff --git a/spec/api_client_spec.rb b/spec/api_client_spec.rb index 325180a..027ca19 100644 --- a/spec/api_client_spec.rb +++ b/spec/api_client_spec.rb @@ -38,7 +38,7 @@ before(:each) do allow(Faraday).to receive(:new).and_return(faraday) - allow(faraday).to receive(:get).and_raise(Faraday::Error::TimeoutError) + allow(faraday).to receive(:get).and_raise(Faraday::TimeoutError) end it "raises a Diffbot::APIClient::RequestTimeout error" do