delayed_job_web 1.2.10 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbcba0ad96175e81e6fae7a52cf978605d65e2c6
-  data.tar.gz: f3065d7b9dea29396b9f9727c4391e464f4b2737
+  metadata.gz: 45e241e7f0f782f3ca6752c987f59544ac8aad17
+  data.tar.gz: 1ad7f26ed45b038275afa3f8a81c7c6dc795cb01
 SHA512:
-  metadata.gz: 9dfeb2edec1976930a999cc798de7d00facfce2bb024d10c7e32877f83553ec50fb3c8fbb7b0404e4111f1b3e7a29d722517d33251c15d578c61a30aaea9cdd3
-  data.tar.gz: dea580745305488adb0c1dbf9661392f1fbbc00cb0031b0e4c1958db21a713b86418a48ce338aff2b1636bc0302ee9bd95cf7fc5bafb260f36dc6999acde7a28
+  metadata.gz: 899e50f7f1850645db6bb567ec0a4140ec9f3ef23f51426a233a95d5adf5584291d13a0b307ba6dcf2ef1a364bbe639b7fc543c0351db36e01093022fcf7b852
+  data.tar.gz: 913d403293ad90b84b97f29510eccf270419a849790496f4beab10aa47388a1117a8118f0d43fd5d36dae20c2c65604b89cbb050a6d71cb58ec80b43ccf46598

data/README.markdown

@@ -7,15 +7,16 @@ activerecord.
 
 Some features:
 
-* Easily view jobs enqueued, working, pending, and failed.
-* Queue any single job. or all pending jobs, to run immediately.
-* Remove a failed job, or easily remove all failed jobs.
+* Easily view enqueued, working, pending, 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.
-* Filter delayed_jobs by queue name
+* Filter delayed_jobs by queue names (comma separated values in the input filter).
+* Reset all queue filters by clicking the reset button.
 
-The interface (yea, a ripoff of resque-web):
+The interface (yeah, a ripoff of resque-web):
 
