flexirest 1.12.1 → 1.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b36abe5b5b35c85e8705681e6ec68792c20b1ec33e44cd94420e7a49a103fb50
-  data.tar.gz: fa2cf4caa5736b75f53b3bcf7ae61909e448ba75d58c41dfe826a92e616e42ec
+  metadata.gz: c7e62a7d0f69e17e808ebb5a91e63805618a5a0e9dee6fa4e1fabbbbe46c065b
+  data.tar.gz: e1961e477b96fac798530f5ea1dccdd55a6c1e1aca9f169f848492184d4b6820
 SHA512:
-  metadata.gz: 6a7b314f07d529deef241d32d750770e51fe2c4fdf32390f3cbbed814d3854d2f1229f6bc138d6b1a6688f7d152ccb330a778dd05298242bae20b9790da09e46
-  data.tar.gz: 3831f016b5b437374f2ba1a7fd9a9568077ffb71c9e1456359244055990dddb0aaf2a0fae0aa506d03bc8a8c5469ef1ae7809e3f6786e4d9b3a93d09937319a5
+  metadata.gz: 10a59eceb8374b68bd5b5a1556a5490ac8d1d1a125d2c64b56e78af6eebf5b54754813504bcb64e728211ee24c3f9ecc58791c3c5797517fbba0b3c45608be31
+  data.tar.gz: 66d9ef4f620f34c5657bf993e30020b3ceb49d5932a2340e4d7b9f3a0ed7e18082dd02e90c33907f25116df33c758b4ff425fd0fe9bf4fe90951fc2a73973c80

data/.github/workflows/build.yml

@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.12.2
+
+Bugfix:
+
+- Changing the parameters in a `defaults` option to a mapping shouldn't mutate the parameters, meaning that retries should get the same as the original parameters (thanks to vskbjrn for the bug report)
+
 ## 1.12.1
 
 Bugfix:

data/lib/flexirest/request.rb

@@ -344,6 +344,8 @@ module Flexirest
         params = {id:params}
       end
 
+      params = params.dup
+
       # Format includes parameter for jsonapi
       if proxy == :json_api
         JsonAPIProxy::Request::Params.translate(params, @object._include_associations)

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.12.1"
+  VERSION = "1.12.2"
 end

data/spec/lib/configuration_spec.rb

@@ -81,18 +81,6 @@ describe Flexirest::Configuration do
     expect(SubConfigurationExample.username).to eq("john")
   end
 
-  it "should escape the username" do
-    Flexirest::Base.username = "bill@example.com"
-    expect(Flexirest::Base.username).to eq("bill%40example.com")
-    Flexirest::Base.username = nil
-  end
-
-  it "should not doubly escape the username" do
-    Flexirest::Base.username = "bill%40example.com"
-    expect(Flexirest::Base.username).to_not eq("bill%2540example.com")
-    Flexirest::Base.username = nil
-  end
-
   it "should remember the set password" do
     expect(ConfigurationExample.password).to eq("smith")
   end
@@ -107,18 +95,6 @@ describe Flexirest::Configuration do
     expect(SubConfigurationExample.password).to eq("smith")
   end
 
-  it "should escape the password" do
-    Flexirest::Base.password = "something@else"
-    expect(Flexirest::Base.password).to eq("something%40else")
-    Flexirest::Base.password = nil
-  end
-
-  it "should not doubly escape the password" do
-    Flexirest::Base.password = "something%40else"
-    expect(Flexirest::Base.password).to_not eq("something%2540else")
-    Flexirest::Base.password = nil
-  end
-
   it "should default to a form_encoded request_body_type" do
     expect(Flexirest::Base.request_body_type).to eq(:form_encoded)
   end

data/spec/lib/request_spec.rb

@@ -173,6 +173,13 @@ describe Flexirest::Request do
       get :second_call, "/second_call"
     end
 
+    class SimpleRetryingExampleClient < Flexirest::Base
+      base_url "http://www.example.com"
+      get :all, "/objects", defaults: proc { |params| { type: params.delete(:object_type) } }
+
+      after_request -> (name, response) { raise Flexirest::CallbackRetryRequestException.new }
+    end
+
     class LazyLoadedExampleClient < ExampleClient
       base_url "http://www.example.com"
       lazy_load!
@@ -1395,6 +1402,13 @@ describe Flexirest::Request do
     expect(RetryingExampleClient.retries).to eq(2)
   end
 
+  it "shouldn't destructively change params before retrying" do
+    stub_request(:get, "http://www.example.com/objects?type=foo").
+      to_return(status: 200, body: "", headers: {})
+    SimpleRetryingExampleClient.all(object_type: 'foo')
+
+    expect(WebMock).to have_requested(:get, "www.example.com/objects?type=foo").twice
+  end
 
   context "Direct URL requests" do
     class SameServerExampleClient < Flexirest::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.12.2
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler