sidekiq-scheduler 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb14c4d168f6e6e04f004a797c8a9247323a8a74
-  data.tar.gz: 230b4f176c716ca9bef539b4dc1d3f428d1ca48d
+  metadata.gz: c13477c36de16f83f295c07f237a6182a2e8b422
+  data.tar.gz: 00bd5143e5c9a63038f4aa5ec879e9d1cb5d0389
 SHA512:
-  metadata.gz: ca5651d5962fbe5981ec4d57c43bb8114bad49d8160603168b2b8fda14a666abfa6b871e401e43b610b87c05ebd1f9652a37353b3110052da4feb97e25df94fd
-  data.tar.gz: 50563b08976a926199ccc2cc5dea1bd133574e3e5772c821b2be9e7ae3dd15da90cc7d633173717b3f34aa967eff19b4959db1214085bc11d4d9a20f178e13bd
+  metadata.gz: dab3552b21945d9fca703a2aa97de4ca0750b15236bffb95b80af82f14c9e10a8d1a5e2e0011105cdf6a47f51e63737cbb5293cfb8689faa16fce2fb4ad41a8f
+  data.tar.gz: 9db739424af1df7bef42f4bb418a2282c6962f0f1392da13dbe8e19a57bbd6587cb73888d714e2950669997a09c944cfb552350f8ca255b2af7a09c9b829e806

data/Rakefile

@@ -22,13 +22,8 @@ end
 
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
+RSpec::Core::RakeTask.new('spec')
 
-task default: :test
+task default: :spec

data/lib/sidekiq/scheduler.rb

@@ -91,7 +91,7 @@ module Sidekiq
       # job should be scheduled regardless of what ENV['RAILS_ENV'] is set
       # to.
       if config['rails_env'].nil? || self.rails_env_matches?(config)
-        logger.info "Scheduling #{name} "
+        logger.info "Scheduling #{name} #{config}"
         interval_defined = false
         interval_types = %w{cron every at in}
         interval_types.each do |interval_type|
@@ -135,15 +135,12 @@ module Sidekiq
 
     # Enqueue a job based on a config hash
     def self.enqueue_job(job_config)
-      config = job_config.dup
+      config = prepare_arguments(job_config.dup)
 
-      config['class'] = config['class'].constantize if config['class'].is_a?(String)
-      config['args'] = Array(config['args'])
-
-      if defined?(ActiveJob::Enqueuing) && config['class'].included_modules.include?(ActiveJob::Enqueuing)
-        config['class'].new.enqueue(config)
+      if active_job_enqueue?(config['class'])
+        enque_with_active_job(config)
       else
-        Sidekiq::Client.push(config)
+        enque_with_sidekiq(config)
       end
     end
 
@@ -156,7 +153,7 @@ module Sidekiq
     end
 
     def self.rufus_scheduler
-      @rufus_scheduler ||= Rufus::Scheduler.new rufus_scheduler_options
+      @rufus_scheduler ||= Rufus::Scheduler.new(rufus_scheduler_options)
     end
 
     # Stops old rufus scheduler and creates a new one.  Returns the new
@@ -202,5 +199,51 @@ module Sidekiq
       end
     end
 
+    def self.enque_with_active_job(config)
+      initialize_active_job(config['class'], config['args']).enqueue(config)
+    end
+
+    def self.enque_with_sidekiq(config)
+      Sidekiq::Client.push(config)
+    end
+
+    def self.initialize_active_job(klass, args)
+      if args.is_a?(Array)
+        klass.new(*args)
+      else
+        klass.new(args)
+      end
+    end
+
+    # Returns true if the enqueuing needs to be done for an ActiveJob
+    #  class false otherwise.
+    #
+    # @param [Class] klass the class to check is decendant from ActiveJob
+    #
+    # @return [Boolean]
+    def self.active_job_enqueue?(klass)
+      defined?(ActiveJob::Enqueuing) && klass.included_modules.include?(ActiveJob::Enqueuing)
+    end
+
+    # Convert the given arguments in the format expected to be enqueued.
+    #
+    # @param [Hash] config the options to be converted
+    # @option config [String] class the job class
+    # @option config [Hash/Array] args the arguments to be passed to the job
+    #   class
+    #
+    # @return [Hash]
+    def self.prepare_arguments(config)
+      config['class'] = config['class'].constantize if config['class'].is_a?(String)
+
+      if config['args'].is_a?(Hash)
+        config['args'].symbolize_keys! if config['args'].respond_to?(:symbolize_keys!)
+      else
+        config['args'] = Array(config['args'])
+      end
+
+      config
+    end
+
   end
 end

