exceptional_synchrony 1.3.1 → 1.4.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa270b85777fd65a8aae32439cb7031d28f9204e21fbfc627b7659890f47c966
-  data.tar.gz: fea79c101de02959aefb8596b9635f2ccb24266c6173be354465b764264265ea
+  metadata.gz: 23aa4209588ee0dc66a1c96e25d1a524e1191f7d6f46a0acdfae90c04f19bf93
+  data.tar.gz: 1c40477122edb3b80bdfae312e486ef8a85cf4bac2c9ee78793e6de97bd72b5e
 SHA512:
-  metadata.gz: ed1b737065894c49b88eeaad73f202d8e5b512b117fb36d9ea810f993d201a9999635380f0d2632978b59726c85d0682a589748d82d0fb72b9c5e7e7fd0b52c9
-  data.tar.gz: ba46f65a0f74e86806dc40eda128b4b3172219d4c214d0ab697781334d371b7fda9f4f8e1f378d548fc7a053e01d83ea5ea747ea32266fb58ba0c81df4ada212
+  metadata.gz: 3fec9e8a041a72ee6c521d1ffb33eeef2a470c3df92b41dacaf7c57d6aa33fe0e3d2ee85392f68261c6ed00e29c0264f809dee303ba896bfc471682f161f2303
+  data.tar.gz: 04d48f19f25bcae51e5b97bf318f78c44151b3d3417dac6b536f25f7b2d778736de0b226aa80c540fbd14801c587c2ffd80e0f4c2890c2ef7003f46fb24f5add

data/.ruby-version

@@ -1 +1 @@
-2.7.5
+2.6.5

data/CHANGELOG.md

@@ -6,9 +6,10 @@ Note: This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0
 
 All notable changes to this project will be documented in this file.
 
-## [1.3.1] - 2024-03-04
-### Changed
-- Updated `exception_handling` dependency to allow usage of version 3.0
+## [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`
 
 ## [1.3.0] - 2021-02-04
 ### Added

data/Gemfile.lock

@@ -1,42 +1,58 @@
 PATH
   remote: .
   specs:
-    exceptional_synchrony (1.3.1)
+    exceptional_synchrony (1.4.0.pre.1)
       em-http-request
       em-synchrony
       eventmachine
-      exception_handling (>= 2.2)
+      exception_handling (~> 2.2)
       invoca-utils (~> 0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.2)
-      base64
-      bigdecimal
+    actionmailer (6.1.1)
+      actionpack (= 6.1.1)
+      actionview (= 6.1.1)
+      activejob (= 6.1.1)
+      activesupport (= 6.1.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.1.1)
+      actionview (= 6.1.1)
+      activesupport (= 6.1.1)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.1.1)
+      activesupport (= 6.1.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.1)
+      activesupport (= 6.1.1)
+      globalid (>= 0.3.6)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
-      mutex_m
       tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
-    base64 (0.2.0)
-    bigdecimal (3.1.6)
     builder (3.2.4)
     coderay (1.1.2)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
-    contextual_logger (1.2.0)
+    concurrent-ruby (1.1.8)
+    contextual_logger (0.11.0)
       activesupport
       json
-    cookiejar (0.3.4)
+    cookiejar (0.3.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    drb (2.2.1)
+    crass (1.0.6)
     em-http-request (1.1.7)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
@@ -47,45 +63,65 @@ GEM
       eventmachine (>= 1.0.0.beta.4)
     em-synchrony (1.0.6)
       eventmachine (>= 1.0.0.beta.1)
-    escalate (0.3.0)
+    erubi (1.10.0)
     eventmachine (1.2.7)
-    exception_handling (3.0.0)
-      activesupport (>= 5.2)
-      contextual_logger (~> 1.0)
-      escalate (~> 0.3)
+    exception_handling (2.8.1)
+      actionmailer (>= 4.2, < 7.0)
+      actionpack (>= 4.2, < 7.0)
+      activesupport (>= 4.2, < 7.0)
+      contextual_logger (~> 0.7)
+      eventmachine (~> 1.0)
       invoca-utils (~> 0.3)
-      psych (~> 3.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
     hashdiff (1.0.1)
-    http_parser.rb (0.8.0)
-    i18n (1.14.1)
+    http_parser.rb (0.6.0)
+    i18n (1.8.8)
       concurrent-ruby (~> 1.0)
-    invoca-utils (0.5.1)
-      activesupport (>= 5.0)
-    json (2.7.1)
+    invoca-utils (0.4.1)
+    json (2.5.1)
+    loofah (2.9.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
     method_source (1.0.0)
+    mini_mime (1.0.2)
+    mini_portile2 (2.5.0)
     minitest (5.14.0)
     minitest-reporters (1.4.2)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mutex_m (0.2.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (3.3.4)
     public_suffix (4.0.4)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     rake (13.0.1)
     rr (1.2.1)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
     thor (1.0.1)
-    tzinfo (2.0.6)
+    tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     webmock (1.24.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -101,4 +137,4 @@ DEPENDENCIES
   webmock (~> 1.24)
 
 BUNDLED WITH
-   2.3.22
+   1.17.3

data/exceptional_synchrony.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'em-synchrony'
   spec.add_dependency 'em-http-request'
   spec.add_dependency 'eventmachine'
-  spec.add_dependency 'exception_handling', '>= 2.2'
+  spec.add_dependency 'exception_handling', '~> 2.2'
   spec.add_dependency 'invoca-utils', '~> 0.3'
 end

data/lib/exceptional_synchrony/event_machine_proxy.rb

@@ -76,6 +76,7 @@ module ExceptionalSynchrony
     #   :log   - log any rescued StandardError exceptions and continue
     #   :raise - raise FatalRunError for any rescued StandardError exceptions
     def run(on_error: :log, &block)
+      configure_faraday
       case on_error
       when :log   then run_with_error_logging(&block)
       when :raise then run_with_error_raising(&block)
@@ -133,6 +134,12 @@ module ExceptionalSynchrony
 
     private
 
+    def configure_faraday
+      if defined?(Faraday)
+        Faraday.default_adapter = :em_synchrony
+      end
+    end
+
     def run_with_error_logging(&block)
       ensure_completely_safe("run_with_error_logging") do
         if @proxy_class.respond_to?(:synchrony)

data/lib/exceptional_synchrony/version.rb

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

data/test/unit/event_machine_proxy_test.rb

@@ -112,7 +112,7 @@ describe ExceptionalSynchrony::EventMachineProxy do
     end
 
     it "should handle exceptions when not waiting for its block to run" do
-      mock(ExceptionHandling).log_error(is_a(RuntimeError), "defer")
+      mock(ExceptionHandling).log_error(is_a(RuntimeError), "defer", {})
 
       @em.run do
         assert_nil @em.defer("#defer success", wait_for_result: false) { raise RuntimeError, "error in defer" }
@@ -140,24 +140,45 @@ describe ExceptionalSynchrony::EventMachineProxy do
     end
 
     it "add_timer" do
-      mock(ExceptionHandling).log_error(EXCEPTION, "add_timer")
+      mock(ExceptionHandling).log_error(EXCEPTION, "add_timer", {})
       mock(EventMachine::Synchrony).add_timer(10) { |duration, *args| args.first.call }
       @em.add_timer(10) { raise EXCEPTION }
     end
 
     it "add_periodic_timer" do
-      mock(ExceptionHandling).log_error(EXCEPTION, "add_periodic_timer")
+      mock(ExceptionHandling).log_error(EXCEPTION, "add_periodic_timer", {})
       mock(EventMachine::Synchrony).add_periodic_timer(10) { |duration, *args| args.first.call }
       @em.add_periodic_timer(10) { raise EXCEPTION }
     end
 
     it "next_tick" do
-      mock(ExceptionHandling).log_error(EXCEPTION, "next_tick")
+      mock(ExceptionHandling).log_error(EXCEPTION, "next_tick", {})
       mock(EventMachine::Synchrony).next_tick { |*args| args.first.call }
       @em.next_tick { raise EXCEPTION }
     end
   end
 
+  describe "run with faraday" do
+    it "should conigure Faraday default_adapter to :em_synchrony if Faraday is defined" do
+      class Faraday
+        class << self
+          attr_reader :default_adapter
+
+          def default_adapter=(adapter)
+            @default_adapter = adapter
+          end
+        end
+
+        self.default_adapter = :net_http
+      end
+
+      mock(@em).run_with_error_logging
+      assert_equal :net_http, Faraday.default_adapter
+      @em.run
+      assert_equal :em_synchrony, Faraday.default_adapter
+    end
+  end
+
   { synchrony: SynchronyProxyMock, run: RunProxyMock }.each do |method, proxy_mock|
     describe "run" do
       before do
@@ -189,7 +210,7 @@ describe ExceptionalSynchrony::EventMachineProxy do
 
         describe "when using #{method} and on_error = :log" do
           it "should rescue any exceptions and log them" do
-            mock(ExceptionHandling).log_error(EXCEPTION, "run_with_error_logging")
+            mock(ExceptionHandling).log_error(EXCEPTION, "run_with_error_logging", {})
 
             @proxy.run(on_error: :log) { raise EXCEPTION }
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exceptional_synchrony
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0.pre.1
 platform: ruby
 authors:
 - Invoca
@@ -56,14 +56,14 @@ dependencies:
   name: exception_handling
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
@@ -126,11 +126,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Extensions to EventMachine/Synchrony to work well with exceptions