sidecloq 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b27e2e4e4be57df8dd1786682b5b60581c56ad16
-  data.tar.gz: 9dff323de41c33ac48524b1ac8ab280790ec8b10
+  metadata.gz: dbb14d2cb9a6f7f0bffae45cd3ec7f00c8a2ad13
+  data.tar.gz: c44a7e5b308559bfb3c5d2bf10c108de1e9ff090
 SHA512:
-  metadata.gz: 9f23da51d63a47876d1030350f76d8d34b6486234bdcf53f8b9c7753b9b046cf23d46a1bb9aa632406a0ab3d7faae3a531083578f89802564b39b299ffe53619
-  data.tar.gz: c5db5145e7b68be1e43380874584465919e85f05597c550faf404349ea2f354753515b0533dc8d22fc013dc7778f8d4c7040746d9b444a9142cdea55813eb29b
+  metadata.gz: f613f8c63b1d6e3bd87682e740a1e56fdf2796be6b5488967cda62fbd5f9ce417382ca42ee3ae7ac3b3a3975636b13a03c518d80eee59c47e20ac245565cb2ea
+  data.tar.gz: 69f054480ede7d3318804bbff1d9b0b59c46b40210fa2cac10aea2691fb8d4912027537f48599c0803b4015f75b716830adbea0af39878efc4d77d4e2b0a9f0e

data/Gemfile

@@ -17,9 +17,11 @@ sidekiq_dep =
 
 gem 'sidekiq', sidekiq_dep
 
-# rack >= 2.0 requires ruby >= 2.2.2
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2.2")
+  # rack >= 2.0 requires ruby >= 2.2.2
   gem 'rack', '< 2.0'
+  # activejob >= 5 requires ruby >= 2.2.2
+  gem 'activejob', '< 5'
 end
 
 group :test do

data/README.md

@@ -14,8 +14,7 @@ Recurring / Periodic / Scheduled / Cron job extension for
 ## Why
 
 There are several options for running periodic tasks with Sidekiq,
-including [Sidetiq](https://github.com/tobiassvn/sidetiq),
-[sidekiq-scheduler](https://github.com/Moove-it/sidekiq-scheduler),
+including [sidekiq-scheduler](https://github.com/Moove-it/sidekiq-scheduler),
 [sidekiq-cron](https://github.com/ondrejbartas/sidekiq-cron), as well as
 [Sidekiq Pro](http://sidekiq.org/products/pro).  Each tackles the
 problem slightly differently. Sidecloq is inspired by various facets

data/Rakefile

@@ -35,6 +35,9 @@ task :web do
     config[:schedule] = sched
   end
 
+  class DoWork
+  end
+
   require 'sidekiq/web'
   require 'sidecloq/web'
 

data/lib/sidecloq.rb

@@ -9,6 +9,7 @@ require 'sidecloq/schedule'
 require 'sidecloq/locker'
 require 'sidecloq/scheduler'
 require 'sidecloq/runner'
+require 'sidecloq/job_enqueuer'
 require 'sidecloq/version'
 
 # Sideloq provides a lightweight recurring job scheduler for sidekiq

data/lib/sidecloq/job_enqueuer.rb

@@ -0,0 +1,34 @@
+module Sidecloq
+  class JobEnqueuer
+    attr_reader :spec, :klass
+
+    def initialize(spec)
+      @spec = spec
+      @klass = spec['class'].constantize
+    end
+
+    def enqueue
+      if active_job_class?
+        initialize_active_job_class.enqueue(queue: spec['queue'])
+      else
+        Sidekiq::Client.push(spec)
+      end
+    end
+
+    private unless $TESTING
+
+    def active_job_class?
+      defined?(ActiveJob::Base) && klass < ActiveJob::Base
+    end
+
+    def initialize_active_job_class
+      args = spec['args']
+
+      if args.is_a?(Array)
+        klass.new(*args)
+      else
+        klass.new(args)
+      end
+    end
+  end
+end

data/lib/sidecloq/scheduler.rb

@@ -65,15 +65,10 @@ module Sidecloq
 
       # failed enqueuing should not b0rk stuff
       begin
-        enqueue_job!(spec)
+        JobEnqueuer.new(spec).enqueue
       rescue => e
         logger.info "error enqueuing #{name} - #{e.class.name}: #{e.message}"
       end
     end
-
-    # can raise exceptions, but shouldn't
-    def enqueue_job!(spec)
-      Sidekiq::Client.push(spec)
-    end
   end
 end

data/lib/sidecloq/version.rb

@@ -1,3 +1,3 @@
 module Sidecloq
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/sidecloq/web.rb

@@ -15,7 +15,7 @@ module Sidecloq
 
         # rubocop:disable Lint/AssignmentInCondition
         if spec = Sidecloq::Schedule.from_redis.job_specs[job_name]
-          Sidekiq::Client.push(spec)
+          JobEnqueuer.new(spec).enqueue
         end
         # rubocop:enableLint/AssignmentInCondition
         redirect "#{root_path}recurring"

data/sidecloq.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'redis-namespace', '~> 1.5', '>= 1.5.2'
+  spec.add_development_dependency 'activejob'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidecloq
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Matt Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -126,6 +126,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: activejob
+  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: Recurring jobs for Sidekiq
 email:
 - robinson.matty@gmail.com
@@ -140,6 +154,7 @@ files:
 - README.md
 - Rakefile
 - lib/sidecloq.rb
+- lib/sidecloq/job_enqueuer.rb
 - lib/sidecloq/locker.rb
 - lib/sidecloq/runner.rb
 - lib/sidecloq/schedule.rb
@@ -169,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Recurring jobs for Sidekiq