mcmire-delayed_job_web 1.1.3.rc2 → 1.1.3.rc3

data/VERSION

@@ -1 +1 @@
-1.1.3.rc2
+1.1.3.rc3

data/lib/delayed_job_web/application/app.rb

@@ -35,9 +35,10 @@ class DelayedJobWeb < Sinatra::Base
   def tabs
     [
       {:name => 'Overview', :path => '/overview'},
-      {:name => 'Pending', :path => '/pending'},
       {:name => 'Working', :path => '/working'},
+      {:name => 'Pending', :path => '/pending'},
       {:name => 'Failed', :path => '/failed'},
+      {:name => 'All', :path => '/enqueued'},
       {:name => 'Stats', :path => '/stats'}
     ]
   end
@@ -148,7 +149,7 @@ class DelayedJobWeb < Sinatra::Base
   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

@@ -35,10 +35,11 @@ pre { font-family:Courier New; line-height:1.4em; }
 #main p.sub { font-size:95%; color:#999;}
 
 #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; }
-#main table.overview tr.failure td { background:#ffecec; color:#E03434; }
-#main table.overview tr.failure td a{ color:#E03434; }
+#main table.overview td.status { 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.all td { border-top:2px solid silver; font-weight: bold }
 
 #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,9 +1,9 @@
 %h1
-  Enqueued
+  All Jobs
 %p.sub
-  The list below contains all jobs that are waiting to be run.
+  The list below contains all jobs which are in the delayed_jobs table.
 %p.sub
-  = "Showing #{start} to #{start + per_page} of #{@all_jobs.count} enqueued jobs."
+  = "Showing #{start} to #{start + per_page} of #{@all_jobs.count} jobs."
 %ul.job
   - @jobs.each do |job|
     = partial :job, {:job => job}

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

@@ -1,19 +1,26 @@
 %h1
   Overview
+%p.sub
+  The table below gives the state of all jobs in the delayed_jobs table broken
+  down by status.
 %table.overview
   %tr
     %th Status
     %th Count
-  %tr
-    %td.status
-      %a{:href => u('/pending')} Pending Jobs
-    %td= count_all_jobs(:pending)
   %tr
     %td.status
       %a{:href => u('/working')} Working Jobs
     %td= count_all_jobs(:working)
+  %tr
+    %td.status
+      %a{:href => u('/pending')} Pending Jobs
+    %td= count_all_jobs(:pending)
   %tr{:class => count_all_jobs(:failed) > 0 ? 'failure' : ''}
     %td.status
       %a{:href => u('/failed')} Failed Jobs
     %td= count_all_jobs(:failed)
+  %tr.all
+    %td.status
+      %a{:href => u('/enqueued')} All Jobs
+    %td= count_all_jobs
 = poll

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

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

data/mcmire-delayed_job_web.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mcmire-delayed_job_web}
-  s.version = "1.1.3.rc2"
+  s.version = "1.1.3.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erick Schmitt", "Elliot Winkler"]
-  s.date = %q{2012-11-11}
+  s.date = %q{2012-11-12}
   s.default_executable = %q{delayed_job_web}
   s.description = %q{Web interface for delayed_job inspired by resque}
   s.email = %q{ejschmitt@gmail.com}

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: mcmire-delayed_job_web
 version: !ruby/object:Gem::Version 
-  hash: 15424057
+  hash: 15424059
   prerelease: 6
   segments: 
   - 1
   - 1
   - 3
   - rc
-  - 2
-  version: 1.1.3.rc2
+  - 3
+  version: 1.1.3.rc3
 platform: ruby
 authors: 
 - Erick Schmitt
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-11 00:00:00 -07:00
+date: 2012-11-12 00:00:00 -07:00
 default_executable: delayed_job_web
 dependencies: 
 - !ruby/object:Gem::Dependency