Merge pull request #37 from romanbsd/mongoid-2

Instead of performing a redundant query, just wrap the result
collectiveidea · Apr 8, 2013 · d74a0b9 · d74a0b9
2 parents 5d8e20b + 4b1fbec
commit d74a0b9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/delayed/backend/mongoid.rb b/lib/delayed/backend/mongoid.rb
@@ -67,8 +67,10 @@ def self.reserve(worker, max_run_time = Worker.max_run_time)
             )
 
             # Return result as a Mongoid document.
-            # When Mongoid starts supporting findAndModify, this extra step should no longer be necessary.
+            new.tap do |job|
-            self.find(:first, :conditions => {:_id => result["_id"]}) unless result.nil?
+              job.new_record = false
+              job.assign_attributes(result)
+            end unless result.nil?
           rescue Mongo::OperationFailure
             nil # no jobs available
           end