From 3120bd1985525dd0fbd5147dc51ce42565b6d38d Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 13 Sep 2021 14:16:38 +0100 Subject: [PATCH 1/4] Fix deprecation warning --- lib/faraday/connection.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/faraday/connection.rb b/lib/faraday/connection.rb index 6344f6a0c..7a9849ad1 100644 --- a/lib/faraday/connection.rb +++ b/lib/faraday/connection.rb @@ -433,13 +433,18 @@ def url_prefix=(url, encoder = nil) uri.query = nil with_uri_credentials(uri) do |user, password| - basic_auth user, password + set_basic_auth(user, password) uri.user = uri.password = nil end @proxy = proxy_from_env(url) unless @manual_proxy end + def set_basic_auth(user, password) + header = Faraday::Request::BasicAuthentication.header(user, password) + headers[Faraday::Request::Authorization::KEY] = header + end + # Sets the path prefix and ensures that it always has a leading # slash. # From 46b4717d00e5ea80f5fc58c8e001a0ec26b34580 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 13 Sep 2021 14:19:24 +0100 Subject: [PATCH 2/4] Fix rubocop --- .rubocop_todo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index f9b7fdd11..1ffc73e93 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -14,7 +14,7 @@ Metrics/AbcSize: # Offense count: 5 # Configuration parameters: CountComments, CountAsOne. Metrics/ClassLength: - Max: 256 + Max: 260 # Offense count: 15 # Configuration parameters: IgnoredMethods. From cf8b2ffb1aad98ff2dffab58868c55372f676fe7 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 13 Sep 2021 14:39:38 +0100 Subject: [PATCH 3/4] fix script/console --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 66c9d29f4..2bb215638 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,7 @@ gem 'jruby-openssl', '~> 0.10.7', platforms: :jruby group :development, :test do gem 'pry' gem 'rake' + gem 'irb' end group :lint, :development do From 1c1c1b96f8023e64a490f9ef63a6a841218bd932 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 13 Sep 2021 14:41:06 +0100 Subject: [PATCH 4/4] fix rubocop --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2bb215638..fcbe1d39a 100644 --- a/Gemfile +++ b/Gemfile @@ -7,9 +7,9 @@ ruby RUBY_VERSION gem 'jruby-openssl', '~> 0.10.7', platforms: :jruby group :development, :test do + gem 'irb' gem 'pry' gem 'rake' - gem 'irb' end group :lint, :development do