delayed_job_groups_plugin 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9773f978178a522b2f7d150230d2aec54bdd5a3bd11b13a980e93ebd71a0bf8c
-  data.tar.gz: 9d7ae98668fc83a5d7aa516138470585dc5f711a52796c297f8c408969cb2903
+  metadata.gz: 1a151f3024b43407ef181bc42c113e97877160c37f48f1f68b793e533f001b88
+  data.tar.gz: d9f29810d2680e21956472ec485fe03f009765591cfadb9cb2fcaea17569c163
 SHA512:
-  metadata.gz: 964f5ea0c140c4d9122ed4602e2e059263f8e2ba71242aa741f079a195a8f7a39c42938380b8794f40b7ebb0b464c640ae1945c7a4174150d5299df9af381bd0
-  data.tar.gz: 98ff4ae8816c181e05aea9ad267d105e0d0397f3d02a50ef7fa3c61bfc9c53100d8e0a3a10aee298b512ae80a55f753f08e7407dafaabfaf6f5f40080428f600
+  metadata.gz: 1a9b598b3f77a3256b6fbcca5ba5d1acd47c065c7d845fc19bf541ffe236779419f0439cf70ef82783c3185697305137acb8d0baf7eadc9f51d3796933d2e65d
+  data.tar.gz: b273960f4d058062e50c67a9144a6638f8574c97a72e5ec88a1388dc632778e3877c3e4f7218dc261789137e69382a0cd9d1600bc4800cb72b73f751c5dc93f8

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.14.0
+- Reverts changes made in version 0.13.
+
 ## 0.13.0
 - Moves `on_cancellation` logic from the before delayed job lifecycle hook to the after hook.
 - Gem will now fail to load if `Delayed::Worker.destroy_failed_jobs` is set to true.

data/lib/delayed/job_groups/job_group.rb

@@ -62,18 +62,8 @@ module Delayed
       end
 
       def cancel
-        with_lock do
-          return if destroyed?
-
-          Delayed::Job.enqueue(on_cancellation_job, on_cancellation_job_options || {}) if on_cancellation_job
-          destroy
-        end
-      rescue ActiveRecord::RecordNotFound
-        # The first failing job to attempt cancelling the job group will enqueue the
-        # on cancellation job and destroy the group. Any other concurrently failing job
-        # in the same group can therefore silently return if the job group has already
-        # been destroyed.
-        nil
+        Delayed::Job.enqueue(on_cancellation_job, on_cancellation_job_options || {}) if on_cancellation_job
+        destroy
       end
 
       def check_for_completion(skip_pending_jobs_check: false)

data/lib/delayed/job_groups/plugin.rb

@@ -17,13 +17,7 @@ module Delayed
           end
         end
 
-        # In order to allow individual jobs in the JobGroup to perform cleanup activities upon
-        # job failure, a JobGroups on cancellation job must be enqueued in the after failure
-        # delayed job lifecycle hook. If both were to be performed in the same hook, the job's
-        # failure hook and the on cancellation job may run at the same time since hook execution
-        # order is never guaranteed. This is particular important if the on cancellation job
-        # depends on state set in the failure hook of an individual job.
-        lifecycle.after(:failure) do |_worker, job|
+        lifecycle.before(:failure) do |_worker, job|
           # If a job in the job group fails, then cancel the whole job group.
           # Need to check that the job group is present since another
           # job may have concurrently cancelled it.

data/lib/delayed/job_groups/railtie.rb

@@ -4,15 +4,6 @@ module Delayed
   module JobGroups
     class Railtie < ::Rails::Railtie
       config.after_initialize do
-
-        # On cancellation checks are performed in the after failure delayed job lifecycle, however
-        # https://github.com/collectiveidea/delayed_job/blob/master/lib/delayed/worker.rb#L268 may
-        # delete jobs before the hook runs. This could cause a successful job in the same group to
-        # complete the group instead of the group being cancelled. Therefore, we must ensure that
-        # the Delayed::Worker.destroy_failed_jobs is set to false, guaranteeing that the group is
-        # never empty if failure occurs.
-        raise Delayed::JobGroups::IncompatibleWithDelayedJobError if Delayed::Worker.destroy_failed_jobs
-
         Delayed::Backend::ActiveRecord::Job.include(Delayed::JobGroups::JobExtensions)
       end
     end

data/lib/delayed/job_groups/version.rb

@@ -2,6 +2,6 @@
 
 module Delayed
   module JobGroups
-    VERSION = '0.13.0'
+    VERSION = '0.14.0'
   end
 end

data/lib/delayed_job_groups_plugin.rb

@@ -4,7 +4,6 @@ require 'active_support'
 require 'active_record'
 require 'delayed_job'
 require 'delayed_job_active_record'
-require 'delayed/job_groups/errors'
 require 'delayed/job_groups/compatibility'
 require 'delayed/job_groups/complete_stuck_job_groups_job'
 require 'delayed/job_groups/job_extensions'
@@ -19,7 +18,6 @@ if defined?(Rails::Railtie)
 else
   # Do the same as in the railtie
   Delayed::Backend::ActiveRecord::Job.include(Delayed::JobGroups::JobExtensions)
-  raise Delayed::JobGroups::IncompatibleWithDelayedJobError if Delayed::Worker.destroy_failed_jobs
 end
 
 Delayed::Worker.plugins << Delayed::JobGroups::Plugin

data/spec/delayed/job_groups/job_group_spec.rb

@@ -299,28 +299,11 @@ describe Delayed::JobGroups::JobGroup do
   end
 
   describe "#cancel" do
-    subject(:job_group) do
-      create(
-        :job_group,
-        on_completion_job: on_completion_job,
-        on_completion_job_options: on_completion_job_options,
-        on_cancellation_job: on_cancellation_job,
-        on_cancellation_job_options: on_cancellation_job_options,
-        blocked: blocked
-      )
-    end
-
     let!(:queued_job) { Delayed::Job.create!(job_group_id: job_group.id) }
     let!(:running_job)  { Delayed::Job.create!(job_group_id: job_group.id, locked_at: Time.now, locked_by: 'test') }
-    let(:before_hook) {}
-    let(:on_cancellation_job) { 'dummy job' }
-    let(:on_cancellation_job_options) do
-      { foo: 'bar' }
-    end
-    let(:cancel) { true }
 
     before do
-      job_group.cancel if cancel
+      job_group.cancel
     end
 
     it "destroys the job group" do
@@ -334,21 +317,6 @@ describe Delayed::JobGroups::JobGroup do
     it "does not destroy running jobs" do
       expect(running_job).not_to have_been_destroyed
     end
-
-    context "when already cancelled" do
-      let(:cancel) { false }
-
-      it "skips cancel block if already cancelled" do
-        other = Delayed::JobGroups::JobGroup.find(job_group.id)
-        job_group.cancel
-
-        other.cancel
-        other.cancel
-
-        expect(Delayed::Job)
-          .to have_received(:enqueue).with(on_cancellation_job, on_cancellation_job_options).once
-      end
-    end
   end
 
   describe "#failure_cancels_group?" do

data/spec/spec_helper.rb

@@ -13,11 +13,6 @@ end
 
 require 'rspec/its'
 require 'database_cleaner'
-require 'delayed_job'
-
-Delayed::Worker.read_ahead = 1
-Delayed::Worker.destroy_failed_jobs = false
-
 require 'delayed_job_groups_plugin'
 require 'factory_bot'
 require 'yaml'
@@ -28,6 +23,9 @@ Dir["#{spec_dir}/support/**/*.rb"].sort.each { |f| require f }
 
 FileUtils.makedirs('log')
 
+Delayed::Worker.read_ahead = 1
+Delayed::Worker.destroy_failed_jobs = false
+
 Delayed::Worker.logger = Logger.new('log/test.log')
 Delayed::Worker.logger.level = Logger::DEBUG
 ActiveRecord::Base.logger = Delayed::Worker.logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_groups_plugin
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Joel Turkel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-09-24 00:00:00.000000000 Z
+date: 2025-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -269,7 +269,6 @@ files:
 - gemfiles/rails_8.0.gemfile
 - lib/delayed/job_groups/compatibility.rb
 - lib/delayed/job_groups/complete_stuck_job_groups_job.rb
-- lib/delayed/job_groups/errors.rb
 - lib/delayed/job_groups/job_extensions.rb
 - lib/delayed/job_groups/job_group.rb
 - lib/delayed/job_groups/plugin.rb

data/lib/delayed/job_groups/errors.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Delayed
-  module JobGroups
-    ConfigurationError = Class.new(StandardError)
-
-    class IncompatibleWithDelayedJobError < ConfigurationError
-      DEFAULT_MESSAGE = 'DelayedJobGroupsPlugin is incompatible with Delayed::Job ' \
-                        'when `destroy_failed_jobs` is set to `true`'
-
-      def initialize(msg = DEFAULT_MESSAGE)
-        super(msg)
-      end
-    end
-  end
-end