mcmire-delayed_job_web 1.1.3.rc3 → 1.1.3.rc4

data/README.markdown

@@ -1,9 +1,8 @@
-About this Fork
+About This Fork
 ===============
 
-This fork by [@mcmire][2] adds Rails 2.x support, and also removes the
-"enqueued" tab from the UI (because I didn't see a need for it). I also updated
-the README below.
+This fork by [@mcmire][2] adds Rails 2.x support, and also repurposes the
+"enqueued" tab as an "all jobs" tab. I also updated the README below.
 
 ---
 
@@ -15,33 +14,33 @@ written to work with Rails 2 and 3 applications using activerecord.
 
 Some features:
 
-* Easily view pending, working, and failed jobs.
+* Easily view pending, working, failed, and all jobs.
 * Queue any single job, or all pending jobs, to run immediately.
 * Remove a failed job, or easily remove all failed jobs.
 
 Quick Start For Rails 3 Applications
 ------------------------------------
 
-Add the dependency to your Gemfile
+Add the dependency to your Gemfile:
 
 ```ruby
 gem "delayed_job_web"
 ```
 
-Install it...
+Install it:
 
 ```ruby
 bundle
 ```
 
-Add a route to your application for accessing the interface
+Add a route to your application for accessing the interface:
 
 ```ruby
-match "/delayed_job" => DelayedJobWeb, :anchor => false
+mount DelayedJobWeb => '/delayed_job'
 ```
 
-You probably want to password protect the interface, an easy way is to add
-something like this your config.ru file
+Finally, you'll probably want to password-protect the interface. An easy way to
+do this is to add something like this to your config.ru file:
 
 ```ruby
 if Rails.env.production?

data/VERSION

@@ -1 +1 @@
-1.1.3.rc3
+1.1.3.rc4

data/lib/delayed_job_web/application/app.rb

@@ -96,6 +96,11 @@ class DelayedJobWeb < Sinatra::Base
     redirect back
   end
 
+  post "/clear" do
+    remove_jobs
+    redirect back
+  end
+
   def find_all_jobs(type, opts={})
     conditions = delayed_job_sql(type)
     if Rails.version.to_s =~ /^2/
@@ -133,8 +138,12 @@ class DelayedJobWeb < Sinatra::Base
     find_job(id).delete
   end
 
-  def remove_jobs(type)
-    delayed_job.destroy_all(delayed_job_sql(type))
+  def remove_jobs(type=nil)
+    if type
+      delayed_job.destroy_all(delayed_job_sql(type))
+    else
+      delayed_job.destroy_all
+    end
   end
 
   def requeue_failed_jobs

data/lib/delayed_job_web/application/public/javascripts/application.js

@@ -61,4 +61,8 @@ $(function() {
 
     return false
   })
+
+  $('.btn.confirm').click(function() {
+    return window.confirm($(this).data('message'));
+  })
 })

data/lib/delayed_job_web/application/views/enqueued.haml

@@ -1,5 +1,7 @@
-%h1
-  All Jobs
+%h1 All Jobs
+- if @jobs.any?
+  %form{:method => 'POST', :action => u('clear')}
+    %input{:type => 'submit', :value => 'Clear All Jobs', :class => 'btn confirm', :'data-message' => 'Are you sure you want to clear all jobs? This cannot be undone.'}
 %p.sub
   The list below contains all jobs which are in the delayed_jobs table.
 %p.sub

data/lib/delayed_job_web/application/views/failed.haml

@@ -1,7 +1,7 @@
 %h1 Failed Jobs
 - if @jobs.any?
   %form{:method => 'POST', :action => u('failed/clear')}
-    %input{:type => 'submit', :value => 'Clear Failed Jobs'}
+    %input{:type => 'submit', :value => 'Clear Failed Jobs', :class => 'btn confirm', :'data-message' => 'Are you sure you want to clear all failed jobs? This cannot be undone.'}
   %form{:method => 'POST', :action => u('requeue/all')}
     %input{:type => 'submit', :value => 'Retry Failed Jobs'}
 

data/lib/delayed_job_web/application/views/pending.haml

@@ -2,9 +2,9 @@
   Pending
 - if @jobs.any?
   %form{:method => 'POST', :action => u('requeue/all')}
-    %input{:type => 'submit', :value => 'Enqueue All Immediately'}
+    %input{:type => 'submit', :value => 'Re-enqueue Pending Jobs'}
 %p.sub
-  The list below contains jobs which are waiting to be processed.
+  The list below contains jobs which are waiting to be run.
 %p.sub= "Showing #{start} to #{start + per_page} of #{@all_jobs.count} pending jobs."
 %ul.job
   - @jobs.each do |job|

data/lib/delayed_job_web/application/views/working.haml

@@ -1,7 +1,7 @@
 %h1
   Working
 %p.sub
-  The list below contains jobs currently being processed.
+  The list below contains jobs which are currently being run.
 %p.sub= "Showing #{start} to #{start + per_page} of #{@all_jobs.count} working jobs."
 %ul.job
   - @jobs.each do |job|

data/mcmire-delayed_job_web.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mcmire-delayed_job_web}
-  s.version = "1.1.3.rc3"
+  s.version = "1.1.3.rc4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erick Schmitt", "Elliot Winkler"]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: mcmire-delayed_job_web
 version: !ruby/object:Gem::Version 
-  hash: 15424059
+  hash: 15424053
   prerelease: 6
   segments: 
   - 1
   - 1
   - 3
   - rc
-  - 3
-  version: 1.1.3.rc3
+  - 4
+  version: 1.1.3.rc4
 platform: ruby
 authors: 
 - Erick Schmitt