que-scheduler 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53cadc9fafa321124d4f52caa66503d8590cb1eaa11ee2ac86e0208c5d6a0fef
-  data.tar.gz: 2a5731c305089b58c3841f51b67c2dc698718e123a9b68395e92e1dfff37a693
+  metadata.gz: cf1ee6c62677a8c215d48d990da257e0f4854c8e6e354e1eae3e90fc0685b601
+  data.tar.gz: dd948edfb90841bc54fc0bb3fc9e725bf4127f1ca31c53654a209ed6d5332e42
 SHA512:
-  metadata.gz: '087a32c4e9245c3bbaa26fb0e891f2b232c2617bad351d354eb502c0edb853a32ec786601a71e796fe5baa1b13f3691f1dc1c17f55d1b1973648101cd60602c7'
-  data.tar.gz: 1ba223766fa1d52b79b7ebcdcd534da366636cc306f538e6bc067830a2999b57913c1ade0f5a381287883222aedadc4aa380f9fb479223838468f7df3dfa5d73
+  metadata.gz: 7ae4812d01e7ea24300afb6b76a5194f3a25a912852723e30cbc8a1405d1822e8fb543dee955049f87e3063a9ae8b322675e6bbb836c0ab9fe0cc46c119b180c
+  data.tar.gz: 7246c2709a90c3e2ac7e14a9a8ee2f91792f3cccf0f516ad2dc6f119ddcf025b9eb9324fcf4e3eb6f7b279646066a02693f2f1364773a34c3aed011e041012da

data/lib/que-scheduler.rb

@@ -1,3 +1,3 @@
 # rubocop:disable Naming/FileName
-require 'que/scheduler'
+require "que/scheduler"
 # rubocop:enable Naming/FileName

data/lib/que/scheduler.rb

@@ -1,8 +1,8 @@
-require 'que/scheduler/version'
-require 'que/scheduler/version_support'
-require 'que/scheduler/config'
-require 'que/scheduler/scheduler_job'
-require 'que/scheduler/db'
-require 'que/scheduler/audit'
-require 'que/scheduler/migrations'
-require 'que/scheduler/jobs/que_scheduler_audit_clear_down_job'
+require "que/scheduler/version"
+require "que/scheduler/version_support"
+require "que/scheduler/config"
+require "que/scheduler/scheduler_job"
+require "que/scheduler/db"
+require "que/scheduler/audit"
+require "que/scheduler/migrations"
+require "que/scheduler/jobs/que_scheduler_audit_clear_down_job"

data/lib/que/scheduler/audit.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'to_enqueue'
+require_relative "to_enqueue"
 
 module Que
   module Scheduler
     module Audit
-      TABLE_NAME = 'que_scheduler_audit'
-      ENQUEUED_TABLE_NAME = 'que_scheduler_audit_enqueued'
+      TABLE_NAME = "que_scheduler_audit"
+      ENQUEUED_TABLE_NAME = "que_scheduler_audit_enqueued"
       INSERT_AUDIT = %{
         INSERT INTO #{TABLE_NAME} (scheduler_job_id, executed_at)
         VALUES ($1::bigint, $2::timestamptz)

data/lib/que/scheduler/config.rb

@@ -1,5 +1,5 @@
-require 'que'
-require_relative 'version_support'
+require "que"
+require_relative "version_support"
 
 module Que
   module Scheduler
@@ -21,7 +21,7 @@ module Que
 end
 
 Que::Scheduler.configure do |config|
-  config.schedule_location = ENV.fetch('QUE_SCHEDULER_CONFIG_LOCATION', 'config/que_schedule.yml')
+  config.schedule_location = ENV.fetch("QUE_SCHEDULER_CONFIG_LOCATION", "config/que_schedule.yml")
   config.transaction_adapter = ::Que.method(:transaction)
   config.que_scheduler_queue = Que::Scheduler::VersionSupport.default_scheduler_queue
 end

data/lib/que/scheduler/db.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative 'config'
+require_relative "config"
 
 module Que
   module Scheduler
     module Db
       SCHEDULER_COUNT_SQL =
         "SELECT COUNT(*) FROM que_jobs WHERE job_class = 'Que::Scheduler::SchedulerJob'"
-      NOW_SQL = 'SELECT now()'
+      NOW_SQL = "SELECT now()"
 
       class << self
         def count_schedulers

data/lib/que/scheduler/defined_job.rb

@@ -1,5 +1,5 @@
-require 'hashie'
-require 'fugit'
+require "hashie"
+require "fugit"
 
 # This is the definition of one scheduleable job in the que-scheduler config yml file.
 module Que
@@ -59,10 +59,10 @@ module Que
       # rubocop:disable Style/GuardClause This reads better as a conditional
       def validate_fields_types(options)
         unless queue.nil? || queue.is_a?(String)
-          err_field(:queue, options, 'queue must be a string')
+          err_field(:queue, options, "queue must be a string")
         end
         unless priority.nil? || priority.is_a?(Integer)
-          err_field(:priority, options, 'priority must be an integer')
+          err_field(:priority, options, "priority must be an integer")
         end
         unless DEFINED_JOB_TYPES.include?(schedule_type)
           err_field(:schedule_type, options, "Not in #{DEFINED_JOB_TYPES}")
@@ -71,10 +71,10 @@ module Que
       # rubocop:enable Style/GuardClause
 
       def validate_fields_presence(options)
-        err_field(:name, options, 'name must be present') if name.nil?
-        err_field(:job_class, options, 'job_class must be present') if job_class.nil?
+        err_field(:name, options, "name must be present") if name.nil?
+        err_field(:job_class, options, "job_class must be present") if job_class.nil?
         # An invalid cron is nil
-        err_field(:cron, options, 'cron must be present') if cron.nil?
+        err_field(:cron, options, "cron must be present") if cron.nil?
       end
 
       def validate_job_class_related(options)
@@ -88,7 +88,7 @@ module Que
         if queue &&
            Que::Scheduler::ToEnqueue.active_job_sufficient_version? &&
            job_class < ::ActiveJob::Base &&
-           Que::Scheduler::ToEnqueue.active_job_version < Gem::Version.create('6.0.3')
+           Que::Scheduler::ToEnqueue.active_job_version < Gem::Version.create("6.0.3")
           puts <<-ERR
             WARNING from que-scheduler....
             Between versions 4.2.3 and 6.0.2 (inclusive) Rails did not support setting queue names
@@ -104,7 +104,7 @@ module Que
         end
       end
 
-      def err_field(field, options, reason = '')
+      def err_field(field, options, reason = "")
         schedule = Que::Scheduler.configuration.schedule_location
         value = options[field]
         raise "Invalid #{field} '#{value}' for '#{name}' in que-scheduler schedule #{schedule}.\n" \

data/lib/que/scheduler/enqueueing_calculator.rb

@@ -1,4 +1,4 @@
-require 'fugit'
+require "fugit"
 
 module Que
   module Scheduler

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

@@ -1,4 +1,4 @@
-require 'que'
+require "que"
 
 # This job can optionally be scheduled to clear down the que-scheduler audit log if it
 # isn't required in the long term.
@@ -21,8 +21,8 @@ module Que
           end
         end
 
-        DELETE_AUDIT_ENQUEUED_SQL = build_sql('que_scheduler_audit_enqueued').freeze
-        DELETE_AUDIT_SQL = build_sql('que_scheduler_audit').freeze
+        DELETE_AUDIT_ENQUEUED_SQL = build_sql("que_scheduler_audit_enqueued").freeze
+        DELETE_AUDIT_SQL = build_sql("que_scheduler_audit").freeze
 
         # Very low priority
         Que::Scheduler::VersionSupport.set_priority(self, 100)
@@ -36,7 +36,7 @@ module Que
             # This will delete all but `retain_row_count` oldest rows
             count = Que::Scheduler::VersionSupport.execute(DELETE_AUDIT_SQL, [retain_row_count])
             log = "#{self.class} cleared down #{count.first.fetch(:count)} rows"
-            ::Que.log(event: 'que-scheduler'.to_sym, message: log)
+            ::Que.log(event: "que-scheduler".to_sym, message: log)
           end
         end
       end

data/lib/que/scheduler/schedule.rb

@@ -1,4 +1,4 @@
-require_relative 'defined_job'
+require_relative "defined_job"
 
 module Que
   module Scheduler
@@ -30,11 +30,11 @@ 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')
+            if !defined_job_hash.key?("args")
               # No args were requested
               []
             else
-              args = defined_job_hash['args']
+              args = defined_job_hash["args"]
               if args.is_a?(Array)
                 # An array of args was requested
                 args
@@ -47,12 +47,12 @@ module Que
 
           Que::Scheduler::DefinedJob.create(
             name: name,
-            job_class: defined_job_hash['class'] || name,
-            queue: defined_job_hash['queue'],
+            job_class: defined_job_hash["class"] || name,
+            queue: defined_job_hash["queue"],
             args_array: args_array,
-            priority: defined_job_hash['priority'],
-            cron: defined_job_hash['cron'],
-            schedule_type: defined_job_hash['schedule_type']&.to_sym
+            priority: defined_job_hash["priority"],
+            cron: defined_job_hash["cron"],
+            schedule_type: defined_job_hash["schedule_type"]&.to_sym
           )
         end
       end

data/lib/que/scheduler/scheduler_job.rb

@@ -1,11 +1,11 @@
-require 'que'
+require "que"
 
-require_relative 'schedule'
-require_relative 'enqueueing_calculator'
-require_relative 'scheduler_job_args'
-require_relative 'state_checks'
-require_relative 'to_enqueue'
-require_relative 'version_support'
+require_relative "schedule"
+require_relative "enqueueing_calculator"
+require_relative "scheduler_job_args"
+require_relative "state_checks"
+require_relative "to_enqueue"
+require_relative "version_support"
 
 # The main job that runs every minute, determining what needs to be enqueued, enqueues the required
 # jobs, then re-enqueues itself.
@@ -29,7 +29,7 @@ module Que
             scheduler_job_args, scheduler_job_args.as_time, result.job_dictionary, enqueued_jobs
           )
           # Only now we're sure nothing errored, log the results
-          logs.each { |str| ::Que.log(event: 'que-scheduler'.to_sym, message: str) }
+          logs.each { |str| ::Que.log(event: "que-scheduler".to_sym, message: str) }
           destroy
         end
       end
@@ -51,7 +51,7 @@ module Que
                 else
                   # This can happen if a middleware nixes the enqueue call
                   "que-scheduler called enqueue on #{to_enqueue.job_class} " \
-                              'but it reported no job was scheduled. Has `enqueue` been overridden?'
+                              "but it reported no job was scheduled. Has `enqueue` been overridden?"
                 end
       end
 
@@ -71,7 +71,7 @@ module Que
 
         # rubocop:disable Style/GuardClause This reads better as a conditional
         unless Que::Scheduler::VersionSupport.job_attributes(enqueued_job).fetch(:job_id)
-          raise 'SchedulerJob could not self-schedule. Has `.enqueue` been monkey patched?'
+          raise "SchedulerJob could not self-schedule. Has `.enqueue` been monkey patched?"
         end
         # rubocop:enable Style/GuardClause
       end

data/lib/que/scheduler/scheduler_job_args.rb

@@ -1,6 +1,6 @@
-require 'hashie'
-require 'active_support'
-require 'active_support/time_with_zone'
+require "hashie"
+require "active_support"
+require "active_support/time_with_zone"
 
 # These are the args that are used for this particular run of the scheduler.
 module Que

data/lib/que/scheduler/state_checks.rb

@@ -1,6 +1,6 @@
-require_relative 'audit'
-require_relative 'db'
-require_relative 'migrations'
+require_relative "audit"
+require_relative "db"
+require_relative "migrations"
 
 module Que
   module Scheduler

data/lib/que/scheduler/to_enqueue.rb

@@ -1,4 +1,4 @@
-require 'que'
+require "que"
 
 # This module uses polymorphic dispatch to centralise the differences between supporting Que::Job
 # and other job systems.
@@ -23,13 +23,13 @@ module Que
         end
 
         def active_job_version
-          Gem.loaded_specs['activejob']&.version
+          Gem.loaded_specs["activejob"]&.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')
+          active_job_version && active_job_version > Gem::Version.create("5")
         end
 
         def active_job_version_supports_queues?
@@ -38,7 +38,7 @@ module Que
           # and readded in Rails 6.0.3
           # https://github.com/rails/rails/pull/38635
           ToEnqueue.active_job_version && ToEnqueue.active_job_version >=
-            Gem::Version.create('6.0.3')
+            Gem::Version.create("6.0.3")
         end
 
         private

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = '3.4.0'.freeze
+    VERSION = "3.4.1".freeze
   end
 end

data/lib/que/scheduler/version_support.rb

@@ -1,4 +1,4 @@
-require 'que'
+require "que"
 
 # The purpose of this module is to centralise the differences when supporting both que 0.x and
 # 1.x with the same gem.
@@ -15,7 +15,7 @@ module Que
         # the top of all jobs it enqueues.
         def set_priority(context, priority)
           if zero_major?
-            context.instance_variable_set('@priority', priority)
+            context.instance_variable_set("@priority", priority)
           else
             context.priority = priority
           end
@@ -24,7 +24,7 @@ module Que
         # Ensure the job runs at least once an hour when it is backing off due to errors
         def apply_retry_semantics(context)
           if zero_major?
-            context.instance_variable_set('@retry_interval', RETRY_PROC)
+            context.instance_variable_set("@retry_interval", RETRY_PROC)
           else
             context.maximum_retry_count = 1 << 128 # Heat death of universe
             context.retry_interval = RETRY_PROC
@@ -33,9 +33,9 @@ module Que
 
         def job_attributes(enqueued_job)
           if zero_major?
-            enqueued_job.attrs.transform_keys(&:to_sym)
+            enqueued_job.attrs.to_h.transform_keys(&:to_sym)
           else
-            enqueued_job.que_attrs.transform_keys(&:to_sym).tap do |hash|
+            enqueued_job.que_attrs.to_h.transform_keys(&:to_sym).tap do |hash|
               hash[:job_id] = hash.delete(:id)
             end
           end
@@ -48,7 +48,7 @@ module Que
         end
 
         def default_scheduler_queue
-          zero_major? ? '' : Que::DEFAULT_QUEUE
+          zero_major? ? "" : Que::DEFAULT_QUEUE
         end
 
         def running_synchronously?
@@ -56,18 +56,18 @@ module Que
         end
 
         def running_synchronously_code?
-          zero_major? ? 'Que.mode == :sync' : 'Que.run_synchronously = true'
+          zero_major? ? "Que.mode == :sync" : "Que.run_synchronously = true"
         end
 
         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 ||= Gem.loaded_specs["que"].version.to_s.split(".").first.to_i.zero?
         end
 
         private
 
         def normalise_array_of_hashes(array)
-          array.map { |row| row.transform_keys(&:to_sym) }
+          array.map { |row| row.to_h.transform_keys(&:to_sym) }
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-07 00:00:00.000000000 Z
+date: 2020-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport