delayed_job_web 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7179527cc2cebed1494d856765bac6dbb0657b8b
-  data.tar.gz: 887a714ebd1e601459994058b90fe04f4e538eb2
+  metadata.gz: 64765045ff23c2d82edb694c0b43c789d2c1bf53
+  data.tar.gz: adca16793350ca13765734007509fb4272962ee0
 SHA512:
-  metadata.gz: 069cc73508226c8e1dde5a1b37aa8641cc9438d58386c48a8db0fdb93e253d58dcedf30aa0e30daa8b3b010d640cc62ed3113169e5054cafbe557fa1f85161c0
-  data.tar.gz: afcff45a056936ed64488f3c3b5c79953d8a486529231bef7dfb39693fcba46753a7f785883adf8517612383b572fd277de503e9130fb100d31e560f49001be3
+  metadata.gz: e3393593ccd0f51136ec99ed5f693961e4dac89435abf58f7d4b72ef364408f0d64cf13587af04ac9d5e561584172cae12f0da22818d36ae090d988b6b8c7968
+  data.tar.gz: 305ce84cc7e3de232a17d42094b4f6d4221ce6d0ea096ad309f2a42e817ee778a70f15b39ffbc12cbe87bde9f394c14b40c6bbc9d63674f34a66ade6d7c143dd

data/delayed_job_web.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = "delayed_job_web"
-  gem.version     = "1.2.8"
+  gem.version     = "1.2.9"
   gem.author      = "Erick Schmitt"
   gem.email       = "ejschmitt@gmail.com"
   gem.homepage    = "https://github.com/ejschmitt/delayed_job_web"
@@ -23,9 +23,11 @@ Gem::Specification.new do |gem|
     "README.markdown"
   ]
 
-  gem.add_runtime_dependency     "sinatra",      [">= 1.4.4"]
-  gem.add_runtime_dependency     "activerecord", ["> 3.0.0"]
-  gem.add_runtime_dependency     "delayed_job",  ["> 2.0.3"]
-  gem.add_development_dependency "shoulda",      [">= 0"]
-  gem.add_development_dependency "rack-test",    [">= 0"]
+  gem.add_runtime_dependency "sinatra",      [">= 1.4.4"]
+  gem.add_runtime_dependency "activerecord", ["> 3.0.0"]
+  gem.add_runtime_dependency "delayed_job",  ["> 2.0.3"]
+
+  gem.add_development_dependency "minitest",  ["~> 4.2"]
+  gem.add_development_dependency "rack-test", ["~> 0.6"]
+  gem.add_development_dependency "rails",     ["~> 4.0"]
 end

data/lib/delayed_job_web/application/app.rb

@@ -115,6 +115,11 @@ class DelayedJobWeb < Sinatra::Base
     redirect back
   end
 
+  post "/requeue/all" do
+    delayed_jobs(:failed, @queues).update_all(:run_at => Time.now, :failed_at => nil)
+    redirect back
+  end
+
   post "/requeue/:id" do
     job = delayed_job.find(params[:id])
     job.update_attributes(:run_at => Time.now, :failed_at => nil)
@@ -132,11 +137,6 @@ class DelayedJobWeb < Sinatra::Base
     redirect u('failed')
   end
 
-  post "/requeue/all" do
-    delayed_jobs(:failed, @queues).update_all(:run_at => Time.now, :failed_at => nil)
-    redirect back
-  end
-
   def delayed_jobs(type, queues = [])
     rel = delayed_job
 
@@ -147,7 +147,7 @@ class DelayedJobWeb < Sinatra::Base
       when :failed
         rel.where('last_error IS NOT NULL')
       when :pending
-        rel.where(:attempts => 0)
+        rel.where(:attempts => 0, :locked_at => nil)
       else
         rel
       end

data/test/integration/test_mounted_in_rails_app.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+require 'support/rails_app'
+require 'support/delayed_job_fake'
+
+class TestMountedInRailsApp < MiniTest::Unit::TestCase
+  include Rack::Test::Methods
+
+  def app
+    RailsApp
+  end
+
+  # basic smoke test all the tabs
+  %w(overview enqueued working pending failed stats).each do |tab|
+    define_method :"test_#{tab}" do
+      get "/delayed_job/#{tab}"
+      assert last_response.ok?, "Received bad response: #{last_response.inspect}"
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+require 'test_helper'
+require 'support/delayed_job_fake'
+require 'delayed_job_web/application/app'
+
+class TestDelayedJobWeb < MiniTest::Unit::TestCase
+
+  include Rack::Test::Methods
+
+  def app
+    DelayedJobWeb
+  end
+
+  def test_requeue_all
+
+    dataset = Minitest::Mock.new
+    where = lambda { | criteria |
+      criteria.must_equal 'last_error IS NOT NULL'
+      dataset
+    }
+
+    dataset.expect(:update_all, nil, [:run_at => time, :failed_at => nil])
+
+    Time.stub(:now, time) do
+      Delayed::Job.stub(:where, where) do
+        post "/requeue/all", request_data, rack_env
+        last_response.status.must_equal 302
+      end
+    end
+
+    dataset.verify
+
+  end
+
+  def test_requeue_id
+    job = Minitest::Mock.new
+    job.expect(:update_attributes, nil, [:run_at => time, :failed_at => nil])
+
+    find = lambda { | id |
+      id.must_equal "1"
+      job
+    }
+
+    Time.stub(:now, time) do
+      Delayed::Job.stub(:find, find) do
+        post "/requeue/1", request_data, rack_env
+        last_response.status.must_equal 302
+      end
+    end
+
+    job.verify
+  end
+
+  private
+
+  def time
+    @time ||= Time.now
+  end
+
+  def rack_env
+    {'rack.session' => {:csrf => "123"}}
+  end
+
+  def request_data
+    {"authenticity_token" => "123"}
+  end
+
+end

data/test/support/delayed_job_fake.rb

@@ -0,0 +1,34 @@
+require 'delayed_job'
+
+class Delayed::Job
+  class DelayedJobFake < Array
+    # fake out arel
+    def order(*args)
+      DelayedJobFake.new
+    end
+
+    def offset(*args)
+      DelayedJobFake.new
+    end
+
+    def limit(*args)
+      DelayedJobFake.new
+    end
+  end
+
+  def self.where(*args)
+    DelayedJobFake.new
+  end
+
+  def self.count(*args)
+    0
+  end
+
+  def self.order(*args)
+    DelayedJobFake.new
+  end
+
+  def self.find(*args)
+    DelayedJobFake.new
+  end
+end

data/test/support/rails_app.rb

@@ -0,0 +1,12 @@
+require "action_controller/railtie"
+require "logger"
+require "delayed_job_web"
+
+class RailsApp < Rails::Application
+  config.logger = Rails.logger = Logger.new(nil)
+  config.secret_key_base = "foo"
+
+  routes.draw do
+    match "/delayed_job" => DelayedJobWeb, :anchor => false, via: [:get, :post]
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,7 @@
+$:.unshift File.dirname(__FILE__)
+
+require "bundler"
+Bundler.setup(:default, :development)
+require "minitest/autorun"
+
+ENV['RACK_ENV'] = 'test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_web
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Erick Schmitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -53,33 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.3
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 description: Web interface for delayed_job inspired by resque
 email: ejschmitt@gmail.com
 executables:
@@ -114,8 +128,11 @@ files:
 - lib/delayed_job_web/application/views/stats.erb
 - lib/delayed_job_web/application/views/working.erb
 - lib/delayed_job_web/railtie.rb
-- test/helper.rb
-- test/test_delayed_job_web.rb
+- test/integration/test_mounted_in_rails_app.rb
+- test/lib/delayed_job_web/application/test_app.rb
+- test/support/delayed_job_fake.rb
+- test/support/rails_app.rb
+- test/test_helper.rb
 homepage: https://github.com/ejschmitt/delayed_job_web
 licenses:
 - MIT
@@ -141,4 +158,3 @@ signing_key:
 specification_version: 4
 summary: Web interface for delayed_job inspired by resque
 test_files: []
-has_rdoc: 

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'delayed_job_web'
-
-class Test::Unit::TestCase
-end

data/test/test_delayed_job_web.rb

@@ -1,52 +0,0 @@
-require 'helper'
-require 'rack/test'
-require 'delayed_job_web/application/app'
-ENV['RACK_ENV'] = 'test'
-
-class Delayed::Job
-  class DelayedJobFake < Array
-    # fake out arel
-    def order(*args)
-      DelayedJobFake.new
-    end
-
-    def offset(*args)
-      DelayedJobFake.new
-    end
-
-    def limit(*args)
-      DelayedJobFake.new
-    end
-  end
-
-  def self.where(*args)
-    DelayedJobFake.new
-  end
-
-  def self.count(*args)
-    0
-  end
-
-  def self.order(*args)
-    DelayedJobFake.new
-  end
-end
-
-class TestDelayedJobWeb < Test::Unit::TestCase
-  include Rack::Test::Methods
-  def app
-    DelayedJobWeb.new
-  end
-
-  def should_respond_with_success
-    assert last_response.ok?, last_response.errors
-  end
-
-  # basic smoke test all the tabs
-  %w(overview enqueued working pending failed stats).each do |tab|
-    should "get '/#{tab}'" do
-      get "/#{tab}"
-      should_respond_with_success
-    end
-  end
-end