sidetiq 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+0.1.5
+-----
+
+- Allow jobs to be scheduled for immediate runs via the web extension.

data/README.md

@@ -110,23 +110,23 @@ Sidetiq.configure do |config|
 end
 ```
 
-## WEB EXTENSION
+## NOTES
 
-Sidetiq includes an extension for Sidekiq's web interface. It will not be
-loaded by default, so it will have to be required manually:
+By default Sidekiq uses a 15 second polling interval to check if scheduled
+jobs are due. If a recurring job has to run more often than that you should
+lower this value.
 
 ```ruby
-require 'sidetiq/web'
+Sidekiq.options[:poll_interval] = 1
 ```
 
-### NOTES
+## WEB EXTENSION
 
-By default Sidekiq uses a 15 second polling interval to check if scheduled
-jobs are due. If a recurring job has to run more often than that you should
-lower this value.
+Sidetiq includes an extension for Sidekiq's web interface. It will not be
+loaded by default, so it will have to be required manually:
 
 ```ruby
-Sidekiq.options[:poll_interval] = 1
+require 'sidetiq/web'
 ```
 
 ### SCREENSHOT

data/lib/sidetiq/version.rb

@@ -8,7 +8,7 @@ module Sidetiq
     MINOR = 1
 
     # Public: Sidetiq patch level.
-    PATCH = 4
+    PATCH = 5
 
     # Public: String representation of the current Sidetiq version.
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')

data/lib/sidetiq/views/sidetiq.slim

@@ -12,12 +12,13 @@ header.row
     - @schedules.each do |worker, schedule|
       tr
         td
-          = worker.name
+          a href="#{root_path}sidetiq/#{worker.name}"= worker.name
         td= worker.get_sidekiq_options['queue']
         td
           == relative_time(schedule.next_occurrence(@time))
         td
-          a href="#{root_path}sidetiq/#{worker.name}" Details
+          form action="#{root_path}sidetiq/#{worker.name}/trigger" method="post"
+            input.btn.btn-danger.btn-small type="submit" name="trigger" value="Trigger" data-confirm="Are you sure you want to trigger this job?"
 - else
   .alert.alert-success No recurring jobs found.
 

data/lib/sidetiq/web.rb

@@ -5,27 +5,45 @@ module Sidetiq
     VIEWS = File.expand_path('views', File.dirname(__FILE__))
 
     def self.registered(app)
+      app.helpers do
+        def sidetiq_clock
+          Sidetiq::Clock.instance
+        end
+
+        def sidetiq_schedules
+          sidetiq_clock.schedules
+        end
+      end
+
       app.get "/sidetiq" do
-        clock = Sidetiq::Clock.instance
-        @schedules = clock.schedules
-        @time = clock.gettime
+        @schedules = sidetiq_schedules
+        @time = sidetiq_clock.gettime
         slim File.read(File.join(VIEWS, 'sidetiq.slim'))
       end
 
       app.get "/sidetiq/:name" do
         halt 404 unless (name = params[:name])
 
-        clock = Sidetiq::Clock.instance
-        schedules = clock.schedules
-
-        @time = clock.gettime
+        @time = sidetiq_clock.gettime
 
-        @worker, @schedule = schedules.select do |worker, schedule|
+        @worker, @schedule = sidetiq_schedules.select do |worker, schedule|
           worker.name == name
         end.flatten
 
         slim File.read(File.join(VIEWS, 'sidetiq_details.slim'))
       end
+
+      app.post "/sidetiq/:name/trigger" do
+        halt 404 unless (name = params[:name])
+
+        worker, _ = sidetiq_schedules.select do |worker, schedule|
+          worker.name == name
+        end.flatten
+
+        worker.perform_async
+
+        redirect "#{root_path}sidetiq"
+      end
     end
   end
 end

data/test/test_web.rb

@@ -20,6 +20,15 @@ class TestWeb < Sidetiq::TestCase
     Sidekiq::Web
   end
 
+  def host
+    last_request.host
+  end
+
+  def setup
+    super
+    Worker.jobs.clear
+  end
+
   def test_home_tab
     get '/'
     assert_equal 200, last_response.status
@@ -54,5 +63,12 @@ class TestWeb < Sidetiq::TestCase
       assert_match /#{time.getutc.to_s}/, last_response.body
     end
   end
+
+  def test_trigger
+    post "/sidetiq/#{Worker.name}/trigger"
+    assert_equal 302, last_response.status
+    assert_equal "http://#{host}/sidetiq", last_response.location
+    assert_equal 1, Worker.jobs.size
+  end
 end
 

metadata

@@ -2,14 +2,14 @@
 name: sidetiq
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Tobias Svensson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -53,6 +53,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md