nfo-resque-mongo 1.15.1 → 1.17.1

data/lib/resque/server/views/working.erb

@@ -27,8 +27,14 @@
 
 <% else %>
 
-  <% workers = resque.working.reject { |w| w.idle? } %>
-  <h1 class='wi'><%= workers.size %> of <%= resque.workers.size %> Workers Working</h1>
+  <%
+    workers = resque.working
+    jobs = workers.collect {|w| w.job }
+    worker_jobs = workers.zip(jobs)
+    worker_jobs = worker_jobs.reject { |w, j| w.idle? }
+  %>
+
+  <h1 class='wi'><%= worker_jobs.size %> of <%= resque.workers.size %> Workers Working</h1>
   <p class='intro'>The list below contains all workers which are currently running a job.</p>
   <table class='workers'>
     <tr>
@@ -37,15 +43,13 @@
       <th>Queue</th>
       <th>Processing</th>
     </tr>
-    <% if workers.empty? %>
+    <% if worker_jobs.empty? %>
     <tr>
       <td colspan="4" class='no-data'>Nothing is happening right now...</td>
     </tr>
     <% end %>
 
-    <% for worker in workers.sort_by { |w| (w && w.job && w.job['run_at']) ? w.job['run_at'] : '' } %>
-      <% job = worker.job %>
-
+    <% worker_jobs.sort_by {|w, j| j['run_at'] ? j['run_at'] : '' }.each do |worker, job| %>
       <tr>
         <td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
         <% host, pid, queues = worker.to_s.split(':') %>

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.15.1'
+  Version = VERSION = '1.17.1'
 end

data/lib/resque/worker.rb

@@ -117,14 +117,14 @@ module Resque
       loop do
         break if shutdown?
 
-        if not @paused and job = reserve
+        if not paused? and job = reserve
           log "got: #{job.inspect}"
           run_hook :before_fork, job
           working_on job
 
           if @child = fork
-            rand # Reseeding
-            procline "Forked #{@child} at #{Time.now.to_s}"
+            srand # Reseeding
+            procline "Forked #{@child} at #{Time.now.to_i}"
             Process.wait
           else
             procline "Processing #{job.queue} since #{Time.now.to_s} (#{job_count} so far)"
@@ -138,7 +138,7 @@ module Resque
         else
           break if interval.zero?
           log! "Sleeping for #{interval} seconds"
-          procline @paused ? "Paused" : "Waiting for #{@queues.join(',')}"
+          procline paused? ? "Paused" : "Waiting for #{@queues.join(',')}"
           sleep interval
         end
       end
@@ -299,6 +299,11 @@ module Resque
       end
     end
 
+    # are we paused?
+    def paused?
+      @paused
+    end
+    
     # Stop processing jobs after the current one has completed (if we're
     # currently running one).
     def pause_processing

data/test/hoptoad_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+begin
+  require 'hoptoad_notifier'
+rescue LoadError
+  warn "Install hoptoad_notifier gem to run Hoptoad tests."
+end
+
+if defined? HoptoadNotifier
+  context "Hoptoad" do
+    test "should be notified of an error" do
+      exception = StandardError.new("BOOM")
+      worker = Resque::Worker.new(:test)
+      queue = "test"
+      payload = {'class' => Object, 'args' => 66}
+
+      HoptoadNotifier.expects(:notify_or_ignore).with(
+        exception,
+        :parameters => {:payload_class => 'Object', :payload_args => '66'})
+
+      backend = Resque::Failure::Hoptoad.new(exception, worker, queue, payload)
+      backend.save
+    end
+  end
+end

data/test/job_hooks_test.rb

@@ -250,6 +250,46 @@ context "Resque::Job after_enqueue" do
   end
 end
 
+
+context "Resque::Job before_enqueue" do
+  include PerformJob
+
+  class ::BeforeEnqueueJob
+    @queue = :jobs
+    def self.before_enqueue_record_history(history)
+      history << :before_enqueue
+    end
+
+    def self.perform(history)
+    end
+  end
+
+  class ::BeforeEnqueueJobAbort
+    @queue = :jobs
+    def self.before_enqueue_abort(history)
+      false
+    end
+
+    def self.perform(history)
+    end
+  end
+
+  test "the before enqueue hook should run" do
+    history = []
+    @worker = Resque::Worker.new(:jobs)
+    Resque.enqueue(BeforeEnqueueJob, history)
+    @worker.work(0)
+    assert_equal history, [:before_enqueue], "before_enqueue was not run"
+  end
+
+  test "a before enqueue hook that returns false should prevent the job from getting queued" do
+    history = []
+    @worker = Resque::Worker.new(:jobs)
+    Resque.enqueue(BeforeEnqueueJobAbort, history)
+    assert_equal 0, Resque.size(:jobs)
+  end
+end
+
 context "Resque::Job all hooks" do
   include PerformJob
 

data/test/queue_stats_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__)) + '/test_helper'
+require 'test_helper'
 
 context "Queue Statistics" do  
   setup do

data/test/resque_test.rb

@@ -13,7 +13,7 @@ context "Resque" do
     #STDERR.puts Resque.queues.inspect
     assert Resque.queues.include? 'people'
   end
-  
+
   test "can put jobs on a queue" do
     assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')
     assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')

data/test/test_helper.rb

@@ -1,9 +1,12 @@
+require 'rubygems'
+require 'bundler'
+Bundler.setup(:default, :test)
+Bundler.require(:default, :test)
+
 dir = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH.unshift dir + '/../lib'
 $TESTING = true
 require 'test/unit'
-require 'rubygems'
-require 'resque'
 
 begin
   require 'leftright'

metadata

@@ -1,88 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nfo-resque-mongo
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.17.1
   prerelease: 
-  version: 1.15.1
 platform: ruby
-authors: 
+authors:
 - Chris Wanstrath
 - Christos Trochalakis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-29 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongo
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2151773960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: vegas
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2151773960
+- !ruby/object:Gem::Dependency
+  name: vegas
+  requirement: &2151772540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2151772540
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &2151771120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2151771120
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &2151770140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.4.6
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id004
-description: "    Resque-mongo is a MongoDB-backed Ruby library for creating background jobs,\n    placing those jobs on multiple queues, and processing them later.\n\n    Background jobs can be any Ruby class or module that responds to\n    perform. Your existing classes can easily be converted to background\n    jobs or you can create new classes specifically to do work. Or, you\n    can do both.\n\n    Resque is heavily inspired by DelayedJob (which rocks) and is\n    comprised of three parts:\n\n    * A Ruby library for creating, querying, and processing jobs\n    * A Rake task for starting a worker which processes jobs\n    * A Sinatra app for monitoring queues, jobs, and workers.\n"
+  prerelease: false
+  version_requirements: *2151770140
+description: ! "    Resque-mongo is a MongoDB-backed Ruby library for creating background
+  jobs,\n    placing those jobs on multiple queues, and processing them later.\n\n
+  \   Background jobs can be any Ruby class or module that responds to\n    perform.
+  Your existing classes can easily be converted to background\n    jobs or you can
+  create new classes specifically to do work. Or, you\n    can do both.\n\n    Resque
+  is heavily inspired by DelayedJob (which rocks) and is\n    comprised of three parts:\n\n
+  \   * A Ruby library for creating, querying, and processing jobs\n    * A Rake task
+  for starting a worker which processes jobs\n    * A Sinatra app for monitoring queues,
+  jobs, and workers.\n"
 email: chris@ozmm.org
-executables: 
+executables:
 - resque
 - resque-web
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.markdown
-files: 
+files:
 - README.markdown
 - Rakefile
 - LICENSE
 - HISTORY.md
+- lib/nfo-resque-mongo.rb
 - lib/resque/errors.rb
 - lib/resque/failure/base.rb
 - lib/resque/failure/hoptoad.rb
 - lib/resque/failure/mongo.rb
 - lib/resque/failure/multiple.rb
+- lib/resque/failure/redis.rb
 - lib/resque/failure.rb
 - lib/resque/helpers.rb
 - lib/resque/job.rb
 - lib/resque/plugin.rb
 - lib/resque/queue_stats.rb
+- lib/resque/server/public/favicon.ico
 - lib/resque/server/public/idle.png
 - lib/resque/server/public/jquery-1.3.2.min.js
 - lib/resque/server/public/jquery.relatize_date.js
@@ -109,9 +117,12 @@ files:
 - lib/resque/version.rb
 - lib/resque/worker.rb
 - lib/resque.rb
+- lib/tasks/redis.rake
+- lib/tasks/resque.rake
 - bin/resque
 - bin/resque-web
 - test/dump.rdb
+- test/hoptoad_test.rb
 - test/job_hooks_test.rb
 - test/job_plugins_test.rb
 - test/plugin_test.rb
@@ -121,35 +132,29 @@ files:
 - test/resque_test.rb
 - test/test_helper.rb
 - test/worker_test.rb
-- tasks/redis.rake
-- tasks/resque.rake
-has_rdoc: true
-homepage: http://github.com/defunkt/resque
+homepage: http://github.com/nfo/resque-mongo
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Resque is a Redis-backed queueing system.
 test_files: []
-