delayed_job_groups_plugin 0.4.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0754808400681b63e14fc299849af001fd1657bf492fdd56947e00519eaba89
-  data.tar.gz: c30c2bde41bcb5a9c374cdb3bab3c9c75ebf7ea5d50e63696fba296600f13985
+  metadata.gz: d9fb6a8ff3bc2cada4bb9a8f76382ca323eed8539188646efccd80a1b767acac
+  data.tar.gz: 90e5ea6437fc1485d8ca26a34062e3a30de989c7f8d8751643280d3830d12c79
 SHA512:
-  metadata.gz: 53c683f2825c99da19e8307c7a1d8b42f91dcad430f77a2f3fcd2cb90cef2ab5e1a2a4693166da75f3cc51e72a614688ae92edbdddcd39626c3b4bdf95a09722
-  data.tar.gz: a6a273708961cbd9922382400c441c97f570768283db311c129120f27cfb414b1265227667895e65d2385a194f2bfc05b1e8d09f1489341fa85dc76309a10cda
+  metadata.gz: 943569571301edf9a43a3a73c967fb165fb5fcda2e9576a3d0ace3b2a5a3bf2a4fe46e73cc812d0498ec09b2bf2fa8ffc56bee70741f5e29d30aa4ca653ce822
+  data.tar.gz: 0f26bbf975f3d5c727aa639afe5ea1e974fd0c8623031e62fbec78467237c8b44ea31d28f977c8dd74fb15779f8cd951a530504a9e24181ae69579ccde29a7a8

data/.circleci/config.yml

@@ -0,0 +1,81 @@
+version: 2.1
+jobs:
+  lint:
+    docker:
+      - image: salsify/ruby_ci:2.6.6
+    working_directory: ~/delayed_job_groups
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-gems-ruby-2.6.6-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }}
+            - v1-gems-ruby-2.6.6-
+      - run:
+          name: Install Gems
+          command: |
+            if ! bundle check --path=vendor/bundle; then
+              bundle install --path=vendor/bundle --jobs=4 --retry=3
+              bundle clean
+            fi
+      - save_cache:
+          key: v1-gems-ruby-2.6.6-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }}
+          paths:
+            - "vendor/bundle"
+            - "gemfiles/vendor/bundle"
+      - run:
+          name: Run Rubocop
+          command: bundle exec rubocop
+  test:
+    parameters:
+      gemfile:
+        type: string
+      ruby_version:
+        type: string
+    docker:
+      - image: salsify/ruby_ci:<< parameters.ruby_version >>
+    environment:
+      CIRCLE_TEST_REPORTS: "test-results"
+      BUNDLE_GEMFILE: << parameters.gemfile >>
+    working_directory: ~/delayed_job_groups
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-gems-ruby-<< parameters.ruby_version >>-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
+            - v1-gems-ruby-<< parameters.ruby_version >>-
+      - run:
+          name: Install Gems
+          command: |
+            if ! bundle check --path=vendor/bundle; then
+              bundle install --path=vendor/bundle --jobs=4 --retry=3
+              bundle clean
+            fi
+      - save_cache:
+          key: v1-gems-ruby-<< parameters.ruby_version >>-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
+          paths:
+            - "vendor/bundle"
+            - "gemfiles/vendor/bundle"
+      - run:
+          name: Run Tests
+          command: |
+            bundle exec rspec --format RspecJunitFormatter --out $CIRCLE_TEST_REPORTS/rspec/junit.xml --format progress spec
+      - store_test_results:
+          path: "test-results"
+workflows:
+  build:
+    jobs:
+      - lint
+      - test:
+          matrix:
+            parameters:
+              gemfile:
+                - "gemfiles/rails_5.2.gemfile"
+                - "gemfiles/rails_6.0.gemfile"
+                - "gemfiles/rails_6.1.gemfile"
+              ruby_version:
+                - "2.6.6"
+                - "2.7.2"
+                - "3.0.0"
+            exclude:
+              - gemfile: "gemfiles/rails_5.2.gemfile"
+                ruby_version: "3.0.0"

data/.rubocop.yml

@@ -2,7 +2,10 @@ inherit_gem:
   salsify_rubocop: conf/rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
+  Exclude:
+    - 'vendor/**/*'
+    - 'gemfiles/**/*'
 
 Style/FrozenStringLiteralComment:
   Enabled: true

data/Appraisals

@@ -1,30 +1,17 @@
 # frozen_string_literal: true
 
-appraise 'rails-4.2' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'activerecord', '4.2.10'
-  gem 'activesupport', '4.2.10'
-end
-
-appraise 'rails-5.0' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'activerecord', '5.0.7'
-  gem 'activesupport', '5.0.7'
-end
-
-appraise 'rails-5.1' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'activerecord', '5.1.6'
-  gem 'activesupport', '5.1.6'
-end
-
 appraise 'rails-5.2' do
   gem 'sqlite3', '~> 1.3.6'
-  gem 'activerecord', '5.2.1 '
-  gem 'activesupport', '5.2.1 '
+  gem 'activerecord', '5.2.1'
+  gem 'activesupport', '5.2.1'
 end
 
 appraise 'rails-6.0' do
   gem 'activerecord', '6.0.3'
   gem 'activesupport', '6.0.3'
 end
+
+appraise 'rails-6.1' do
+  gem 'activerecord', '6.1.0'
+  gem 'activesupport', '6.1.0'
+end

data/CHANGELOG.md

@@ -1,4 +1,24 @@
 # Changelog
+### 0.7.0
+* Add support for ruby 3
+* Drop support for ruby < 2.6
+
+### 0.6.2
+* Defer including extension until delayed_job_active_record is loaded
+
+### 0.6.1
+* Fix job_group_id `belongs_to` behavior when `config.active_record.belongs_to_required_by_default` is enabled.
+
+### 0.6.0
+* Add support for Rails 6.1.
+
+### 0.5.0
+* Drop support for Ruby 2.3 and 2.4.
+* Drop support for Rails < 5.2.
+* Bugfix for rails version in generated migration files
+
+### 0.4.3
+* Bugfix for `on_completion_job` when `failure_cancels_group` is set to false.
 
 ### 0.4.2
 * Add support for Rails 6.0.

data/README.md

@@ -100,7 +100,8 @@ job_group.cancel
 
 Configuration to allow failed jobs not to cancel the group
 ```ruby
-# We can optionally pass options that will allow jobs to fail without cancelling the group
+# We can optionally pass options that will allow jobs to fail without cancelling the group.
+# This also allows the on_completion job to fire once all jobs have either succeeded or failed. 
 job_group = Delayed::JobGroups::JobGroup.create!(failure_cancels_group: false)
 ```
 

data/delayed_job_groups.gemspec

@@ -1,7 +1,6 @@
-
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'delayed/job_groups/version'
 
@@ -19,22 +18,24 @@ Gem::Specification.new do |spec|
   spec.test_files    = Dir.glob('spec/**/*')
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.add_dependency 'delayed_job', '>= 4.1'
   spec.add_dependency 'delayed_job_active_record', '>= 4.1'
 
-  spec.post_install_message = 'See https://github.com/salsify/delayed_job_groups_plugin#installation for upgrade/installation notes.'
+  spec.post_install_message = 'See https://github.com/salsify/delayed_job_groups_plugin#installation '\
+                              'for upgrade/installation notes.'
 
   spec.add_development_dependency 'appraisal'
-  spec.add_dependency 'activerecord', '>= 4.2', '< 6.1'
-  spec.add_development_dependency 'coveralls'
+  spec.add_dependency 'activerecord', '>= 5.2', '< 7'
+  spec.add_development_dependency 'coveralls_reborn', '>= 0.18.0'
   spec.add_development_dependency 'database_cleaner', '>= 1.2'
   spec.add_development_dependency 'mime-types'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'rspec-its'
-  spec.add_development_dependency 'salsify_rubocop', '0.52.1.1'
+  spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_development_dependency 'salsify_rubocop', '~> 1.0.1'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'timecop'

data/gemfiles/rails_5.2.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "sqlite3", "~> 1.3.6"
-gem "activerecord", "5.2.1 "
-gem "activesupport", "5.2.1 "
+gem "activerecord", "5.2.1"
+gem "activesupport", "5.2.1"
 
 gemspec path: "../"

data/gemfiles/{rails_5.0.gemfile → rails_6.1.gemfile}

@@ -2,8 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "~> 1.3.6"
-gem "activerecord", "5.0.7"
-gem "activesupport", "5.0.7"
+gem "activerecord", "6.1.0"
+gem "activesupport", "6.1.0"
 
 gemspec path: "../"

data/lib/delayed/job_groups/compatibility.rb

@@ -7,10 +7,6 @@ module Delayed
   module JobGroups
     module Compatibility
 
-      def self.mass_assignment_security_enabled?
-        defined?(::ActiveRecord::MassAssignmentSecurity)
-      end
-
     end
   end
 end

data/lib/delayed/job_groups/job_extensions.rb

@@ -11,11 +11,7 @@ module Delayed
       end
 
       included do
-        if Delayed::JobGroups::Compatibility.mass_assignment_security_enabled?
-          attr_accessible :job_group_id, :blocked
-        end
-
-        belongs_to :job_group, class_name: 'Delayed::JobGroups::JobGroup'
+        belongs_to :job_group, class_name: 'Delayed::JobGroups::JobGroup', required: false
 
         class << self
           prepend ReadyToRunExtension

data/lib/delayed/job_groups/job_group.rb

@@ -8,11 +8,6 @@ module Delayed
 
       self.table_name = "#{ActiveRecord::Base.table_name_prefix}delayed_job_groups"
 
-      if Delayed::JobGroups::Compatibility.mass_assignment_security_enabled?
-        attr_accessible :on_completion_job, :on_completion_job_options, :blocked, :on_cancellation_job,
-                        :on_cancellation_job_options, :failure_cancels_group
-      end
-
       serialize :on_completion_job, Delayed::JobGroups::YamlLoader
       serialize :on_completion_job_options, Hash
       serialize :on_cancellation_job, Delayed::JobGroups::YamlLoader
@@ -30,6 +25,7 @@ module Delayed
       def mark_queueing_complete
         with_lock do
           raise 'JobGroup has already completed queueing' if queueing_complete?
+
           update_column(:queueing_complete, true)
           complete if ready_for_completion?
         end
@@ -66,13 +62,14 @@ module Delayed
           # zero will queue the job group's completion job and destroy the job group so
           # other jobs need to handle the job group having been destroyed already.
           job_group = where(id: job_group_id).lock(true).first
-          job_group.send(:complete) if job_group && job_group.send(:ready_for_completion?)
+          job_group.send(:complete) if job_group&.send(:ready_for_completion?)
         end
       end
 
       def self.has_pending_jobs?(job_group_ids) # rubocop:disable Naming/PredicateName
         job_group_ids = Array(job_group_ids)
         return false if job_group_ids.empty?
+
         Delayed::Job.where(job_group_id: job_group_ids, failed_at: nil).exists?
       end
 

data/lib/delayed/job_groups/plugin.rb

@@ -21,15 +21,14 @@ module Delayed
           # 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.
-          if job.in_job_group? && job.job_group && job.job_group.failure_cancels_group?
-            job.job_group.cancel
-          end
+          job.job_group.cancel if job.in_job_group? && job.job_group&.failure_cancels_group?
         end
 
         lifecycle.after(:perform) do |_worker, job|
           # Make sure we only check to see if the job group is complete
-          # if the job succeeded
-          if job.in_job_group? && job_completed?(job)
+          # if the job succeeded or the job has failed (maxed out retries) with failure_cancels_group
+          # set to false
+          if job.in_job_group? && (job_completed?(job) || job_acceptably_failed?(job))
             JobGroup.check_for_completion(job.job_group_id)
           end
         end
@@ -44,6 +43,12 @@ module Delayed
         # if it has completed
         job.destroyed?
       end
+
+      def self.job_acceptably_failed?(job)
+        # Job has set failed_at (retries have maxed out) and failure_cancels_group is false signaling
+        # that the group should complete despite failures.
+        job.failed_at.present? && job.job_group.present? && !job.job_group.failure_cancels_group?
+      end
     end
   end
 end

data/lib/delayed/job_groups/railtie.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Delayed
+  module JobGroups
+    class Railtie < ::Rails::Railtie
+      config.after_initialize do
+        Delayed::Backend::ActiveRecord::Job.include(Delayed::JobGroups::JobExtensions)
+      end
+    end
+  end
+end

data/lib/delayed/job_groups/version.rb

@@ -2,6 +2,6 @@
 
 module Delayed
   module JobGroups
-    VERSION = '0.4.2'
+    VERSION = '0.7.0'
   end
 end

data/lib/delayed/job_groups/yaml_loader.rb

@@ -5,11 +5,13 @@ module Delayed
     module YamlLoader
       def self.load(yaml)
         return yaml unless yaml.is_a?(String) && /^---/.match(yaml)
+
         YAML.load_dj(yaml)
       end
 
       def self.dump(object)
         return if object.nil?
+
         YAML.dump(object)
       end
     end

data/lib/delayed_job_groups_plugin.rb

@@ -11,6 +11,12 @@ require 'delayed/job_groups/plugin'
 require 'delayed/job_groups/yaml_loader'
 require 'delayed/job_groups/version'
 
-Delayed::Backend::ActiveRecord::Job.send(:include, Delayed::JobGroups::JobExtensions)
+if defined?(Rails::Railtie)
+  # Postpone initialization to railtie for correct order
+  require 'delayed/job_groups/railtie'
+else
+  # Do the same as in the railtie
+  Delayed::Backend::ActiveRecord::Job.include(Delayed::JobGroups::JobExtensions)
+end
 
 Delayed::Worker.plugins << Delayed::JobGroups::Plugin

data/lib/generators/delayed_job_groups_plugin/install_generator.rb

@@ -11,7 +11,7 @@ module DelayedJobGroupsPlugin
     source_paths << File.join(File.dirname(__FILE__), 'templates')
 
     def create_migration_file
-      migration_template('migration.rb', 'db/migrate/create_delayed_job_groups.rb')
+      migration_template('migration.erb', 'db/migrate/create_delayed_job_groups.rb')
     end
 
     def self.next_migration_number(dirname)

