que-scheduler 4.0.3 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe4e2dccf7d28c0918286aff2764b770b5f7ce4ddfe3383e4db74e3b21531bcc
-  data.tar.gz: a0b4db17f63d630acd1ef5e401d897ca5df2995c1cf45489367541671a5039f8
+  metadata.gz: a75db11d923c140204bd92360916e4cacaac5531fc25470616a4d558dde22dd3
+  data.tar.gz: ba08caa1a8bf8a87532da3fa5cbfc8b720784e88354ab74b240c5d724c46fb07
 SHA512:
-  metadata.gz: 358a0ed1b4e31f5dc355f11bfab0dd8765852857684f752bf8ab99ca805690ed3eb7b502d6f36f2683c2fdc1429eaff8d5d4faa00983c9175a6669cf1ff5ea5f
-  data.tar.gz: 29b612a226076216788cb914fbe7064c6840597962f718fd3635d85c23e4085aa2c497ec521e661c621631b7b36de9aae080538bc6b37ac93e489fad035ba583
+  metadata.gz: 19ad5f4284dd03b6129d970e87cdd1652f8e992a5c141c032fc4935beaea2bbf15f35253c5c5f6c93e3cf6b32875beb6138112d43e8e5e123235c32fa9593984
+  data.tar.gz: f8618b848befcccf03387fe2e891f201790c1dc8b736406a62bd3d63990ac1c8f47737966103713d843a627ec39d2ff23128570dd6b03cd28682bc4613638fcf

data/README.md

@@ -309,7 +309,7 @@ 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.4.0.
+Your [postgres](https://www.postgresql.org/) database must be at least version 9.5.0.
 
 ## Inspiration
 
@@ -318,6 +318,7 @@ This gem was inspired by the makers of the excellent [Que](https://github.com/ch
 ## Contributors
 
 * @bnauta
+* @bjeanes
 * @JackDanger
 * @jish
 * @joehorsnell

data/lib/que/scheduler/configuration.rb

@@ -4,11 +4,8 @@ require_relative "version_support"
 module Que
   module Scheduler
     class Configuration
-      attr_accessor :schedule_location
-      attr_accessor :schedule
-      attr_accessor :transaction_adapter
-      attr_accessor :que_scheduler_queue
-      attr_accessor :time_zone
+      attr_accessor :schedule_location, :schedule, :transaction_adapter, :que_scheduler_queue,
+                    :time_zone
     end
 
     class << self

data/lib/que/scheduler/db.rb

@@ -18,9 +18,11 @@ module Que
           Que::Scheduler::VersionSupport.execute(NOW_SQL).first.values.first
         end
 
+        # rubocop:disable Style/ExplicitBlockArgument
         def transaction
           Que::Scheduler.configuration.transaction_adapter.call { yield }
         end
+        # rubocop:enable Style/ExplicitBlockArgument
       end
     end
   end

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_sufficient_version? &&
+           Que::Scheduler::ToEnqueue.active_job_loaded? &&
            job_class < ::ActiveJob::Base &&
            Que::Scheduler::ToEnqueue.active_job_version < Gem::Version.create("6.0.3")
           puts <<~ERR

data/lib/que/scheduler/jobs/que_scheduler_audit_clear_down_job.rb

@@ -28,7 +28,7 @@ module Que
         Que::Scheduler::VersionSupport.set_priority(self, 100)
 
         def run(options)
-          retain_row_count = options.fetch(:retain_row_count)
+          retain_row_count = options.symbolize_keys.fetch(:retain_row_count)
           Que::Scheduler::Db.transaction do
             # This may delete zero or more than `retain_row_count` depending on if anything was
             # scheduled in each of the past schedule runs

data/lib/que/scheduler/schedule.rb

@@ -37,7 +37,8 @@ module Que
 
         def from_hash(config_hash)
           config_hash.map do |name, defined_job_hash|
-            [name, hash_item_to_defined_job(name, defined_job_hash)]
+            name_str = name.to_s
+            [name_str, hash_item_to_defined_job(name_str, defined_job_hash)]
           end.to_h
         end
 
@@ -48,10 +49,7 @@ module Que
           # an array with one item which is that value (this includes if it is a hash). It could
           # also be a single nil value.
           args_array =
-            if !defined_job_hash.key?("args")
-              # No args were requested
-              []
-            else
+            if defined_job_hash.key?("args")
               args = defined_job_hash["args"]
               if args.is_a?(Array)
                 # An array of args was requested
@@ -61,11 +59,14 @@ module Que
                 # be enqueued as an array of 1 item
                 [args]
               end
+            else
+              # No args were requested
+              []
             end
 
           Que::Scheduler::DefinedJob.create(
             name: name,
-            job_class: defined_job_hash["class"] || name,
+            job_class: defined_job_hash["class"]&.to_s || name,
             queue: defined_job_hash["queue"],
             args_array: args_array,
             priority: defined_job_hash["priority"],

data/lib/que/scheduler/to_enqueue.rb

@@ -22,14 +22,12 @@ module Que
           type_from_job_class(job_class).present?
         end
 
-        def active_job_version
-          Gem.loaded_specs["activejob"]&.version
+        def active_job_loaded?
+          !!active_job_version
         end
 
-        def active_job_sufficient_version?
-          # ActiveJob 4.x does not support job_ids correctly
-          # https://github.com/rails/rails/pull/20056/files
-          active_job_version && active_job_version > Gem::Version.create("5")
+        def active_job_version
+          Gem.loaded_specs["activejob"]&.version
         end
 
         def active_job_version_supports_queues?
@@ -56,7 +54,7 @@ module Que
               hash = {
                 ::Que::Job => QueJobType,
               }
-              hash[::ActiveJob::Base] = ActiveJobType if ToEnqueue.active_job_sufficient_version?
+              hash[::ActiveJob::Base] = ActiveJobType if ToEnqueue.active_job_loaded?
               hash
             end
         end

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = "4.0.3".freeze
+    VERSION = "4.1.0".freeze
   end
 end

data/lib/que/scheduler/version_support.rb

@@ -61,7 +61,11 @@ module Que
 
         def zero_major?
           # This is the only way to handle beta releases too
-          @zero_major ||= Gem.loaded_specs["que"].version.to_s.split(".").first.to_i.zero?
+          @zero_major ||= que_version.split(".").first.to_i.zero?
+        end
+
+        def que_version
+          @que_version ||= Gem.loaded_specs["que"].version.to_s
         end
 
         private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.1.0
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: fugit
   requirement: !ruby/object:Gem::Requirement
@@ -90,14 +90,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -258,14 +258,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.84.0
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.84.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -376,7 +376,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="