delayed_job_web 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45e241e7f0f782f3ca6752c987f59544ac8aad17
-  data.tar.gz: 1ad7f26ed45b038275afa3f8a81c7c6dc795cb01
+  metadata.gz: 5edfc338b6fb18fabbd06ed11c0c9333ca1c76b2
+  data.tar.gz: f4400d803f007745ac56d87c36ec174850a27243
 SHA512:
-  metadata.gz: 899e50f7f1850645db6bb567ec0a4140ec9f3ef23f51426a233a95d5adf5584291d13a0b307ba6dcf2ef1a364bbe639b7fc543c0351db36e01093022fcf7b852
-  data.tar.gz: 913d403293ad90b84b97f29510eccf270419a849790496f4beab10aa47388a1117a8118f0d43fd5d36dae20c2c65604b89cbb050a6d71cb58ec80b43ccf46598
+  metadata.gz: 7edfb192fe584d1bdc6468247e0149a7e074f3d08e629614345d7d305d97ff5712af5455e347b1fd83ac2001285e44ee4c05bd941599569394e360cf0f43babc
+  data.tar.gz: 08cda19f9dc812a1564a10c0391b40ad215d53021a3ecaa81d2e4d57a2d530caead7f56a012c13106a7400aa5bc05aebee9f0b1bc737718786c1258024012af6

data/README.markdown

@@ -101,6 +101,19 @@ Rails' will need to be configured to `config.action_dispatch.x_sendfile_header =
 
 Lighty is more `X-Sendfile`, like [outlined](http://redmine.lighttpd.net/projects/1/wiki/X-LIGHTTPD-send-file) in their wiki.
 
+Configuration
+-------------
+
+The following settings can be changed using the `.set` method in your configu.ru. For example:
+
+```ruby
+DelayedJobWeb.set(:allow_requeue_pending, false)
+```
+
+* **`allow_requeue_pending`** (default: `true`)
+
+  Controls whether the 'Enqueue all immediately' button is available on the list of Pending jobs. Hiding this button can be useful if you have jobs set to run in the future and you don't want to accidentally run them immediately.
+
 
 Contributing
 ------------

data/delayed_job_web.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = "delayed_job_web"
-  gem.version     = "1.3"
+  gem.version     = "1.4"
   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

@@ -9,6 +9,8 @@ class DelayedJobWeb < Sinatra::Base
   set :public_folder, File.expand_path('../public', __FILE__)
   set :views, File.expand_path('../views', __FILE__)
 
+  set :allow_requeue_pending, true
+
   # Enable sessions so we can use CSRF protection
   enable :sessions
 
@@ -38,7 +40,7 @@ class DelayedJobWeb < Sinatra::Base
   end
 
   def per_page
-    20
+    params[:per_page].to_i > 0 ? params[:per_page].to_i : 20
   end
 
   def url_path(*path_parts)
@@ -120,6 +122,7 @@ class DelayedJobWeb < Sinatra::Base
     get "/#{page}" do
       @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)
+      @allow_requeue_pending = settings.allow_requeue_pending
       erb page.to_sym
     end
   end
@@ -129,11 +132,16 @@ class DelayedJobWeb < Sinatra::Base
     redirect back
   end
 
-  %w(pending failed).each do |page|
-    post "/requeue/#{page}" do
-      delayed_jobs(page.to_sym, @queues).update_all(:run_at => Time.now, :failed_at => nil)
-      redirect back
+  post "/requeue/pending" do
+    if settings.allow_requeue_pending
+      delayed_jobs(:pending, @queues).update_all(:run_at => Time.now, :failed_at => nil)
     end
+    redirect back
+  end
+
+  post "/requeue/failed" do
+    delayed_jobs(:failed, @queues).update_all(:run_at => Time.now, :failed_at => nil)
+    redirect back
   end
 
   post "/requeue/:id" do

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

@@ -1,9 +1,11 @@
 <h1>Pending</h1>
 <% if @jobs.any? %>
-  <form action="<%= u('requeue/pending') %>" method="POST">
-    <%= csrf_token_tag %>
-    <input type="submit" value="Enqueue All Immediately"></input>
-  </form>
+  <% if @allow_requeue_pending -%>
+    <form action="<%= u('requeue/pending') %>" method="POST">
+      <%= csrf_token_tag %>
+      <input type="submit" value="Enqueue All Immediately"></input>
+    </form>
+  <% end -%>
 <% end %>
 <p class="sub">
   The list below contains jobs currently being processed.

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

@@ -52,6 +52,27 @@ class TestDelayedJobWeb < MiniTest::Unit::TestCase
 
   end
 
+  def test_requeue_pending_with_requeue_pending_disallowed
+
+    app.set(:allow_requeue_pending, false)
+
+    dataset = Minitest::Mock.new
+    where = lambda { |criteria|
+      dataset
+    }
+
+    Time.stub(:now, time) do
+      Delayed::Job.stub(:where, where) do
+        post "/requeue/pending", request_data, rack_env
+        last_response.status.must_equal 302
+      end
+    end
+
+    # Expect dataset to not have received any method calls.
+    dataset.verify
+
+  end
+
   def test_requeue_id
     job = Minitest::Mock.new
     job.expect(:update_attributes, nil, [:run_at => time, :failed_at => nil])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_web
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Erick Schmitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra