que-scheduler 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50f99770c888127c3d20b6d5a9072fd529c3a6be
-  data.tar.gz: 3fedea8f36b9a322b4cc1b09b05eb1fab35789e8
+  metadata.gz: 308f6550dbe058549d79ccf73b5a7ff5752d43a0
+  data.tar.gz: 8f003e7a8b2a39c6c205f7f137365a80b7c70992
 SHA512:
-  metadata.gz: 5c406a1a4d22830795836f2bde623ed6b438f0c9e09fdc5bfaf15d5df3bd1385e924e208058241df8a06dc614ea10746d85e13e8d1d9c80022e972fade58c4be
-  data.tar.gz: '08cae05d301b647f98b85ffbf1512709b0c134d5432c73c02a3620e5f3914ecc56ce32ae8fb7b71c2cf6d6bca3d6a6873f8ed310aee7bbd0b8dcbfac6a441583'
+  metadata.gz: 8d9dc59a505942c3427508dc6322acc174711fed650b6c771b783331ff00eb9077675284c698d54c8eaa6659e5882ff32efa180ceb2dc1aecbee0e7457363515
+  data.tar.gz: 7c0dd0d36ec8d585448b1dbfa7f4df3b50916baab0d8991a263cad81abef57ce242686f5f53589a18da9ed83e46705c03f40e800648f2566bc0c22f89506f750

data/lib/que/scheduler.rb

@@ -1,3 +1,6 @@
 require 'que/scheduler/version'
 require 'que/scheduler/scheduler_job'
-require 'que/scheduler/engine' if Gem::Specification.find_by_name('railties')
+require 'que/scheduler/adapters/orm'
+# rubocop:disable Style/PreferredHashMethods
+require 'que/scheduler/engine' if Gem.loaded_specs.has_key?('railties')
+# rubocop:enable Style/PreferredHashMethods

data/lib/que/scheduler/adapters/orm.rb

@@ -0,0 +1,69 @@
+module Que
+  module Scheduler
+    module Adapters
+      module Orm
+        class AdapterBase
+          SCHEDULER_COUNT_SQL =
+            'SELECT COUNT(*) FROM que_jobs WHERE job_class = ' \
+            "'#{Que::Scheduler::SchedulerJob.name}'".freeze
+
+          def transaction
+            transaction_base.transaction do
+              yield
+            end
+          end
+
+          def count_schedulers
+            dml(SCHEDULER_COUNT_SQL).first.values.first.to_i
+          end
+        end
+
+        class ActiveRecordAdapter < AdapterBase
+          def transaction_base
+            ::ActiveRecord::Base
+          end
+
+          def dml(sql)
+            ::ActiveRecord::Base.connection.execute(sql)
+          end
+
+          def ddl(sql)
+            dml(sql)
+          end
+        end
+
+        class SequelAdapter < AdapterBase
+          def transaction_base
+            ::DB
+          end
+
+          def dml(sql)
+            ::DB.fetch(sql)
+          end
+
+          def ddl(sql)
+            ::DB.run(sql)
+          end
+        end
+
+        class << self
+          # The exposed mutator method here allows any future orm adapters to be tested.
+          attr_writer :instance
+
+          def instance
+            # rubocop:disable Style/PreferredHashMethods
+            @instance ||=
+              if Gem.loaded_specs.has_key?('activerecord')
+                ActiveRecordAdapter.new
+              elsif Gem.loaded_specs.has_key?('sequel')
+                SequelAdapter.new
+              else
+                raise 'No known ORM adapter is available for que-scheduler'
+              end
+            # rubocop:enable Style/PreferredHashMethods
+          end
+        end
+      end
+    end
+  end
+end

data/lib/que/scheduler/defined_job.rb

@@ -57,7 +57,7 @@ module Que
 
       class << self
         def defined_jobs
-          @defined_jobs ||= YAML.load_file(QUE_SCHEDULER_CONFIG_LOCATION).map do |k, v|
+          @defined_jobs ||= YAML.safe_load(IO.read(QUE_SCHEDULER_CONFIG_LOCATION)).map do |k, v|
             Que::Scheduler::DefinedJob.new(
               {
                 name: k,

data/lib/que/scheduler/scheduler_job.rb

@@ -7,14 +7,13 @@ require_relative 'scheduler_job_args'
 module Que
   module Scheduler
     class SchedulerJob < Que::Job
-      SCHEDULER_COUNT_SQL = "SELECT COUNT(*) FROM que_jobs WHERE job_class = '#{name}'".freeze
       SCHEDULER_FREQUENCY = 60
 
       # Always highest possible priority.
       @priority = 0
 
       def run(options = nil)
-        ::ActiveRecord::Base.transaction do
+        ::Que::Scheduler::Adapters::Orm.instance.transaction do
           assert_one_scheduler_job
           scheduler_job_args = SchedulerJobArgs.build(options)
           logs = ["que-scheduler last ran at #{scheduler_job_args.last_run_time}."]
@@ -37,7 +36,7 @@ module Que
       private
 
       def assert_one_scheduler_job
-        schedulers = ActiveRecord::Base.connection.execute(SCHEDULER_COUNT_SQL).first['count'].to_i
+        schedulers = ::Que::Scheduler::Adapters::Orm.instance.count_schedulers
         return if schedulers == 1
         raise "Only one #{self.class.name} should be enqueued. #{schedulers} were found."
       end

data/lib/que/scheduler/scheduler_job_args.rb

@@ -1,4 +1,6 @@
 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
@@ -17,6 +19,7 @@ module Que
               job_dictionary: []
             }
           else
+            options = options.symbolize_keys
             {
               last_run_time: Time.zone.parse(options.fetch(:last_run_time)),
               job_dictionary: options.fetch(:job_dictionary)

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.0.2'.freeze
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-06 00:00:00.000000000 Z
+date: 2018-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,217 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-description: A lightweight cron scheduler for the async job worker Que
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: que-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: zonebie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A lightweight cron scheduler for the Que async job worker
 email:
 - harry@harrylascelles.com
 executables: []
@@ -89,6 +299,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/que/scheduler.rb
+- lib/que/scheduler/adapters/orm.rb
 - lib/que/scheduler/defined_job.rb
 - lib/que/scheduler/engine.rb
 - lib/que/scheduler/enqueueing_calculator.rb