delayed_job_groups_plugin 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d1a906f965ab26f60407c3a5b10a9e1405b39e3c
-  data.tar.gz: 7cf5b5a7b17135b3de0788de8da05b6852101fc3
+SHA256:
+  metadata.gz: 8e0fcf7a3d3099755aad28122f38afb96cec8896576cb54b47c2b4f7adfd2b94
+  data.tar.gz: 5241cc7d7365f07179896559c1aae27df4bf1e8010a49b2e0a2323f752b9efe4
 SHA512:
-  metadata.gz: ac0d877eeac021a5da0d2bf48185fa5507c35e89d8791fd0ccf6de52181cc961c3fde975eee83be4b8dacbb252743f566d35362072c779a59e71c4a515fb497e
-  data.tar.gz: ded7fd3760219acbf979050767a58147c12c2f7aea7ba74523672ea41a21c413399ab64c416adeef7715047fda953aafdb0203cee7955d7e759d79248b7931dd
+  metadata.gz: a6e7381efe91a0aa89492a58f7820e71f3c6d6c35d1e5ddaf4dd777dd63d6707f5f268587569a7da1f57dcd404df859f9980e9bbae1acffbf54c76841f0af8f1
+  data.tar.gz: '029c2dd29ed387c254f869c58295c41b446bfb42f87948e5980047ab47c2f7571fe794b65e7f9aa4d73162771d61361e67d6495f7ba4e02e754da29be0ee611e'

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,34 +1,14 @@
 language: ruby
 sudo: false
-env:
-  global:
-    - JRUBY_OPTS="$JRUBY_OPTS --debug"
-  matrix:
-    - RAILS_VERSION="~> 3.2.22.5"
-    - RAILS_VERSION="~> 4.0.13"
-    - RAILS_VERSION="~> 4.1.16"
-    - RAILS_VERSION="~> 4.2.9"
-    - RAILS_VERSION="~> 5.0.6"
-    - RAILS_VERSION="~> 5.1.3"
+gemfile:
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
 rvm:
-  - 2.1.10
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
-  - jruby-9.1.13.0
-matrix:
-  exclude:
-    - rvm: 2.1.10
-      env: RAILS_VERSION="~> 5.0.6"
-    - rvm: 2.4.2
-      env: RAILS_VERSION="~> 3.2.22.5"
-    - rvm: 2.4.2
-      env: RAILS_VERSION="~> 4.0.13"
-    - rvm: 2.4.2
-      env: RAILS_VERSION="~> 4.1.16"
-    - rvm: jruby-9.1.13.0
-      env: RAILS_VERSION="~> 5.0.6"
-    - rvm: 2.1.10
-      env: RAILS_VERSION="~> 5.1.3"
-    - rvm: jruby-9.1.13.0
-      env: RAILS_VERSION="~> 5.1.3"
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+script:
+  - bundle exec rspec
+  - bundle exec rubocop

data/Appraisals

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+appraise 'rails-4.2' do
+  gem 'activerecord', '4.2.10'
+  gem 'activesupport', '4.2.10'
+end
+
+appraise 'rails-5.0' do
+  gem 'activerecord', '5.0.7'
+  gem 'activesupport', '5.0.7'
+end
+
+appraise 'rails-5.1' do
+  gem 'activerecord', '5.1.6'
+  gem 'activesupport', '5.1.6'
+end
+
+appraise 'rails-5.2' do
+  gem 'activerecord', '5.2.1 '
+  gem 'activesupport', '5.2.1 '
+end

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
-### 0.3.0 (unreleased)
+### 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
@@ -13,5 +22,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

@@ -107,8 +107,8 @@ 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,37 +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.required_ruby_version = '>= 2.1'
+  spec.required_ruby_version = '>= 2.3'
 
   spec.add_dependency 'delayed_job', '>= 4.1'
-  spec.add_dependency 'delayed_job_active_record', '>= 0.4'
+  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.2'])
+  spec.add_development_dependency 'appraisal'
+  spec.add_dependency 'activerecord', '>= 4.2', '< 5.3'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'database_cleaner', '>= 1.2'
-  # rspec < 3.5 requires rake < 11.0
-  spec.add_development_dependency 'rake', '< 11.0'
-  spec.add_development_dependency 'rspec', '>= 2.14', '< 2.99'
-  spec.add_development_dependency 'simplecov', '~> 0.7.1'
+  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 'simplecov'
+  spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'timecop'
-  spec.add_development_dependency 'mime-types', '~> 2'
-
-  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,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "4.2.10"
+gem "activesupport", "4.2.10"
+
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

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

data/gemfiles/rails_5.1.gemfile

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

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.2.1 "
+gem "activesupport", "5.2.1 "
+
+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,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Delayed
   module JobGroups

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: '::Delayed::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: '::Delayed::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'
@@ -8,7 +8,7 @@ module Delayed
     class Plugin < Delayed::Plugin
 
       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
@@ -17,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.
@@ -26,7 +26,7 @@ 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)
@@ -35,8 +35,6 @@ module Delayed
         end
       end
 
-      private
-
       def self.job_group_cancelled?(job_group_id)
         !JobGroup.exists?(job_group_id)
       end
@@ -49,4 +47,3 @@ module Delayed
     end
   end
 end
-

data/lib/delayed/job_groups/version.rb

@@ -1,7 +1,7 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 module Delayed
   module JobGroups
-    VERSION = '0.3.0'
+    VERSION = '0.4.1'
   end
 end

data/lib/delayed/job_groups/yaml_loader.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Delayed
+  module JobGroups
+    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
+  end
+end

data/lib/delayed_job_groups_plugin.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 require 'active_support'
 require 'active_record'
@@ -8,6 +8,7 @@ require 'delayed/job_groups/compatibility'
 require 'delayed/job_groups/job_extensions'
 require 'delayed/job_groups/job_group'
 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)

data/lib/generators/delayed_job_groups_plugin/install_generator.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 require 'rails/generators'
 require 'rails/generators/migration'
@@ -8,7 +8,7 @@ module DelayedJobGroupsPlugin
   class InstallGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    self.source_paths << File.join(File.dirname(__FILE__), 'templates')
+    source_paths << File.join(File.dirname(__FILE__), 'templates')
 
     def create_migration_file
       migration_template('migration.rb', 'db/migrate/create_delayed_job_groups.rb')

data/lib/generators/delayed_job_groups_plugin/templates/migration.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 class CreateDelayedJobGroups < ActiveRecord::Migration
 

data/spec/db/schema.rb

@@ -1,6 +1,6 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
-ActiveRecord::Schema.define(:version => 0) do
+ActiveRecord::Schema.define(version: 0) do
 
   create_table(:delayed_jobs, force: true) do |t|
     t.integer :priority, default: 0