exceptional_synchrony 1.4.0.pre.1 → 1.4.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23aa4209588ee0dc66a1c96e25d1a524e1191f7d6f46a0acdfae90c04f19bf93
-  data.tar.gz: 1c40477122edb3b80bdfae312e486ef8a85cf4bac2c9ee78793e6de97bd72b5e
+  metadata.gz: 7337c98f6e124b7e27327707ad7996bea893fe5c005ae57627e855ec35c77ff4
+  data.tar.gz: 2603dc05990ab4c3f257409382f8fc6453f8e22446a82a1ad9841564b509994e
 SHA512:
-  metadata.gz: 3fec9e8a041a72ee6c521d1ffb33eeef2a470c3df92b41dacaf7c57d6aa33fe0e3d2ee85392f68261c6ed00e29c0264f809dee303ba896bfc471682f161f2303
-  data.tar.gz: 04d48f19f25bcae51e5b97bf318f78c44151b3d3417dac6b536f25f7b2d778736de0b226aa80c540fbd14801c587c2ffd80e0f4c2890c2ef7003f46fb24f5add
+  metadata.gz: bd0b2894a70161f7162c465aacf315cada6748267d88590bb943d3c68ad382f0ed1b910224738f54b1a1ada219f894b9fd64bcb2f06c7f3b95f0c9b3efb1d218
+  data.tar.gz: b9b7c5fde46b71d32651108b855f4396517e32a73915b1e3bc09e258a5bcee678d3946ca3fc6c768eef1deebc0edaa66e4e41898b3a08a6d95e993c0bc12339e

data/CHANGELOG.md

@@ -8,8 +8,8 @@ All notable changes to this project will be documented in this file.
 
 ## [1.4.0] - UNRELEASED
 ### Added
-- For users of `Faraday` connections, its `default_adapter` is configured to `:em_synchrony` when starting
-  the `EventMachine` reactor so that the reactor does not get blocked when using `Faraday`
+- Added `:faraday_adapter` option to `EventMachineProxy#run` with a default of `:em_synchrony`
+  so that the reactor does not get blocked when using `Faraday` connections
 
 ## [1.3.0] - 2021-02-04
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    exceptional_synchrony (1.4.0.pre.1)
+    exceptional_synchrony (1.4.0.pre.2)
       em-http-request
       em-synchrony
       eventmachine

data/lib/exceptional_synchrony/event_machine_proxy.rb

@@ -72,11 +72,16 @@ module ExceptionalSynchrony
       @proxy_class.connect(server, port, handler, *args, &block)
     end
 
+    # This method starts the EventMachine reactor.
     # The on_error option has these possible values:
     #   :log   - log any rescued StandardError exceptions and continue
     #   :raise - raise FatalRunError for any rescued StandardError exceptions
-    def run(on_error: :log, &block)
-      configure_faraday
+    # The faraday_adapter option has these possible values that only apply if Faraday connections are in use:
+    #   :em_synchrony - for use when EM::Synchrony is being used in all threads of the given process
+    #   :net_http     - for use when EM::Synchrony is being used in only some threads of the given process;
+    #                   in this case requests made over the Faraday connection will block the reactor
+    def run(on_error: :log, faraday_adapter: :em_synchrony, &block)
+      configure_faraday(faraday_adapter)
       case on_error
       when :log   then run_with_error_logging(&block)
       when :raise then run_with_error_raising(&block)
@@ -134,9 +139,10 @@ module ExceptionalSynchrony
 
     private
 
-    def configure_faraday
+    def configure_faraday(adapter)
       if defined?(Faraday)
-        Faraday.default_adapter = :em_synchrony
+        adapter.in?([:em_synchrony, :net_http]) or raise ArgumentError, "Invalid faraday_adapter: #{adapter.inspect}"
+        Faraday.default_adapter = adapter
       end
     end
 

data/lib/exceptional_synchrony/version.rb

@@ -1,3 +1,3 @@
 module ExceptionalSynchrony
-  VERSION = '1.4.0.pre.1'
+  VERSION = '1.4.0.pre.2'
 end

data/test/unit/event_machine_proxy_test.rb

@@ -159,7 +159,7 @@ describe ExceptionalSynchrony::EventMachineProxy do
   end
 
   describe "run with faraday" do
-    it "should conigure Faraday default_adapter to :em_synchrony if Faraday is defined" do
+    before do
       class Faraday
         class << self
           attr_reader :default_adapter
@@ -172,11 +172,26 @@ describe ExceptionalSynchrony::EventMachineProxy do
         self.default_adapter = :net_http
       end
 
-      mock(@em).run_with_error_logging
       assert_equal :net_http, Faraday.default_adapter
+    end
+
+    it "sets Faraday default_adapter to :em_synchrony by default if Faraday is defined" do
+      mock(@em).run_with_error_logging
       @em.run
       assert_equal :em_synchrony, Faraday.default_adapter
     end
+
+    it "sets Faraday default_adapter to :net_http if Faraday is defined" do
+      mock(@em).run_with_error_logging
+      @em.run(faraday_adapter: :net_http)
+      assert_equal :net_http, Faraday.default_adapter
+    end
+
+    it "raise ArgumentError if the specified faraday_adapter is invalid" do
+      assert_raises(ArgumentError, "Invalid faraday_adapter: :bogus") do
+        @em.run(faraday_adapter: :bogus)
+      end
+    end
   end
 
   { synchrony: SynchronyProxyMock, run: RunProxyMock }.each do |method, proxy_mock|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exceptional_synchrony
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre.1
+  version: 1.4.0.pre.2
 platform: ruby
 authors:
 - Invoca