que-scheduler 3.2.4 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38a2b7875c377e5464a1c7765a97fbeb7f1619d6ec9d2425278d95faa33b60ee
-  data.tar.gz: 2770026bd29d9e08dd7bf45fa82814e2cec5a7bbf18e656e6003854e5f839822
+  metadata.gz: 53c67a2992ebec58fd5f78b27d498b3c57fc3d96e12418eef44f107137c4e87d
+  data.tar.gz: 9327a0ad5ec9f30ab8a21a83adb6b7ddc288816c94a159bb75a5255c82a6f199
 SHA512:
-  metadata.gz: 4a14e16dfe2cb57b90249d3b16747ce92a7a6716bdd79627648df3d8059e1dd0ee86181ee558386ff68a987a4929e90fe19148a26752ee65f58d63be141e962a
-  data.tar.gz: 0674f778f0e1bd9c38927426a9699cb20ff4e8a7b08a8b96807be66cb252295460779f660357b83e9a0893a8147c2e11627ff81e675b0840c602b6642df098ea
+  metadata.gz: d975f2f8bfaef54fd7356b7339da8fb12c5d2333b3c719de122d23cd409ba64ef9159443a98b7a960033fddc8d77739783fec4585846463b26e4b0f021c41d16
+  data.tar.gz: 588bec202c190e898fffe4bb0c5188b1439dca86ead2d0b160a2b170f879e72d3f12374bd766787f53c62c30c2d2331327c1563274dd954a82d06746db3f805e

data/lib/que/scheduler/audit.rb

@@ -22,10 +22,10 @@ module Que
 
       class << self
         def append(scheduler_job_id, executed_at, enqueued_jobs)
-          ::Que.execute(INSERT_AUDIT, [scheduler_job_id, executed_at])
+          ::Que::Scheduler::VersionSupport.execute(INSERT_AUDIT, [scheduler_job_id, executed_at])
           enqueued_jobs.each do |j|
             attrs = Que::Scheduler::VersionSupport.job_attributes(j)
-            inserted = ::Que.execute(
+            inserted = ::Que::Scheduler::VersionSupport.execute(
               INSERT_AUDIT_ENQUEUED,
               [scheduler_job_id] +
                 attrs.values_at(:job_class, :queue, :priority, :args, :job_id, :run_at)

data/lib/que/scheduler/config.rb

@@ -1,4 +1,5 @@
 require 'que'
+require_relative 'version_support'
 
 module Que
   module Scheduler
@@ -14,6 +15,7 @@ module Que
     class Configuration
       attr_accessor :schedule_location
       attr_accessor :transaction_adapter
+      attr_accessor :que_scheduler_queue
     end
   end
 end
@@ -21,4 +23,5 @@ end
 Que::Scheduler.configure do |config|
   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

@@ -11,11 +11,11 @@ module Que
 
       class << self
         def count_schedulers
-          Que.execute(SCHEDULER_COUNT_SQL).first.values.first.to_i
+          Que::Scheduler::VersionSupport.execute(SCHEDULER_COUNT_SQL).first.values.first.to_i
         end
 
         def now
-          Que.execute(NOW_SQL).first.values.first
+          Que::Scheduler::VersionSupport.execute(NOW_SQL).first.values.first
         end
 
         def transaction

data/lib/que/scheduler/migrations.rb

@@ -27,13 +27,15 @@ module Que
         end
 
         def db_version
-          return Que.execute(TABLE_COMMENT).first[:description].to_i if audit_table_exists?
+          if audit_table_exists?
+            return Que::Scheduler::VersionSupport.execute(TABLE_COMMENT).first[:description].to_i
+          end
 
           Que::Scheduler::Db.count_schedulers.zero? ? 0 : 1
         end
 
         def audit_table_exists?
-          result = Que.execute(<<-SQL)
+          result = Que::Scheduler::VersionSupport.execute(<<-SQL)
             SELECT * FROM information_schema.tables WHERE table_name = '#{AUDIT_TABLE_NAME}';
           SQL
           result.any?
@@ -52,10 +54,11 @@ module Que
         end
 
         def execute_step(number, direction)
-          Que.execute(IO.read("#{__dir__}/migrations/#{number}/#{direction}.sql"))
+          sql = IO.read("#{__dir__}/migrations/#{number}/#{direction}.sql")
+          Que::Scheduler::VersionSupport.execute(sql)
           return unless audit_table_exists?
 
-          Que.execute(
+          Que::Scheduler::VersionSupport.execute(
             "COMMENT ON TABLE que_scheduler_audit IS '#{direction == :up ? number : number - 1}'"
           )
         end

data/lib/que/scheduler/scheduler_job.rb

@@ -72,6 +72,7 @@ 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

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = '3.2.4'.freeze
+    VERSION = '3.2.5'.freeze
   end
 end

data/lib/que/scheduler/version_support.rb

@@ -13,6 +13,20 @@ module Que
         def job_attributes(enqueued_job)
           enqueued_job.attrs.transform_keys(&:to_sym)
         end
+
+        # Between Que 0.x and 1.x the result of `Que.execute` changed keys from strings to symbols.
+        # Here we wrap the concept and make sure either way produces symbols
+        def execute(str, args = [])
+          normalise_array_of_hashes(Que.execute(str, args))
+        end
+
+        def default_scheduler_queue
+          ''
+        end
+
+        def normalise_array_of_hashes(array)
+          array.map { |row| row.transform_keys(&:to_sym) }
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.5
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-14 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -230,16 +230,16 @@ dependencies:
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -260,14 +260,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.61'
+        version: 0.63.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.61'
+        version: 0.63.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement