delayed_job_groups_plugin 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08082884f93f3a0b28ca97d8d212b5ad59defaf7ecc08987654e81433ee2f3ab'
-  data.tar.gz: 6e1287e9ddced955fa2be1e29d4444c53051321908ba8e4b863bd41f44f2c6a9
+  metadata.gz: dc7b851a75a0814848eac3a150ddd9517411c78e8d4c5f02230bf8ed00e6dded
+  data.tar.gz: 87d0123a70117592b305eeb1096e9c9bcf3ba590638bd522e7b453f3439db244
 SHA512:
-  metadata.gz: f1e613c4575fba5d4c15a140ecb0968fe308d7f46bc229c87fd38b547d14fbd5aa80118b8bd73218a8024a0a342387cc06b566c88f36f91ab40215765db1e6e9
-  data.tar.gz: a1684af456260bbe492af11d894837cfa5e4fb0c27cbc799e5df65b1aa08d51b1cdb869e99ec97a3de4f388449174243ddda99a64222c880f24b38377d0008f9
+  metadata.gz: caa34cca5bcc4558a85ec8147132a4596fcbe95b45b755468902a81ac89a49cc16405dd3107c6e60a6455a39d3c5b3c609a7f142e41f44220577ae0da5ace362
+  data.tar.gz: 05d1861bf1316638dc689b59dd56a5e7ebffa6a4dfb5e2ca3a9e5fde849f4a099ce2c9927a927630a4201881f50872e4462c7e32ad221f2f006af0cd1f836375

data/.circleci/config.yml

@@ -2,14 +2,14 @@ version: 2.1
 jobs:
   lint:
     docker:
-      - image: salsify/ruby_ci:2.5.8
+      - image: salsify/ruby_ci:2.7.6
     working_directory: ~/delayed_job_groups
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v1-gems-ruby-2.5.8-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }}
-            - v1-gems-ruby-2.5.8-
+            - v1-gems-ruby-2.7.6-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }}
+            - v1-gems-ruby-2.7.6-
       - run:
           name: Install Gems
           command: |
@@ -18,7 +18,7 @@ jobs:
               bundle clean
             fi
       - save_cache:
-          key: v1-gems-ruby-2.5.8-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-gems-ruby-2.7.6-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - "vendor/bundle"
             - "gemfiles/vendor/bundle"
@@ -29,8 +29,10 @@ jobs:
     parameters:
       gemfile:
         type: string
+      ruby_version:
+        type: string
     docker:
-      - image: salsify/ruby_ci:2.5.8
+      - image: salsify/ruby_ci:<< parameters.ruby_version >>
     environment:
       CIRCLE_TEST_REPORTS: "test-results"
       BUNDLE_GEMFILE: << parameters.gemfile >>
@@ -39,8 +41,8 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v1-gems-ruby-2.5.8-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
-            - v1-gems-ruby-2.5.8-
+            - 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: |
@@ -49,7 +51,7 @@ jobs:
               bundle clean
             fi
       - save_cache:
-          key: v1-gems-ruby-2.5.8-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
+          key: v1-gems-ruby-<< parameters.ruby_version >>-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
           paths:
             - "vendor/bundle"
             - "gemfiles/vendor/bundle"
@@ -67,6 +69,10 @@ workflows:
           matrix:
             parameters:
               gemfile:
-              - "gemfiles/rails_5.2.gemfile"
-              - "gemfiles/rails_6.0.gemfile"
-              - "gemfiles/rails_6.1.gemfile"
+                - "gemfiles/rails_6.0.gemfile"
+                - "gemfiles/rails_6.1.gemfile"
+                - "gemfiles/rails_7.0.gemfile"
+              ruby_version:
+                - "2.7.6"
+                - "3.0.4"
+                - "3.1.2"

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @jturkel @will89

data/.rubocop.yml

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

data/Appraisals

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
 
-appraise 'rails-5.2' do
-  gem 'sqlite3', '~> 1.3.6'
-  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'
+  gem 'activerecord', '~> 6.0.4'
+  gem 'activesupport', '~> 6.0.4'
 end
 
 appraise 'rails-6.1' do
-  gem 'activerecord', '6.1.0'
-  gem 'activesupport', '6.1.0'
+  gem 'activerecord', '~> 6.1.5'
+  gem 'activesupport', '~> 6.1.5'
+end
+
+appraise 'rails-7.0' do
+  gem 'activerecord', '~> 7.0.2'
+  gem 'activesupport', '~> 7.0.2'
 end

data/CHANGELOG.md

@@ -1,7 +1,23 @@
 # Changelog
 
+### 0.8.0
+- Drop support for ruby < 2.7
+- Add support for ruby 3.1
+- Drop Rails 5.2
+- Add Rails 7.0
+
+### 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
-* A support for Rails 6.1.
+* Add support for Rails 6.1.
 
 ### 0.5.0
 * Drop support for Ruby 2.3 and 2.4.

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'
 
@@ -15,19 +14,27 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/salsify/delayed_job_groups_plugin'
   spec.license       = 'MIT'
 
+  if spec.respond_to?(:metadata)
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+    spec.metadata['rubygems_mfa_required'] = 'true'
+  else
+    raise 'RubyGems 2.0 or newer is required to set allowed_push_host.'
+  end
+
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.test_files    = Dir.glob('spec/**/*')
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.7'
 
   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', '>= 5.2', '< 7'
+  spec.add_dependency 'activerecord', '>= 5.2', '< 7.1'
   spec.add_development_dependency 'coveralls_reborn', '>= 0.18.0'
   spec.add_development_dependency 'database_cleaner', '>= 1.2'
   spec.add_development_dependency 'mime-types'
@@ -35,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'rspec_junit_formatter'
-  spec.add_development_dependency 'salsify_rubocop', '0.52.1.1'
+  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_6.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "6.0.3"
-gem "activesupport", "6.0.3"
+gem "activerecord", "~> 6.0.4"
+gem "activesupport", "~> 6.0.4"
 
 gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

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

data/gemfiles/{rails_5.2.gemfile → rails_7.0.gemfile}

@@ -2,8 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "~> 1.3.6"
-gem "activerecord", "5.2.1"
-gem "activesupport", "5.2.1"
+gem "activerecord", "~> 7.0.2"
+gem "activesupport", "~> 7.0.2"
 
 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,9 +21,7 @@ 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|

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.6.0'
+    VERSION = '0.8.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/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
@@ -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

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,8 +75,8 @@ 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
@@ -84,7 +84,7 @@ describe Delayed::JobGroups::Plugin do
         # Run the job which should fail and cancel the JobGroup
         Delayed::Worker.new.work_off(1)
         # Completion job is not invoked
-        expect(CompletionJob.invoked).to be(false)
+        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
@@ -98,15 +98,15 @@ describe Delayed::JobGroups::Plugin do
       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
@@ -120,7 +120,7 @@ describe Delayed::JobGroups::Plugin do
         # Run the completion job
         Delayed::Worker.new.work_off(1)
         # Completion job is invoked
-        expect(CompletionJob.invoked).to be(true)
+        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
@@ -129,8 +129,8 @@ describe Delayed::JobGroups::Plugin do
       it "runs completion job if last job failed" do
         Delayed::Worker.max_attempts = 2
 
-        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
         expect(queued_job_count).to eq 2
         expect(job_group_count).to eq 1
@@ -144,7 +144,7 @@ describe Delayed::JobGroups::Plugin do
         # Run the job which should error
         Delayed::Worker.new.work_off(1)
         # Completion job is not invoked
-        expect(CompletionJob.invoked).to be(false)
+        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
@@ -159,7 +159,7 @@ describe Delayed::JobGroups::Plugin do
         # Run the completion job
         Delayed::Worker.new.work_off(1)
         # Completion job is invoked
-        expect(CompletionJob.invoked).to be(true)
+        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
@@ -169,7 +169,7 @@ describe Delayed::JobGroups::Plugin do
 
   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
@@ -182,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
 
@@ -197,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
@@ -239,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
@@ -265,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
@@ -286,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.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Joel Turkel
 - Randy Burkes
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -62,7 +62,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
@@ -175,16 +175,16 @@ dependencies:
   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
@@ -237,6 +237,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/CODEOWNERS"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -247,13 +248,14 @@ files:
 - README.md
 - Rakefile
 - delayed_job_groups.gemspec
-- gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.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
@@ -261,15 +263,19 @@ files:
 - 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
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
 post_install_message: See https://github.com/salsify/delayed_job_groups_plugin#installation
   for upgrade/installation notes.
 rdoc_options: []
@@ -279,22 +285,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 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.2.33
+signing_key: 
 specification_version: 4
 summary: Delayed::Job job groups plugin
 test_files:
-- spec/spec_helper.rb
-- spec/support/destroyed_model.rb
-- spec/delayed/job_groups/plugin_spec.rb
+- 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/db/schema.rb
-- spec/db/database.yml
+- spec/spec_helper.rb
+- spec/support/destroyed_model.rb
+- spec/support/test_jobs.rb