mongo-dequeue 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/mongo-dequeue.rb

@@ -85,16 +85,20 @@ class Mongo::Dequeue
 	    }
 	end
 	
-	
 	# Remove the document from the queue. This should be called when the work is done and the document is no longer needed.
 	# You must provide the process identifier that the document was locked with to complete it.
 	def complete(id)
-		cmd = BSON::OrderedHash.new
-		cmd['findandmodify'] = collection.name
-		cmd['query']         = {:_id => BSON::ObjectId.from_string(id), :complete => false}
-		cmd['update']        = {'$set' => {:completed_at => Time.now.utc, :complete => true} }
-		cmd['limit']         = 1
-		collection.db.command(cmd)
+		begin
+			cmd = BSON::OrderedHash.new
+			cmd['findandmodify'] = collection.name
+			cmd['query']         = {:_id => BSON::ObjectId.from_string(id), :complete => false}
+			cmd['update']        = {'$set' => {:completed_at => Time.now.utc, :complete => true} }
+			cmd['limit']         = 1
+			collection.db.command(cmd)
+		rescue Mongo::OperationFailure => of
+			#opfailure happens when item has been already completed
+			return nil
+		end
 	end
 	
 	# Removes completed job history
@@ -133,6 +137,16 @@ class Mongo::Dequeue
 		return Digest::MD5.hexdigest(body.to_json) #won't ever match a duplicate. Need a better way to handle hashes and arrays.
 	end
 	
+	def peek
+		firstfew = collection.find({
+				:complete => false, 
+				'$or'=>[{:locked_till=> nil},{:locked_till=>{'$lt'=>Time.now.utc}}]
+			}, 
+			:sort => [[:priority, :descending],[:inserted_at, :ascending]], 
+			:limit => 10)
+		return firstfew
+	end
+	
 	
 	protected
 	

data/mongo-dequeue.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo-dequeue}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["TelegramSam"]
-  s.date = %q{2011-07-01}
+  s.date = %q{2011-07-11}
   s.description = %q{A de-duplicating priority queue that uses mongodb as the storage engine.}
   s.email = %q{telegramsam@gmail.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "mongo-dequeue.gemspec",
     "pkg/mongo-dequeue-0.1.0.gem",
     "pkg/mongo-dequeue-0.2.0.gem",
+    "pkg/mongo-dequeue-0.2.1.gem",
     "spec/mongo_dequeue_spec.rb",
     "spec/spec_helper.rb"
   ]

data/spec/mongo_dequeue_spec.rb

@@ -203,6 +203,19 @@ describe Mongo::Dequeue do
 	    end
 	    
 	end
+	
+	describe "Peek" do
+		it "should peek properly" do
+			@a = insert_and_inspect("a")
+			@b = insert_and_inspect("b")
+			
+			@peek = []
+			p = @queue.peek
+			p.each{|q| @peek << q }
+			
+			@peek.length.should == 2
+		end
+	end
 
 	describe "Stats" do
 	    before(:all) do

metadata

@@ -2,7 +2,7 @@
 name: mongo-dequeue
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - TelegramSam
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 -06:00
+date: 2011-07-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,6 +99,7 @@ files:
 - mongo-dequeue.gemspec
 - pkg/mongo-dequeue-0.1.0.gem
 - pkg/mongo-dequeue-0.2.0.gem
+- pkg/mongo-dequeue-0.2.1.gem
 - spec/mongo_dequeue_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -115,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -788232409843759481
+      hash: -1516401480189970073
       segments: 
       - 0
       version: "0"