Skip to content

Commit 6b5a22b

Browse files
Merge pull request #63 from BranchIntl/support_faraday_2_X
Support Faraday version 2.x
2 parents 72bbdf4 + 24b4d5c commit 6b5a22b

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

lib/rabbitmq/http/client.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require "addressable/uri"
22
require "hashie"
33
require "faraday"
4-
require "faraday_middleware"
4+
require "faraday/follow_redirects"
55
require "multi_json"
66
require "uri"
77

@@ -450,9 +450,9 @@ def initialize_connection(endpoint, options = {})
450450
adapter = options.delete(:adapter) || Faraday.default_adapter
451451

452452
@connection = Faraday.new(options) do |conn|
453-
conn.request :basic_auth, user, password
453+
conn.request :authorization, :basic, user, password
454454

455-
conn.use FaradayMiddleware::FollowRedirects, :limit => 3
455+
conn.use Faraday::FollowRedirects::Middleware, :limit => 3
456456
conn.use Faraday::Response::RaiseError
457457
conn.response :json, :content_type => /\bjson$/
458458

lib/rabbitmq/http/client/health_checks.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require "hashie"
22
require "faraday"
3-
require "faraday_middleware"
3+
require "faraday/follow_redirects"
44
require "multi_json"
55
require "uri"
66

lib/rabbitmq/http/client/request_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require "hashie"
22
require "faraday"
3-
require "faraday_middleware"
3+
require "faraday/follow_redirects"
44
require "multi_json"
55
require "uri"
66

lib/rabbitmq/http/client/response_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require "hashie"
22
require "faraday"
3-
require "faraday_middleware"
3+
require "faraday/follow_redirects"
44
require "multi_json"
55
require "uri"
66

rabbitmq_http_api_client.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ Gem::Specification.new do |gem|
2121
gem.add_dependency 'addressable', '~> 2.7'
2222
gem.add_dependency 'hashie', '~> 4.1'
2323
gem.add_dependency 'multi_json', '~> 1.15'
24-
gem.add_dependency 'faraday', '~> 1.3'
25-
gem.add_dependency 'faraday_middleware', '~> 1.2'
24+
gem.add_dependency 'faraday', '~> 2.0'
25+
gem.add_dependency 'faraday-follow_redirects', '~> 0.3'
2626
end

0 commit comments

Comments
 (0)