data/lib/sidekiq-scheduler/version.rb

@@ -1,5 +1,5 @@
 module SidekiqScheduler
 
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 
 end

data/lib/sidekiq-scheduler/web.rb

@@ -22,4 +22,5 @@ end
 
 require 'sidekiq/web' unless defined?(Sidekiq::Web)
 Sidekiq::Web.register(SidekiqScheduler::Web)
-Sidekiq::Web.tabs['Recurring Jobs'] = 'recurring-jobs'
+Sidekiq::Web.tabs['recurring_jobs'] = 'recurring-jobs'
+Sidekiq::Web.set :locales, Sidekiq::Web.locales << File.expand_path(File.dirname(__FILE__) + "/../../web/locales")

data/web/locales/cs.yml

@@ -0,0 +1,9 @@
+cs:
+  recurring_jobs: Pravidelně opakované
+  name: Jméno
+  description: Popis
+  interval: Interval
+  class: Třída
+  queue: Fronta
+  arguments: Argumenty
+  enqueue_now: Zařadit nyní

data/web/locales/en.yml

@@ -0,0 +1,9 @@
+en:
+  recurring_jobs: Recurring Jobs
+  name: Name
+  description: Description
+  interval: Interval
+  class: Class
+  queue: Queue
+  arguments: Arguments
+  enqueue_now: Enqueue now

data/web/views/recurring_jobs.erb

@@ -1,15 +1,15 @@
-<h3>Recurring Jobs</h3>
+<h3><%= t('recurring_jobs') %></h3>
 
 <div class="table_container">
   <table class="table table-hover table-bordered table-striped table-white">
     <thead>
       <tr>
-        <th>Name</th>
-        <th>Description</th>
-        <th>Interval</th>
-        <th>Class</th>
-        <th>Queue</th>
-        <th>Arguments</th>
+        <th><%= t('name') %></th>
+        <th><%= t('description') %></th>
+        <th><%= t('interval') %></th>
+        <th><%= t('class') %></th>
+        <th><%= t('queue') %></th>
+        <th><%= t('arguments') %></th>
         <th></th>
       </tr>
     </thead>
@@ -27,7 +27,7 @@
           <td><%= job_spec['args'] %></td>
           <td class="text-center">
             <a class="btn btn-warn btn-xs" href="<%= root_path %>recurring-jobs/<%= URI.escape(name) %>/enqueue">
-              Enqueue now
+              <%= t('enqueue_now') %>
             </a>
           </td>
         </tr>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Morton Jonuschat
@@ -9,202 +9,216 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.8
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !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: mocha
   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: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mock_redis
   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: simplecov
   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: 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'
 - !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: rack-test
   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: sinatra
   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: Light weight job scheduling extension for Sidekiq that adds support for
@@ -215,24 +229,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
-- README.md
-- Rakefile
-- lib/sidekiq-scheduler.rb
+- lib/sidekiq/scheduler.rb
 - lib/sidekiq-scheduler/manager.rb
 - lib/sidekiq-scheduler/schedule.rb
 - lib/sidekiq-scheduler/version.rb
 - lib/sidekiq-scheduler/web.rb
-- lib/sidekiq/scheduler.rb
-- test/config.yml
-- test/fake_env.rb
-- test/lib/sidekiq/scheduler_test.rb
-- test/lib/sidekiq/web_test.rb
-- test/schedule_test.rb
-- test/support/direct_worker.rb
-- test/support/my_worker.rb
-- test/test_helper.rb
+- lib/sidekiq-scheduler.rb
+- web/locales/cs.yml
+- web/locales/en.yml
 - web/views/recurring_jobs.erb
+- MIT-LICENSE
+- Rakefile
+- README.md
 homepage: https://github.com/moove-it/sidekiq-scheduler
 licenses:
 - MIT
@@ -243,26 +251,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Light weight job scheduling extension for Sidekiq
-test_files:
-- test/config.yml
-- test/fake_env.rb
-- test/lib/sidekiq/scheduler_test.rb
-- test/lib/sidekiq/web_test.rb
-- test/schedule_test.rb
-- test/support/direct_worker.rb
-- test/support/my_worker.rb
-- test/test_helper.rb
+test_files: []

data/test/config.yml

@@ -1,11 +0,0 @@
----
-:verbose:      false
-:environment:  xzibit
-:require:      ./test/fake_env.rb
-:pidfile:      /tmp/sidekiq-config-test.pid
-:concurrency:  50
-:resolution:   30
-:queues:
-  - [often, 2]
-  - [seldom, 1]
----

data/test/lib/sidekiq/scheduler_test.rb

@@ -1,326 +0,0 @@
-require 'test_helper'
-
-class ManagerTest < Minitest::Test
-  describe 'Sidekiq::Scheduler' do
-
-    before do
-      Sidekiq::Scheduler.enabled = true
-      Sidekiq::Scheduler.dynamic = false
-      Sidekiq.redis { |r| r.del(:schedules) }
-      Sidekiq.redis { |r| r.del(:schedules_changed) }
-      Sidekiq::Scheduler.clear_schedule!
-      Sidekiq::Scheduler.send(:class_variable_set, :@@scheduled_jobs, {})
-    end
-
-    it 'sidekiq-scheduler enabled option is working' do
-      Sidekiq::Scheduler.enabled = false
-      assert_equal(0, Sidekiq::Scheduler.rufus_scheduler.jobs.size)
-      Sidekiq.schedule = {
-        :some_ivar_job => {
-          'cron' => '* * * * *',
-          'class' => 'SomeIvarJob',
-          'args' => '/tmp'
-        }
-      }
-
-      Sidekiq::Scheduler.load_schedule!
-
-      assert_equal(0, Sidekiq::Scheduler.rufus_scheduler.jobs.size)
-      refute Sidekiq::Scheduler.scheduled_jobs.include?(:some_ivar_job)
-    end
-
-    it 'enqueue constantizes' do
-      # The job should be loaded, since a missing rails_env means ALL envs.
-      ENV['RAILS_ENV'] = 'production'
-      config = {
-        'cron' => '* * * * *',
-        'class' => 'SomeRealClass',
-        'queue' => 'high',
-        'args' => '/tmp'
-      }
-
-      Sidekiq::Client.expects(:push).with(
-        {
-          'cron' => '* * * * *',
-          'class' => SomeRealClass,
-          'queue' => 'high',
-          'args' => ['/tmp']
-        }
-      )
-      Sidekiq::Scheduler.enqueue_job(config)
-    end
-
-    it 'enqueue_job respects queue params' do
-      config = {
-        'cron' => '* * * * *',
-        'class' => 'SomeIvarJob',
-        'queue' => 'high'
-      }
-
-      Sidekiq::Client.expects(:push).with(
-        {
-          'cron' => '* * * * *',
-          'class' => SomeIvarJob,
-          'args' => [],
-          'queue' => 'high'
-        }
-      )
-
-      Sidekiq::Scheduler.enqueue_job(config)
-    end
-
-    it 'config makes it into the rufus_scheduler' do
-      assert_equal(0, Sidekiq::Scheduler.rufus_scheduler.jobs.size)
-      Sidekiq.schedule = {
-        :some_ivar_job => {
-          'cron' => '* * * * *',
-          'class' => 'SomeIvarJob',
-          'args' => '/tmp'
-        }
-      }
-
-      Sidekiq::Scheduler.load_schedule!
-
-      assert_equal(1, Sidekiq::Scheduler.rufus_scheduler.jobs.size)
-      assert Sidekiq::Scheduler.scheduled_jobs.include?(:some_ivar_job)
-    end
-
-    it 'can pass options to the Rufus scheduler instance' do
-      options = { :lockfile => '/tmp/rufus_lock' }
-
-      Sidekiq::Scheduler.rufus_scheduler_options = options
-      Rufus::Scheduler.expects(:new).with(options)
-
-      Sidekiq::Scheduler.clear_schedule!
-    end
-
-    it 'can reload schedule' do
-      Sidekiq::Scheduler.dynamic = true
-      Sidekiq.schedule = {
-        :some_ivar_job => {
-          'cron' => '* * * * *',
-          'class' => 'SomeIvarJob',
-          'args' => '/tmp'
-        }
-      }
-
-      Sidekiq::Scheduler.load_schedule!
-
-      assert Sidekiq::Scheduler.scheduled_jobs.include?('some_ivar_job')
-
-      Sidekiq.redis { |r| r.del(:schedules) }
-      Sidekiq.redis do |r|
-        r.hset(
-          :schedules,
-          'some_ivar_job2',
-          MultiJson.encode(
-            {
-              'cron' => '* * * * *',
-              'class' => 'SomeIvarJob',
-              'args' => '/tmp/2'
-            }
-          )
-        )
-      end
-
-      Sidekiq::Scheduler.reload_schedule!
-
-      refute  Sidekiq::Scheduler.scheduled_jobs.include?('some_ivar_job')
-      assert Sidekiq::Scheduler.scheduled_jobs.include?('some_ivar_job2')
-
-      assert_equal '/tmp/2', Sidekiq.schedule['some_ivar_job2']['args']
-    end
-
-    it 'reloads the schedule from redis after 5 seconds when dynamic' do
-      Sidekiq.redis { |r| r.flushdb }
-      Sidekiq::Scheduler.clear_schedule!
-
-      Sidekiq::Scheduler.dynamic = true
-      Sidekiq.schedule = {
-        :some_ivar_job => {
-          'cron' => '* * * * *',
-          'class' => 'SomeIvarJob',
-          'args' => '/tmp'
-        }
-      }
-
-      Sidekiq::Scheduler.load_schedule!
-
-      assert Sidekiq::Scheduler.scheduled_jobs.include?('some_ivar_job')
-      assert !Sidekiq::Scheduler.scheduled_jobs.include?('some_ivar_job2')
-
-      Sidekiq.set_schedule(
-        'some_ivar_job2',
-        {
-          'cron' => '* * * * *',
-          'class' => 'SomeIvarJob',
-          'args' => '/tmp/2'
-        }
-      )
-
-      Timecop.travel(7 * 60)
-      sleep 0.1
-
-      assert Sidekiq::Scheduler.scheduled_jobs.include?('some_ivar_job')
-      assert Sidekiq::Scheduler.scheduled_jobs.include?('some_ivar_job2')
-    end
-
-
-    it 'load_schedule_job loads a schedule' do
-      Sidekiq::Scheduler.load_schedule_job(
-        'some_ivar_job',
-        {
-          'cron' => '* * * * *',
-          'class' => 'SomeIvarJob',
-          'args' => '/tmp'
-        }
-      )
-
-      assert_equal(1, Sidekiq::Scheduler.rufus_scheduler.jobs.size)
-      assert_equal(1, Sidekiq::Scheduler.scheduled_jobs.size)
-      assert Sidekiq::Scheduler.scheduled_jobs.keys.include?('some_ivar_job')
-    end
-
-    it 'load_schedule_job with every with options' do
-      Sidekiq::Scheduler.load_schedule_job(
-        'some_ivar_job',
-        {
-          'every' => ['30s', {'first_in' => '60s'}],
-          'class' => 'SomeIvarJob',
-          'args' => '/tmp'
-        }
-      )
-
-      assert_equal(1, Sidekiq::Scheduler.rufus_scheduler.jobs.size)
-      assert_equal(1, Sidekiq::Scheduler.scheduled_jobs.size)
-      assert Sidekiq::Scheduler.scheduled_jobs.keys.include?('some_ivar_job')
-      assert Sidekiq::Scheduler.scheduled_jobs['some_ivar_job'].params.keys.include?(:first_in)
-    end
-
-    it 'load_schedule_job with cron with options' do
-      Sidekiq::Scheduler.load_schedule_job(
-        'some_ivar_job',
-        {
-          'cron' => ['* * * * *', {'allow_overlapping' => 'true'}],
-          'class' => 'SomeIvarJob',
-          'args' => '/tmp'
-        }
-      )
-
-      assert_equal(1, Sidekiq::Scheduler.rufus_scheduler.jobs.size)
-      assert_equal(1, Sidekiq::Scheduler.scheduled_jobs.size)
-      assert Sidekiq::Scheduler.scheduled_jobs.keys.include?('some_ivar_job')
-      assert Sidekiq::Scheduler.scheduled_jobs['some_ivar_job'].params.keys.include?(:allow_overlapping)
-    end
-
-    it 'load_schedule_job with at' do
-      Sidekiq::Scheduler.load_schedule_job(
-        'some_ivar_job',
-        {
-          'at' => "2013/12/12 12:30",
-          'class' => 'SomeIvarJob',
-          'args' => '/tmp'
-        }
-      )
-
-      assert_equal(1, Sidekiq::Scheduler.rufus_scheduler.jobs.size)
-      assert_equal(1, Sidekiq::Scheduler.scheduled_jobs.size)
-      assert Sidekiq::Scheduler.scheduled_jobs.keys.include?('some_ivar_job')
-    end
-
-    it 'load_schedule_job with in' do
-      Sidekiq::Scheduler.load_schedule_job(
-        'some_ivar_job',
-        {
-          'in' => "10d",
-          'class' => 'SomeIvarJob',
-          'args' => '/tmp'
-        }
-      )
-
-      assert_equal(1, Sidekiq::Scheduler.rufus_scheduler.jobs.size)
-      assert_equal(1, Sidekiq::Scheduler.scheduled_jobs.size)
-      assert Sidekiq::Scheduler.scheduled_jobs.keys.include?('some_ivar_job')
-    end
-
-    it 'does not load the schedule without cron' do
-      Sidekiq::Scheduler.load_schedule_job(
-        'some_ivar_job',
-        {
-          'class' => 'SomeIvarJob',
-          'args' => '/tmp'
-        }
-      )
-
-      assert_equal(0, Sidekiq::Scheduler.rufus_scheduler.jobs.size)
-      assert_equal(0, Sidekiq::Scheduler.scheduled_jobs.size)
-      assert !Sidekiq::Scheduler.scheduled_jobs.keys.include?('some_ivar_job')
-    end
-
-    it 'does not load the schedule with an empty cron' do
-      Sidekiq::Scheduler.load_schedule_job(
-        'some_ivar_job',
-        {
-          'cron' => '',
-          'class' => 'SomeIvarJob',
-          'args' => '/tmp'
-        }
-      )
-
-      assert_equal(0, Sidekiq::Scheduler.rufus_scheduler.jobs.size)
-      assert_equal(0, Sidekiq::Scheduler.scheduled_jobs.size)
-      assert !Sidekiq::Scheduler.scheduled_jobs.keys.include?('some_ivar_job')
-    end
-
-    it 'update_schedule' do
-      Sidekiq::Scheduler.dynamic = true
-      Sidekiq.schedule = {
-        'some_ivar_job'     => {'cron' => '* * * * *', 'class' => 'SomeIvarJob', 'args' => '/tmp'},
-        'another_ivar_job'  => {'cron' => '* * * * *', 'class' => 'SomeIvarJob', 'args' => '/tmp/5'},
-        'stay_put_job'      => {'cron' => '* * * * *', 'class' => 'SomeJob', 'args' => '/tmp'}
-      }
-
-      Sidekiq::Scheduler.load_schedule!
-
-      Sidekiq::Scheduler.scheduled_jobs['some_ivar_job'].expects(:unschedule)
-      Sidekiq::Scheduler.scheduled_jobs['another_ivar_job'].expects(:unschedule)
-
-      Sidekiq.set_schedule(
-        'some_ivar_job',
-        {
-          'cron' => '* * * * *',
-          'class' => 'SomeIvarJob',
-          'args' => '/tmp/2'
-        }
-      )
-      Sidekiq.set_schedule(
-        'new_ivar_job',
-        {
-          'cron' => '* * * * *',
-          'class' => 'SomeJob',
-          'args' => '/tmp/3'
-        }
-      )
-      Sidekiq.set_schedule(
-        'stay_put_job',
-        {
-          'cron' => '* * * * *',
-          'class' => 'SomeJob',
-          'args' => '/tmp'
-        }
-      )
-      Sidekiq.remove_schedule('another_ivar_job')
-
-      Sidekiq::Scheduler.update_schedule
-
-      %w(some_ivar_job new_ivar_job stay_put_job).each do |job_name|
-        assert Sidekiq::Scheduler.scheduled_jobs.keys.include?(job_name)
-        assert Sidekiq.schedule.keys.include?(job_name)
-      end
-      assert !Sidekiq::Scheduler.scheduled_jobs.keys.include?('another_ivar_job')
-      assert !Sidekiq.schedule.keys.include?('another_ivar_job')
-      assert_equal 0, Sidekiq.redis { |r| r.scard(:schedules_changed) }
-    end
-
-  end
-end

data/test/lib/sidekiq/web_test.rb

@@ -1,72 +0,0 @@
-require 'test_helper'
-require 'sidekiq-scheduler/web'
-require 'rack/test'
-
-class WebTest < MiniTest::Test
-  describe 'sidekiq-scheduler web' do
-    include Rack::Test::Methods
-
-    def app
-      Sidekiq::Web
-    end
-
-    let(:jobs) do
-      {
-        'Foo Job' => {
-          'class' => 'FooClass',
-          'cron' => '0 * * * * US/Eastern',
-          'args' => [42],
-          'description' => 'Does foo things.'
-        },
-
-        'Bar Job' => {
-          'class' => 'BarClass',
-          'every' => '1h',
-          'args' => ['foo', 'bar'],
-          'queue' => 'special'
-        }
-      }
-    end
-
-    before do
-      # Sidekiq::WebHelpers expects the Redis client to return an id
-      Sidekiq.redis { |conn| conn.client.stubs(:id).returns('redis://127.0.0.1:1234/0') }
-
-      Sidekiq.schedule = jobs
-    end
-
-    it 'shows schedule' do
-      get '/recurring-jobs'
-
-      assert(last_response.ok?)
-
-      assert_match(/Foo Job/, last_response.body)
-      assert_match(/FooClass/, last_response.body)
-      assert_match(/0 \* \* \* \* US\/Eastern/, last_response.body)
-      assert_match(/default/, last_response.body)
-      assert_match(/\[42\]/, last_response.body)
-      assert_match(/Does foo things\./, last_response.body)
-
-      assert_match(/Bar Job/, last_response.body)
-      assert_match(/BarClass/, last_response.body)
-      assert_match(/1h/, last_response.body)
-      assert_match(/special/, last_response.body)
-      assert_match(/\[\"foo\", \"bar\"\]/, last_response.body)
-
-      assert_match(/Enqueue now/, last_response.body)
-    end
-
-    it 'enqueues particular job' do
-      job_name = jobs.keys.first
-      job = jobs[job_name]
-
-      Sidekiq::Scheduler.expects(:enqueue_job).with(job)
-
-      get "/recurring-jobs/#{URI.escape(job_name)}/enqueue"
-
-      assert(last_response.redirect?)
-      follow_redirect!
-      assert_equal(last_request.path, '/recurring-jobs')
-    end
-  end
-end

data/test/schedule_test.rb

@@ -1,97 +0,0 @@
-require 'test_helper'
-
-class ScheduleTest < Minitest::Test
-
-  describe 'SidekiqScheduler::Schedule' do
-
-    def build_cron_hash
-      {
-        'cron'  => '* * * * *',
-        'class' => 'SomeIvarJob',
-        'args'  => '/tmp/75'
-      }
-    end
-
-    def only_cron_and_args
-      -> (key, _) { %w(cron args).include?(key) }
-    end
-
-    def job_from_redis(job_id)
-      MultiJson.decode(job_from_redis_without_decoding(job_id))
-    end
-
-    def job_from_redis_without_decoding(job_id)
-      Sidekiq.redis { |redis|
-        redis.hget(:schedules, job_id)
-      }
-    end
-
-    let(:cron_hash)    { build_cron_hash }
-    let(:job_id)       { 'my_ivar_job' }
-    let(:job_class_id) { 'SomeIvarJob' }
-
-    it 'schedule= sets the schedule' do
-      Sidekiq::Scheduler.dynamic = true
-
-      Sidekiq.schedule = {job_id => cron_hash}
-
-      assert_equal(cron_hash, job_from_redis(job_id))
-    end
-
-    it "schedule= uses job name as 'class' argument if it's missing" do
-      Sidekiq::Scheduler.dynamic = true
-
-      Sidekiq.schedule = {job_class_id => cron_hash.select(&only_cron_and_args)}
-
-      assert_equal(cron_hash, job_from_redis(job_class_id))
-      assert_equal(job_class_id, Sidekiq.schedule[job_class_id]['class'])
-    end
-
-    it 'schedule= does not mutate argument' do
-      schedule = {job_class_id => cron_hash.select(&only_cron_and_args)}
-
-      Sidekiq.schedule = schedule
-
-      assert !schedule[job_class_id].key?('class')
-    end
-
-    it 'set_schedule can set an individual schedule' do
-      Sidekiq.set_schedule(job_id, cron_hash)
-
-      assert_equal(cron_hash, job_from_redis(job_id))
-      assert Sidekiq.redis { |r| r.sismember(:schedules_changed, job_id) }
-    end
-
-    it 'get_schedule returns a schedule' do
-      Sidekiq.redis { |r| r.hset(:schedules, job_id, MultiJson.encode(cron_hash)) }
-
-      assert_equal(cron_hash, Sidekiq.get_schedule(job_id))
-    end
-
-    it 'remove_schedule removes a schedule' do
-      Sidekiq.redis { |r| r.hset(:schedules, job_id, MultiJson.encode(cron_hash)) }
-
-      Sidekiq.remove_schedule(job_id)
-
-      assert_equal nil, job_from_redis_without_decoding(job_id)
-      assert Sidekiq.redis{ |r| r.sismember(:schedules_changed, job_id) }
-    end
-
-    describe 'schedule update' do
-      let(:new_job_id)       { 'my_ivar_job_2' }
-      let(:new_job_class_id) { 'SomeIvarJob2' }
-
-      before do
-        Sidekiq::Scheduler.dynamic = true
-        Sidekiq.schedule = {job_id => cron_hash}
-      end
-
-      it 'schedule= adds new jobs to schedule and remove old ones' do
-        Sidekiq.schedule = {new_job_id => cron_hash}
-
-        assert_equal(cron_hash, job_from_redis(new_job_id))
-        assert_equal(nil, job_from_redis_without_decoding(job_id))
-      end
-    end
-  end
-end

data/test/support/direct_worker.rb

@@ -1,6 +0,0 @@
-class DirectWorker
-  include Sidekiq::Worker
-  def perform(a, b)
-    a + b
-  end
-end

data/test/support/my_worker.rb

@@ -1,3 +0,0 @@
-class MyWorker
-  include Sidekiq::Worker
-end

data/test/test_helper.rb

@@ -1,54 +0,0 @@
-require 'simplecov'
-SimpleCov.start
-
-require 'coveralls'
-Coveralls.wear!
-
-require 'minitest/autorun'
-require 'minitest/pride'
-require 'minitest/autorun'
-require 'sidekiq-scheduler'
-require 'mocha/setup'
-require 'multi_json'
-require 'mock_redis'
-require 'timecop'
-
-require 'sidekiq'
-require 'sidekiq/util'
-if Sidekiq.respond_to?(:logger)
-  Sidekiq.logger.level = Logger::ERROR
-else
-  Sidekiq::Util.logger.level = Logger::ERROR
-end
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-require 'sidekiq/redis_connection'
-
-class MiniTest::Spec
-  before :each do
-    redis = MockRedis.new
-    client = Object.new
-
-    redis.stubs(:client).returns(client)
-    client.stubs(:location).returns('MockRedis')
-
-    Sidekiq::RedisConnection.stubs(:create).returns(ConnectionPool.new({}) { redis })
-  end
-end
-
-class SomeJob
-  include Sidekiq::Worker
-  def self.perform(_, _)
-  end
-end
-
-class SomeIvarJob < SomeJob
-  sidekiq_options queue: :ivar
-end
-
-class SomeRealClass
-  include Sidekiq::Worker
-  sidekiq_options queue: :some_real_queue
-end