delayed_job_groups_plugin 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5409e2a3bc8eebbe71680ca0275c194b3eb0707
-  data.tar.gz: 781737c5ed0983a1029f7ee1a098924973a2adf7
+  metadata.gz: d1a906f965ab26f60407c3a5b10a9e1405b39e3c
+  data.tar.gz: 7cf5b5a7b17135b3de0788de8da05b6852101fc3
 SHA512:
-  metadata.gz: ba7664bd77f42330c748ab9ab642fdf88e235620ba41df98965fcea38620653e9d69743b97c947fa25e5abd2e3227deae21268138178645fb7836fac0814a6b5
-  data.tar.gz: f766f35242d34702ae6a25453777552adf90e134f66ef179e47bc25afef5f6649c2724e60ee3497c3a0645ec74c2c7d2b6b5c74b3803333b99e112d3d2bf2f5f
+  metadata.gz: ac0d877eeac021a5da0d2bf48185fa5507c35e89d8791fd0ccf6de52181cc961c3fde975eee83be4b8dacbb252743f566d35362072c779a59e71c4a515fb497e
+  data.tar.gz: ded7fd3760219acbf979050767a58147c12c2f7aea7ba74523672ea41a21c413399ab64c416adeef7715047fda953aafdb0203cee7955d7e759d79248b7931dd

data/.travis.yml

@@ -1,22 +1,34 @@
 language: ruby
+sudo: false
 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"
+  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"
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
-  - jruby-19mode
+  - 2.1.10
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
+  - jruby-9.1.13.0
 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"
-before_install:
-  - gem install bundler
+    - 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"

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 0.3.0 (unreleased)
+* Drop support for Ruby 1.9 and 2.0.
+
 ### 0.2.0
 * Change supported delayed job version
 * Clean up lifecycle management in plugin

data/delayed_job_groups.gemspec

@@ -17,15 +17,18 @@ Gem::Specification.new do |spec|
   spec.test_files    = Dir.glob('spec/**/*')
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.1'
+
   spec.add_dependency 'delayed_job', '>= 4.1'
   spec.add_dependency 'delayed_job_active_record', '>= 0.4'
 
   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 'activerecord', ENV.fetch('RAILS_VERSION', ['>= 3.2', '< 5.2'])
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'database_cleaner', '>= 1.2'
-  spec.add_development_dependency 'rake'
+  # 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 'timecop'

data/lib/delayed/job_groups/job_extensions.rb

@@ -4,6 +4,11 @@ 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

@@ -19,7 +19,7 @@ module Delayed
       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
+        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
@@ -28,7 +28,7 @@ module Delayed
       # 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,
+        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},

data/lib/delayed/job_groups/version.rb

@@ -2,6 +2,6 @@
 
 module Delayed
   module JobGroups
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_groups_plugin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Joel Turkel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -48,7 +48,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -91,16 +91,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Delayed::Job job groups plugin