que-scheduler 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3031c76424c60291dc8d004538ab6dc5d57fdf8bb7c48faa6dae2cd2ddba90f7
-  data.tar.gz: 0c3d33ade4ebce0c2e24414347da1a5150d5ba680adafa240a15475a71ba646b
+  metadata.gz: 10ede03b787b5856626a071b1bc95482444e85426749dbd3e71cd0df4cce2471
+  data.tar.gz: acb2b596d1eb686618e508b25480402686e46c631cfe193ae8c974e49b91090a
 SHA512:
-  metadata.gz: c6c0bdefa899496a741b4c4b059cdc7663299a4a349b41560c44d77d2c788bc3ee4fb53f7c8fa51767d86332f1bd5475ea3bca3516ddd1a81de1bfea91e2e653
-  data.tar.gz: 447ff26a1c104803e27da593730b77aaf59300e13ead005c7dece366c1fbc0f252d65524dcba6b6a64be2a656681a97e1ae78adb45117b374b533525e2612b6a
+  metadata.gz: 4a61f0242dde1547c4df76f2626ccab9e4fe2f2046db698ff54699f0b19fe3233a1ba4a586781500a3f9f8519033de3f2ef68cf39f73ba1e7d31fcfb270d0b7e
+  data.tar.gz: 5e8636614bb56e1b38acd50f7b2afdfc2edf9860cc55898b98552537d3aaab543dff7a40396e6aae623fd70f2fe1618f1214faf6589a5c4fb5c2000c8bff7f2e

data/README.md

@@ -334,3 +334,4 @@ This gem was inspired by the makers of the excellent [Que](https://github.com/ch
 * @papodaca
 * @ajoneil
 * @ippachi
+* @milgner

data/lib/que/scheduler/migrations.rb

@@ -43,13 +43,17 @@ module Que
 
         # This method is only intended for use in squashed migrations
         def reenqueue_scheduler_if_missing
-          Que::Scheduler::SchedulerJob.enqueue if Que::Scheduler::Db.count_schedulers.zero?
+          return unless Que::Scheduler::Db.count_schedulers.zero?
+
+          Que::Scheduler::VersionSupport.enqueue_a_job(Que::Scheduler::SchedulerJob)
         end
 
         private
 
         def migrate_up(current, version)
-          Que::Scheduler::SchedulerJob.enqueue if current.zero? # Version 1 does not use SQL
+          if current.zero? # Version 1 does not use SQL
+            Que::Scheduler::VersionSupport.enqueue_a_job(Que::Scheduler::SchedulerJob)
+          end
           execute_step((current += 1), :up) until current == version
         end
 

data/lib/que/scheduler/scheduler_job.rb

@@ -65,11 +65,16 @@ module Que
 
         # And rerun...
         next_run_at = scheduler_job_args.as_time.beginning_of_minute + SCHEDULER_FREQUENCY
-        enqueued_job = SchedulerJob.enqueue(
-          queue: Que::Scheduler.configuration.que_scheduler_queue,
-          last_run_time: last_full_execution.iso8601,
-          job_dictionary: job_dictionary,
-          run_at: next_run_at
+        enqueued_job = Que::Scheduler::VersionSupport.enqueue_a_job(
+          SchedulerJob,
+          {
+            queue: Que::Scheduler.configuration.que_scheduler_queue,
+            run_at: next_run_at,
+          },
+          {
+            last_run_time: last_full_execution.iso8601,
+            job_dictionary: job_dictionary,
+          }
         )
 
         # rubocop:disable Style/GuardClause This reads better as a conditional

data/lib/que/scheduler/to_enqueue.rb

@@ -65,12 +65,11 @@ module Que
     class QueJobType < ToEnqueue
       def enqueue
         job_settings = to_h.slice(:queue, :priority, :run_at).compact
-        job =
-          if args.is_a?(Hash)
-            job_class.enqueue(**args.merge(job_settings))
-          else
-            job_class.enqueue(*args, **job_settings)
-          end
+        job = Que::Scheduler::VersionSupport.enqueue_a_job(
+          job_class,
+          job_settings,
+          args
+        )
 
         return nil if job.nil? || !job # nil in Rails < 6.1, false after.
 

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = "4.3.0".freeze
+    VERSION = "4.3.1".freeze
   end
 end

data/lib/que/scheduler/version_support.rb

@@ -47,6 +47,25 @@ module Que
           normalise_array_of_hashes(Que.execute(str, args))
         end
 
+        # rubocop:disable Style/IfInsideElse
+        def enqueue_a_job(clazz, job_options = {}, job_args = [])
+          if supports_job_options_keyword?
+            # More recent versions have separated the way job arguments and options are passed in
+            if job_args.is_a?(Hash)
+              clazz.enqueue(job_args, job_options: job_options)
+            else
+              clazz.enqueue(*job_args, job_options: job_options)
+            end
+          else
+            if job_args.is_a?(Hash)
+              clazz.enqueue(**job_args.merge(job_options))
+            else
+              clazz.enqueue(*job_args, **job_options)
+            end
+          end
+        end
+
+        # rubocop:enable Style/IfInsideElse
         def default_scheduler_queue
           zero_major? ? "" : Que::DEFAULT_QUEUE
         end
@@ -64,12 +83,25 @@ module Que
           @zero_major ||= que_version.split(".").first.to_i.zero?
         end
 
+        def one_major?
+          # This is the only way to handle beta releases too
+          @one_major ||= que_version.split(".").first.to_i == 1
+        end
+
         def que_version
-          @que_version ||= Gem.loaded_specs["que"].version.to_s
+          @que_version ||= que_version_object.to_s
         end
 
         private
 
+        def supports_job_options_keyword?
+          @supports_job_options_keyword ||= que_version_object >= Gem::Version.new("1.2.0")
+        end
+
+        def que_version_object
+          @que_version_object ||= Gem.loaded_specs["que"].version
+        end
+
         def normalise_array_of_hashes(array)
           array.map { |row| row.to_h.transform_keys(&:to_sym) }
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport