delayed_job_groups_plugin 0.1.3 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f43ffca72b01980b11ae8ddf09838814aca69655
-  data.tar.gz: 21beb5d9d657a1b594eecd8ab5ead1b41c80f9fd
+SHA256:
+  metadata.gz: 03a9f0066659dc667431ab9ebc586c2529832d1461258dd6d426f863e5f86d01
+  data.tar.gz: ab1c0829e4734e8582f59b403e51ae9caa2415afa1f871a1bab630b052cbae59
 SHA512:
-  metadata.gz: 4b237b11183b3492791071bdc3e8b46afb9ed6d9916afe5771f3ea7931fda82094a4df36f79ac9281589d78a53f26d771ee0ba2f6f18ba6f596ade2b47a72cd1
-  data.tar.gz: 849d41f1e585797dc2305c00dcdeedba2799a13c6572384716835bf2d878b3dea5cefeb9d47ceee0d05e43ad4d42492f4a00ddfdc3f707e2272438ae6e4b62c3
+  metadata.gz: 3c268e4005abf1659599be599224e0ed2ff67e36f81bfaea8814de515384974ebecab3d60be9b6a985305294d9bb58ebd65c23a5a4ee5fe6300a15b46b7081a0
+  data.tar.gz: 55ab232adbd0e6f36d2dd36d2eab69210bdae606de95eee08de87f98545b650b4e37a9bc8dcf7838a925a3d6750e2cf7690664c0f81df23933eb7cd8bfa8d1ef

data/.gitignore

@@ -18,3 +18,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.gemfile.lock

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --format progress
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,8 @@
+inherit_gem:
+  salsify_rubocop: conf/rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.3
+
+Style/FrozenStringLiteralComment:
+  Enabled: true

data/.travis.yml

@@ -1,20 +1,21 @@
 language: ruby
-env:
-  - RAILS_VERSION="~> 3.2.21" JRUBY_OPTS="$JRUBY_OPTS --debug"
-  - RAILS_VERSION="~> 4.0.13" JRUBY_OPTS="$JRUBY_OPTS --debug"
-  - RAILS_VERSION="~> 4.1.9" JRUBY_OPTS="$JRUBY_OPTS --debug"
-  - RAILS_VERSION="~> 4.2.0" JRUBY_OPTS="$JRUBY_OPTS --debug"
+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:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
-  - jruby-19mode
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+script:
+  - bundle exec rspec
+  - bundle exec rubocop
 matrix:
   exclude:
-    # See https://github.com/salsify/goldiloader/issues/22
-    - rvm: jruby-19mode
-      env: RAILS_VERSION="~> 4.2.0" JRUBY_OPTS="$JRUBY_OPTS --debug"
-    # See https://github.com/rails/rails/pull/18306
-    - rvm: 2.2.0
-      env: RAILS_VERSION="~> 3.2.21" JRUBY_OPTS="$JRUBY_OPTS --debug"
+  - rvm: 2.3.8
+    gemfile: gemfiles/rails_6.0.gemfile
+  - rvm: 2.4.5
+    gemfile: gemfiles/rails_6.0.gemfile

data/Appraisals

@@ -0,0 +1,30 @@
+# 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 '
+end
+
+appraise 'rails-6.0' do
+  gem 'activerecord', '6.0.3'
+  gem 'activesupport', '6.0.3'
+end

data/CHANGELOG.md

@@ -1,6 +1,26 @@
 # Changelog
 
-### 0.1.4(Unreleased)
+### 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.
+
+### 0.4.1
+* Bugfix for `on_completion_job` and `on_cancellation_job` YAML serialization
+
+### 0.4.0
+* Drop support for Ruby 2.0, 2.1 and 2.2.
+* Add support for Ruby 2.5.
+* Drop support for Rails < 4.2.
+* Add support for Rails 5.2
+
+### 0.3.0
+* Drop support for Ruby 1.9 and 2.0.
+
+### 0.2.0
+* Change supported delayed job version
+* Clean up lifecycle management in plugin
 
 ### 0.1.3
 * Change supported rails version.
@@ -8,5 +28,5 @@
 ### 0.1.2
 * Add configuration option to allow failed jobs not to cancel a group.
 
-### 0.1.1 
+### 0.1.1
 * Update the run_at for all jobs in a JobGroup when it's unblocked.

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -100,15 +100,16 @@ 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)
 ```
 
 ## Supported Platforms
 
 * Only the Delayed Job Active Record backend is supported.
-* Tested with Rails 3.2 and 4.0.
-* Tested with MRI 1.9.3, 2.0.0, 2.1.0 and JRuby in 1.9 mode.
+* Tested with Rails 4.2 through 5.2.
+* Tested with MRI 2.3 through 2.5.
 
 ## Contributing
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks
 

data/delayed_job_groups.gemspec

@@ -1,4 +1,6 @@
-# encoding: UTF-8
+
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'delayed/job_groups/version'
@@ -8,33 +10,32 @@ Gem::Specification.new do |spec|
   spec.version       = Delayed::JobGroups::VERSION
   spec.authors       = ['Joel Turkel', 'Randy Burkes']
   spec.email         = ['jturkel@salsify.com', 'rlburkes@gmail.com']
-  spec.description   = %q{Aggregates Delayed::Job jobs into groups with group level management and lifecycle callbacks}
-  spec.summary       = %q{Delayed::Job job groups plugin}
+  spec.description   = 'Aggregates Delayed::Job jobs into groups with group level management and lifecycle callbacks'
+  spec.summary       = 'Delayed::Job job groups plugin'
   spec.homepage      = 'https://github.com/salsify/delayed_job_groups_plugin'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.test_files    = Dir.glob('spec/**/*')
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'delayed_job', '>= 3.0'
-  spec.add_dependency 'delayed_job_active_record', '>= 0.4'
+  spec.required_ruby_version = '>= 2.3'
+
+  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.add_development_dependency 'activerecord', ENV.fetch('RAILS_VERSION', ['>= 3.2', '< 5.0'])
+  spec.add_development_dependency 'appraisal'
+  spec.add_dependency 'activerecord', '>= 4.2', '< 6.1'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'database_cleaner', '>= 1.2'
+  spec.add_development_dependency 'mime-types'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '>= 2.14', '< 2.99'
-  spec.add_development_dependency 'simplecov', '~> 0.7.1'
+  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 'simplecov'
+  spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'timecop'
-
-  if RUBY_PLATFORM == 'java'
-    spec.add_development_dependency 'jdbc-sqlite3'
-    spec.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
-  else
-    spec.add_development_dependency 'sqlite3'
-  end
-
 end

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,9 @@
+# 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.0.gemfile

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

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,9 @@
+# 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: "../"

data/gemfiles/rails_5.2.gemfile

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

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "6.0.3"
+gem "activesupport", "6.0.3"
+
+gemspec path: "../"

data/lib/delayed/job_groups/compatibility.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 require 'active_support/version'
 require 'active_record/version'
@@ -8,7 +8,7 @@ module Delayed
     module Compatibility
 
       def self.mass_assignment_security_enabled?
-        ::ActiveRecord::VERSION::MAJOR < 4 || defined?(::ActiveRecord::MassAssignmentSecurity)
+        defined?(::ActiveRecord::MassAssignmentSecurity)
       end
 
     end

data/lib/delayed/job_groups/job_extensions.rb

@@ -1,9 +1,14 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Delayed
   module JobGroups
     module JobExtensions
       extend ActiveSupport::Concern
+      module ReadyToRunExtension
+        def ready_to_run(worker_name, max_run_time)
+          super(worker_name, max_run_time).where(blocked: false)
+        end
+      end
 
       included do
         if Delayed::JobGroups::Compatibility.mass_assignment_security_enabled?
@@ -13,15 +18,9 @@ module Delayed
         belongs_to :job_group, class_name: 'Delayed::JobGroups::JobGroup'
 
         class << self
-
-          # Patch ready_to_run to exclude blocked jobs
-          def ready_to_run_with_blocked_filtering(worker_name, max_run_time)
-            ready_to_run_without_blocked_filtering(worker_name, max_run_time).where(blocked: false)
-          end
-          alias_method_chain :ready_to_run, :blocked_filtering
+          prepend ReadyToRunExtension
         end
       end
-
       def in_job_group?
         job_group_id.present?
       end

data/lib/delayed/job_groups/job_group.rb

@@ -1,4 +1,6 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
+require_relative 'yaml_loader'
 
 module Delayed
   module JobGroups
@@ -11,29 +13,19 @@ module Delayed
                         :on_cancellation_job_options, :failure_cancels_group
       end
 
-      serialize :on_completion_job
+      serialize :on_completion_job, Delayed::JobGroups::YamlLoader
       serialize :on_completion_job_options, Hash
-      serialize :on_cancellation_job
+      serialize :on_cancellation_job, Delayed::JobGroups::YamlLoader
       serialize :on_cancellation_job_options, Hash
 
       validates :queueing_complete, :blocked, :failure_cancels_group, inclusion: [true, false]
 
-      if ActiveRecord::VERSION::MAJOR >= 4
-        has_many :active_jobs, -> { where(failed_at: nil) }, class_name: Job
-      else
-        has_many :active_jobs, class_name: Job, conditions: {failed_at: nil}
-      end
-
+      has_many :active_jobs, -> { where(failed_at: nil) }, class_name: '::Delayed::Job'
 
       # Only delete dependent jobs that are unlocked so we can determine if there are in-flight jobs
       # for canceled job groups
-      if ActiveRecord::VERSION::MAJOR >= 4
-        has_many :queued_jobs, -> { where(failed_at: nil, locked_by: nil) }, class_name: Job,
-                 dependent: :delete_all
-      else
-        has_many :queued_jobs, class_name: Job, conditions: {failed_at: nil, locked_by: nil},
-                 dependent: :delete_all
-      end
+      has_many :queued_jobs, -> { where(failed_at: nil, locked_by: nil) }, class_name: '::Delayed::Job',
+                dependent: :delete_all
 
       def mark_queueing_complete
         with_lock do
@@ -78,7 +70,7 @@ module Delayed
         end
       end
 
-      def self.has_pending_jobs?(job_group_ids)
+      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?

data/lib/delayed/job_groups/plugin.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 require 'delayed_job'
 require 'set'
@@ -7,21 +7,8 @@ module Delayed
   module JobGroups
     class Plugin < Delayed::Plugin
 
-      # Delayed job callbacks will be registered in a global Delayed::Lifecycle every time a
-      # Delayed::Worker is created. This creates problems in test runs that create
-      # multiple workers because we register the callbacks multiple times on the same
-      # global Lifecycle.
-      def self.callbacks(&block)
-        registered_lifecycles = Set.new
-        super do |lifecycle|
-          if registered_lifecycles.add?(lifecycle.object_id)
-            block.call(lifecycle)
-          end
-        end
-      end
-
       callbacks do |lifecycle|
-        lifecycle.before(:error) do |worker, job|
+        lifecycle.before(:error) do |_worker, job|
           # If the job group has been cancelled then don't let the job be retried
           if job.in_job_group? && job_group_cancelled?(job.job_group_id)
             def job.max_attempts
@@ -30,7 +17,7 @@ module Delayed
           end
         end
 
-        lifecycle.before(: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.
@@ -39,17 +26,16 @@ module Delayed
           end
         end
 
-        lifecycle.after(:perform) do |worker, job|
+        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
       end
 
-      private
-
       def self.job_group_cancelled?(job_group_id)
         !JobGroup.exists?(job_group_id)
       end
@@ -59,7 +45,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
-