exceptional_synchrony 1.4.3 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5bdb260665703f32ecf34544572e38d1e497664114839950c672ab0390cb279
-  data.tar.gz: 2d6210c606d546533f5d3dbb8d6b1810ecdd27441a9196addfbe75c45cbc6cb9
+  metadata.gz: 4ca2d74de17a099687d616f5c15642347fc55c61633d59e0c5b37b73cb51006d
+  data.tar.gz: f9fc4d71c4122a7c213e57fdbcb4a82007a7b6c542d810b5568af9cde2aa1fca
 SHA512:
-  metadata.gz: 718c4a5819c54a5f31bdeef67c88c9b7661703be2a2383b6261f4a56e5b19e82e863c10c2b5daaf9a2cbf4d4d1f2d26cc357b742a0fa3d540a2deccb9a5b3421
-  data.tar.gz: 2d301211b26981e3f1b22111dde38529ccae94a78f2ac7ec7e618ae957e95d635e20b4a5f939b53cd9c7a927bfd97f53f977818e7522193372d9b64efd55a1fc
+  metadata.gz: 3ba9ce595d840b6377ec85eebe6818c9abbce57f01f36409d0c8c41e5d8730532418af278fe36ef05a2824e7f9c31bee6903dc1204e302c676c3747afa543d4d
+  data.tar.gz: d34d1678567d5b8d673a89be6a284432adf99de049a71bf59e675aa031e567646b0f003a227f45815dae2283ee58d65957ad78968c08c4df7f21aa77e847d11a

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Invoca/octothorpe

data/.github/workflows/pipeline.yml

@@ -8,13 +8,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6.5]
+        ruby: [2.7, '3.0', 3.1]
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 1.17.3
+        bundler: 2.2.29
         bundler-cache: true
     - name: Unit tests
       run: bundle exec rake

data/.ruby-version

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

data/CHANGELOG.md

@@ -6,6 +6,14 @@ 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.4.5] - 2024-02-29
+### Changed
+- Updated dependency on `exception_handling` to allow for the latest version.
+
+## [1.4.4] - 2022-03-25
+### Changed
+- Default unused defer(context) argument to nil.
+
 ## [1.4.3] - 2022-03-24
 ### Changed
 - Update exception_handling
@@ -41,6 +49,7 @@ All notable changes to this project will be documented in this file.
 ## [1.1.1] - 2020-05-03
 - Replace hobo_support with invoca_utils
 
+[1.4.4]: https://github.com/Invoca/exceptional_synchrony/compare/v1.4.3...v1.4.4
 [1.4.3]: https://github.com/Invoca/exceptional_synchrony/compare/v1.4.2...v1.4.3
 [1.4.2]: https://github.com/Invoca/exceptional_synchrony/compare/v1.4.1...v1.4.2
 [1.4.1]: https://github.com/Invoca/exceptional_synchrony/compare/v1.4.0...v1.4.1

data/Gemfile

@@ -10,6 +10,7 @@ group :development do
   gem 'minitest-reporters'
   gem 'pry'
   gem 'rake'
+  gem 'rexml'
   gem 'rr',      '~> 1.2'
   gem 'thor'
   gem 'webmock', '~> 1.24'

data/Gemfile.lock

@@ -1,58 +1,74 @@
 PATH
   remote: .
   specs:
-    exceptional_synchrony (1.4.3)
+    exceptional_synchrony (1.4.5)
       em-http-request
       em-synchrony
       eventmachine
-      exception_handling (~> 2.10)
+      exception_handling (>= 2.10, < 4.0)
       invoca-utils (~> 0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.1.5)
-      actionpack (= 6.1.5)
-      actionview (= 6.1.5)
-      activejob (= 6.1.5)
-      activesupport (= 6.1.5)
+    actionmailer (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.1.5)
-      actionview (= 6.1.5)
-      activesupport (= 6.1.5)
-      rack (~> 2.0, >= 2.0.9)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.3.2)
+      actionview (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.5)
-      activesupport (= 6.1.5)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.5)
-      activesupport (= 6.1.5)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.3.6)
-    activesupport (6.1.5)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       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)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
     builder (3.2.4)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.10)
