diff --git a/lib/rabbitmq/http/client.rb b/lib/rabbitmq/http/client.rb index 0c7f854..79bcbcd 100644 --- a/lib/rabbitmq/http/client.rb +++ b/lib/rabbitmq/http/client.rb @@ -1,7 +1,7 @@ require "addressable/uri" require "hashie" require "faraday" -require "faraday_middleware" +require "faraday/follow_redirects" require "multi_json" require "uri" @@ -450,9 +450,9 @@ def initialize_connection(endpoint, options = {}) adapter = options.delete(:adapter) || Faraday.default_adapter @connection = Faraday.new(options) do |conn| - conn.request :basic_auth, user, password + conn.request :authorization, :basic, user, password - conn.use FaradayMiddleware::FollowRedirects, :limit => 3 + conn.use Faraday::FollowRedirects::Middleware, :limit => 3 conn.use Faraday::Response::RaiseError conn.response :json, :content_type => /\bjson$/ diff --git a/lib/rabbitmq/http/client/health_checks.rb b/lib/rabbitmq/http/client/health_checks.rb index 47e5b81..6cdc50d 100644 --- a/lib/rabbitmq/http/client/health_checks.rb +++ b/lib/rabbitmq/http/client/health_checks.rb @@ -1,6 +1,6 @@ require "hashie" require "faraday" -require "faraday_middleware" +require "faraday/follow_redirects" require "multi_json" require "uri" diff --git a/lib/rabbitmq/http/client/request_helper.rb b/lib/rabbitmq/http/client/request_helper.rb index 0cc394b..5bb88e8 100644 --- a/lib/rabbitmq/http/client/request_helper.rb +++ b/lib/rabbitmq/http/client/request_helper.rb @@ -1,6 +1,6 @@ require "hashie" require "faraday" -require "faraday_middleware" +require "faraday/follow_redirects" require "multi_json" require "uri" diff --git a/lib/rabbitmq/http/client/response_helper.rb b/lib/rabbitmq/http/client/response_helper.rb index 452035c..a527a3b 100644 --- a/lib/rabbitmq/http/client/response_helper.rb +++ b/lib/rabbitmq/http/client/response_helper.rb @@ -1,6 +1,6 @@ require "hashie" require "faraday" -require "faraday_middleware" +require "faraday/follow_redirects" require "multi_json" require "uri" diff --git a/rabbitmq_http_api_client.gemspec b/rabbitmq_http_api_client.gemspec index 23b718a..aa00ad9 100644 --- a/rabbitmq_http_api_client.gemspec +++ b/rabbitmq_http_api_client.gemspec @@ -21,6 +21,6 @@ Gem::Specification.new do |gem| gem.add_dependency 'addressable', '~> 2.7' gem.add_dependency 'hashie', '~> 4.1' gem.add_dependency 'multi_json', '~> 1.15' - gem.add_dependency 'faraday', '~> 1.3' - gem.add_dependency 'faraday_middleware', '~> 1.2' + gem.add_dependency 'faraday', '~> 2.0' + gem.add_dependency 'faraday-follow_redirects', '~> 0.3' end