faktory_worker_ruby 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8df3ceda59c66e2bcb7d04f70fec7de89e6a6219f9159420a9500df7c8a0d35b
-  data.tar.gz: 258295f65b955167b9d89f66aada3b28675368d835362edef694bd50b10f57cd
+  metadata.gz: 61cfbc8aa05f1700b58f7ba4f9a5899c8c2f08a092e579d278543e4067bdf789
+  data.tar.gz: 6a1c3012207e5e9079333e37cefe6452a05fde915d920bf580b080795bef69bd
 SHA512:
-  metadata.gz: 0b02206889ca2ff8b57f3de485a880904b9eb8e422975e78ed23176e753b4cc5ce7d4eca76f65f7f9b0c49c0440503892e26cdc9f960d170a076f8d49570a4d1
-  data.tar.gz: 7e7065afe15d6308245131ab4524fd5d2accdf51590817c91cd83beededd356a3bc4e0132cfc42f1eeb2bfc13bb367eecf8087f6c225d4a939d2f05828709662
+  metadata.gz: 4408d26363ee756e2f74688004d72b587528340289a1ccca05689fe671986e5311d45ac90266802d514ab3f690d3af80aec8e3b755019750e5e0c68eca0300f3
+  data.tar.gz: e02f8ea49cd856e0d1876b3e3e584d3e47b550c9fc54f812742921e352176c75b01f88e866318e2a69323844a0d5d9a80bba1a10af4c4c99d6bef5a231d5213a

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
+        ruby: ["3.2", "3.3", "3.4"]
     runs-on: ubuntu-latest
     services:
       faktory:
@@ -20,7 +20,7 @@ jobs:
             - 7419:7419
             - 7420:7420
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true

data/Changes.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2.2.0
+
+- Add support for Active Job's transaction and iteration adapter hooks [#92]
+- Forward compatibility with connection_pool 3.x
+
+## 2.1.2
+
+- Fix race condition in `faktory_options`. [#523]
+
 ## 2.1.1
 
 - Add new `Faktory::Client#queue_latency` API

data/Gemfile.lock

@@ -1,57 +1,56 @@
 PATH
   remote: .
   specs:
-    faktory_worker_ruby (2.1.0)
-      connection_pool (~> 2.5)
+    faktory_worker_ruby (2.2.0)
+      connection_pool (< 4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (8.0.2)
-      activesupport (= 8.0.2)
+    activejob (8.1.3)
+      activesupport (= 8.1.3)
       globalid (>= 0.3.6)
-    activesupport (8.0.2)
+    activesupport (8.1.3)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
     ast (2.4.3)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
     docile (1.4.1)
-    drb (2.2.1)
-    globalid (1.2.1)
+    drb (2.2.3)
+    globalid (1.3.0)
       activesupport (>= 6.1)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    json (2.11.3)
-    language_server-protocol (3.17.0.4)
+    json (2.19.3)
+    language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    minitest (5.25.5)
-    minitest-hooks (1.5.2)
-      minitest (> 5.3)
+    minitest (6.0.2)
+      drb (~> 2.0)
+      prism (~> 1.5)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
-    prism (1.4.0)
+    prism (1.9.0)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
-    regexp_parser (2.10.0)
-    rubocop (1.75.5)
+    rake (13.3.1)
+    regexp_parser (2.11.3)
+    rubocop (1.84.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -59,54 +58,53 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
-    rubocop-performance (1.25.0)
+      prism (~> 1.7)
+    rubocop-performance (1.26.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    standard (1.49.0)
+    standard (1.54.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.75.2)
+      rubocop (~> 1.84.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.8)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.8.0)
+    standard-performance (1.9.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.25.0)
+      rubocop-performance (~> 1.26.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    uri (1.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activejob
+  activejob (>= 7.0.0, >= 0)
   faktory_worker_ruby!
-  minitest (~> 5)
-  minitest-hooks
+  minitest
   rake
   simplecov
   standard
 
 BUNDLED WITH
-   2.4.22
+  4.0.4

data/faktory_worker_ruby.gemspec

@@ -22,9 +22,8 @@ Gem::Specification.new do |gem|
     "source_code_uri" => "https://github.com/contribsys/faktory_worker_ruby"
   }
 
-  gem.add_dependency "connection_pool", "~> 2.5"
+  gem.add_dependency "connection_pool", "<4"
   gem.add_development_dependency "activejob", ">= 7.0.0"
-  gem.add_development_dependency "minitest", "~> 5"
-  gem.add_development_dependency "minitest-hooks"
+  gem.add_development_dependency "minitest"
   gem.add_development_dependency "rake"
 end

data/lib/active_job/queue_adapters/faktory_adapter.rb

@@ -10,6 +10,17 @@ module ActiveJob
     #
     #   Rails.application.config.active_job.queue_adapter = :faktory
     class FaktoryAdapter
+      @@stopping = false
+      Faktory.configure_worker { |config| config.on(:quiet) { @@stopping = true } }
+
+      def stopping?
+        @@stopping
+      end
+
+      def enqueue_after_transaction_commit?(job) # :nodoc:
+        true
+      end
+
       def enqueue(job) # :nodoc:
         enqueue_at(job, nil)
       end

data/lib/faktory/job.rb

@@ -122,6 +122,8 @@ module Faktory
     end
 
     module ClassMethods
+      ACCESSOR_MUTEX = Mutex.new
+
       def set(options)
         opts = get_faktory_options.dup
         opts["jobtype"] = self
@@ -162,10 +164,18 @@ module Faktory
         instance_writer = true
 
         attrs.each do |name|
+          synchronized_getter = "__synchronized_#{name}"
+
           singleton_class.instance_eval do
             undef_method(name) if method_defined?(name) || private_method_defined?(name)
           end
-          define_singleton_method(name) { nil }
+
+          define_singleton_method(synchronized_getter) { nil }
+          singleton_class.class_eval do
+            private(synchronized_getter)
+          end
+
+          define_singleton_method(name) { ACCESSOR_MUTEX.synchronize { send synchronized_getter } }
 
           ivar = "@#{name}"
 
@@ -175,8 +185,10 @@ module Faktory
           end
           define_singleton_method(:"#{name}=") do |val|
             singleton_class.class_eval do
-              undef_method(name) if method_defined?(name) || private_method_defined?(name)
-              define_method(name) { val }
+              ACCESSOR_MUTEX.synchronize do
+                undef_method(synchronized_getter) if method_defined?(synchronized_getter) || private_method_defined?(synchronized_getter)
+                define_method(synchronized_getter) { val }
+              end
             end
 
             if singleton_class?

data/lib/faktory/middleware/chain.rb

@@ -67,6 +67,7 @@ module Faktory
   module Middleware
     class Chain
       include Enumerable
+
       attr_reader :entries
 
       def initialize_copy(copy)

data/lib/faktory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Faktory
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,28 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: faktory_worker_ruby
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Mike Perham
 bindir: bin
 cert_chain: []
-date: 2025-05-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -39,20 +39,6 @@ dependencies:
         version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: minitest-hooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -146,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Ruby worker for Faktory
 test_files: []