topprospect-delayed_job 2.0.8 → 2.0.9

data/lib/delayed/backend/active_record.rb

@@ -34,12 +34,10 @@ module Delayed
           scope :by_priority, order('priority ASC, run_at ASC')
         else
           named_scope :ready_to_run, lambda {|worker_name, max_run_time|
-
             if Worker.queue == Delayed::ALL_QUEUES
-              conditions = ['(locked_at IS NULL OR locked_at < ?) AND failed_at IS NULL', db_time_now - max_run_time]
+              conditions = ['locked_at IS NULL AND failed_at IS NULL']
             else
-              conditions = ['queue = ? AND (locked_at IS NULL OR locked_at < ?) AND failed_at IS NULL',
-                            Worker.queue, db_time_now - max_run_time]
+              conditions = ['queue = ? AND locked_at IS NULL AND failed_at IS NULL', Worker.queue]
             end
 
             {:conditions => conditions}

data/lib/delayed/backend/couch_rest.rb

@@ -1,4 +1,5 @@
 require 'couchrest'
+require 'couchrest_extended_document'
 
 #extent couchrest to handle delayed_job serialization.
 class CouchRest::ExtendedDocument

data/spec/backend/shared_backend_spec.rb

@@ -100,9 +100,9 @@ shared_examples_for 'a backend' do
       @backend.find_available('worker', 5, 4.hours).should include(@job)
     end
     
-    it "should find expired jobs" do
+    it "should not find expired jobs" do
       @job = create_job(:locked_by => 'worker', :locked_at => @backend.db_time_now - 2.minutes)
-      @backend.find_available('worker', 5, 1.minute).should include(@job)
+      @backend.find_available('worker', 5, 1.minute).should_not include(@job)
     end
     
     #it "should find own jobs" do
@@ -144,8 +144,8 @@ shared_examples_for 'a backend' do
       @backend.find_available('worker2', 1, 6.minutes).length.should == 0
     end
 
-    it "should be found by another worker if the time has expired" do
-      @backend.find_available('worker2', 1, 4.minutes).length.should == 1
+    it "should not be found by another worker even if the time has expired" do
+      @backend.find_available('worker2', 1, 4.minutes).length.should == 0
     end
 
     it "should be able to get exclusive access again when the worker name is the same" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: topprospect-delayed_job
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  hash: 29
+  prerelease: false
   segments: 
   - 2
   - 0
-  - 8
-  version: 2.0.8
+  - 9
+  version: 2.0.9
 platform: ruby
 authors: 
 - Chris Gaffney
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 -07:00
+date: 2011-10-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -241,6 +241,7 @@ files:
 - spec/setup/data_mapper.rb
 - spec/setup/mongo_mapper.rb
 - spec/spec_helper.rb
+- spec/test.sql3
 - spec/worker_spec.rb
 - rails/init.rb
 - MIT-LICENSE
@@ -278,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify
@@ -298,4 +299,5 @@ test_files:
 - spec/setup/data_mapper.rb
 - spec/setup/mongo_mapper.rb
 - spec/spec_helper.rb
+- spec/test.sql3
 - spec/worker_spec.rb