diff --git a/faraday-pr1549-unespace-rack-utils-query-result.patch b/faraday-pr1549-unespace-rack-utils-query-result.patch deleted file mode 100644 index e727376..0000000 --- a/faraday-pr1549-unespace-rack-utils-query-result.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 66551ecc79f5d3d5bca1a2523bd8736db8c2220c Mon Sep 17 00:00:00 2001 -From: Mattia Giuffrida -Date: Sat, 20 Jan 2024 16:48:26 +0000 -Subject: [PATCH] Unescape the result of `Rack::Utils.build_nested_query` - ---- - spec/faraday/params_encoders/nested_spec.rb | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/spec/faraday/params_encoders/nested_spec.rb b/spec/faraday/params_encoders/nested_spec.rb -index 46312047f..83da22dc4 100644 ---- a/spec/faraday/params_encoders/nested_spec.rb -+++ b/spec/faraday/params_encoders/nested_spec.rb -@@ -62,7 +62,8 @@ - it 'encodes rack compat' do - params = { a: [{ one: '1', two: '2' }, '3', ''] } - result = Faraday::Utils.unescape(Faraday::NestedParamsEncoder.encode(params)).split('&') -- expected = Rack::Utils.build_nested_query(params).split('&') -+ escaped = Rack::Utils.build_nested_query(params) -+ expected = Rack::Utils.unescape(escaped).split('&') - expect(result).to match_array(expected) - end - diff --git a/faraday-pr1560-ruby34-backtrace-change.patch b/faraday-pr1560-ruby34-backtrace-change.patch deleted file mode 100644 index 076c534..0000000 --- a/faraday-pr1560-ruby34-backtrace-change.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8cdc483218d4612d53239f48785567b6b6d056cd Mon Sep 17 00:00:00 2001 -From: m-nakamura145 -Date: Fri, 24 May 2024 23:23:24 +0900 -Subject: [PATCH] Fix compatibility with Ruby 3.4.0-preview1 - ---- - spec/faraday_spec.rb | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/spec/faraday_spec.rb b/spec/faraday_spec.rb -index 30be29cf8..c3583f184 100644 ---- a/spec/faraday_spec.rb -+++ b/spec/faraday_spec.rb -@@ -18,7 +18,9 @@ - end - - it 'uses method_missing on Faraday if there is no proxyable method' do -- expected_message = if RUBY_VERSION >= '3.3' -+ expected_message = if RUBY_VERSION >= '3.4' -+ "undefined method 'this_method_does_not_exist' for module Faraday" -+ elsif RUBY_VERSION >= '3.3' - "undefined method `this_method_does_not_exist' for module Faraday" - else - "undefined method `this_method_does_not_exist' for Faraday:Module" diff --git a/faraday-pr1604-ruby34-hash-inspect-formatting-change.patch b/faraday-pr1604-ruby34-hash-inspect-formatting-change.patch deleted file mode 100644 index b972f1b..0000000 --- a/faraday-pr1604-ruby34-hash-inspect-formatting-change.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 74962b2d77af4a1ca6bc557031e6c24759dbafa7 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Tue, 3 Dec 2024 15:48:12 +0900 -Subject: [PATCH] [TEST] fix compatibility with ruby 3.4.0dev - -ruby 3.4 changes Hash#inspect formatting as: -https://bugs.ruby-lang.org/issues/20433 - -Closes #1602 ---- - spec/faraday/error_spec.rb | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/spec/faraday/error_spec.rb b/spec/faraday/error_spec.rb -index fd30e2d34..170f32672 100644 ---- a/spec/faraday/error_spec.rb -+++ b/spec/faraday/error_spec.rb -@@ -21,7 +21,11 @@ - it { expect(subject.wrapped_exception).to be_nil } - it { expect(subject.response).to eq(exception) } - it { expect(subject.message).to eq('the server responded with status 400') } -- it { expect(subject.inspect).to eq('#400}>') } -+ if RUBY_VERSION >= '3.4' -+ it { expect(subject.inspect).to eq('#') } -+ else -+ it { expect(subject.inspect).to eq('#400}>') } -+ end - end - - context 'with string' do diff --git a/faraday-rack-pr13-rack31-rack_input.patch b/faraday-rack-pr13-rack31-rack_input.patch deleted file mode 100644 index f08c969..0000000 --- a/faraday-rack-pr13-rack31-rack_input.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a590bc34e40b62484440dcd4ab5147c0c02bb425 Mon Sep 17 00:00:00 2001 -From: Andreas Schleifer -Date: Wed, 9 Apr 2025 09:21:05 +0200 -Subject: [PATCH] Fix tests for rack 3.1: env['rack.input'] is optional (#13) - -* fix(spec): fix tests for rack 3.1 - -* feat(ci): add ruby 3.4 to CI test matrix - ---------- - -Co-authored-by: Olle Jonsson ---- - .github/workflows/ci.yml | 1 + - spec/support/webmock_rack_app.rb | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/spec/support/webmock_rack_app.rb b/spec/support/webmock_rack_app.rb -index a3212c7..894c411 100644 ---- a/spec/support/webmock_rack_app.rb -+++ b/spec/support/webmock_rack_app.rb -@@ -49,7 +49,7 @@ def req_headers(env) - end - - def req_body(env) -- env['rack.input'].read -+ env['rack.input']&.read - end - - def process_response(req_signature) diff --git a/rubygem-faraday.spec b/rubygem-faraday.spec index 6d9542c..bc54f03 100644 --- a/rubygem-faraday.spec +++ b/rubygem-faraday.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Version: 1.0.1 -Release: 18%{?dist} +Release: 12%{?dist} Summary: HTTP/REST API client library License: MIT URL: https://lostisland.github.io/faraday @@ -24,20 +24,6 @@ Patch1: faraday-1.0.1-net-http-persistent-3-error-kind.patch # https://github.com/lostisland/faraday/pull/1523 # https://github.com/ruby/ruby/pull/6950 Patch2: faraday-pr1523-testsuite-undefined-method-change.patch -# ruby3.4 backtrace quoting change -# https://github.com/lostisland/faraday/pull/1560 -Patch3: faraday-pr1560-ruby34-backtrace-change.patch -# ruby3.4 Hash#inspect formatting change -# https://github.com/lostisland/faraday/pull/1604 -Patch4: faraday-pr1604-ruby34-hash-inspect-formatting-change.patch -# https://github.com/lostisland/faraday-rack/pull/13 -# https://github.com/lostisland/faraday-rack/commit/a590bc34e40b62484440dcd4ab5147c0c02bb425 -# Patch for rack 3.1 wrt env['rack.input'] is optional -Patch5: faraday-rack-pr13-rack31-rack_input.patch -# https://github.com/lostisland/faraday/pull/1549 -# https://github.com/lostisland/faraday/commit/66551ecc79f5d3d5bca1a2523bd8736db8c2220c.patch -# Unescape the result of Rack::Utils.build_nested_query for rack 3.1 -Patch6: faraday-pr1549-unespace-rack-utils-query-result.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby >= 2.3 @@ -124,24 +110,6 @@ popd %{gem_instdir}/spec %changelog -* Mon Dec 01 2025 Mamoru TASAKA - 1.0.1-18 -- Backport upstream patch for rack3.1 change - -* Fri Jul 25 2025 Fedora Release Engineering - 1.0.1-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.0.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Dec 04 2024 Mamoru TASAKA - 1.0.1-15 -- Use upstreamed patch for ruby34 formatting change - -* Sun Dec 01 2024 Mamoru TASAKA - 1.0.1-14 -- Support ruby3.4 backtrace / Hash inspect formatting change - -* Fri Jul 19 2024 Fedora Release Engineering - 1.0.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - * Fri Jan 26 2024 Fedora Release Engineering - 1.0.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild