que-scheduler 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3031c76424c60291dc8d004538ab6dc5d57fdf8bb7c48faa6dae2cd2ddba90f7
-  data.tar.gz: 0c3d33ade4ebce0c2e24414347da1a5150d5ba680adafa240a15475a71ba646b
+  metadata.gz: aac67112308ae6e0840d46479cf890eb123f94c51ac9ac9a9a1b51900064cc96
+  data.tar.gz: 1e268c0c918988a05e4bb5912ff47aee45b680ade2c3b422ea9dbf5c1bd0fd18
 SHA512:
-  metadata.gz: c6c0bdefa899496a741b4c4b059cdc7663299a4a349b41560c44d77d2c788bc3ee4fb53f7c8fa51767d86332f1bd5475ea3bca3516ddd1a81de1bfea91e2e653
-  data.tar.gz: 447ff26a1c104803e27da593730b77aaf59300e13ead005c7dece366c1fbc0f252d65524dcba6b6a64be2a656681a97e1ae78adb45117b374b533525e2612b6a
+  metadata.gz: 7ba7be6ea94dfa50387a329e39753ce1b17df38aa13e8c106c49c4eabaa3a249be8528d8fc6985201736a87a74ef318083f4f9661d6153191f484f06136f3ede
+  data.tar.gz: eba73e89578334e55d4d39a253edf1d2822647eee62d733d52235184c8eaa9b36f64a7027fde5ed3c2a6ea2c73666a9ea6b82ed4ca62edbd5df1ed0bdeee6432

data/README.md

@@ -308,12 +308,10 @@ A full changelog can be found here: [CHANGELOG.md](https://github.com/hlascelles
 
 ## System requirements
 
-Your [postgres](https://www.postgresql.org/) database must be at least version 9.5.0.
+Your [postgres](https://www.postgresql.org/) database must be at least version 9.6.0.
 
-The latest version of que-scheduler supports Ruby 2.7, though this is largely to allow
-the gem to work with que 2.x. Recent que-scheduler versions (up to 4.2.2) work with Ruby 2.5.
-
-Ruby 3.x support (and thus que 2.x support) is currently in beta. 
+The latest version of que-scheduler supports Ruby 2.7 and above.
+que-scheduler versions below 4.2.3 work with Ruby 2.5 and Ruby 2.6.
 
 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
@@ -334,3 +332,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.4.0".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.4.0
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -71,9 +71,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -81,9 +81,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -103,7 +103,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -192,16 +192,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement