mongo-dequeue 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/mongo-dequeue.rb

@@ -50,7 +50,8 @@ class Mongo::Dequeue
 				:locked_till => nil,
 				:completed_at => nil,
 				:priority => item_opts[:priority] || @config[:default_priority],
-				:duplicate_key => dup_key
+				:duplicate_key => dup_key,
+				:completecount => 0
 			},
 			'$inc' => {:count => 1 }
 		}
@@ -91,8 +92,8 @@ class Mongo::Dequeue
 		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['query']         = {:_id => BSON::ObjectId.from_string(id)}
+			cmd['update']        = {'$set' => {:completed_at => Time.now.utc, :complete => true}, '$inc' => {:completecount => 1} }
 			cmd['limit']         = 1
 			collection.db.command(cmd)
 		rescue Mongo::OperationFailure => of
@@ -119,15 +120,24 @@ class Mongo::Dequeue
 			        var c = db.#{collection.name}.count({'complete': true});
 			        var t = db.#{collection.name}.count();
 			        var l = db.#{collection.name}.count({'complete': false, 'locked_till': {'$gte':nowutc} });
-			        return [a, c, t, l];
+			        var rc = db.#{collection.name}.group({
+			        	'key': {},
+			        	'cond': {'complete':true},
+			        	'$reduce': function(obj, prev){prev.count += (obj.completecount - 1);},
+			        	'initial': {count: 0}
+			        });
+			        
+			        return [a, c, t, l, rc[0] ? rc[0].count : 0];
 			      }
 			    );
 			  }"
-		available, complete, total, locked = collection.db.eval(js) 
+		available, complete, total, locked, redundant_completes = collection.db.eval(js) 
 		{ :locked    => locked.to_i,
 		  :complete => complete.to_i,
 		  :available => available.to_i,
-		  :total     => total.to_i }
+		  :total     => total.to_i,
+		  :redundantcompletes => redundant_completes.to_i
+		}
 	end
 	
 	def self.generate_duplicate_key(body)

data/mongo-dequeue.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo-dequeue}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["TelegramSam"]
-  s.date = %q{2011-07-11}
+  s.date = %q{2011-07-19}
   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 = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "pkg/mongo-dequeue-0.1.0.gem",
     "pkg/mongo-dequeue-0.2.0.gem",
     "pkg/mongo-dequeue-0.2.1.gem",
+    "pkg/mongo-dequeue-0.3.0.gem",
     "spec/mongo_dequeue_spec.rb",
     "spec/spec_helper.rb"
   ]

data/spec/mongo_dequeue_spec.rb

@@ -216,10 +216,46 @@ describe Mongo::Dequeue do
 			@peek.length.should == 2
 		end
 	end
+	
+	describe "Completing" do
+	    before(:all) do
+	       @a = insert_and_inspect("a")
+	       @b = insert_and_inspect("b")
+	       @c = insert_and_inspect("c")
+
+	       
+	       @ap = @queue.pop
+	       @queue.complete(@ap[:id])
+			@ac = @queue.send(:collection).find_one({:_id => BSON::ObjectId.from_string(@ap[:id])})
+	       
+	       @bp = @queue.pop
+	       @bc = @queue.send(:collection).find_one({:_id => BSON::ObjectId.from_string(@bp[:id])})
+	       
+	       @cp = @queue.pop
+   	       @queue.complete(@cp[:id])
+   	       @queue.complete(@cp[:id])
+   	       @queue.complete(@cp[:id])
+   	       @cc = @queue.send(:collection).find_one({:_id => BSON::ObjectId.from_string(@cp[:id])})
+   	       @stats = @queue.stats
+
+	    end
+		it "should count a single completion" do
+			@ac["completecount"].should eq 1
+			
+		end
+		it "should report zero for uncompleted items" do
+			@bc["completecount"].should eq 0
+		end
+		it "should count a single completion" do
+			@cc["completecount"].should eq 3
+		end
+		it "should report stats correctly" do
+			 @stats[:redundantcompletes].should == 2
+		end
+	end
 
 	describe "Stats" do
 	    before(:all) do
-	       @queue.flush!
 	       @a = insert_and_inspect("a")
 
 	       @b = insert_and_inspect("b")
@@ -250,6 +286,9 @@ describe Mongo::Dequeue do
 	    it "should count locked" do
 	    	@stats[:locked].should == 1
 	    end
+	    it "should count redundant completes" do
+	    	@stats[:redundantcompletes].should == 0
+	    end
 
 	    
 	end

metadata

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