mcmire-delayed_job_web 1.1.3.rc1 → 1.1.3.rc2

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
   gem "sinatra", '>= 0.9.2'
   gem "haml", '~> 3.1.3'
-  gem 'activerecord', '> 3.0.0'
+  gem 'activerecord', '> 2.0.0'
   gem 'delayed_job', '> 2.0.3'
   gem 'rdoc'
 

data/README.markdown

@@ -1,16 +1,23 @@
+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.
+
+---
+
 delayed_job_web
 ===============
 
-A [resque][0] inspired (read: stolen) interface for delayed_job.
-This gem is written to work with rails 3 applications using
-activerecord.
+A [resque][0] inspired (read: stolen) interface for delayed_job. This gem is
+written to work with Rails 2 and 3 applications using activerecord.
 
 Some features:
 
-* Easily view jobs enqueued, working, pending, and failed.
-* Queue any single job. or all pending jobs, to run immediately.
+* Easily view pending, working, and failed jobs.
+* Queue any single job, or all pending jobs, to run immediately.
 * Remove a failed job, or easily remove all failed jobs.
-* Watch delayed_job operation with live ajax polling.
 
 Quick Start For Rails 3 Applications
 ------------------------------------
@@ -33,16 +40,62 @@ Add a route to your application for accessing the interface
 match "/delayed_job" => DelayedJobWeb, :anchor => false
 ```
 
-You probably want to password protect the interface, an easy way is to add something like this your config.ru file
+You probably want to password protect the interface, an easy way is to add
+something like this your config.ru file
+
+```ruby
+if Rails.env.production?
+  DelayedJobWeb.use Rack::Auth::Basic do |username, password|
+    username == 'username' && password == 'password'
+  end
+end
+```
+
+Quick Start For Rails 2.x Applications
+--------------------------------------
+
+Yes, this works for older Rails apps too, but it requires a little bit of extra
+work.
+
+First, in starting your app you will have to go outside of the Rails framework a
+bit. Rails 2.x doesn't have the concept of mountable apps, but Rack does. So
+if you want to access the DelayedJob interface, you'll need to start your app
+Rack-style.
+
+First begin by adding a config.ru file that looks something like this:
 
 ```ruby
+require File.dirname(__FILE__) + '/config/environment'
+
+# For some reason this doesn't happen automatically anymore
+Delayed::Worker.guess_backend
+
 if Rails.env.production?
   DelayedJobWeb.use Rack::Auth::Basic do |username, password|
     username == 'username' && password == 'password'
   end
 end
+
+app = Rack::Builder.new {
+  use Rails::Rack::Static
+
+  map "/delayed_jobs" do
+    run DelayedJobWeb.new
+  end
+
+  map "/" do
+    run ActionController::Dispatcher.new
+  end
+}.to_app
+
+run app
 ```
 
+Now to run your Rails app, use `rackup` instead of `script/server`. In
+production, you will obviously want to make sure whatever you are using to run
+your app does this as well. (Passenger does by default.)
+
+
 The Interface - Yea, a ripoff of resque-web
 ------------------------------------
 
@@ -59,3 +112,4 @@ Erick Schmitt - [@ejschmitt][1]
 
 [0]: https://github.com/defunkt/resque
 [1]: http://twitter.com/ejschmitt
+[2]: http://github.com/mcmire

data/Rakefile

@@ -14,13 +14,13 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "delayed_job_web"
+  gem.name = "mcmire-delayed_job_web"
   gem.homepage = "http://github.com/ejschmitt/delayed_job_web"
   gem.license = "MIT"
   gem.summary = "Web interface for delayed_job"
   gem.description = "Web interface for delayed_job inspired by resque"
   gem.email = "ejschmitt@gmail.com"
-  gem.authors = ["Erick Schmitt"]
+  gem.authors = ["Erick Schmitt", "Elliot Winkler"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3.rc2

data/lib/delayed_job_web/application/app.rb

@@ -35,9 +35,8 @@ class DelayedJobWeb < Sinatra::Base
   def tabs
     [
       {:name => 'Overview', :path => '/overview'},
-      {:name => 'Enqueued', :path => '/enqueued'},
-      {:name => 'Working', :path => '/working'},
       {:name => 'Pending', :path => '/pending'},
+      {:name => 'Working', :path => '/working'},
       {:name => 'Failed', :path => '/failed'},
       {:name => 'Stats', :path => '/stats'}
     ]
@@ -66,41 +65,90 @@ class DelayedJobWeb < Sinatra::Base
 
   %w(enqueued working pending failed).each do |page|
     get "/#{page}" do
-      @jobs = delayed_jobs(page.to_sym).order('created_at desc, id desc').offset(start).limit(per_page)
-      @all_jobs = delayed_jobs(page.to_sym)
+      @jobs = find_all_jobs(page.to_sym,
+        :order => 'created_at desc, id desc',
+        :offset => start,
+        :limit => per_page
+      )
+      @all_jobs = find_all_jobs(page.to_sym)
       haml page.to_sym
     end
   end
 
   get "/remove/:id" do
-    delayed_job.find(params[:id]).delete
+    remove_job(params[:id])
     redirect back
   end
 
   get "/requeue/:id" do
-    job = delayed_job.find(params[:id])
-    job.update_attributes(:run_at => Time.now, :failed_at => nil)
+    update_job(params[:id], :run_at => Time.now, :failed_at => nil)
     redirect back
   end
 
   post "/failed/clear" do
-    delayed_job.destroy_all(delayed_job_sql(:failed))
+    remove_jobs(:failed)
     redirect u('failed')
   end
 
   post "/requeue/all" do
-    delayed_jobs(:failed).update_all(:run_at => Time.now, :failed_at => nil)
+    requeue_failed_jobs
     redirect back
   end
 
-  def delayed_jobs(type)
-    delayed_job.where(delayed_job_sql(type))
+  def find_all_jobs(type, opts={})
+    conditions = delayed_job_sql(type)
+    if Rails.version.to_s =~ /^2/
+      delayed_job.find(:all, {:conditions => conditions}.merge(opts))
+    else
+      scope = delayed_job.where(conditions)
+      scope.order(opts[:order]) if opts[:order]
+      scope.offset(opts[:offset]) if opts[:offset]
+      scope.limit(opts[:limit]) if opts[:limit]
+      scope
+    end
+  end
+
+  def count_all_jobs(type=nil)
+    if type.nil?
+      return delayed_job.count
+    end
+    if Rails.version.to_s =~ /^2/
+      delayed_job.count(:conditions => delayed_job_sql(type))
+    else
+      find_all_jobs(type).count
+    end
+  end
+
+  def find_job(id)
+    delayed_job.find(id)
+  end
+
+  def update_job(id, attrs)
+    job = find_job(id)
+    job.update_attributes(attrs)
+  end
+
+  def remove_job(id)
+    find_job(id).delete
+  end
+
+  def remove_jobs(type)
+    delayed_job.destroy_all(delayed_job_sql(type))
+  end
+
+  def requeue_failed_jobs
+    updates = {:run_at => Time.now, :failed_at => nil}
+    if Rails.version.to_s =~ /^2/
+      delayed_job.update_all(updates, delayed_job_sql(:failed))
+    else
+      find_all_jobs(:failed).update_all(updates)
+    end
   end
 
   def delayed_job_sql(type)
     case type
     when :enqueued
-      ''
+      'run_at is null or (run_at is not null and last_error is null)'
     when :working
       'locked_at is not null'
     when :failed

data/lib/delayed_job_web/application/public/stylesheets/style.css

@@ -36,9 +36,9 @@ pre { font-family:Courier New; line-height:1.4em; }
 
 #main table.overview { width:40%;}
 #main table.overview td.status { font-weight:bold; width:50%;}
-#main table.overview tr.failed td { border-top:2px solid; font-size:90%; }
-#main table.overview tr.failure td { background:#ffecec; border-top:2px solid #d37474; font-size:90%; color:#d37474;}
-#main table.overview tr.failure td a{ color:#d37474;}
+#main table.overview tr.failed td { border-top:2px solid; }
+#main table.overview tr.failure td { background:#ffecec; color:#E03434; }
+#main table.overview tr.failure td a{ color:#E03434; }
 
 #main table.jobs td.class { font-family:Monaco, "Courier New", monospace; font-size:90%; width:50%;}
 #main table.jobs td.args{ width:50%;}

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

@@ -1,7 +1,7 @@
 %h1
   Enqueued
 %p.sub
-  The list below contains all jobs currently in the delayed_job queue.
+  The list below contains all jobs that are waiting to be run.
 %p.sub
   = "Showing #{start} to #{start + per_page} of #{@all_jobs.count} enqueued jobs."
 %ul.job

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

@@ -1,25 +1,19 @@
 %h1
   Overview
-%p.sub
-  The list below shows an overview of the jobs in the delayed_job queue.
 %table.overview
   %tr
     %th Status
     %th Count
   %tr
     %td.status
-      %a{:href => u('/enqueued')} Enqueued Jobs
-    %td= delayed_job.count
+      %a{:href => u('/pending')} Pending Jobs
+    %td= count_all_jobs(:pending)
   %tr
     %td.status
       %a{:href => u('/working')} Working Jobs
-    %td= delayed_jobs(:working).count
-  %tr
-    %td.status
-      %a{:href => u('/pending')} Pending Jobs
-    %td= delayed_jobs(:pending).count
-  %tr{:class => delayed_jobs(:failed).count > 0 ? 'failure' : ''}
+    %td= count_all_jobs(:working)
+  %tr{:class => count_all_jobs(:failed) > 0 ? 'failure' : ''}
     %td.status
       %a{:href => u('/failed')} Failed Jobs
-    %td= delayed_jobs(:failed).count
+    %td= count_all_jobs(:failed)
 = poll

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

@@ -8,13 +8,13 @@
   %tr
     %th.status
       failed
-    %th= delayed_jobs(:failed).count
+    %th= count_all_jobs(:failed)
   %tr
     %th.status
       pending
-    %th= delayed_jobs(:pending).count
+    %th= count_all_jobs(:pending)
   %tr
     %th.status
       working
-    %th= delayed_jobs(:working).count
+    %th= count_all_jobs(:working)
 = poll

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.rc1"
+  s.version = "1.1.3.rc2"
 
   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: 15424063
+  hash: 15424057
   prerelease: 6
   segments: 
   - 1
   - 1
   - 3
   - rc
-  - 1
-  version: 1.1.3.rc1
+  - 2
+  version: 1.1.3.rc2
 platform: ruby
 authors: 
 - Erick Schmitt