-    contextual_logger (0.11.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    contextual_logger (1.2.0)
       activesupport
       json
-    cookiejar (0.3.3)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    cookiejar (0.3.4)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
+    date (3.3.4)
+    drb (2.2.0)
+      ruby2_keywords
     em-http-request (1.1.7)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
@@ -63,67 +79,89 @@ GEM
       eventmachine (>= 1.0.0.beta.4)
     em-synchrony (1.0.6)
       eventmachine (>= 1.0.0.beta.1)
-    erubi (1.10.0)
+    erubi (1.12.0)
     escalate (0.3.0)
     eventmachine (1.2.7)
-    exception_handling (2.10.0)
-      actionmailer (>= 4.2, < 7.0)
-      actionpack (>= 4.2, < 7.0)
-      activesupport (>= 4.2, < 7.0)
-      contextual_logger (~> 0.7)
+    exception_handling (2.16.0)
+      actionmailer (>= 5.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      contextual_logger (~> 1.0)
       escalate (~> 0.3)
       eventmachine (~> 1.0)
       invoca-utils (~> 0.3)
-    globalid (1.0.0)
-      activesupport (>= 5.0)
+      net-smtp
+      psych (~> 3.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     hashdiff (1.0.1)
     http_parser.rb (0.8.0)
-    i18n (1.10.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    invoca-utils (0.4.1)
-    json (2.6.1)
-    loofah (2.15.0)
+    invoca-utils (0.5.1)
+      activesupport (>= 5.0)
+    json (2.7.1)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.15.0)
-    minitest-reporters (1.4.2)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
+    minitest (5.18.0)
+    minitest-reporters (1.6.0)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.13.3)
-      mini_portile2 (~> 2.8.0)
+    mutex_m (0.2.0)
+    net-imap (0.4.10)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.4.0.1)
+      net-protocol
+    nokogiri (1.15.5)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.4)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    psych (3.3.4)
+    public_suffix (5.0.1)
+    racc (1.7.3)
+    rack (3.0.9.1)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    rake (13.0.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rake (13.0.6)
+    rexml (3.2.5)
     rr (1.2.1)
-    ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
-    thor (1.0.1)
-    tzinfo (2.0.4)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    thor (1.2.1)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     webmock (1.24.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -134,9 +172,10 @@ DEPENDENCIES
   minitest-reporters
   pry
   rake
+  rexml
   rr (~> 1.2)
   thor
   webmock (~> 1.24)
 
 BUNDLED WITH
-   1.17.3
+   2.3.22

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.10'
+  spec.add_dependency 'exception_handling', '>= 2.10', '< 4.0'
   spec.add_dependency 'invoca-utils', '~> 0.3'
 end

data/lib/exceptional_synchrony/event_machine_proxy.rb

@@ -89,7 +89,7 @@ module ExceptionalSynchrony
     # This method will execute the block on the background thread pool
     # By default, it will block the caller until the background thread has finished, so that the result can be returned
     #  :wait_for_result - setting this to false will prevent the caller from being blocked by this deferred work
-    def defer(context, wait_for_result: true, &block)
+    def defer(_context = nil, wait_for_result: true, &block)
       if wait_for_result
         deferrable = EventMachine::DefaultDeferrable.new
         callback = -> (result) { deferrable.succeed(result) }

data/lib/exceptional_synchrony/version.rb

@@ -1,3 +1,3 @@
 module ExceptionalSynchrony
-  VERSION = '1.4.3'
+  VERSION = '1.4.5'
 end

data/test/unit/event_machine_proxy_test.rb

@@ -102,7 +102,7 @@ describe ExceptionalSynchrony::EventMachineProxy do
 
     it "should output its block's output when it doesn't raise an error, by default" do
       @em.run do
-        assert_equal 12, @em.defer("#defer success") { 12 }
+        assert_equal 12, @em.defer { 12 }
         @em.stop
       end
     end
@@ -111,7 +111,7 @@ describe ExceptionalSynchrony::EventMachineProxy do
       @block_ran = false
 
       @em.run do
-        assert_nil @em.defer("#defer success", wait_for_result: false) { @block_ran = true; 12 }
+        assert_nil @em.defer(wait_for_result: false) { @block_ran = true; 12 }
         refute @block_ran
         stop_em_after_defers_finish!(@em)
       end
@@ -120,10 +120,14 @@ 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", {})
+      if RUBY_VERSION < '2.7'
+        mock(ExceptionHandling).log_error(is_a(RuntimeError), "defer", {})
+      else
+        mock(ExceptionHandling).log_error(is_a(RuntimeError), "defer")
+      end
 
       @em.run do
-        assert_nil @em.defer("#defer success", wait_for_result: false) { raise RuntimeError, "error in defer" }
+        assert_nil @em.defer(wait_for_result: false) { raise RuntimeError, "error in defer" }
         stop_em_after_defers_finish!(@em)
       end
     end
@@ -131,7 +135,7 @@ describe ExceptionalSynchrony::EventMachineProxy do
     it "should raise an error when its block raises an error" do
       @em.run do
         ex = assert_raises(ArgumentError) do
-          @em.defer("#defer raising an error") { raise ArgumentError, "!!!" }
+          @em.defer { raise ArgumentError, "!!!" }
         end
 
         assert_equal "!!!", ex.message
@@ -148,19 +152,31 @@ describe ExceptionalSynchrony::EventMachineProxy do
     end
 
     it "add_timer" do
-      mock(ExceptionHandling).log_error(EXCEPTION, "add_timer", {})
+      if RUBY_VERSION < '2.7'
+        mock(ExceptionHandling).log_error(EXCEPTION, "add_timer", {})
+      else
+        mock(ExceptionHandling).log_error(EXCEPTION, "add_timer")
+      end
       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", {})
+      if RUBY_VERSION < '2.7'
+        mock(ExceptionHandling).log_error(EXCEPTION, "add_periodic_timer", {})
+      else
+        mock(ExceptionHandling).log_error(EXCEPTION, "add_periodic_timer")
+      end
       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", {})
+      if RUBY_VERSION < '2.7'
+        mock(ExceptionHandling).log_error(EXCEPTION, "next_tick", {})
+      else
+        mock(ExceptionHandling).log_error(EXCEPTION, "next_tick")
+      end
       mock(EventMachine::Synchrony).next_tick { |*args| args.first.call }
       @em.next_tick { raise EXCEPTION }
     end
@@ -210,7 +226,11 @@ 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", {})
+            if RUBY_VERSION < '2.7'
+              mock(ExceptionHandling).log_error(EXCEPTION, "run_with_error_logging", {})
+            else
+              mock(ExceptionHandling).log_error(EXCEPTION, "run_with_error_logging")
+            end
 
             @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.4.3
+  version: 1.4.5
 platform: ruby
 authors:
 - Invoca
@@ -56,16 +56,22 @@ dependencies:
   name: exception_handling
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: invoca-utils
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +93,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".dependabot/config.yml"
+- ".github/CODEOWNERS"
 - ".github/workflows/pipeline.yml"
 - ".gitignore"
 - ".ruby-gemset"
@@ -130,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Extensions to EventMachine/Synchrony to work well with exceptions