que-scheduler 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d92cf3d8ebdf259e1710f12bd18a4c8659487db9a9aef74abc8adc5003d41e3
-  data.tar.gz: 3f0444f62191a9e21d83d2aa3e8d31e2c360d8aa29855cac7c6e3a85a453354f
+  metadata.gz: e73846d81092ac0bacd4a3c854a3610bde40c8c4a5289728f42b59a5ef7833bf
+  data.tar.gz: 01e41964ee78f56cf90836457a5f439d0bc5185466890e5fcbbcbe4e77306041
 SHA512:
-  metadata.gz: c92abb1259bec07700f14bc38f87513d664dab477a8c1c77112dc3850b807ce7ecc277dbe352bdcb1df1a5098758537a664ded7a59887b4c9e8b9f35c04019d8
-  data.tar.gz: '080de57bec485640cff2f458c4462cd1ff13646851f2212273829195c4da3014df3675197c1d08e11e89bbcbdd68af1a951561837f0c89926a3baf1346b5cddb'
+  metadata.gz: 49bd076fb802ef81ad445d4dd668bd144a0d313aeee04988cb5bae8ebd9061955ac19c30efe46085f7453bb6dfd20f04b63c4225f6360407a46afefc8b833391
+  data.tar.gz: 1d4074dda7344d003140ed4b2e513702ffc8386620d236df8602a660f1fa1209d5f324d4f840bb17434b7164f5785b02d93ee4cfef08c2e055625ec675634fe8

data/README.md

@@ -310,6 +310,13 @@ A full changelog can be found here: [CHANGELOG.md](https://github.com/hlascelles
 
 Your [postgres](https://www.postgresql.org/) database must be at least version 9.5.0.
 
+Ruby 2.6 and above is supported. Ruby 2.5 currently still currently works but is unsupported.
+
+Using que 0.x with Rails 6 needs a patch to support it. 
+See the patch and how to use it here: https://github.com/que-rb/que/issues/247#issuecomment-595258236
+If that patch is included then que-scheduler will work. This setup is tested, but is not supported.
+
+
 ## Inspiration
 
 This gem was inspired by the makers of the excellent [Que](https://github.com/chanks/que) job scheduler gem. 
@@ -324,3 +331,4 @@ This gem was inspired by the makers of the excellent [Que](https://github.com/ch
 * @krzyzak
 * @papodaca
 * @ajoneil
+* @ippachi

data/lib/que/scheduler/defined_job.rb

@@ -86,7 +86,7 @@ module Que
         # queue name is only supported for a subrange of ActiveJob versions. Print this out as a
         # warning.
         if queue &&
-           Que::Scheduler::ToEnqueue.active_job_loaded? &&
+           Que::Scheduler::ToEnqueue.active_job_defined? &&
            job_class < ::ActiveJob::Base &&
            Que::Scheduler::ToEnqueue.active_job_version < Gem::Version.create("6.0.3")
           puts <<~ERR

data/lib/que/scheduler/migrations/6/up.sql

@@ -13,7 +13,7 @@ DECLARE
 BEGIN
     IF OLD.job_class = 'Que::Scheduler::SchedulerJob' THEN
         IF NOT que_scheduler_check_job_exists() THEN
-            raise exception 'Deletion of que_scheduler job % prevented. Deleting the que_scheduler job is almost certainly a mistake.', OLD.job_id;
+            raise exception 'Deletion of que_scheduler job prevented. Deleting the que_scheduler job is almost certainly a mistake.';
         END IF;
     END IF;
     RETURN OLD;

data/lib/que/scheduler/schedule.rb

@@ -36,10 +36,9 @@ module Que
         end
 
         def from_hash(config_hash)
-          config_hash.to_h do |name, defined_job_hash|
-            name_str = name.to_s
-            [name_str, hash_item_to_defined_job(name_str, defined_job_hash)]
-          end
+          config_hash
+            .map { |name, defined_job_hash| hash_item_to_defined_job(name.to_s, defined_job_hash) }
+            .index_by(&:name)
         end
 
         def hash_item_to_defined_job(name, defined_job_hash_in)

data/lib/que/scheduler/to_enqueue.rb

@@ -22,8 +22,8 @@ module Que
           type_from_job_class(job_class).present?
         end
 
-        def active_job_loaded?
-          !!active_job_version
+        def active_job_defined?
+          Object.const_defined?("ActiveJob")
         end
 
         def active_job_version
@@ -54,7 +54,7 @@ module Que
               hash = {
                 ::Que::Job => QueJobType,
               }
-              hash[::ActiveJob::Base] = ActiveJobType if ToEnqueue.active_job_loaded?
+              hash[::ActiveJob::Base] = ActiveJobType if ToEnqueue.active_job_defined?
               hash
             end
         end

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = "4.2.1".freeze
+    VERSION = "4.2.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -404,7 +404,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A cron scheduler for Que