-![Screen shot](http://dl.dropbox.com/u/1506097/Screenshots/delayed_job_web_1.png)
+![Screen shot](./delayed_job_web.png)
 
 
 Quick Start For Rails 3 and 4 Applications
@@ -37,7 +38,7 @@ Add the following route to your application for accessing the interface,
 and retrying failed jobs.
 
 ```ruby
-match "/delayed_job" => DelayedJobWeb, :anchor => false, via: [:get, :post]
+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,13 +46,38 @@ You probably want to password protect the interface, an easy way is to add somet
 ```ruby
 if Rails.env.production?
   DelayedJobWeb.use Rack::Auth::Basic do |username, password|
-    username == 'username' && password == 'password'
+    ActiveSupport::SecurityUtils.variable_size_secure_compare('username', username) &&
+      ActiveSupport::SecurityUtils.variable_size_secure_compare('password', password)
   end
 end
 ```
 
 `delayed_job_web` runs as a Sinatra application within the rails application. Visit it at `/delayed_job`.
 
+
+## Authenticating with Devise and Warden
+
+This can be accomplished in the routes.rb file using an `authenticated` callback. Note, do not use an `authenticate` callback as this forces an authentication check and redirects can be screwy, [see here](http://excid3.com/blog/rails-tip-5-authenticated-root-and-dashboard-routes-with-devise/) for more information.
+
+A simple user check looks like this:
+
+```ruby
+
+authenticated :user do
+  mount DelayedJobWeb, at: "/delayed_job"
+end
+
+```
+But you probably want to check for administrator permissions:
+
+```ruby
+
+authenticated :user, -> user { user.admin? }  do
+  mount DelayedJobWeb, at: "/delayed_job"
+end
+
+```
+
 ## 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.

data/delayed_job_web.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = "delayed_job_web"
-  gem.version     = "1.2.10"
+  gem.version     = "1.3"
   gem.author      = "Erick Schmitt"
   gem.email       = "ejschmitt@gmail.com"
   gem.homepage    = "https://github.com/ejschmitt/delayed_job_web"

data/lib/delayed_job_web/application/app.rb

@@ -49,6 +49,20 @@ class DelayedJobWeb < Sinatra::Base
 
   alias_method :u, :url_path
 
+  def queue_path(queue)
+    with_queue(queue) do
+      url_path(:overview)
+    end
+  end
+
+  def with_queue(queue, &block)
+    aux_queues = @queues
+    @queues = Array(queue)
+    result  = block.call
+    @queues = aux_queues
+    result
+  end
+
   def h(text)
     Rack::Utils.escape_html(text)
   end

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

@@ -77,17 +77,17 @@
               return daysfrom + " days from now";
           }
       } else if (delta < -(48*60*60)) {
-          return '1 day from now';
+          return '2 days from now';
       } else if (delta < -(24*60*60)) {
+          return '1 day from now';
+      } else if (delta < -(120*60)) {
           return 'about ' + parseInt(Math.abs(delta / 3600)).toString() +
               ' hours from now';
-      } else if (delta < -(120*60)) {
-          return 'about an hour from now';
       } else if (delta < -(45*60)) {
+          return 'about an hour from now';
+      } else if (delta < -60) {
           return parseInt(Math.abs(delta / 60)).toString()
               + ' minutes from now';
-      } else if (delta < -60) {
-          return 'about a minute from now';
       } else if (delta < 0) {
           return 'less than a minute from now';
       } else if (delta < 60) {
@@ -102,7 +102,6 @@
           return 'about ' + (parseInt(delta / 3600)).toString() + ' hours ago';
       } else if (delta < (48*60*60)) {
           return '1 day ago';
-      } else {
         var days = (parseInt(delta / 86400)).toString();
         if (days > 5) {
           var fmt  = '%B %d, %Y'

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

@@ -21,6 +21,12 @@
             <input type="submit" value="Filter" />
           </form>
         </li>
+        <li>
+          <form method="get" class="header-queues" action="" style="display:inline;">
+            <input name="queues" type="hidden" value="" />
+            <input type="submit" value="Reset" />
+          </form>
+        </li>
       </ul>
     </div>
     <div id="main">

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

@@ -42,4 +42,25 @@
     </td>
   </tr>
 </table>
+
+<table class="overview">
+  <tr>
+    <th>Queue</th>
+    <th>Count</th>
+  </tr>
+
+  <% delayed_jobs(nil).group(:queue).size.each do |queue, count| %>
+    <tr>
+      <td class="status">
+        <a href="<%= queue_path(queue) %>">
+          <%= queue %>
+        </a>
+      </td>
+      <td>
+      <%= count %>
+      </td>
+    </tr>
+  <% end %>
+</table>
+
 <%= poll %>

data/test/lib/delayed_job_web/application/test_app.rb

@@ -35,7 +35,7 @@ class TestDelayedJobWeb < MiniTest::Unit::TestCase
 
     dataset = Minitest::Mock.new
     where = lambda { | criteria |
-      criteria.must_equal 'last_error IS NOT NULL'
+      criteria.must_equal :attempts => 0, :locked_at => nil
       dataset
     }
 
@@ -43,7 +43,7 @@ class TestDelayedJobWeb < MiniTest::Unit::TestCase
 
     Time.stub(:now, time) do
       Delayed::Job.stub(:where, where) do
-        post "/requeue/failed", request_data, rack_env
+        post "/requeue/pending", request_data, rack_env
         last_response.status.must_equal 302
       end
     end

data/test/support/delayed_job_fake.rb

@@ -14,6 +14,14 @@ class Delayed::Job
     def limit(*args)
       DelayedJobFake.new
     end
+
+    def size(*args)
+      {}
+    end
+  end
+
+  def self.group(*args)
+    DelayedJobFake.new
   end
 
   def self.where(*args)
@@ -31,4 +39,4 @@ class Delayed::Job
   def self.find(*args)
     DelayedJobFake.new
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_web
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: '1.3'
 platform: ruby
 authors:
 - Erick Schmitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Web interface for delayed_job inspired by resque