sidekiq-cron 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8adf66042c715b918d56ac413f033f713fb0cfb0
-  data.tar.gz: 44d64bdf7d9e1329510fece42e186c35776ed85d
+  metadata.gz: 7b46a8aee85dbf5b066d34641a17f4f34ff7307f
+  data.tar.gz: b3d6a7566616aaa7ac5489289f5972432027d5a2
 SHA512:
-  metadata.gz: 1e0b4a1f7cd40f4e4db9d15ebc37cebb2afbf1249b8107be50557e72f93f8100da2c85bb1349a8125de0ba529b77c17c17ca7ff077883118c9cb655f33f5f4e9
-  data.tar.gz: 3487319de6f4626be8704a91f5767ba24505e88385b06b9df43b6818451dcc90e8246c110c1084d290e9fbfabe8d44831b8949f4277c80c1393287639f7714e4
+  metadata.gz: 2d4ef330692ca3f9ea1ca7c9784cec17d8b13b15364426c0b25d604bccf87b39e3bd6e2d1b6c7bd12a52661c8d9675f495ab8f36a8c58bc44960e8dd566a87ef
+  data.tar.gz: 974512d9821df1ec95296be13cd51f4e5490f04eca4b65bc3be2e41756af4570cbde023e1c2a1020187a404507087b3a133173c03b79b8d8ff8a9fe0a04ba7fa

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'sidekiq', '>= 4.0.0'
+gem 'sidekiq', '>= 4.2.1'
 gem 'rufus-scheduler', '>= 2.0.24'
 gem 'redis-namespace', '>= 1.5.2'
 

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/sidekiq/cron/job.rb

@@ -54,24 +54,50 @@ module Sidekiq
               nil
             end
 
-        if @active_job or defined?(ActiveJob::Base) && klass_const && klass_const < ActiveJob::Base
-          Sidekiq::Client.push(active_job_message)
+        if klass_const
+          if defined?(ActiveJob::Base) && klass_const < ActiveJob::Base
+            enqueue_active_job(klass_const)
+          else
+            enqueue_sidekiq_worker(klass_const)
+          end
         else
-          Sidekiq::Client.push(sidekiq_worker_message)
+          if @active_job
+            Sidekiq::Client.push(active_job_message)
+          else
+            Sidekiq::Client.push(sidekiq_worker_message)
+          end
         end
 
         save
         logger.debug { "enqueued #{@name}: #{@message}" }
       end
 
+      def is_active_job?
+        @active_job || defined?(ActiveJob::Base) && @klass.to_s.constantize < ActiveJob::Base
+      rescue NameError
+        false
+      end
+
+      def enqueue_active_job(klass_const)
+        klass_const.set(queue: @queue_name_with_prefix).perform_later(*@args)
+
+        true
+      end
+
+      def enqueue_sidekiq_worker(klass_const)
+        klass_const.set(queue: @queue_name_with_prefix).perform_async(*@args)
+
+        true
+      end
+
       # siodekiq worker message
       def sidekiq_worker_message
         @message.is_a?(String) ? Sidekiq.load_json(@message) : @message
       end
 
-      # active job has different structure how it is loading data from sidekiq
-      # queue, it createaswrapper arround job
-      def active_job_message
+      def queue_name_with_prefix
+        return @queue unless is_active_job?
+
         if !"#{@active_job_queue_name_delimiter}".empty?
           queue_name_delimiter = @active_job_queue_name_delimiter
         elsif defined?(ActiveJob::Base) && defined?(ActiveJob::Base.queue_name_delimiter) && !ActiveJob::Base.queue_name_delimiter.empty?
@@ -88,14 +114,20 @@ module Sidekiq
           queue_name = @queue
         end
 
+        queue_name
+      end
+
+      # active job has different structure how it is loading data from sidekiq
+      # queue, it createaswrapper arround job
+      def active_job_message
         {
           'class'        => 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper',
-          'queue'        => queue_name,
+          'queue'        => @queue_name_with_prefix,
           'description'  => @description,
           'args'         => [{
             'job_class'  => @klass,
             'job_id'     => SecureRandom.uuid,
-            'queue_name' => queue_name,
+            'queue_name' => @queue_name_with_prefix,
             'arguments'  => @args
           }]
         }
@@ -289,6 +321,7 @@ module Sidekiq
           @message = message_data
         end
 
+        @queue_name_with_prefix = queue_name_with_prefix
       end
 
       def status

data/lib/sidekiq/cron/web_extension.rb

@@ -7,7 +7,7 @@ module Sidekiq
         app.settings.locales << File.join(File.expand_path("..", __FILE__), "locales")
 
         #index page of cron jobs
-        app.get '/cron' do   
+        app.get '/cron' do
           view_path    = File.join(File.expand_path("..", __FILE__), "views")
 
           @cron_jobs = Sidekiq::Cron::Job.all
@@ -21,37 +21,37 @@ module Sidekiq
         end
 
         #enque cron job
-        app.post '/cron/:name/enque' do |name|
-          if job = Sidekiq::Cron::Job.find(name)
+        app.post '/cron/:name/enque' do
+          if job = Sidekiq::Cron::Job.find(route_params[:name])
             job.enque!
           end
           redirect "#{root_path}cron"
         end
 
         #delete schedule
-        app.post '/cron/:name/delete' do |name|
-          if job = Sidekiq::Cron::Job.find(name)
+        app.post '/cron/:name/delete' do
+          if job = Sidekiq::Cron::Job.find(route_params[:name])
             job.destroy
           end
           redirect "#{root_path}cron"
         end
 
         #enable job
-        app.post '/cron/:name/enable' do |name|
-          if job = Sidekiq::Cron::Job.find(name)
+        app.post '/cron/:name/enable' do
+          if job = Sidekiq::Cron::Job.find(route_params[:name])
             job.enable!
           end
           redirect "#{root_path}cron"
         end
 
         #disable job
-        app.post '/cron/:name/disable' do |name|
-          if job = Sidekiq::Cron::Job.find(name)
+        app.post '/cron/:name/disable' do
+          if job = Sidekiq::Cron::Job.find(route_params[:name])
             job.disable!
           end
           redirect "#{root_path}cron"
         end
-        
+
       end
     end
   end

data/sidekiq-cron.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sidekiq-cron 0.4.3 ruby lib
+# stub: sidekiq-cron 0.4.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron".freeze
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Ondrej Bartas".freeze]
-  s.date = "2016-08-18"
+  s.date = "2016-09-22"
   s.description = "Enables to set jobs to be run in specified time (using CRON notation)".freeze
   s.email = "ondrej@bartas.cz".freeze
   s.extra_rdoc_files = [
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sidekiq>.freeze, [">= 4.0.0"])
+      s.add_runtime_dependency(%q<sidekiq>.freeze, [">= 4.2.1"])
       s.add_runtime_dependency(%q<rufus-scheduler>.freeze, [">= 2.0.24"])
       s.add_runtime_dependency(%q<redis-namespace>.freeze, [">= 1.5.2"])
       s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
@@ -74,7 +74,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<coveralls>.freeze, [">= 0"])
       s.add_development_dependency(%q<shotgun>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<sidekiq>.freeze, [">= 4.0.0"])
+      s.add_dependency(%q<sidekiq>.freeze, [">= 4.2.1"])
       s.add_dependency(%q<rufus-scheduler>.freeze, [">= 2.0.24"])
       s.add_dependency(%q<redis-namespace>.freeze, [">= 1.5.2"])
       s.add_dependency(%q<bundler>.freeze, [">= 0"])
@@ -93,7 +93,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shotgun>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<sidekiq>.freeze, [">= 4.0.0"])
+    s.add_dependency(%q<sidekiq>.freeze, [">= 4.2.1"])
     s.add_dependency(%q<rufus-scheduler>.freeze, [">= 2.0.24"])
     s.add_dependency(%q<redis-namespace>.freeze, [">= 1.5.2"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])

data/test/test_helper.rb

@@ -32,7 +32,7 @@ require 'sidekiq/web'
 Sidekiq.logger.level = Logger::ERROR
 
 require 'sidekiq/redis_connection'
-redis_url = ENV['REDIS_URL'] || 'redis://localhost/15'
+redis_url = ENV['REDIS_URL'] || 'redis://0.0.0.0:6379'
 REDIS = Sidekiq::RedisConnection.create(:url => redis_url, :namespace => 'testy')
 
 Sidekiq.configure_client do |config|
@@ -61,3 +61,32 @@ class CronTestClassWithQueue
     puts "super croned job #{args}"
   end
 end
+
+module ActiveJob
+  class Base
+    def self.queue_name_prefix
+      @queue_name_prefix
+    end
+
+    def self.queue_name_prefix=(queue_name_prefix)
+      @queue_name_prefix = queue_name_prefix
+    end
+
+    def self.set(options)
+      @queue = options['queue']
+
+      self
+    end
+
+    def self.perform_later(*args)
+      {
+        "job_class"  => self.class.name,
+        "queue_name" => @queue,
+        "args"  => [*args],
+      }
+    end
+  end
+end
+
+class ActiveJobCronTestClass < ActiveJob::Base
+end

data/test/unit/job_test.rb

@@ -2,7 +2,6 @@
 require './test/test_helper'
 
 describe "Cron Job" do
-
   before do
     #clear all previous saved data from redis
     Sidekiq.redis do |conn|
@@ -260,23 +259,12 @@ describe "Cron Job" do
   describe '#active_job_message' do
     before do
       SecureRandom.stubs(:uuid).returns('XYZ')
-      module ActiveJob
-        class Base
-          def self.queue_name_prefix
-            @@queue_name_prefix
-          end
-          def self.queue_name_prefix=(queue_name_prefix)
-            @@queue_name_prefix = queue_name_prefix
-          end
-        end
-      end
-      class ActiveJobTest < ActiveJob::Base; end
       ActiveJob::Base.queue_name_prefix = ''
 
       @args = {
         name:  'Test',
         cron:  '* * * * *',
-        klass: 'ActiveJobTest',
+        klass: 'ActiveJobCronTestClass',
         queue: 'super_queue',
         description: nil,
         args:  { foo: 'bar' }
@@ -290,7 +278,7 @@ describe "Cron Job" do
         'queue'       => 'super_queue',
         'description' => nil,
         'args'        => [{
-          'job_class'  => 'ActiveJobTest',
+          'job_class'  => 'ActiveJobCronTestClass',
           'job_id'     => 'XYZ',
           'queue_name' => 'super_queue',
           'arguments'  => [{foo: 'bar'}]
@@ -303,23 +291,12 @@ describe "Cron Job" do
   describe '#active_job_message with queue_name_prefix' do
     before do
       SecureRandom.stubs(:uuid).returns('XYZ')
-      module ActiveJob
-        class Base
-          def self.queue_name_prefix
-            @@queue_name_prefix
-          end
-          def self.queue_name_prefix=(queue_name_prefix)
-            @@queue_name_prefix = queue_name_prefix
-          end
-        end
-      end
-      class ActiveJobTest < ActiveJob::Base; end
       ActiveJob::Base.queue_name_prefix = "prefix"
 
       @args = {
         name:  'Test',
         cron:  '* * * * *',
-        klass: 'ActiveJobTest',
+        klass: 'ActiveJobCronTestClass',
         queue: 'super_queue',
         queue_name_prefix: 'prefix',
         args:  { foo: 'bar' }
@@ -333,7 +310,7 @@ describe "Cron Job" do
         'queue' => 'prefix_super_queue',
         'description' => nil,
         'args'  =>[{
-          'job_class'  => 'ActiveJobTest',
+          'job_class'  => 'ActiveJobCronTestClass',
           'job_id'     => 'XYZ',
           'queue_name' => 'prefix_super_queue',
           'arguments'  => [{foo: 'bar'}]
@@ -346,71 +323,45 @@ describe "Cron Job" do
   describe '#enque!' do
     describe 'active job' do
       before do
-        module ActiveJob
-          class Base
-            def self.queue_name_prefix
-              @@queue_name_prefix
-            end
-            def self.queue_name_prefix=(queue_name_prefix)
-              @@queue_name_prefix = queue_name_prefix
-            end
-          end
-        end
-        class ActiveJobTest < ActiveJob::Base; end
-        ActiveJob::Base.queue_name_prefix = ""
-
         @args = {
           name:  'Test',
           cron:  '* * * * *',
-          klass: 'ActiveJobTest'
+          klass: 'ActiveJobCronTestClass'
         }
         @job = Sidekiq::Cron::Job.new(@args)
       end
 
       it 'pushes to queue active jobs message' do
-        @job.expects(:active_job_message)
-          .returns('class' => 'Test', 'args' => [])
+        @job.expects(:enqueue_active_job)
+            .returns(true)
         @job.enque!
       end
     end
 
     describe 'active job with queue_name_prefix' do
       before do
-        module ActiveJob
-          class Base
-            def self.queue_name_prefix
-              @@queue_name_prefix
-            end
-            def self.queue_name_prefix=(queue_name_prefix)
-              @@queue_name_prefix = queue_name_prefix
-            end
-          end
-        end
-        class ActiveJobTest < ActiveJob::Base; end
-        ActiveJob::Base.queue_name_prefix = "prefix"
-
         @args = {
           name:  'Test',
           cron:  '* * * * *',
-          klass: 'ActiveJobTest',
+          klass: 'ActiveJobCronTestClass',
           queue: 'cron'
         }
         @job = Sidekiq::Cron::Job.new(@args)
       end
 
       it 'pushes to queue active jobs message with queue_name_prefix' do
-        @job.expects(:active_job_message)
-          .returns('class' => 'Test', 'args' => [], 'queue' => 'prefix_cron')
+        @job.expects(:enqueue_active_job)
+            .returns(true)
         @job.enque!
       end
     end
 
-    describe 'active job via configuration (bool: true)' do
+    describe 'active job via configuration (bool: true) [unknown class]' do
       before do
         @args = {
           name:  'Test',
           cron:  '* * * * *',
-          klass: 'ActiveJobTest',
+          klass: 'UnknownClass',
           active_job: true
         }
         @job = Sidekiq::Cron::Job.new(@args)
@@ -418,17 +369,17 @@ describe "Cron Job" do
 
       it 'pushes to queue active jobs message' do
         @job.expects(:active_job_message)
-          .returns('class' => 'Test', 'args' => [])
+          .returns('class' => 'UnknownClass', 'args' => [])
         @job.enque!
       end
     end
 
-    describe 'active job via configuration (string: true)' do
+    describe 'active job via configuration (string: true) [unknown class]' do
       before do
         @args = {
           name:  'Test',
           cron:  '* * * * *',
-          klass: 'ActiveJobTest',
+          klass: 'UnknownClass',
           active_job: 'true'
         }
         @job = Sidekiq::Cron::Job.new(@args)
@@ -436,17 +387,17 @@ describe "Cron Job" do
 
       it 'pushes to queue active jobs message' do
         @job.expects(:active_job_message)
-          .returns('class' => 'Test', 'args' => [])
+          .returns('class' => 'UnknownClass', 'args' => [])
         @job.enque!
       end
     end
 
-    describe 'active job via configuration (string: yes)' do
+    describe 'active job via configuration (string: yes) [unknown class]' do
       before do
         @args = {
           name:  'Test',
           cron:  '* * * * *',
-          klass: 'ActiveJobTest',
+          klass: 'UnknownClass',
           active_job: 'yes'
         }
         @job = Sidekiq::Cron::Job.new(@args)
@@ -454,17 +405,17 @@ describe "Cron Job" do
 
       it 'pushes to queue active jobs message' do
         @job.expects(:active_job_message)
-          .returns('class' => 'Test', 'args' => [])
+          .returns('class' => 'UnknownClass', 'args' => [])
         @job.enque!
       end
     end
 
-    describe 'active job via configuration (number: 1)' do
+    describe 'active job via configuration (number: 1) [unknown class]' do
       before do
         @args = {
           name:  'Test',
           cron:  '* * * * *',
-          klass: 'ActiveJobTest',
+          klass: 'UnknownClass',
           active_job: 1
         }
         @job = Sidekiq::Cron::Job.new(@args)
@@ -472,17 +423,17 @@ describe "Cron Job" do
 
       it 'pushes to queue active jobs message' do
         @job.expects(:active_job_message)
-          .returns('class' => 'Test', 'args' => [])
+          .returns('class' => 'UnknownClass', 'args' => [])
         @job.enque!
       end
     end
 
-    describe 'active job via configuration with queue_name_prefix option' do
+    describe 'active job via configuration with queue_name_prefix option [unknown class]' do
       before do
         @args = {
           name:  'Test',
           cron:  '* * * * *',
-          klass: 'ActiveJobTest',
+          klass: 'UnknownClass',
           queue: 'cron',
           active_job: true,
           queue_name_prefix: 'prefix'
@@ -492,7 +443,7 @@ describe "Cron Job" do
 
       it 'pushes to queue active jobs message with queue_name_prefix' do
         @job.expects(:active_job_message)
-          .returns('class' => 'Test', 'args' => [], 'queue' => 'prefix_cron')
+          .returns('class' => 'UnknownClass', 'args' => [], 'queue' => 'prefix_cron')
         @job.enque!
       end
     end
@@ -508,8 +459,8 @@ describe "Cron Job" do
       end
 
       it 'pushes to queue active jobs message' do
-        @job.expects(:sidekiq_worker_message)
-          .returns('class' => 'Test', 'args' => [])
+        @job.expects(:enqueue_sidekiq_worker)
+            .returns(true)
         @job.enque!
       end
     end
@@ -526,7 +477,8 @@ describe "Cron Job" do
       end
 
       it 'pushes to queue sidekiq worker message' do
-        assert_equal @job.sidekiq_worker_message, { 'class' => 'UnknownClass', 'args' => [], 'queue' => 'another' }
+        @job.expects(:sidekiq_worker_message)
+            .returns('class' => 'UnknownClass', 'args' => [], 'queue' => 'another')
         @job.enque!
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement