delayed_job_web 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b1747cd568048db0cb506ccade13936467232c7
-  data.tar.gz: 47fe80185455b916f68b39aa6300fc823471efb8
+  metadata.gz: a024d8e2555f5bb896f5cbe5f077eee5422a6db8
+  data.tar.gz: 4538ff701954c0b3c6cf67520a0363e7c6e3b97c
 SHA512:
-  metadata.gz: c36d123758d03d6b9f07e4babc50f818119db18870014043ed4f6d3f89f7d8d46723de81046a5f5ddfba3e04f14f561a34b1b0100f9ede20c3657635275b9698
-  data.tar.gz: 2e4e047d9d783903e1b8129bfdd5270bdf78cb3ef40619dd529ec72fb7a523695218c9b62bb48124138f16183f4fa93238ed324df236665bf69c0818e354caf9
+  metadata.gz: 5811906545e849a206af0911ba0cbf0ab5a5cb67840420e8985758507dcc1dd045d75e492eb079be75e59d5fc1c1551fc28df974f1a9dffb1aaa36f8d36edbde
+  data.tar.gz: 3207d0809ed97d6607d37d0a2d28848406ad11c0ac8d599890709ba05d2be1179adb19064670d8c0ab38b737a50e6c75e93c3c6b2d6a31dc047de68100721f24

data/Gemfile

@@ -1,14 +1,3 @@
 source "https://rubygems.org"
-  gem "tilt", "1.4.1"
-  gem "sinatra", '>= 0.9.2'
-  gem "haml", '>= 3.1.3'
-  gem 'activerecord', '> 3.0.0'
-  gem 'delayed_job', '> 2.0.3'
-  gem 'rdoc'
 
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "> 1.0.0"
-  gem "jeweler"
-  gem "rack-test", ">= 0"
-end
+gemspec

data/README.markdown

@@ -11,6 +11,7 @@ Some features:
 * 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.
+* Filter delayed_jobs by queue name
 
 Quick Start For Rails 3 and 4 Applications
 ------------------------------------
@@ -27,10 +28,11 @@ Install it...
 bundle
 ```
 
-Add a route to your application for accessing the interface
+Add the following route to your application for accessing the interface,
+and retrying failed jobs.
 
 ```ruby
-get "/delayed_job" => DelayedJobWeb, :anchor => false
+match "/delayed_job" => DelayedJobWeb, :anchor => false, via: [:get, :post]
 ```
 
 You probably want to password protect the interface, an easy way is to add something like this your config.ru file
@@ -45,6 +47,29 @@ end
 
 `delayed_job_web` runs as a Sinatra application within the rails application. Visit it at `/delayed_job_web`.
 
+## Serving static assets
+
+If you mount the app on another route, you may encounter the CSS not working anymore. To work around this you can leverage a special HTTP header. Install it, activate it and configure it -- see below.
+
+### Apache
+
+    XSendFile On 
+    XSendFilePath /path/to/shared/bundle
+
+[`XSendFilePath`](https://tn123.org/mod_xsendfile/) white-lists a directory from which static files are allowed to be served. This should be at least the path to where delayed_job_web is installed.
+
+Using Rails you'll have to set `config.action_dispatch.x_sendfile_header = "X-Sendfile"`.
+
+### Nginx
+
+Nginx uses an equivalent that's called `X-Accel-Redirect`, further instructions can be found [in their wiki](http://wiki.nginx.org/XSendfile).
+
+Rails' will need to be configured to `config.action_dispatch.x_sendfile_header = "X-Accel-Redirect"`.
+
+### Lighttpd
+
+Lighty is more `X-Sendfile`, like [outlined](http://redmine.lighttpd.net/projects/1/wiki/X-LIGHTTPD-send-file) in their wiki.
+
 The Interface - Yea, a ripoff of resque-web
 ------------------------------------
 

data/Rakefile

@@ -11,20 +11,6 @@ rescue Bundler::BundlerError => e
 end
 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.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"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

data/delayed_job_web.gemspec

@@ -1,15 +1,12 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = "delayed_job_web"
-  s.version = "1.2.2"
+  s.version = "1.2.4"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = "2.0.14"
   s.authors = ["Erick Schmitt"]
-  s.date = "2014-01-14"
+  s.date = "2014-01-29"
   s.description = "Web interface for delayed_job inspired by resque"
   s.email = "ejschmitt@gmail.com"
   s.executables = ["delayed_job_web"]
@@ -23,7 +20,6 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.markdown",
     "Rakefile",
-    "VERSION",
     "bin/delayed_job_web",
     "delayed_job_web.gemspec",
     "lib/delayed_job_web.rb",
@@ -34,62 +30,28 @@ Gem::Specification.new do |s|
     "lib/delayed_job_web/application/public/javascripts/jquery.relatize_date.js",
     "lib/delayed_job_web/application/public/stylesheets/reset.css",
     "lib/delayed_job_web/application/public/stylesheets/style.css",
-    "lib/delayed_job_web/application/views/enqueued.haml",
-    "lib/delayed_job_web/application/views/error.haml",
-    "lib/delayed_job_web/application/views/failed.haml",
-    "lib/delayed_job_web/application/views/job.haml",
-    "lib/delayed_job_web/application/views/layout.haml",
-    "lib/delayed_job_web/application/views/next_more.haml",
-    "lib/delayed_job_web/application/views/overview.haml",
-    "lib/delayed_job_web/application/views/pending.haml",
-    "lib/delayed_job_web/application/views/stats.haml",
-    "lib/delayed_job_web/application/views/working.haml",
+    "lib/delayed_job_web/application/views/enqueued.erb",
+    "lib/delayed_job_web/application/views/error.erb",
+    "lib/delayed_job_web/application/views/failed.erb",
+    "lib/delayed_job_web/application/views/job.erb",
+    "lib/delayed_job_web/application/views/layout.erb",
+    "lib/delayed_job_web/application/views/next_more.erb",
+    "lib/delayed_job_web/application/views/overview.erb",
+    "lib/delayed_job_web/application/views/pending.erb",
+    "lib/delayed_job_web/application/views/stats.erb",
+    "lib/delayed_job_web/application/views/working.erb",
     "test/helper.rb",
     "test/test_delayed_job_web.rb"
   ]
   s.homepage = "http://github.com/ejschmitt/delayed_job_web"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.6"
   s.summary = "Web interface for delayed_job"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<tilt>, ["= 1.4.1"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_runtime_dependency(%q<haml>, [">= 3.1.3"])
-      s.add_runtime_dependency(%q<activerecord>, ["> 3.0.0"])
-      s.add_runtime_dependency(%q<delayed_job>, ["> 2.0.3"])
-      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rack-test>, [">= 0"])
-    else
-      s.add_dependency(%q<tilt>, ["= 1.4.1"])
-      s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_dependency(%q<haml>, [">= 3.1.3"])
-      s.add_dependency(%q<activerecord>, ["> 3.0.0"])
-      s.add_dependency(%q<delayed_job>, ["> 2.0.3"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["> 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rack-test>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<tilt>, ["= 1.4.1"])
-    s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<haml>, [">= 3.1.3"])
-    s.add_dependency(%q<activerecord>, ["> 3.0.0"])
-    s.add_dependency(%q<delayed_job>, ["> 2.0.3"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["> 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rack-test>, [">= 0"])
-  end
+  s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
+  s.add_runtime_dependency(%q<activerecord>, ["> 3.0.0"])
+  s.add_runtime_dependency(%q<delayed_job>, ["> 2.0.3"])
+  s.add_development_dependency(%q<shoulda>, [">= 0"])
+  s.add_development_dependency(%q<rack-test>, [">= 0"])
 end
 

data/lib/delayed_job_web/application/app.rb

@@ -2,14 +2,16 @@ require 'sinatra/base'
 require 'active_support'
 require 'active_record'
 require 'delayed_job'
-require 'haml'
 
 class DelayedJobWeb < Sinatra::Base
   set :root, File.dirname(__FILE__)
   set :static, true
   set :public_folder,  File.expand_path('../public', __FILE__)
   set :views,  File.expand_path('../views', __FILE__)
-  set :haml, { :format => :html5 }
+  
+  before do
+    @queues = (params[:queues] || "").split(",").map{|queue| queue.strip}.uniq.compact
+  end
 
   def current_page
     url_path request.path_info.sub('/','')
@@ -22,11 +24,13 @@ class DelayedJobWeb < Sinatra::Base
   def per_page
     20
   end
-
+  
   def url_path(*path_parts)
-    [ path_prefix, path_parts ].join("/").squeeze('/')
+    url = [ path_prefix, path_parts ].join("/").squeeze('/')
+    url += "?queues=#{@queues.join(",")}" unless @queues.empty?
+    url
   end
-  alias_method :u, :url_path
+ alias_method :u, :url_path
 
   def path_prefix
     request.env['SCRIPT_NAME']
@@ -53,22 +57,22 @@ class DelayedJobWeb < Sinatra::Base
 
   get '/overview' do
     if delayed_job
-      haml :overview
+      erb :overview
     else
       @message = "Unable to connected to Delayed::Job database"
-      haml :error
+      erb :error
     end
   end
 
   get '/stats' do
-    haml :stats
+    erb :stats
   end
 
   %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)
-      haml page.to_sym
+      @jobs     = delayed_jobs(page.to_sym, @queues).order('created_at desc, id desc').offset(start).limit(per_page)
+      @all_jobs = delayed_jobs(page.to_sym, @queues)
+      erb page.to_sym
     end
   end
 
@@ -90,23 +94,23 @@ class DelayedJobWeb < Sinatra::Base
   end
 
   post "/failed/clear" do
-    delayed_job.destroy_all(delayed_job_sql(:failed))
+    delayed_job.destroy_all(delayed_job_sql(:failed, @queues))
     redirect u('failed')
   end
 
   post "/requeue/all" do
-    delayed_jobs(:failed).update_all(:run_at => Time.now, :failed_at => nil)
+    delayed_jobs(:failed, @queues).update_all(:run_at => Time.now, :failed_at => nil)
     redirect back
   end
 
-  def delayed_jobs(type)
-    delayed_job.where(delayed_job_sql(type))
+  def delayed_jobs(type, queues = [])
+    delayed_job.where(delayed_job_sql(type, queues))
   end
 
-  def delayed_job_sql(type)
-    case type
-    when :enqueued
-      ''
+  def delayed_job_sql(type, queues = [])
+    conditions = []
+    
+    conditions << case type
     when :working
       'locked_at is not null'
     when :failed
@@ -114,6 +118,10 @@ class DelayedJobWeb < Sinatra::Base
     when :pending
       'attempts = 0'
     end
+    
+    conditions << "queue IN ('#{queues.join("','")}')" unless queues.empty?
+    
+    conditions.compact.join(" AND ")
   end
 
   get "/?" do
@@ -122,7 +130,7 @@ class DelayedJobWeb < Sinatra::Base
 
   def partial(template, local_vars = {})
     @partial = true
-    haml(template.to_sym, {:layout => false}, local_vars)
+    erb(template.to_sym, {:layout => false}, local_vars)
   ensure
     @partial = false
   end
@@ -141,7 +149,7 @@ class DelayedJobWeb < Sinatra::Base
     if @polling
       text = "Last Updated: #{Time.now.strftime("%H:%M:%S")}"
     else
-      text = "<a href='#{u(request.path_info)}.poll' rel='poll'>Live Poll</a>"
+      text = "<a href='#{u(request.path_info + ".poll")}' rel='poll'>Live Poll</a>"
     end
     "<p class='poll'>#{text}</p>"
   end
@@ -150,8 +158,8 @@ class DelayedJobWeb < Sinatra::Base
     content_type "text/html"
     @polling = true
     # show(page.to_sym, false).gsub(/\s{1,}/, ' ')
-    @jobs = delayed_jobs(page.to_sym)
-    haml(page.to_sym, {:layout => false})
+    @jobs = delayed_jobs(page.to_sym, @queues)
+    erb(page.to_sym, {:layout => false})
   end
 
 end

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

@@ -0,0 +1,13 @@
+<h1>Enqueued</h1>
+<p class="sub">
+  The list below contains all jobs currently in the delayed_job queue.
+</p>
+<p class="sub">
+  <%= "Showing #{start} to #{start + per_page} of #{@all_jobs.count} enqueued jobs." %>
+</p>
+<ul class="job">
+  <% @jobs.each do |job| %>
+    <%= partial :job, {:job => job} %>
+  <% end %>
+</ul>
+<%= partial :next_more, :start => start, :total_size => @all_jobs.count, :per_page => per_page %>

data/lib/delayed_job_web/application/views/error.erb

@@ -0,0 +1,2 @@
+<h1>Error</h1>
+<p><%= @message %></p>

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

@@ -0,0 +1,21 @@
+<h1>Failed Jobs</h1>
+<% if @jobs.any? %>
+  <form action="<%= u('failed/clear') %>" method="POST">
+    <input type="submit" value="Clear Failed Jobs"></input>
+  </form>
+  <form action="<%= u('requeue/all') %>" method="POST">
+    <input type="submit" value="Retry Failed Jobs"></input>
+  </form>
+<% end %>
+<p class="sub">
+  The list below contains all jobs that have a last_error message set.
+</p>
+<p class="sub">
+  <%= "Showing #{start} to #{start + per_page} of #{@all_jobs.count} failed jobs." %>
+</p>
+<ul class="failed job">
+  <% @jobs.each do |job| %>
+    <%= partial :job, {:job => job} %>
+  <% end %>
+</ul>
+<%= partial :next_more, :start => start, :total_size => @all_jobs.count, :per_page => per_page %>

data/lib/delayed_job_web/application/views/job.erb

@@ -0,0 +1,61 @@
+<li class="job">
+  <dl>
+    <dt>ID</dt>
+    <dd>
+      <a name="<%= job.id %>"></a>
+      <a href="#<%= job.id %>"><%= job.id %></a>
+      <div class="controls">
+        <a href="<%= u("requeue/#{job.id}") %>" rel="retry">Retry</a>
+        or
+        <a href="<%= u("remove/#{job.id}") %>" rel="remove">Remove</a>
+        or
+        <a href="<%= u("reload/#{job.id}") %>" rel="reload_job">Reload Job</a>
+      </div>
+    </dd>
+    <dt>Priority</dt>
+    <dd><%= job.priority %></dd>
+    <dt>Attempts</dt>
+    <dd><%= job.attempts %></dd>
+    <% if job.respond_to?(:queue) && job.queue %>
+      <dt>Queue</dt>
+      <dd><%= job.queue %></dd>
+    <% end %>
+    <dt>Handler</dt>
+    <dd>
+    <pre><%= job.handler %></pre>
+    </dd>
+    <% if job.last_error %>
+      <dt>Last Error</dt>
+      <dd>
+        <div class="backtrace">
+          <pre><%= job.last_error[0..100] + '...' %></pre>
+        </div>
+        <a class="backtrace" href="#">Toggle full message</a>
+        <div class="backtrace full hide">
+          <pre><%= job.last_error %></pre>
+        </div>
+      </dd>
+    <% end %>
+    <% if job.run_at %>
+      <dt>Run At</dt>
+      <dd class="time">
+        <%= job.run_at.rfc822 %>
+      </dd>
+    <% end %>
+    <% if job.locked_at %>
+      <dt>Locked At</dt>
+      <dd class="time">
+        <%= job.locked_at.rfc822 %>
+      </dd>
+    <% end %>
+    <% if job.locked_by %>
+      <dt>Locked By</dt>
+      <dd>
+        <%= job.locked_by %>
+      </dd>
+    <% end %>
+    <% if job.failed_at %>
+      <dt>Failed At</dt>
+    <% end %>
+  </dl>
+</li>

data/lib/delayed_job_web/application/views/layout.erb

@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <title>Delayed Job Web</title>
+    <link rel="stylesheet" type="text/css" href="stylesheets/reset.css" />
+    <link rel="stylesheet" type="text/css" href="stylesheets/style.css" />
+  </head>
+  <body>
+    <div class="header">
+      <ul class="nav">
+        <% tabs.each do |tab| %>
+          <li class="<%= request.path_info == tab[:path] ? 'current' : '' %>">
+            <a class="tab" href="<%= u(tab[:path]) %>">
+              <%= tab[:name] %>
+            </a>
+          </li>
+        <% end %>
+        <li>
+          <form method="get" action="" style="display:inline; width: 100%;">
+            <input name="queues" type="text" value="<%= @queues.join(", ") %>" style="width: 300px;" placeholder="Filter jobs by queue name (e.g. queue1, queue2)" />
+            <input type="submit" value="Filter" />
+          </form>
+        </li>
+      </ul>
+    </div>
+    <div id="main">
+      <%= yield %>
+    </div>
+    <div id="footer">
+      <p>
+        Powered by
+        <a href="https://github.com/collectiveidea/delayed_job">delayed_job</a>
+        &
+        <a href="https://github.com/ejschmitt/delayed_job_web">delayed_job_web</a>
+      </p>
+    </div>
+    <script src="<%= u("javascripts/jquery-1.7.1.min.js") %>" type="text/javascript"></script>
+    <script src="<%= u("javascripts/jquery.relatize_date.js") %>" type="text/javascript"></script>
+    <script src="<%= u("javascripts/application.js") %>" type="text/javascript"></script>
+  </body>
+</html>

data/lib/delayed_job_web/application/views/next_more.erb

@@ -0,0 +1,11 @@
+<% if start - per_page >= 0 || start + per_page <= total_size %>
+<% divider = @queues.empty? ? "?" : "&" %>
+  <p class="pagination">
+    <% if start - per_page >= 0 %>
+      <a class="less" href="<%= current_page %><%= divider %>start=<%= start - per_page %>">&laquo; less</a>
+    <% end %>
+    <% if start + per_page < total_size %>
+      <a class="more" href="<%= current_page %><%= divider %>start=<%= start + per_page %>">more &raquo;</a>
+    <% end %>
+  </p>
+<% end %>

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

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

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

@@ -0,0 +1,18 @@
+<h1>Pending</h1>
+<% if @jobs.any? %>
+  <form action="<%= u('requeue/all') %>" method="POST">
+    <input type="submit" value="Enqueue All Immediately"></input>
+  </form>
+<% end %>
+<p class="sub">
+  The list below contains jobs currently being processed.
+</p>
+<p class="sub">
+  <%= "Showing #{start} to #{start + per_page} of #{@all_jobs.count} pending jobs." %>
+</p>
+<ul class="job">
+  <% @jobs.each do |job| %>
+    <%= partial :job, {:job => job} %>
+  <% end %>
+</ul>
+<%= partial :next_more, :start => start, :total_size => @all_jobs.count, :per_page => per_page %>

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

@@ -0,0 +1,36 @@
+<h1>Stats</h1>
+<table class="stats">
+  <tr>
+    <th class="status">
+      environment
+    </th>
+    <th>
+      <%= Sinatra::Application.environment.to_s %>
+    </th>
+  </tr>
+  <tr>
+    <th class="status">
+      failed
+    </th>
+    <th>
+      <%= delayed_jobs(:failed, @queues).count %>
+    </th>
+  </tr>
+  <tr>
+    <th class="status">
+      pending
+    </th>
+    <th>
+      <%= delayed_jobs(:pending, @queues).count %>
+    </th>
+  </tr>
+  <tr>
+    <th class="status">
+      working
+    </th>
+    <th>
+      <%= delayed_jobs(:working, @queues).count %>
+    </th>
+  </tr>
+</table>
+<%= poll %>

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

@@ -0,0 +1,13 @@
+<h1>Working</h1>
+<p class="sub">
+  The list below contains jobs currently being processed.
+</p>
+<p class="sub">
+  <%= "Showing #{start} to #{start + per_page} of #{@all_jobs.count} working jobs." %>
+</p>
+<ul class="job">
+  <% @jobs.each do |job| %>
+    <%= partial :job, {:job => job} %>
+  <% end %>
+</ul>
+<%= partial :next_more, :start => start, :total_size => @all_jobs.count, :per_page => per_page %>

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_web
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Erick Schmitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +52,6 @@ dependencies:
     - - '>'
       - !ruby/object:Gem::Version
         version: 2.0.3
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -108,34 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>'
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>'
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +94,6 @@ files:
 - LICENSE.txt
 - README.markdown
 - Rakefile
-- VERSION
 - bin/delayed_job_web
 - delayed_job_web.gemspec
 - lib/delayed_job_web.rb
@@ -175,16 +104,16 @@ files:
 - lib/delayed_job_web/application/public/javascripts/jquery.relatize_date.js
 - lib/delayed_job_web/application/public/stylesheets/reset.css
 - lib/delayed_job_web/application/public/stylesheets/style.css
-- lib/delayed_job_web/application/views/enqueued.haml
-- lib/delayed_job_web/application/views/error.haml
-- lib/delayed_job_web/application/views/failed.haml
-- lib/delayed_job_web/application/views/job.haml
-- lib/delayed_job_web/application/views/layout.haml
-- lib/delayed_job_web/application/views/next_more.haml
-- lib/delayed_job_web/application/views/overview.haml
-- lib/delayed_job_web/application/views/pending.haml
-- lib/delayed_job_web/application/views/stats.haml
-- lib/delayed_job_web/application/views/working.haml
+- lib/delayed_job_web/application/views/enqueued.erb
+- lib/delayed_job_web/application/views/error.erb
+- lib/delayed_job_web/application/views/failed.erb
+- lib/delayed_job_web/application/views/job.erb
+- lib/delayed_job_web/application/views/layout.erb
+- lib/delayed_job_web/application/views/next_more.erb
+- lib/delayed_job_web/application/views/overview.erb
+- lib/delayed_job_web/application/views/pending.erb
+- lib/delayed_job_web/application/views/stats.erb
+- lib/delayed_job_web/application/views/working.erb
 - test/helper.rb
 - test/test_delayed_job_web.rb
 homepage: http://github.com/ejschmitt/delayed_job_web
@@ -202,13 +131,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.14
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Web interface for delayed_job
 test_files: []
+has_rdoc: 

data/VERSION

@@ -1 +0,0 @@
-1.2.2

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

@@ -1,10 +0,0 @@
-%h1
-  Enqueued
-%p.sub
-  The list below contains all jobs currently in the delayed_job queue.
-%p.sub
-  = "Showing #{start} to #{start + per_page} of #{@all_jobs.count} enqueued jobs."
-%ul.job
-  - @jobs.each do |job|
-    = partial :job, {:job => job}
-= partial :next_more, :start => start, :total_size => @all_jobs.count, :per_page => per_page

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

@@ -1,2 +0,0 @@
-%h1 Error
-%p= @message

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

@@ -1,14 +0,0 @@
-%h1 Failed Jobs
-- if @jobs.any?
-  %form{:method => 'POST', :action => u('failed/clear')}
-    %input{:type => 'submit', :value => 'Clear Failed Jobs'}
-  %form{:method => 'POST', :action => u('requeue/all')}
-    %input{:type => 'submit', :value => 'Retry Failed Jobs'}
-
-%p.sub
-  The list below contains all jobs that have a last_error message set.
-%p.sub= "Showing #{start} to #{start + per_page} of #{@all_jobs.count} failed jobs."
-%ul.failed.job
-  - @jobs.each do |job|
-    = partial :job, {:job => job}
-= partial :next_more, :start => start, :total_size => @all_jobs.count, :per_page => per_page

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

@@ -1,44 +0,0 @@
-%li.job
-  %dl
-    %dt ID
-    %dd
-      %a{:name => job.id}
-      %a{:href => "##{job.id}"}=job.id
-      %div.controls
-        %a{:rel => 'retry', :href => u("requeue/#{job.id}")}Retry
-        or
-        %a{:rel => 'remove', :href => u("remove/#{job.id}")}Remove
-        or
-        %a{:rel => 'reload_job', :href => u("reload/#{job.id}")}Reload Job
-    %dt Priority
-    %dd= job.priority
-    %dt Attempts
-    %dd= job.attempts
-    - if job.respond_to?(:queue) && job.queue
-      %dt Queue
-      %dd= job.queue
-    %dt Handler
-    %dd
-      %pre&= job.handler
-    - if job.last_error
-      %dt Last Error
-      %dd
-        %div.backtrace
-          %pre&= job.last_error[0..100] + '...'
-        %a{:href => '#', :class => 'backtrace'} Toggle full message
-        %div.backtrace.full.hide
-          %pre&= job.last_error
-    - if job.run_at
-      %dt Run At
-      %dd.time= job.run_at.rfc822
-    - if job.locked_at
-      %dt Locked At
-      %dd.time= job.locked_at.rfc822
-    - if job.locked_by
-      %dt Locked By
-      %dd= job.locked_by
-    - if job.failed_at
-      %dt Failed At
-      %dd.time= job.failed_at.rfc822
-    %dt Created At
-    %dd.time= job.created_at.rfc822

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

@@ -1,23 +0,0 @@
-!!!
-%html
-  %head
-    %title Delayed Job Web
-    %link(rel="stylesheet" type="text/css" href="#{u 'stylesheets/reset.css'}")
-    %link(rel="stylesheet" type="text/css" href="#{u 'stylesheets/style.css'}")
-  %body
-    %div.header
-      %ul.nav
-        - tabs.each do |tab|
-          %li{:class => request.path_info == tab[:path] ? 'current' : ''}
-            %a.tab{:href => u(tab[:path])}= tab[:name]
-    %div#main
-      = yield
-    %div#footer
-      %p
-        Powered by
-        %a{:href => 'https://github.com/collectiveidea/delayed_job'} delayed_job
-        &
-        %a{:href => 'https://github.com/ejschmitt/delayed_job_web'} delayed_job_web
-    %script{:type => "text/javascript", :src  => u("javascripts/jquery-1.7.1.min.js")}
-    %script{:type => "text/javascript", :src  => u("javascripts/jquery.relatize_date.js")}
-    %script{:type => "text/javascript", :src  => u("javascripts/application.js")}

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

@@ -1,6 +0,0 @@
-- if start - per_page >= 0 || start + per_page <= total_size
-  %p.pagination
-    - if start - per_page >= 0
-      %a{:href => "#{current_page}?start=#{start - per_page}", :class => 'less'} &laquo; less
-    - if start + per_page < total_size
-      %a{:href => "#{current_page}?start=#{start + per_page}", :class => 'more'} more &raquo;

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

@@ -1,25 +0,0 @@
-%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
-  %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.status
-      %a{:href => u('/failed')} Failed Jobs
-    %td= delayed_jobs(:failed).count
-= poll

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

@@ -1,12 +0,0 @@
-%h1
-  Pending
-- if @jobs.any?
-  %form{:method => 'POST', :action => u('requeue/all')}
-    %input{:type => 'submit', :value => 'Enqueue All Immediately'}
-%p.sub
-  The list below contains jobs currently being processed.
-%p.sub= "Showing #{start} to #{start + per_page} of #{@all_jobs.count} pending jobs."
-%ul.job
-  - @jobs.each do |job|
-    = partial :job, {:job => job}
-= partial :next_more, :start => start, :total_size => @all_jobs.count, :per_page => per_page

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

@@ -1,20 +0,0 @@
-%h1
-  Stats
-%table.stats
-  %tr
-    %th.status
-      environment
-    %th= Sinatra::Application.environment.to_s
-  %tr
-    %th.status
-      failed
-    %th= delayed_jobs(:failed).count
-  %tr
-    %th.status
-      pending
-    %th= delayed_jobs(:pending).count
-  %tr
-    %th.status
-      working
-    %th= delayed_jobs(:working).count
-= poll

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

@@ -1,9 +0,0 @@
-%h1
-  Working
-%p.sub
-  The list below contains jobs currently being processed.
-%p.sub= "Showing #{start} to #{start + per_page} of #{@all_jobs.count} working jobs."
-%ul.job
-  - @jobs.each do |job|
-    = partial :job, {:job => job}
-= partial :next_more, :start => start, :total_size => @all_jobs.count, :per_page => per_page