delayed 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56e1fb1ba1756335d42efb26a1469fecab4eb40817fb1783c5bd010db6aa799f
-  data.tar.gz: 003ee0881213a406571b19d293b145a48eee377f6aef1282f701d76429816e9e
+  metadata.gz: 223856c2ccfb73e2f42eed3da86e70b0a819a575028ca1d0ddbebe0fc757c1d6
+  data.tar.gz: b8d496dbd42774fcb7a5528cb4969b15a87cebd2c59899ad8dafa86438279874
 SHA512:
-  metadata.gz: a2cccc74e3a2ecbb2459008fe9d399ebf2572dba782cd660bdd69bf4aafbab421a545952206fe1767edd03b9b38655f1e4a4209d9dd30060631499d3d949fba0
-  data.tar.gz: f92d61ae2788cc3fa6e5a1d84150571516caf7d8e520057efc90f80de24bf1d402a5e01243c18eae903d46e48849ab044809e466fc687a02ab4f07c179118ec1
+  metadata.gz: 5770b2945b0ff2e2a5f80a5cad81c8dd506c41519897e19ad29f973b57250891f3aa31c2d57135f69c960de12ea0724ad4bfa2bc68f445be6699851177a67b5e
+  data.tar.gz: 89dbae3fb440d8cef88ed57131131ca7d3081b8039f772b6d88ebbd09332f7ffa9a2cfe09e5505d5c422ce69b82ae8344bf79d475022aa454594e87ef559e1d6

data/lib/delayed/active_job_adapter.rb

@@ -17,7 +17,7 @@ module Delayed
     private
 
     def _enqueue(job, opts = {})
-      if job.class.respond_to?(:enqueue_after_transaction_commit) && job.class.enqueue_after_transaction_commit == :always
+      if enqueue_after_transaction_commit_enabled?(job)
         raise UnsafeEnqueueError, "The ':delayed' ActiveJob adapter is not compatible with enqueue_after_transaction_commit"
       end
 
@@ -29,6 +29,11 @@ module Delayed
       end
     end
 
+    def enqueue_after_transaction_commit_enabled?(job)
+      job.class.respond_to?(:enqueue_after_transaction_commit) &&
+        [true, :always].include?(job.class.enqueue_after_transaction_commit)
+    end
+
     module EnqueuingPatch
       def self.included(klass)
         klass.prepend PrependedMethods

data/spec/delayed/active_job_adapter_spec.rb

@@ -295,7 +295,9 @@ RSpec.describe Delayed::ActiveJobAdapter do
         end
 
         it 'raises an exception on enqueue' do
-          expect { JobClass.perform_later }.to raise_error(Delayed::ActiveJobAdapter::UnsafeEnqueueError)
+          ActiveJob.deprecator.silence do
+            expect { JobClass.perform_later }.to raise_error(Delayed::ActiveJobAdapter::UnsafeEnqueueError)
+          end
         end
       end
 
@@ -306,7 +308,33 @@ RSpec.describe Delayed::ActiveJobAdapter do
         end
 
         it 'does not raises an exception on enqueue' do
-          expect { JobClass.perform_later }.not_to raise_error(Delayed::ActiveJobAdapter::UnsafeEnqueueError)
+          ActiveJob.deprecator.silence do
+            expect { JobClass.perform_later }.not_to raise_error
+          end
+        end
+      end
+    end
+
+    if ActiveJob.gem_version.release >= Gem::Version.new('8.0')
+      context 'when the given job sets enqueue_after_transaction_commit to true' do
+        before do
+          JobClass.include ActiveJob::EnqueueAfterTransactionCommit # normally run in an ActiveJob railtie
+          JobClass.enqueue_after_transaction_commit = true
+        end
+
+        it 'raises an exception on enqueue' do
+          expect { JobClass.perform_later }.to raise_error(Delayed::ActiveJobAdapter::UnsafeEnqueueError)
+        end
+      end
+
+      context 'when the given job sets enqueue_after_transaction_commit to false' do
+        before do
+          JobClass.include ActiveJob::EnqueueAfterTransactionCommit # normally run in an ActiveJob railtie
+          JobClass.enqueue_after_transaction_commit = false
+        end
+
+        it 'does not raises an exception on enqueue' do
+          expect { JobClass.perform_later }.not_to raise_error
         end
       end
     end

data/spec/helper.rb

@@ -10,6 +10,13 @@ require 'sample_jobs'
 
 require 'rake'
 
+if ActiveSupport.gem_version >= Gem::Version.new('7.1')
+  frameworks = [ActiveModel, ActiveRecord, ActionMailer, ActiveJob, ActiveSupport]
+  frameworks.each { |framework| framework.deprecator.behavior = :raise }
+else
+  ActiveSupport::Deprecation.behavior = :raise
+end
+
 if ENV['DEBUG_LOGS']
   Delayed.logger = Logger.new($stdout)
 else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Nathan Griffith
@@ -18,7 +18,7 @@ authors:
 - Tobias Lütke
 bindir: bin
 cert_chain: []
-date: 2025-01-15 00:00:00.000000000 Z
+date: 2025-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord