resque-igo 1.1 → 1.1.1

data/lib/resque/errors.rb

@@ -7,4 +7,7 @@ module Resque
   
   # Raised when a worker was killed while processing a job.
   class DirtyExit < RuntimeError; end
+
+  #raised for bad delay/unique queue integrity
+  class QueueError < RuntimeError; end
 end

data/lib/resque/failure/mongo.rb

@@ -0,0 +1,40 @@
+module Resque
+  module Failure
+    # A Failure backend that stores exceptions in Mongo. Very simple but
+    # works out of the box, along with support in the Resque web app.
+    class Mongo < Base
+      def save
+        data = {
+          :failed_at => Time.now.strftime("%Y/%m/%d %H:%M:%S"),
+          :payload   => payload,
+          :exception => exception.class.to_s,
+          :error     => exception.to_s,
+          :backtrace => Array(exception.backtrace),
+          :worker    => worker.to_s,
+          :queue     => queue
+        }
+        Resque.mongo_failures << data
+      end
+
+      def self.count
+        Resque.mongo_failures.count
+      end
+
+      def self.all(start = 0, count = 1)
+        all_failures = Resque.mongo_failures.find().skip(start).limit(count).to_a
+       # all_failures.size == 1 ? all_failures.first : all_failures        
+      end
+
+      def self.clear
+        Resque.mongo_failures.remove
+      end
+
+      def self.requeue(index)
+        item = all(index)
+        item['retried_at'] = Time.now.strftime("%Y/%m/%d %H:%M:%S")
+        Resque.mongo_failures.update({ :_id => item['_id']}, item)
+        Job.create(item['queue'], item['payload']['class'], *item['payload']['args'])
+      end
+    end
+  end
+end

data/lib/resque/job.rb

@@ -50,10 +50,26 @@ module Resque
       end
 
       item = { :class => klass.to_s, :args => args}
+            
       item[:_id] = args[0][:_id] if Resque.allows_unique_jobs(klass) && args[0].is_a?(Hash) && args[0].has_key?(:_id)
       item[:unique] = true if item[:_id]
-      item[:delay_until] = args[0][:delay_until] if Resque.allows_delayed_jobs(klass) && args[0].is_a?(Hash) && args[0].has_key?(:delay_until)
       
+      #are we trying to put a non-delayed job into a delayed queue?
+      if Resque.queue_allows_delayed(queue)
+        if Resque.allows_delayed_jobs(klass)
+          if args[0].is_a?(Hash) && args[0].has_key?(:delay_until)
+            item[:delay_until] = args[0][:delay_until]
+          else
+            raise QueueError.new 'trying to insert delayed job without delay_until'
+          end
+        else
+          raise QueueError.new 'trying to insert non-delayed job into delayed queue'
+        end
+      else
+        if Resque.allows_delayed_jobs(klass)
+          raise QueueError.new 'trying to insert a delayed job into a non-delayed queue'
+        end
+      end
       
       ret = Resque.push(queue, item)
       Plugin.after_enqueue_hooks(klass).each do |hook|

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.1'
+  Version = VERSION = '1.1.1'
 end

data/lib/resque.rb

@@ -247,7 +247,7 @@ module Resque
   # Returns an array of all known Resque queues as strings.
   def queues    
     names = mongo.collection_names
-    names.delete_if{ |name| name == 'system.indexes' || name =~ /resque\./ }  
+    names.delete_if{ |name| name =~ /system./ || name =~ /resque\./ }  
   end
 
   # Given a queue name, completely deletes the queue.

data/test/resque_test.rb

@@ -325,27 +325,17 @@ context "Resque" do
     Resque.bypass_queues = false
   end
 
-  test "other queues are not affected" do
-    args = { :delay_until => Time.new+10}
-    assert OtherUnique.instance_variable_get :@delayed_jobs
-    Resque.enqueue(OtherUnique, args)
-    job = Resque::Job.reserve(:unique2)
-    assert_equal(1, job.args[0].keys.length)
-  end
-
-  test "can enqueue normal jobs in a delayed queue" do
-    args = { :delay_until => Time.new + 3600}
-    Resque.enqueue(DelayedJob, args)
-    Resque.enqueue(DelayedJob, args)
-    Resque.enqueue(DelayedJob, args)
-    assert_equal(3, Resque.size(:delayed))
-    assert_equal(3, Resque.delayed_size(:delayed))
-    assert_equal(0, Resque.ready_size(:delayed))
-    Resque.enqueue(NonDelayedJob, args)
-    Resque.enqueue(NonDelayedJob, args)
-    Resque.enqueue(DelayedJob, args)
-    assert_equal(6, Resque.size(:delayed))
-    assert_equal(2, Resque.ready_size(:delayed))
-    assert_equal(4, Resque.delayed_size(:delayed))
+  test "mixing delay and non-delay is bad" do
+    dargs = { :delay_until => Time.new + 3600}
+    
+    #non-delay into delay
+    assert_raise(Resque::QueueError) do
+      Resque.enqueue(NonDelayedJob, dargs)
+    end
+    
+    #delay into non-delay
+    assert_raise(Resque::QueueError) do
+      Resque.enqueue(MistargetedDelayedJob, dargs)
+    end
   end
 end

data/test/test_helper.rb

@@ -100,7 +100,6 @@ end
 class OtherUnique
   @queue = :unique2
   @unique_jobs = true
-  @delayed_jobs = true
 end
 
 class DelayedJob
@@ -112,6 +111,14 @@ class DelayedJob
   end
 end
 
+class MistargetedDelayedJob
+  @queue = :unique
+  @delayed_jobs = true
+  def self.perform(data)
+    " mistargeteddelayed job executing #{data.inspect}"
+  end
+end
+
 class NonDelayedJob
   @queue = :delayed
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-igo
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  version: "1.1"
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Nathan D Acuff
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 -04:00
+date: 2010-10-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,9 +82,8 @@ dependencies:
         version: 1.0.7
   type: :runtime
   version_requirements: *id004
-description: "    Resque is a Redis-backed Ruby library for creating background jobs,\n    placing those jobs on multiple queues, and processing them later.\n\n\
-  Resque-igo is the same thing, but for mongo.  It would not exist without the work of defunkt and ctrochalakis on github.\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: naginata@gmail.com
+description: "    Resque is a Redis-backed Ruby library for creating background jobs,\n    placing those jobs on multiple queues, and processing them later.\n\n    Resque-igo is the same thing, but for mongo.  It would not exist without the work of defunkt and ctrochalakis on github.\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: nacuff@igodigital.com
 executables: 
 - resque
 - resque-web
@@ -100,6 +100,7 @@ files:
 - 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
@@ -143,7 +144,7 @@ files:
 - test/worker_test.rb
 - tasks/resque.rake
 has_rdoc: true
-homepage: http://github.com/naginata/resque-mongo
+homepage: http://github.com/mediocretes/resque-mongo
 licenses: []
 
 post_install_message: