sidekiq-cron 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e36b7b669446980725e708550d8a4c468a155f42
-  data.tar.gz: b95a3e582638be3924da88fcd45d2c8e5f6e1826
+  metadata.gz: bcc4ae725097b1fc4a42a3c8f0b211f10dd1a046
+  data.tar.gz: 50589e96e308bd347d29e917ee8d7c31b00d3782
 SHA512:
-  metadata.gz: 333bab73a66a5fc2dcc80646a7cd1a64a34ba9e3c92f46bc31560b7b0b774caaf949864b11d2a63d2571a51c280ce9147b2a64ddc626e7c150b5d01dfcaf2cd6
-  data.tar.gz: 4f14cf44af1f6c610a7e411577f7a6555b15fb25d19f3909db96461db03c42d22098d50af826b3f54f6d37acbcdfed613f048a81db4bca7fbdf7952cad1ec11a
+  metadata.gz: 46b8ae7aa71d31dd693f0a3cf5035ed5f06bbf174da2a742de270c3c9d9d2fc6428b4bc26ca4d71a0028254e4a0b0f1228483906d544f5c92a9f40b0cc3a3eef
+  data.tar.gz: 1819f9a1eec1a60c0f1348df9a28747eedab16e4673e10dbfccd3ae62a5b82911f11a6f90dbc1962d664021579f4b723b8d6b97c028bbc9d471af495ead82a6f

data/Changes.md

@@ -2,7 +2,7 @@ v 0.3.1
 -------
 
 - add CSRF tags to forms so it will work with sidekiq >= 3.4.2
-- remove titl dependency
+- remove tilt dependency
 
 v 0.3.0
 -------

data/Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'sidekiq', '>= 2.17.3'
+gem 'sidekiq', '>= 4.0.0'
 gem 'rufus-scheduler', '>= 2.0.24'
+gem 'redis-namespace', '>= 1.5.2'
 
 group :development do
   gem 'bundler'

data/README.md

@@ -18,7 +18,7 @@ Requirements
 -----------------
 
 - Redis 2.4 or greater is required.
-- Sidekiq 2.17.3 or grater is required.
+- Sidekiq 4 or grater is required (for Sidekiq <4 use version sidekiq-cron 0.3.1)
 
 Change Log
 ----------
@@ -47,16 +47,18 @@ _Job properties_:
 {
  'name'  => 'name_of_job', #must be uniq!
  'cron'  => '1 * * * *',
- 'klass' => 'MyClass',
+ 'class' => 'MyClass',
  #OPTIONAL
  'queue' => 'name of queue',
- 'args'  => '[Array or Hash] of arguments which will be passed to perform method'
+ 'args'  => '[Array or Hash] of arguments which will be passed to perform method',
+ 'active_job' => true,  # enqueue job through rails 4.2+ active job interface
+ 'queue_name_prefix' => 'prefix' # rails 4.2+ active job queue with prefix
 }
 ```
 
 ### Time, cron and sidekiq-cron
 
-Cron line is always evaluated against UTC time. So if you are in Prague (timezone +02:00) and you want a job to be enqueued at 8:30 AM, you will need to adjust cronline to `30 6 * * *`.
+sidekiq-cron uses [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) to parse the cronline. By default, the timezone this is evaluated against will be the system time of the machine you are running on. If you want to have your jobs enqueued based on a different time zone you can specify a timezone in the cronline, like this `'0 22 * * 1-5 America/Chicago'`. See [rufus-scheduler documentation](https://github.com/jmettraux/rufus-scheduler#a-note-about-timezones) for more information.
 
 ### What objects/classes can be scheduled
 #### Sidekiq Worker
@@ -92,14 +94,14 @@ class HardWorker
   end
 end
 
-Sidekiq::Cron::Job.create(name: 'Hard worker - every 5min', cron: '*/5 * * * *', klass: 'HardWorker')
+Sidekiq::Cron::Job.create(name: 'Hard worker - every 5min', cron: '*/5 * * * *', class: 'HardWorker')
 # => true
 ```
 
 `create` method will return only true/false if job was saved or not.
 
 ```ruby
-job = Sidekiq::Cron::Job.new(name: 'Hard worker - every 5min', cron: '*/5 * * * *', klass: 'HardWorker')
+job = Sidekiq::Cron::Job.new(name: 'Hard worker - every 5min', cron: '*/5 * * * *', class: 'HardWorker')
 
 if job.valid?
   job.save
@@ -180,7 +182,7 @@ second_job:
 #initializers/sidekiq.rb
 schedule_file = "config/schedule.yml"
 
-if File.exists?(schedule_file)
+if File.exists?(schedule_file) && Sidekiq.server?
   Sidekiq::Cron::Job.load_from_hash YAML.load_file(schedule_file)
 end
 ```

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/sidekiq-cron.rb

@@ -1,4 +1,2 @@
-
 require "sidekiq"
-
-require "sidekiq/cron"
+require "sidekiq/cron"

data/lib/sidekiq/cron.rb

@@ -1,11 +1,6 @@
 require "sidekiq/cron/job"
-
-#require poller only if celluloid is defined
-if defined?(Celluloid)
-  require 'celluloid/autostart'
-  require "sidekiq/cron/poller"
-  require "sidekiq/cron/launcher"
-end
+require "sidekiq/cron/poller"
+require "sidekiq/cron/launcher"
 
 module Sidekiq
   module Cron

data/lib/sidekiq/cron/job.rb

@@ -1,6 +1,5 @@
 require 'sidekiq'
 require 'sidekiq/util'
-require 'sidekiq/actor'
 require 'rufus-scheduler'
 
 module Sidekiq
@@ -45,7 +44,7 @@ module Sidekiq
       def enque! time = Time.now
         @last_enqueue_time = time
 
-        if defined?(ActiveJob::Base) && @klass.to_s.constantize < ActiveJob::Base
+        if @active_job or defined?(ActiveJob::Base) && @klass.to_s.constantize < ActiveJob::Base
           Sidekiq::Client.push(active_job_message)
         else
           Sidekiq::Client.push(sidekiq_worker_message)
@@ -63,13 +62,22 @@ module Sidekiq
       # active job has different structure how it is loading data from sidekiq
       # queue, it createaswrapper arround job
       def active_job_message
+        if !"#{@active_job_queue_name_prefix}".empty?
+          queue_name = "#{@active_job_queue_name_prefix}_#{@queue}"
+        elsif defined?(ActiveJob::Base) && defined?(ActiveJob::Base.queue_name_prefix) && !"#{ActiveJob::Base.queue_name_prefix}".empty?
+          queue_name = "#{ActiveJob::Base.queue_name_prefix}_#{@queue}"
+        else
+          queue_name = @queue
+        end
+
         {
-          'class' => 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper',
-          'queue' => @queue,
-          'args'  => [{
+          'class'        => 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper',
+          'queue'        => queue_name,
+          'description'  => @description,
+          'args'         => [{
             'job_class'  => @klass,
             'job_id'     => SecureRandom.uuid,
-            'queue_name' => @queue,
+            'queue_name' => queue_name,
             'arguments'  => @args
           }]
         }
@@ -79,9 +87,10 @@ module Sidekiq
       # input structure should look like:
       # {
       #   'name_of_job' => {
-      #     'class' => 'MyClass',
-      #     'cron'  => '1 * * * *',
-      #     'args'  => '(OPTIONAL) [Array or Hash]'
+      #     'class'       => 'MyClass',
+      #     'cron'        => '1 * * * *',
+      #     'args'        => '(OPTIONAL) [Array or Hash]',
+      #     'description' => '(OPTIONAL) Description of job'
       #   },
       #   'My super iber cool job' => {
       #     'class' => 'SecondClass',
@@ -108,10 +117,11 @@ module Sidekiq
       # input structure should look like:
       # [
       #   {
-      #     'name'  => 'name_of_job',
-      #     'class' => 'MyClass',
-      #     'cron'  => '1 * * * *',
-      #     'args'  => '(OPTIONAL) [Array or Hash]'
+      #     'name'        => 'name_of_job',
+      #     'class'       => 'MyClass',
+      #     'cron'        => '1 * * * *',
+      #     'args'        => '(OPTIONAL) [Array or Hash]',
+      #     'description' => '(OPTIONAL) Description of job'
       #   },
       #   {
       #     'name'  => 'Cool Job for Second Class',
@@ -190,7 +200,7 @@ module Sidekiq
         end
       end
 
-      attr_accessor :name, :cron, :klass, :args, :message
+      attr_accessor :name, :cron, :description, :klass, :args, :message
       attr_reader   :last_enqueue_time
 
       def initialize input_args = {}
@@ -198,6 +208,7 @@ module Sidekiq
 
         @name = args["name"]
         @cron = args["cron"]
+        @description = args["description"] if args["description"]
 
         #get class from klass or class
         @klass = args["klass"] || args["class"]
@@ -215,6 +226,9 @@ module Sidekiq
         #get right arguments for job
         @args = args["args"].nil? ? [] : parse_args( args["args"] )
 
+        @active_job = args["active_job"] == true || ("#{args["active_job"]}" =~ (/^(true|t|yes|y|1)$/i)) == 0 || false
+        @active_job_queue_name_prefix = args["queue_name_prefix"]
+
         if args["message"]
           @message = args["message"]
           message_data = Sidekiq.load_json(@message) || {}
@@ -268,6 +282,14 @@ module Sidekiq
         save
       end
 
+      def enabled?
+        @status == "enabled"
+      end
+
+      def disabled?
+        !enabled?
+      end
+
       def status_from_redis
         out = "enabled"
         if exists?
@@ -294,9 +316,12 @@ module Sidekiq
           name: @name,
           klass: @klass,
           cron: @cron,
+          description: @description,
           args: @args.is_a?(String) ? @args : Sidekiq.dump_json(@args || []),
           message: @message.is_a?(String) ? @message : Sidekiq.dump_json(@message || {}),
           status: @status,
+          active_job: @active_job,
+          queue_name_prefix: @active_job_queue_name_prefix,
           last_enqueue_time: @last_enqueue_time,
         }
       end
@@ -409,7 +434,7 @@ module Sidekiq
       end
 
       def formated_last_time now = Time.now
-        last_time(now).getutc
+        last_time(now).getutc.iso8601
       end
 
       def self.exists? name

data/lib/sidekiq/cron/launcher.rb

@@ -1,7 +1,7 @@
-#require  Sidekiq original launcher
+# require  Sidekiq original launcher
 require 'sidekiq/launcher'
 
-#require cron poller
+# require cron poller
 require 'sidekiq/cron/poller'
 
 # For Cron we need to add some methods to Launcher
@@ -11,39 +11,43 @@ require 'sidekiq/cron/poller'
 # adding start and stop commands to launcher
 module Sidekiq
   class Launcher
-
-    #Add cron poller to launcher
+    # Add cron poller to launcher
     attr_reader :cron_poller
 
-
-    #remember old initialize
+    # remember old initialize
     alias_method :old_initialize, :initialize
 
-    #add cron poller and execute normal initialize of Sidekiq launcher
+    # add cron poller and execute normal initialize of Sidekiq launcher
     def initialize(options)
-      @cron_poller  = Sidekiq::Cron::Poller.new
+      @cron_poller = Sidekiq::Cron::Poller.new
       old_initialize options
     end
 
-
-    #remember old run
+    # remember old run
     alias_method :old_run, :run
 
-    #execute normal run of launcher and run cron poller
+    # execute normal run of launcher and run cron poller
     def run
       old_run
-      cron_poller.async.poll(true)
+      cron_poller.start
     end
 
+    # remember old quiet
+    alias_method :old_quiet, :quiet
 
-    #remember old stop
+    # execute normal quiet of launcher and quiet cron poller
+    def quiet
+      cron_poller.terminate
+      old_quiet
+    end
+
+    # remember old stop
     alias_method :old_stop, :stop
 
-    #execute normal stop of launcher and stop cron poller
+    # execute normal stop of launcher and stop cron poller
     def stop
-      cron_poller.async.terminate if poller.alive?
+      cron_poller.terminate
       old_stop
     end
-
   end
 end

data/lib/sidekiq/cron/poller.rb

@@ -1,65 +1,32 @@
 require 'sidekiq'
 require 'sidekiq/util'
-require 'sidekiq/actor'
 require 'sidekiq/cron'
+require 'sidekiq/scheduled'
 
 module Sidekiq
   module Cron
-
-    POLL_INTERVAL = 10
-
-    ##
     # The Poller checks Redis every N seconds for sheduled cron jobs
-    class Poller
-      include Util
-      include Actor
-
-      def poll(first_time=false)
-        watchdog('scheduling cron poller thread died!') do
-          add_jitter if first_time
-
-          begin
-            time_now = Time.now
-
-            #go through all jobs
-            Sidekiq::Cron::Job.all.each do |job|
-              #test if job should be enequed
-              # if yes add job to queue
-              begin
-                job.test_and_enque_for_time! time_now if job && job.valid?
-              rescue => ex
-                #problem somewhere in one job
-                logger.error "CRON JOB: #{ex.message}"
-                logger.error "CRON JOB: #{ex.backtrace.first}"
-              end
-            end
-
-          rescue Exception => ex
-            # Most likely a problem with redis networking.
-            # Punt and try again at the next interval
-            logger.error ex.message
-            logger.error ex.backtrace.first
-          end
-
-          after(poll_interval) { poll }
+    class Poller < Sidekiq::Scheduled::Poller
+      def enqueue
+        Sidekiq::Cron::Job.all.each do |job|
+          enqueue_job(job)
         end
+      rescue => ex
+        # Most likely a problem with redis networking.
+        # Punt and try again at the next interval
+        logger.error ex.message
+        logger.error ex.backtrace.first
       end
 
       private
 
-      def poll_interval
-        Sidekiq.options[:poll_interval] || POLL_INTERVAL
+      def enqueue_job(job)
+        job.test_and_enque_for_time! Time.now if job && job.valid?
+      rescue => ex
+        # problem somewhere in one job
+        logger.error "CRON JOB: #{ex.message}"
+        logger.error "CRON JOB: #{ex.backtrace.first}"
       end
-
-      def add_jitter
-        begin
-          sleep(poll_interval * rand)
-        rescue Celluloid::Task::TerminatedError
-          # Hit Ctrl-C when Sidekiq is finished booting and we have a chance
-          # to get here.
-        end
-      end
-
     end
   end
 end

data/lib/sidekiq/cron/views/cron.erb

@@ -11,8 +11,7 @@
       <th><%= t('Name') %></th>
       <th><%= t('Cron') %></th>
       <th><%= t('Last enque') %></th>
-      <th><%= t('Arguments') %></th>
-      <th width="280"><%= t('Actions')%></th>
+      <th width="180"><%= t('Actions')%></th>
     </thead>
 
     <tbody>
@@ -20,10 +19,10 @@
         <% style = "#{job.status == 'disabled' ? "background: #ecc": ""}" %>
         <tr>
           <td style="<%= style %>"><%= t job.status %></td>
-          <td style="<%= style %>"><%= job.name %></td>
-          <td style="<%= style %>"><b><%= job.cron.gsub(" ", "&nbsp;") %></b></td>
-          <td style="<%= style %>"><%= job.last_enqueue_time ? relative_time(job.last_enqueue_time) : "-" %></td>
           <td style="<%= style %>">
+            <b><%= job.name %></b>
+            <hr style="margin:3px;border:0;">
+            <small>
             <% if job.message and job.message.to_s.size > 100 %>
               <button data-toggle="collapse" data-target=".worker_<%= index %>" class="btn btn-xs"><%= t('ShowAll')%></button>
               <div class="toggle worker_<%= index %>" style="display: inline;"><%= job.message[0..100] + "... " %></div>
@@ -31,7 +30,10 @@
             <% else %>
               <%= job.message %>
             <% end %>
+            </small>
           </td>
+          <td style="<%= style %>"><b><%= job.cron.gsub(" ", "&nbsp;") %></b></td>
+          <td style="<%= style %>"><%= job.last_enqueue_time ? relative_time(job.last_enqueue_time) : "-" %></td>
           <td style="<%= style %>">
             <% if job.status == 'enabled' %>
               <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enque" method="post">

data/lib/sidekiq/cron/views/cron.slim

@@ -9,8 +9,7 @@ header.row
       th = t('Name')
       th = t('Cron')
       th = t('Last enque')
-      th = t('Arguments')
-      th width="253px"
+      th width="180px"
         = t('Actions')
 
 
@@ -18,17 +17,20 @@ header.row
       - style = "#{job.status == 'disabled' ? "background: #ecc": ""}"
       tr
         td[style="#{style}"]= job.status
-        td[style="#{style}"]= job.name
+        td[style="#{style}"]
+          b job.name
+          hr style="margin:3px;border:0;"
+          small
+            - if job.message and job.message.to_s.size > 100
+              button data-toggle="collapse" data-target=".worker_#{index}" class="btn btn-mini" = t('ShowAll')
+              .toggle[class="worker_#{index}" style="display: inline;"]= job.message[0..100] + "... "
+              .toggle[class="worker_#{index}" style="display: none;"]= job.message
+            - else
+              = job.message
+
         td[style="#{style}"]
           b == job.cron.gsub(" ", " ")
         td[style="#{style}"]== job.last_enqueue_time ? relative_time(job.last_enqueue_time) : "-"
-        td[style="#{style}"]
-          - if job.message and job.message.to_s.size > 100
-            button data-toggle="collapse" data-target=".worker_#{index}" class="btn btn-mini" = t('ShowAll')
-            .toggle[class="worker_#{index}" style="display: inline;"]= job.message[0..100] + "... "
-            .toggle[class="worker_#{index}" style="display: none;"]= job.message
-          - else
-            = job.message
         td[style="#{style}"]
           -if job.status == 'enabled'
             form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/enque" method="post"

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.3.1 ruby lib
+# stub: sidekiq-cron 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Ondrej Bartas"]
-  s.date = "2015-08-21"
+  s.date = "2015-11-17"
   s.description = "Enables to set jobs to be run in specified time (using CRON notation)"
   s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [
@@ -55,8 +55,9 @@ 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>, [">= 2.17.3"])
+      s.add_runtime_dependency(%q<sidekiq>, [">= 4.0.0"])
       s.add_runtime_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
+      s.add_runtime_dependency(%q<redis-namespace>, [">= 1.5.2"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<shoulda-context>, [">= 0"])
@@ -72,8 +73,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<coveralls>, [">= 0"])
       s.add_development_dependency(%q<shotgun>, [">= 0"])
     else
-      s.add_dependency(%q<sidekiq>, [">= 2.17.3"])
+      s.add_dependency(%q<sidekiq>, [">= 4.0.0"])
       s.add_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
+      s.add_dependency(%q<redis-namespace>, [">= 1.5.2"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<shoulda-context>, [">= 0"])
@@ -90,8 +92,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shotgun>, [">= 0"])
     end
   else
-    s.add_dependency(%q<sidekiq>, [">= 2.17.3"])
+    s.add_dependency(%q<sidekiq>, [">= 4.0.0"])
     s.add_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
+    s.add_dependency(%q<redis-namespace>, [">= 1.5.2"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<shoulda-context>, [">= 0"])

data/test/test_helper.rb

@@ -23,7 +23,6 @@ require "rack/test"
 require "mocha/setup"
 
 #SIDEKIQ Require - need to have sidekiq running!
-require 'celluloid/autostart'
 require 'sidekiq'
 require 'sidekiq/util'
 require 'sidekiq/web'

data/test/unit/job_test.rb

@@ -53,13 +53,23 @@ describe "Cron Job" do
     it "have save method" do
       assert @job.respond_to?(:save)
     end
+
     it "have valid? method" do
       assert @job.respond_to?("valid?".to_sym)
     end
+
     it "have destroy method" do
       assert @job.respond_to?(:destroy)
     end
 
+    it "have enabled? method" do
+      assert @job.respond_to?(:enabled?)
+    end
+
+    it "have disabled? method" do
+      assert @job.respond_to?(:disabled?)
+    end
+
     it 'have sort_name - used for sorting enabled disbaled jobs on frontend' do
       job = Sidekiq::Cron::Job.new(name: "TestName")
       assert_equal job.sort_name, "0_testname"
@@ -116,7 +126,7 @@ describe "Cron Job" do
     end
 
     it "have to_hash method" do
-      [:name,:klass,:cron,:args,:message,:status].each do |key|
+      [:name,:klass,:cron,:description,:args,:message,:status].each do |key|
         assert @job.to_hash.has_key?(key), "to_hash must have key: #{key}"
       end
     end
@@ -231,12 +241,68 @@ 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: 'CronTestClass',
+        klass: 'ActiveJobTest',
         queue: 'super_queue',
+        description: nil,
+        args:  { foo: 'bar' }
+      }
+      @job = Sidekiq::Cron::Job.new(@args)
+    end
+
+    it 'should return valid payload for Sidekiq::Client' do
+      payload = {
+        'class'       => 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper',
+        'queue'       => 'super_queue',
+        'description' => nil,
+        'args'        => [{
+          'job_class'  => 'ActiveJobTest',
+          'job_id'     => 'XYZ',
+          'queue_name' => 'super_queue',
+          'arguments'  => [{foo: 'bar'}]
+        }]
+      }
+      assert_equal @job.active_job_message, payload
+    end
+  end
+
+  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',
+        queue: 'super_queue',
+        queue_name_prefix: 'prefix',
         args:  { foo: 'bar' }
       }
       @job = Sidekiq::Cron::Job.new(@args)
@@ -245,11 +311,12 @@ describe "Cron Job" do
     it 'should return valid payload for Sidekiq::Client' do
       payload = {
         'class' => 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper',
-        'queue' => 'super_queue',
+        'queue' => 'prefix_super_queue',
+        'description' => nil,
         'args'  =>[{
-          'job_class'  => 'CronTestClass',
+          'job_class'  => 'ActiveJobTest',
           'job_id'     => 'XYZ',
-          'queue_name' => 'super_queue',
+          'queue_name' => 'prefix_super_queue',
           'arguments'  => [{foo: 'bar'}]
         }]
       }
@@ -261,9 +328,17 @@ describe "Cron Job" do
     describe 'active job' do
       before do
         module ActiveJob
-          class Base; end
+          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',
@@ -280,6 +355,129 @@ describe "Cron Job" do
       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',
+          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.enque!
+      end
+    end
+
+    describe 'active job via configuration (bool: true)' do
+      before do
+        @args = {
+          name:  'Test',
+          cron:  '* * * * *',
+          klass: 'ActiveJobTest',
+          active_job: true
+        }
+        @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.enque!
+      end
+    end
+
+    describe 'active job via configuration (string: true)' do
+      before do
+        @args = {
+          name:  'Test',
+          cron:  '* * * * *',
+          klass: 'ActiveJobTest',
+          active_job: 'true'
+        }
+        @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.enque!
+      end
+    end
+
+    describe 'active job via configuration (string: yes)' do
+      before do
+        @args = {
+          name:  'Test',
+          cron:  '* * * * *',
+          klass: 'ActiveJobTest',
+          active_job: 'yes'
+        }
+        @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.enque!
+      end
+    end
+
+    describe 'active job via configuration (number: 1)' do
+      before do
+        @args = {
+          name:  'Test',
+          cron:  '* * * * *',
+          klass: 'ActiveJobTest',
+          active_job: 1
+        }
+        @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.enque!
+      end
+    end
+
+    describe 'active job via configuration with queue_name_prefix option' do
+      before do
+        @args = {
+          name:  'Test',
+          cron:  '* * * * *',
+          klass: 'ActiveJobTest',
+          queue: 'cron',
+          active_job: true,
+          queue_name_prefix: 'prefix'
+        }
+        @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.enque!
+      end
+    end
+
     describe 'sidekiq worker' do
       before do
         @args = {
@@ -356,14 +554,18 @@ describe "Cron Job" do
       Sidekiq::Cron::Job.create(@args.merge(status: "disabled"))
       job = Sidekiq::Cron::Job.find(@args)
       assert_equal job.status, "disabled"
+      assert_equal job.disabled?, true
+      assert_equal job.enabled?, false
     end
 
     it "be created with status enabled and disable it afterwards" do
       Sidekiq::Cron::Job.create(@args)
       job = Sidekiq::Cron::Job.find(@args)
       assert_equal job.status, "enabled"
+      assert_equal job.enabled?, true
       job.disable!
       assert_equal job.status, "disabled", "directly after call"
+      assert_equal job.disabled?, true
       job = Sidekiq::Cron::Job.find(@args)
       assert_equal job.status, "disabled", "after find"
     end

data/test/unit/poller_test.rb

@@ -24,14 +24,9 @@ describe 'Cron Poller' do
     }
     @args2 = @args.merge(name: 'with_queue', klass: 'CronTestClassWithQueue', cron: "*/10 * * * *")
 
-    Celluloid.boot
     @poller = Sidekiq::Cron::Poller.new
   end
 
-  after do
-    Celluloid.shutdown
-  end
-
   it 'not enqueue any job - new jobs' do
     now = Time.now
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour + 1, 5, 1)
@@ -40,7 +35,7 @@ describe 'Cron Poller' do
     Sidekiq::Cron::Job.create(@args)
     Sidekiq::Cron::Job.create(@args2)
 
-    @poller.poll
+    @poller.enqueue
 
     Sidekiq.redis do |conn|
       assert_equal 0, conn.llen("queue:default")
@@ -50,7 +45,7 @@ describe 'Cron Poller' do
     #30 seconds after!
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour + 1, 5, 30)
     Time.stubs(:now).returns(enqueued_time)
-      @poller.poll
+      @poller.enqueue
 
       Sidekiq.redis do |conn|
         assert_equal 0, conn.llen("queue:default")
@@ -66,7 +61,7 @@ describe 'Cron Poller' do
     Sidekiq::Cron::Job.create(@args)
     Sidekiq::Cron::Job.create(@args2)
 
-    @poller.poll
+    @poller.enqueue
 
     Sidekiq.redis do |conn|
       assert_equal 0, conn.llen("queue:default")
@@ -75,7 +70,7 @@ describe 'Cron Poller' do
 
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour + 1, 6, 1)
     Time.stubs(:now).returns(enqueued_time)
-    @poller.poll
+    @poller.enqueue
 
     Sidekiq.redis do |conn|
       assert_equal 1, conn.llen("queue:default")
@@ -91,7 +86,7 @@ describe 'Cron Poller' do
     Sidekiq::Cron::Job.create(@args)
     Sidekiq::Cron::Job.create(@args2)
 
-    @poller.poll
+    @poller.enqueue
 
     Sidekiq.redis do |conn|
       assert_equal 0, conn.llen("queue:default")
@@ -100,7 +95,7 @@ describe 'Cron Poller' do
 
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour + 1, 10, 5)
     Time.stubs(:now).returns(enqueued_time)
-    @poller.poll
+    @poller.enqueue
 
     Sidekiq.redis do |conn|
       assert_equal 1, conn.llen("queue:default")
@@ -116,7 +111,7 @@ describe 'Cron Poller' do
     Sidekiq::Cron::Job.create(@args)
     Sidekiq::Cron::Job.create(@args2)
 
-    @poller.poll
+    @poller.enqueue
 
     Sidekiq.redis do |conn|
       assert_equal 0, conn.llen("queue:default")
@@ -125,7 +120,7 @@ describe 'Cron Poller' do
 
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour + 1, 20, 1)
     Time.stubs(:now).returns(enqueued_time)
-    @poller.poll false
+    @poller.enqueue
     Sidekiq.redis do |conn|
       assert_equal 1, conn.llen("queue:default")
       assert_equal 1, conn.llen("queue:super")
@@ -133,7 +128,7 @@ describe 'Cron Poller' do
 
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour + 1, 20, 2)
     Time.stubs(:now).returns(enqueued_time)
-    @poller.poll false
+    @poller.enqueue
     Sidekiq.redis do |conn|
       assert_equal 1, conn.llen("queue:default")
       assert_equal 1, conn.llen("queue:super")
@@ -141,7 +136,7 @@ describe 'Cron Poller' do
 
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour + 1, 20, 20)
     Time.stubs(:now).returns(enqueued_time)
-    @poller.poll false
+    @poller.enqueue
     Sidekiq.redis do |conn|
       assert_equal 1, conn.llen("queue:default")
       assert_equal 1, conn.llen("queue:super")
@@ -149,7 +144,7 @@ describe 'Cron Poller' do
 
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour + 1, 20, 50)
     Time.stubs(:now).returns(enqueued_time)
-    @poller.poll false
+    @poller.enqueue
     Sidekiq.redis do |conn|
       assert_equal 1, conn.llen("queue:default")
       assert_equal 1, conn.llen("queue:super")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.17.3
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.17.3
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.24
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement