From e3f1c43d6bdedb1d71de8260a2a64981e28a3a10 Mon Sep 17 00:00:00 2001 From: Ishan Kanade Date: Tue, 11 Aug 2020 19:17:36 +0530 Subject: [PATCH] Upgrade faraday gem to v1.x [ch20108] (#81) --- chartmogul-ruby.gemspec | 2 +- lib/chartmogul/api_resource.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chartmogul-ruby.gemspec b/chartmogul-ruby.gemspec index 05b03de..2dc0009 100644 --- a/chartmogul-ruby.gemspec +++ b/chartmogul-ruby.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.add_dependency 'faraday', '~> 0.17.3' + spec.add_dependency 'faraday', '~> 1.0.0' spec.add_development_dependency 'bundler', '~> 2' spec.add_development_dependency 'pry', '~> 0.12.2' diff --git a/lib/chartmogul/api_resource.rb b/lib/chartmogul/api_resource.rb index f6950cd..edd0788 100644 --- a/lib/chartmogul/api_resource.rb +++ b/lib/chartmogul/api_resource.rb @@ -37,7 +37,7 @@ def self.connection def self.handling_errors yield - rescue Faraday::ClientError => e + rescue Faraday::ClientError, Faraday::ServerError => e e.response ? handle_request_error(e) : handle_other_error(e) rescue StandardError => e handle_other_error(e) @@ -86,7 +86,7 @@ def self.build_connection faraday.request :retry, max: ChartMogul.max_retries, retry_statuses: RETRY_STATUSES, max_interval: MAX_INTERVAL, backoff_factor: BACKOFF_FACTOR, interval_randomness: INTERVAL_RANDOMNESS, interval: INTERVAL, exceptions: RETRY_EXCEPTIONS - faraday.use Faraday::Adapter::NetHttp + faraday.adapter Faraday::Adapter::NetHttp end end end