data/lib/generators/delayed_job_groups_plugin/templates/{migration.rb → migration.erb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateDelayedJobGroups < ActiveRecord::Migration
+class CreateDelayedJobGroups < ActiveRecord::Migration[<%= ActiveRecord::VERSION::MAJOR %>.<%= ActiveRecord::VERSION::MINOR %>]
 
   def up
     add_column(:delayed_jobs, :blocked, :boolean, default: false, null: false)

data/spec/delayed/job_groups/job_extensions_spec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+describe "delayed job extensions" do
+  it "provides an optional job_group_id" do
+    job_group = Delayed::JobGroups::JobGroup.create!
+    expect(Delayed::Job.new(job_group_id: job_group.id)).to be_valid
+    expect(Delayed::Job.new).to be_valid
+  end
+end

data/spec/delayed/job_groups/job_group_spec.rb

@@ -50,6 +50,7 @@ describe Delayed::JobGroups::JobGroup do
       before { job_group.mark_queueing_complete }
 
       it { is_expected.to be_queueing_complete }
+
       it_behaves_like "the job group was completed"
     end
 
@@ -59,6 +60,7 @@ describe Delayed::JobGroups::JobGroup do
       before { job_group.mark_queueing_complete }
 
       it { is_expected.to be_queueing_complete }
+
       it_behaves_like "the job group was not completed"
     end
 
@@ -69,6 +71,7 @@ describe Delayed::JobGroups::JobGroup do
       end
 
       it { is_expected.to be_queueing_complete }
+
       it_behaves_like "the job group was not completed"
     end
   end
@@ -103,7 +106,7 @@ describe Delayed::JobGroups::JobGroup do
 
     context "when on failed jobs exist" do
       before do
-        job.update_attributes!(failed_at: Time.now)
+        job.update!(failed_at: Time.now)
         Delayed::JobGroups::JobGroup.check_for_completion(job_group.id)
       end
 
@@ -199,6 +202,7 @@ describe Delayed::JobGroups::JobGroup do
         end
 
         its(:blocked?) { is_expected.to be(false) }
+
         it_behaves_like "the job group was completed"
       end
     end
@@ -229,7 +233,7 @@ describe Delayed::JobGroups::JobGroup do
     let(:failure_cancels_group) { true }
 
     before do
-      job_group.update_attributes!(failure_cancels_group: failure_cancels_group)
+      job_group.update!(failure_cancels_group: failure_cancels_group)
     end
 
     context "when failures should cancel the group" do

data/spec/delayed/job_groups/plugin_spec.rb

@@ -5,56 +5,56 @@ describe Delayed::JobGroups::Plugin do
     @old_max_attempts = Delayed::Worker.max_attempts
     Delayed::Worker.max_attempts = 2
 
-    CompletionJob.invoked = false
-    CancellationJob.invoked = false
+    TestJobs::CompletionJob.invoked = false
+    TestJobs::CancellationJob.invoked = false
   end
 
   after do
     Delayed::Worker.max_attempts = @old_max_attempts
   end
 
-  let!(:job_group) { Delayed::JobGroups::JobGroup.create!(on_completion_job: CompletionJob.new) }
+  let!(:job_group) { Delayed::JobGroups::JobGroup.create!(on_completion_job: TestJobs::CompletionJob.new) }
 
   it "runs the completion job after completing other jobs" do
-    job_group.enqueue(NoOpJob.new)
-    job_group.enqueue(NoOpJob.new)
+    job_group.enqueue(TestJobs::NoOpJob.new)
+    job_group.enqueue(TestJobs::NoOpJob.new)
     job_group.mark_queueing_complete
     expect(job_group_count).to eq 1
     expect(queued_job_count).to eq 2
 
     # Run our first job
     Delayed::Worker.new.work_off(1)
-    expect(CompletionJob.invoked).to be(false)
+    expect(TestJobs::CompletionJob.invoked).to be(false)
     expect(job_group_count).to eq 1
     expect(queued_job_count).to eq 1
 
     # Run our second job which should enqueue the completion job
     Delayed::Worker.new.work_off(1)
-    expect(CompletionJob.invoked).to be(false)
+    expect(TestJobs::CompletionJob.invoked).to be(false)
     expect(job_group_count).to eq 0
     expect(queued_job_count).to eq 1
 
     # Now we should run the completion job
     Delayed::Worker.new.work_off(1)
-    expect(CompletionJob.invoked).to be(true)
+    expect(TestJobs::CompletionJob.invoked).to be(true)
     expect(queued_job_count).to eq 0
   end
 
   it "only runs the completion job after queueing is completed" do
-    job_group.enqueue(NoOpJob.new)
-    job_group.enqueue(NoOpJob.new)
+    job_group.enqueue(TestJobs::NoOpJob.new)
+    job_group.enqueue(TestJobs::NoOpJob.new)
     expect(job_group_count).to eq 1
     expect(queued_job_count).to eq 2
 
     # Run our first job
     Delayed::Worker.new.work_off(1)
-    expect(CompletionJob.invoked).to be(false)
+    expect(TestJobs::CompletionJob.invoked).to be(false)
     expect(job_group_count).to eq 1
     expect(queued_job_count).to eq 1
 
     # Run our second job
     Delayed::Worker.new.work_off(1)
-    expect(CompletionJob.invoked).to be(false)
+    expect(TestJobs::CompletionJob.invoked).to be(false)
     expect(job_group_count).to eq 1
     expect(queued_job_count).to eq 0
 
@@ -65,7 +65,7 @@ describe Delayed::JobGroups::Plugin do
 
     # Now we should run the completion job
     Delayed::Worker.new.work_off(1)
-    expect(CompletionJob.invoked).to be(true)
+    expect(TestJobs::CompletionJob.invoked).to be(true)
     expect(queued_job_count).to eq 0
   end
 
@@ -75,15 +75,16 @@ describe Delayed::JobGroups::Plugin do
       it "cancels the group" do
         Delayed::Worker.max_attempts = 1
 
-        job_group.enqueue(FailingJob.new)
-        job_group.enqueue(NoOpJob.new)
+        job_group.enqueue(TestJobs::FailingJob.new)
+        job_group.enqueue(TestJobs::NoOpJob.new)
         job_group.mark_queueing_complete
         expect(queued_job_count).to eq 2
         expect(job_group_count).to eq 1
 
         # Run the job which should fail and cancel the JobGroup
         Delayed::Worker.new.work_off(1)
-        expect(CompletionJob.invoked).to be(false)
+        # Completion job is not invoked
+        expect(TestJobs::CompletionJob.invoked).to be(false)
         expect(failed_job_count).to eq 1
         expect(queued_job_count).to eq 0
         expect(job_group_count).to eq 0
@@ -92,30 +93,83 @@ describe Delayed::JobGroups::Plugin do
 
     context "with failure_cancels_group disabled" do
 
-      before { job_group.update_attributes!(failure_cancels_group: false) }
+      before { job_group.update!(failure_cancels_group: false) }
 
       it "does not cancel the group" do
         Delayed::Worker.max_attempts = 1
 
-        job_group.enqueue(FailingJob.new)
-        job_group.enqueue(NoOpJob.new)
+        job_group.enqueue(TestJobs::FailingJob.new)
+        job_group.enqueue(TestJobs::NoOpJob.new)
         job_group.mark_queueing_complete
         expect(queued_job_count).to eq 2
         expect(job_group_count).to eq 1
 
         # Run the job which should fail don't cancel the JobGroup
         Delayed::Worker.new.work_off(1)
-        expect(CancellationJob.invoked).to be(false)
+        expect(TestJobs::CancellationJob.invoked).to be(false)
         expect(failed_job_count).to eq 1
         expect(queued_job_count).to eq 1
         expect(job_group_count).to eq 1
+
+        # Run the last job
+        Delayed::Worker.new.work_off(1)
+        expect(failed_job_count).to eq 1
+        expect(queued_job_count).to eq 1
+        expect(job_group_count).to eq 0
+
+        # Run the completion job
+        Delayed::Worker.new.work_off(1)
+        # Completion job is invoked
+        expect(TestJobs::CompletionJob.invoked).to be(true)
+        expect(failed_job_count).to eq 1
+        expect(queued_job_count).to eq 0
+        expect(job_group_count).to eq 0
+      end
+
+      it "runs completion job if last job failed" do
+        Delayed::Worker.max_attempts = 2
+
+        job_group.enqueue(TestJobs::NoOpJob.new)
+        job_group.enqueue(TestJobs::FailingJob.new)
+        job_group.mark_queueing_complete
+        expect(queued_job_count).to eq 2
+        expect(job_group_count).to eq 1
+
+        # Run the non failing job
+        Delayed::Worker.new.work_off(1)
+        expect(failed_job_count).to eq 0
+        expect(queued_job_count).to eq 1
+        expect(job_group_count).to eq 1
+
+        # Run the job which should error
+        Delayed::Worker.new.work_off(1)
+        # Completion job is not invoked
+        expect(TestJobs::CompletionJob.invoked).to be(false)
+        expect(failed_job_count).to eq 0
+        expect(queued_job_count).to eq 1
+        expect(job_group_count).to eq 1
+
+        # Run the job again which should fail
+        Timecop.travel(1.minute.from_now)
+        Delayed::Worker.new.work_off(1)
+        expect(failed_job_count).to eq 1
+        expect(queued_job_count).to eq 1
+        expect(job_group_count).to eq 0
+
+        # Run the completion job
+        Delayed::Worker.new.work_off(1)
+        # Completion job is invoked
+        expect(TestJobs::CompletionJob.invoked).to be(true)
+        expect(failed_job_count).to eq 1
+        expect(queued_job_count).to eq 0
+        expect(job_group_count).to eq 0
       end
     end
   end
 
   it "doesn't retry failed jobs if the job group has been canceled" do
     job_group.cancel
-    Delayed::Job.enqueue(FailingJob.new, job_group_id: job_group.id)
+    Delayed::Job.enqueue(TestJobs::FailingJob.new, job_group_id: job_group.id)
     expect(queued_job_count).to eq 1
 
     # Run the job which should fail and should not queue a retry
@@ -128,8 +182,8 @@ describe Delayed::JobGroups::Plugin do
     job_group.blocked = true
     job_group.save!
 
-    job_group.enqueue(NoOpJob.new)
-    job_group.enqueue(NoOpJob.new)
+    job_group.enqueue(TestJobs::NoOpJob.new)
+    job_group.enqueue(TestJobs::NoOpJob.new)
     job_group.mark_queueing_complete
     expect(Delayed::Job.count).to eq 2
 
@@ -143,41 +197,41 @@ describe Delayed::JobGroups::Plugin do
 
     # Run our first job
     Delayed::Worker.new.work_off(1)
-    expect(CompletionJob.invoked).to be(false)
+    expect(TestJobs::CompletionJob.invoked).to be(false)
     expect(job_group_count).to eq 1
     expect(Delayed::Job.count).to eq 1
 
     # Run our second job which should enqueue the completion job
     Delayed::Worker.new.work_off(1)
-    expect(CompletionJob.invoked).to be(false)
+    expect(TestJobs::CompletionJob.invoked).to be(false)
     expect(job_group_count).to eq 0
     expect(Delayed::Job.count).to eq 1
 
     # Now we should run the completion job
     Delayed::Worker.new.work_off(1)
-    expect(CompletionJob.invoked).to be(true)
+    expect(TestJobs::CompletionJob.invoked).to be(true)
     expect(Delayed::Job.count).to eq 0
   end
 
   context "when a cancellation job is provided" do
     let!(:job_group) do
-      Delayed::JobGroups::JobGroup.create!(on_completion_job: CompletionJob.new,
-                                           on_cancellation_job: CancellationJob.new)
+      Delayed::JobGroups::JobGroup.create!(on_completion_job: TestJobs::CompletionJob.new,
+                                           on_cancellation_job: TestJobs::CancellationJob.new)
     end
 
     it "runs the cancellation job after a job error causes cancellation" do
       Delayed::Worker.max_attempts = 1
 
-      job_group.enqueue(FailingJob.new)
-      job_group.enqueue(NoOpJob.new)
+      job_group.enqueue(TestJobs::FailingJob.new)
+      job_group.enqueue(TestJobs::NoOpJob.new)
       job_group.mark_queueing_complete
       expect(queued_job_count).to eq 2
       expect(job_group_count).to eq 1
 
       # Run the job which should fail and cancel the JobGroup
       Delayed::Worker.new.work_off(1)
-      expect(CompletionJob.invoked).to be(false)
-      expect(CancellationJob.invoked).to be(false)
+      expect(TestJobs::CompletionJob.invoked).to be(false)
+      expect(TestJobs::CancellationJob.invoked).to be(false)
       expect(failed_job_count).to eq 1
 
       expect(queued_job_count).to eq 1
@@ -185,24 +239,24 @@ describe Delayed::JobGroups::Plugin do
 
       # Now we should run the cancellation job
       Delayed::Worker.new.work_off(1)
-      expect(CompletionJob.invoked).to be(false)
-      expect(CancellationJob.invoked).to be(true)
+      expect(TestJobs::CompletionJob.invoked).to be(false)
+      expect(TestJobs::CancellationJob.invoked).to be(true)
       expect(queued_job_count).to eq 0
     end
 
     it "runs the cancellation job after the job group is cancelled" do
-      job_group.enqueue(NoOpJob.new)
-      job_group.enqueue(FailingJob.new)
+      job_group.enqueue(TestJobs::NoOpJob.new)
+      job_group.enqueue(TestJobs::FailingJob.new)
       job_group.mark_queueing_complete
       job_group.cancel
 
       # cancellation job should be queued
       expect(queued_job_count).to eq 1
-      expect(CancellationJob.invoked).to be(false)
+      expect(TestJobs::CancellationJob.invoked).to be(false)
 
       # Run the cancellation job
       Delayed::Worker.new.work_off(1)
-      expect(CancellationJob.invoked).to be(true)
+      expect(TestJobs::CancellationJob.invoked).to be(true)
       expect(queued_job_count).to eq 0
     end
   end
@@ -211,8 +265,8 @@ describe Delayed::JobGroups::Plugin do
     let!(:job_group) {  Delayed::JobGroups::JobGroup.create! }
 
     it "doesn't queue a non-existent completion job" do
-      job_group.enqueue(NoOpJob.new)
-      job_group.enqueue(NoOpJob.new)
+      job_group.enqueue(TestJobs::NoOpJob.new)
+      job_group.enqueue(TestJobs::NoOpJob.new)
       job_group.mark_queueing_complete
       expect(job_group_count).to eq 1
       expect(queued_job_count).to eq 2
@@ -232,37 +286,6 @@ describe Delayed::JobGroups::Plugin do
     end
   end
 
-  class FailingJob
-
-    def perform
-      raise 'Test failure'
-    end
-
-  end
-
-  class NoOpJob
-
-    def perform
-
-    end
-  end
-
-  class CompletionJob
-    cattr_accessor :invoked
-
-    def perform
-      CompletionJob.invoked = true
-    end
-  end
-
-  class CancellationJob
-    cattr_accessor :invoked
-
-    def perform
-      CancellationJob.invoked = true
-    end
-  end
-
   def job_group_count
     Delayed::JobGroups::JobGroup.count
   end

data/spec/delayed/job_groups/yaml_loader_spec.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
 describe Delayed::JobGroups::YamlLoader do
-  class Foo; end
-
   describe "#load" do
     context "with a correct yaml object representation" do
-      let(:yaml) { '--- !ruby/object:Foo {}' }
+      let(:yaml) { '--- !ruby/object:TestJobs::Foo {}' }
 
       it "deserializes from YAML properly" do
-        expect(Delayed::JobGroups::YamlLoader.load(yaml)).to be_a(Foo)
+        expect(Delayed::JobGroups::YamlLoader.load(yaml)).to be_a(TestJobs::Foo)
       end
     end
 
@@ -25,10 +23,10 @@ describe Delayed::JobGroups::YamlLoader do
 
   describe "#dump" do
     context "with an object" do
-      let(:object) { Foo.new }
+      let(:object) { TestJobs::Foo.new }
 
       it "serializes into YAML properly" do
-        expect(Delayed::JobGroups::YamlLoader.dump(object)).to eq("--- !ruby/object:Foo {}\n")
+        expect(Delayed::JobGroups::YamlLoader.dump(object)).to eq("--- !ruby/object:TestJobs::Foo {}\n")
       end
     end
 

data/spec/support/test_jobs.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module TestJobs
+  class Foo; end
+
+  class FailingJob
+    def perform
+      raise 'Test failure'
+    end
+  end
+
+  class NoOpJob
+    def perform
+
+    end
+  end
+
+  class CompletionJob
+    cattr_accessor :invoked
+
+    def perform
+      CompletionJob.invoked = true
+    end
+  end
+
+  class CancellationJob
+    cattr_accessor :invoked
+
+    def perform
+      CancellationJob.invoked = true
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_groups_plugin
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Joel Turkel
 - Randy Burkes
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -59,34 +59,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -157,20 +157,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: salsify_rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1.1
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1.1
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -222,10 +236,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -233,27 +247,28 @@ files:
 - README.md
 - Rakefile
 - delayed_job_groups.gemspec
-- gemfiles/rails_4.2.gemfile
-- gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/delayed/job_groups/compatibility.rb
 - lib/delayed/job_groups/job_extensions.rb
 - lib/delayed/job_groups/job_group.rb
 - lib/delayed/job_groups/plugin.rb
+- lib/delayed/job_groups/railtie.rb
 - lib/delayed/job_groups/version.rb
 - lib/delayed/job_groups/yaml_loader.rb
 - lib/delayed_job_groups_plugin.rb
 - lib/generators/delayed_job_groups_plugin/install_generator.rb
-- lib/generators/delayed_job_groups_plugin/templates/migration.rb
+- lib/generators/delayed_job_groups_plugin/templates/migration.erb
 - spec/db/database.yml
 - spec/db/schema.rb
+- spec/delayed/job_groups/job_extensions_spec.rb
 - spec/delayed/job_groups/job_group_spec.rb
 - spec/delayed/job_groups/plugin_spec.rb
 - spec/delayed/job_groups/yaml_loader_spec.rb
 - spec/spec_helper.rb
 - spec/support/destroyed_model.rb
+- spec/support/test_jobs.rb
 homepage: https://github.com/salsify/delayed_job_groups_plugin
 licenses:
 - MIT
@@ -267,22 +282,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Delayed::Job job groups plugin
 test_files:
 - spec/spec_helper.rb
 - spec/support/destroyed_model.rb
+- spec/support/test_jobs.rb
 - spec/delayed/job_groups/plugin_spec.rb
 - spec/delayed/job_groups/job_group_spec.rb
 - spec/delayed/job_groups/yaml_loader_spec.rb
+- spec/delayed/job_groups/job_extensions_spec.rb
 - spec/db/schema.rb
 - spec/db/database.yml

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-sudo: false
-gemfile:
-  - gemfiles/rails_4.2.gemfile
-  - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_5.1.gemfile
-  - gemfiles/rails_5.2.gemfile
-  - gemfiles/rails_6.0.gemfile
-rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-script:
-  - bundle exec rspec
-  - bundle exec rubocop
-matrix:
-  exclude:
-  - rvm: 2.3.8
-    gemfile: gemfiles/rails_6.0.gemfile
-  - rvm: 2.4.5
-    gemfile: gemfiles/rails_6.0.gemfile

data/gemfiles/rails_4.2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "sqlite3", "~> 1.3.6"
-gem "activerecord", "4.2.10"
-gem "activesupport", "4.2.10"
-
-gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "sqlite3", "~> 1.3.6"
-gem "activerecord", "5.1.6"
-gem "activesupport", "5.1.6"
-
-gemspec path: "../"