sidekiq-scheduler 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 743371bafeb924ead436bf1af7be4a04d1643c34
-  data.tar.gz: 51dd55ce2e46e04c9a7f5ff682f7efb7edb1215d
+  metadata.gz: e6fb5253c21173ba4c38ff783846ebf9f7e66f80
+  data.tar.gz: d5a0226a5ca48169389447ba69e4f3d1b2d61a8e
 SHA512:
-  metadata.gz: 3a6c82f077edeeee2700ad78fcf0890e5ebfe7f67f649aca84c98de5b0eaa2310bf24438f0d8e4e1f3dc1aaba1b735db5d063a5e61945eab5a4ebef8d59aa15e
-  data.tar.gz: 1928654824078d46092657a1e6f3b8033066e889119438afc7c2e48ba7b5c0611dd113c868fa9225274f67f1b26c88125f1531bbbcf603a811464127c66ea176
+  metadata.gz: e09e5fda75f41ad8ceefdc6fe37940e4a678abd56422015004cab1b88741e945178b1f79ee3c23749d5c04610529a9fde600804e28c601b6f9fb96050c404c30
+  data.tar.gz: 4130fbe4f5a93b7030f0822c78e2e8e99c8a5d71064127a97ee7ed6c4def928691bdb5cef4609ce7c2304b859a62950224397d4d78240723e13433b2c3d4d071

data/lib/sidekiq-scheduler/version.rb

@@ -1,5 +1,5 @@
 module SidekiqScheduler
 
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 
 end

data/lib/sidekiq-scheduler/web.rb

@@ -10,6 +10,12 @@ module SidekiqScheduler
 
         erb File.read(File.join(VIEW_PATH, 'recurring_jobs.erb'))
       end
+
+      app.get '/recurring-jobs/:name/enqueue' do
+        schedule = Sidekiq.get_schedule(params[:name])
+        Sidekiq::Scheduler.enqueue_job(schedule)
+        redirect to('/recurring-jobs')
+      end
     end
   end
 end

data/lib/sidekiq/scheduler.rb

@@ -104,7 +104,7 @@ module Sidekiq
             @@scheduled_jobs[name] = self.rufus_scheduler.send(interval_type, *args, opts) do
               logger.info "queueing #{config['class']} (#{name})"
               config.delete(interval_type)
-              self.handle_errors { self.enqueue_from_config(config) }
+              self.handle_errors { self.enqueue_job(config) }
             end
 
             interval_defined = true
@@ -134,17 +134,17 @@ module Sidekiq
     end
 
     # Enqueue a job based on a config hash
-    def self.enqueue_from_config(job_config)
+    def self.enqueue_job(job_config)
       config = job_config.dup
 
-      config['class'] = if config['class'].is_a?(String)
-                          config['class'].constantize
-                        else
-                          config['class']
-                        end
+      config['class'] = config['class'].constantize if config['class'].is_a?(String)
       config['args'] = Array(config['args'])
 
-       Sidekiq::Client.push(config)
+      if defined?(ActiveJob) && config['class'].included_modules.include?(ActiveJob::Enqueuing)
+        config['class'].new.enqueue(config)
+      else
+        Sidekiq::Client.push(config)
+      end
     end
 
     def self.rufus_scheduler_options

data/test/lib/sidekiq/scheduler_test.rb

@@ -47,10 +47,10 @@ class ManagerTest < Minitest::Test
           'args' => ['/tmp']
         }
       )
-      Sidekiq::Scheduler.enqueue_from_config(config)
+      Sidekiq::Scheduler.enqueue_job(config)
     end
 
-    it 'enqueue_from_config respects queue params' do
+    it 'enqueue_job respects queue params' do
       config = {
         'cron' => '* * * * *',
         'class' => 'SomeIvarJob',
@@ -66,7 +66,7 @@ class ManagerTest < Minitest::Test
         }
       )
 
-      Sidekiq::Scheduler.enqueue_from_config(config)
+      Sidekiq::Scheduler.enqueue_job(config)
     end
 
     it 'config makes it into the rufus_scheduler' do
@@ -158,7 +158,8 @@ class ManagerTest < Minitest::Test
         }
       )
 
-      sleep(7)
+      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')

data/test/lib/sidekiq/web_test.rb

@@ -10,11 +10,8 @@ class WebTest < MiniTest::Test
       Sidekiq::Web
     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 = {
+    let(:jobs) do
+      {
         'Foo Job' => {
           'class' => 'FooClass',
           'cron' => '0 * * * * US/Eastern',
@@ -31,9 +28,18 @@ class WebTest < MiniTest::Test
       }
     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)
@@ -46,6 +52,21 @@ class WebTest < MiniTest::Test
       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/test_helper.rb

@@ -11,6 +11,7 @@ require 'sidekiq-scheduler'
 require 'mocha/setup'
 require 'multi_json'
 require 'mock_redis'
+require 'timecop'
 
 require 'sidekiq'
 require 'sidekiq/util'

data/web/views/recurring_jobs.erb

@@ -10,6 +10,7 @@
         <th>Class</th>
         <th>Queue</th>
         <th>Arguments</th>
+        <th></th>
       </tr>
     </thead>
 
@@ -24,8 +25,13 @@
             <a href="<%= root_path %>queues/<%= job_spec.fetch('queue', 'default') %>"><%= job_spec.fetch('queue', 'default') %></a>
           </td>
           <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
+            </a>
+          </td>
         </tr>
       <% end %>
     </tbody>
   </table>
-</div>
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Morton Jonuschat
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq