que-scheduler 0.8.1 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acd02f5b4f477baf80628e51ac7d957f6b35232f
-  data.tar.gz: 7d5c1f2070c8b23a3f68e8fae581d87da0aa35f2
+  metadata.gz: 0b426bc239a8d5810c33e8df0d62350ec1556c2a
+  data.tar.gz: 15dedc3ff27d43206d7fb9e7c97f592d3cb4847e
 SHA512:
-  metadata.gz: 27fcc0bc6221078c6b974347679b3afcf672c0a8f7406407cd3468c9e687ed935d6be9d53795792f7d22b3d22fe62df28dfe353e131b0fa576244321534c716e
-  data.tar.gz: 7c41e5d31b7416f44bf4fbc0ade84d93f2e94aa1f3b35485b366f58381034c017cda5e4c77cae91b4f77f9278a370eba99ca1f9351990a33c18b72f95c895a9a
+  metadata.gz: b87c40dd29f3aad6e85fa170bf0c855809cabbfa0a7f3793c2d19497b11def0f357135b3e13bf5a3eb5f865677314fbb8fd2b62a56450fe209f60a042fc1ab38
+  data.tar.gz: d7b98ae64b2c6b5400ba1e2e40b0dd7003f5545075926b16537c4ed70d4107ad633043fdcf7c5856ff18821544cdcac1cc59e72accf00fb5d5874420bfd23cc2

data/lib/que/scheduler.rb

@@ -1,2 +1,3 @@
 require 'que/scheduler/version'
 require 'que/scheduler/scheduler_job'
+require 'que/scheduler/engine' if Gem::Specification.find_by_name('railties')

data/lib/que/scheduler/engine.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'rails/engine'
+
+module Que
+  module Scheduler
+    class Engine < ::Rails::Engine
+      config.after_initialize do
+        # Trigger a load of the schedule to ensure fast fail if it is invalid.
+        ScheduleParser.defined_jobs
+      end
+    end
+  end
+end

data/lib/que/scheduler/schedule_parser.rb

@@ -9,29 +9,19 @@ module Que
       QUE_SCHEDULER_CONFIG_LOCATION =
         ENV.fetch('QUE_SCHEDULER_CONFIG_LOCATION', 'config/que_schedule.yml')
 
-      class << self
-        def scheduler_config
-          @scheduler_config ||= begin
-            jobs_list(YAML.load_file(QUE_SCHEDULER_CONFIG_LOCATION))
-          end
-        end
-
-        # Convert the config hash into a list of real classes and args, parsing the cron and
-        # "unmissable" parameters.
-        def jobs_list(schedule)
-          schedule.map do |k, v|
-            Que::Scheduler::DefinedJob.new(
-              {
-                name: k,
-                job_class: v['class'] || k,
-                queue: v['queue'],
-                args: v['args'],
-                priority: v['priority'],
-                cron: v['cron'],
-                unmissable: v['unmissable']
-              }.compact
-            )
-          end
+      def self.defined_jobs
+        @defined_jobs ||= YAML.load_file(QUE_SCHEDULER_CONFIG_LOCATION).map do |k, v|
+          Que::Scheduler::DefinedJob.new(
+            {
+              name: k,
+              job_class: v['class'] || k,
+              queue: v['queue'],
+              args: v['args'],
+              priority: v['priority'],
+              cron: v['cron'],
+              unmissable: v['unmissable']
+            }.compact
+          )
         end
       end
     end

data/lib/que/scheduler/scheduler_job.rb

@@ -57,7 +57,7 @@ module Que
       def enqueue_required_jobs(scheduler_job_args, logs)
         # Obtain the hash of missed jobs. Keys are the job classes, and the values are arrays
         # each containing more arrays for the arguments of that instance.
-        result = EnqueueingCalculator.parse(ScheduleParser.scheduler_config, scheduler_job_args)
+        result = EnqueueingCalculator.parse(ScheduleParser.defined_jobs, scheduler_job_args)
         result.missed_jobs.each do |job_class, args_arrays|
           args_arrays.each do |args|
             logs << "que-scheduler enqueueing #{job_class} with args: #{args}"

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = '0.8.1'.freeze
+    VERSION = '0.9.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.1
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-18 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -90,6 +90,7 @@ files:
 - README.md
 - lib/que/scheduler.rb
 - lib/que/scheduler/defined_job.rb
+- lib/que/scheduler/engine.rb
 - lib/que/scheduler/enqueueing_calculator.rb
 - lib/que/scheduler/schedule_parser.rb
 - lib/que/scheduler/scheduler_job.rb