faraday 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06eb37848cd7af8f9bbca6515b5d39da8fd1b96242c02ef3e11f370102538030
-  data.tar.gz: 28e3ae036dddef796d0bb388cff43f7aea5bcedfdb92bd410099fd303255abd6
+  metadata.gz: 2123a105dd09a93bec6fe115277fd7c58afa269bc1036524a422a3e45df2b40c
+  data.tar.gz: bdd311dabe80e2ecd28f7bf941ea0e551840b2bc783dd781b56999842086a31f
 SHA512:
-  metadata.gz: 3b492269396e55018147763939f526fd69b34da244c94e0b055b945dc4d4c32a5b4eee25accc0dcb7d60a74e31dca46787349909a0c806fd79428a6806a627fe
-  data.tar.gz: 7d61eaf95bcdd8206d20bb4e63575e774ecf49483623ee7f943d7e19dcfebc4c5820cac985382b4582e146540bf7438771a92a039462978c3081ef566221bab9
+  metadata.gz: 943a1dd4a67287874fc3724d3d9ec7e41540cd3a08b528201b1af806d5dd56bceb976f54df6d0394fb25bffeb0bcb224831700c9ef46c1daf24cb3e13fd2ad52
+  data.tar.gz: 3ae115b30da8ec49253888f4a81522c14667a8da6b248b0d56192252b8d9bf9a6914f703530d467c2a83415a0862b73ccc17f799d9c1d0fba8289296b7cb0faf

data/lib/faraday/adapter/test.rb

@@ -55,6 +55,7 @@ module Faraday
           @stack = {}
           @consumed = {}
           @strict_mode = strict_mode
+          @stubs_mutex = Monitor.new
           yield(self) if block_given?
         end
 
@@ -70,10 +71,13 @@ module Faraday
           stack = @stack[request_method]
           consumed = (@consumed[request_method] ||= [])
 
-          stub, meta = matches?(stack, env)
-          if stub
-            consumed << stack.delete(stub)
-            return stub, meta
+          @stubs_mutex.synchronize do
+            stub, meta = matches?(stack, env)
+            if stub
+              removed = stack.delete(stub)
+              consumed << removed unless removed.nil?
+              return stub, meta
+            end
           end
           matches?(consumed, env)
         end

data/lib/faraday/rack_builder.rb

@@ -73,7 +73,7 @@ module Faraday
     def build
       raise_if_locked
       block_given? ? yield(self) : request(:url_encoded)
-      adapter(Faraday.default_adapter) unless @adapter
+      adapter(Faraday.default_adapter, **Faraday.default_adapter_options) unless @adapter
     end
 
     def [](idx)

data/lib/faraday/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Faraday
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end

data/lib/faraday.rb

@@ -54,6 +54,10 @@ module Faraday
     #   @return [Symbol] the new default_adapter.
     attr_reader :default_adapter
 
+    # Option for the default_adapter
+    #   @return [Hash] default_adapter options
+    attr_accessor :default_adapter_options
+
     # Documented below, see default_connection
     attr_writer :default_connection
 
@@ -149,4 +153,5 @@ module Faraday
   self.root_path = File.expand_path __dir__
   self.lib_path = File.expand_path 'faraday', __dir__
   self.default_adapter = :net_http
+  self.default_adapter_options = {}
 end

data/spec/faraday/rack_builder_spec.rb

@@ -151,6 +151,33 @@ RSpec.describe Faraday::RackBuilder do
     end
   end
 
+  context 'when adapter is added with named options' do
+    after { Faraday.default_adapter_options = {} }
+    let(:conn) { Faraday::Connection.new {} }
+
+    let(:cat_adapter) do
+      Class.new(Faraday::Adapter) do
+        attr_accessor :name
+
+        def initialize(app, name:)
+          super(app)
+          @name = name
+        end
+      end
+    end
+
+    let(:cat) { subject.adapter.build }
+
+    it 'adds a handler to construct adapter with named options' do
+      Faraday.default_adapter = cat_adapter
+      Faraday.default_adapter_options = { name: 'Chloe' }
+      expect { cat }.to_not output(
+        /warning: Using the last argument as keyword parameters is deprecated/
+      ).to_stderr
+      expect(cat.name).to eq 'Chloe'
+    end
+  end
+
   context 'when middleware is added with named arguments' do
     let(:conn) { Faraday::Connection.new {} }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - "@technoweenie"
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday-net_http
@@ -124,7 +124,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://lostisland.github.io/faraday
-  changelog_uri: https://github.com/lostisland/faraday/releases/tag/v2.0.1
+  changelog_uri: https://github.com/lostisland/faraday/releases/tag/v2.1.0
   source_code_uri: https://github.com/lostisland/faraday
   bug_tracker_uri: https://github.com/lostisland/faraday/issues
 post_install_message: