mongo-dequeue 0.1.0 → 0.2.0

data/README.rdoc

@@ -14,19 +14,17 @@ Heavily inspired by Mongo::Queue https://github.com/skiz/mongo_queue
 == Examples
 
 === Setting up a queue
-Mongo::Dequeue requires a Mongo::Connection to your Mongo Server, and allows you to configure the database, 
-collection, and the default read timeout of items in your queue. Items popped from the queue must be confirmed
-complete, or they will be reissued after the timeout specified.
+Mongo::Dequeue requires a Mongo::Collection, and allows you to configure the default read timeout of items in your queue. 
+Items popped from the queue must be confirmed complete, or they will be reissued after the timeout specified.
 
-    db = Mongo::Connection.new
+    mc = Mongo::Connection.new
+    collection = mc.db("whateverdb").collection("my_queue")
 
     options   = {
-      :database   => 'whateverdb',
-      :collection => 'my_queue',
       :timeout    => 60
     }
 
-    queue = Mongo::Dequeue.new(db, options)
+    queue = Mongo::Dequeue.new(collection, options)
 
 === Pushing Items
 Items have a body, passed as the first argument to push(). A body can be a string, number, hash, or array. These 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/mongo-dequeue.rb

@@ -5,11 +5,9 @@ require 'mongo'
 # heavily inspired by https://github.com/skiz/mongo_queue
 
 class Mongo::Dequeue
-	attr_reader :connection, :config
+	attr_reader :collection, :config
 	
 	DEFAULT_CONFIG = {
-		:database   => 'mongo_dequeue',
-		:collection => 'mongo_dequeue',
 		:timeout    => 300,
 		:default_priority => 3
 	}.freeze
@@ -22,8 +20,8 @@ class Mongo::Dequeue
 	#    config = {:timeout => 90, :attempts => 2}
 	#    queue = Mongo::Queue.new(db, config)
 	#
-	def initialize(connection, opts={})
-		@connection = connection
+	def initialize(collection, opts={})
+		@collection = collection
 		@config = DEFAULT_CONFIG.merge(opts)
 	end
  
@@ -49,7 +47,7 @@ class Mongo::Dequeue
 				:body => body,
 				:inserted_at => Time.now.utc,
 				:complete => false,
-				:locked_at => nil,
+				:locked_till => nil,
 				:completed_at => nil,
 				:priority => item_opts[:priority] || @config[:default_priority],
 				:duplicate_key => dup_key
@@ -71,7 +69,7 @@ class Mongo::Dequeue
 		begin
 			timeout = opts[:timeout] || @config[:timeout]
 			cmd = BSON::OrderedHash.new
-		    cmd['findandmodify'] = @config[:collection]
+		    cmd['findandmodify'] = collection.name
 		    cmd['update']        = {'$set' => {:locked_till => Time.now.utc+timeout}} 
 		    cmd['query']         = {:complete => false, '$or'=>[{:locked_till=> nil},{:locked_till=>{'$lt'=>Time.now.utc}}] }
 		    cmd['sort']          = {:priority=>-1,:inserted_at=>1}
@@ -92,7 +90,7 @@ class Mongo::Dequeue
 	# You must provide the process identifier that the document was locked with to complete it.
 	def complete(id)
 		cmd = BSON::OrderedHash.new
-		cmd['findandmodify'] = @config[:collection]
+		cmd['findandmodify'] = collection.name
 		cmd['query']         = {:_id => BSON::ObjectId.from_string(id), :complete => false}
 		cmd['update']        = {:completed_at => Time.now.utc, :complete => true}
 		cmd['limit']         = 1
@@ -113,10 +111,10 @@ class Mongo::Dequeue
 			      return db.eval(
 			      function(){
 			      	var nowutc = new Date();
-			      	var a = db.#{config[:collection]}.count({'complete': false, '$or':[{'locked_till':null},{'locked_till':{'$lt':nowutc}}] });
-			        var c = db.#{config[:collection]}.count({'complete': true});
-			        var t = db.#{config[:collection]}.count();
-			        var l = db.#{config[:collection]}.count({'complete': false, 'locked_till': {'$gte':nowutc} });
+			      	var a = db.#{collection.name}.count({'complete': false, '$or':[{'locked_till':null},{'locked_till':{'$lt':nowutc}}] });
+			        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];
 			      }
 			    );
@@ -142,8 +140,5 @@ class Mongo::Dequeue
 		result['okay'] == 0 ? nil : result['value']
 	end
 	
-	def collection #:nodoc:
-		@connection.db(@config[:database]).collection(@config[:collection])
-	end
 	
 end

data/mongo-dequeue.gemspec

@@ -0,0 +1,65 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{mongo-dequeue}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["TelegramSam"]
+  s.date = %q{2011-06-30}
+  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 = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/mongo-dequeue.rb",
+    "mongo-dequeue.gemspec",
+    "pkg/mongo-dequeue-0.1.0.gem",
+    "spec/mongo_dequeue_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/TelegramSam/Dequeue}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.3}
+  s.summary = %q{Mongo based de-duplicating pritority queue}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<mongo>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<mongo>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<mongo>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/spec/mongo_dequeue_spec.rb

@@ -11,11 +11,9 @@ describe Mongo::Dequeue do
   
   before(:all) do
     opts   = {
-      :database   => 'mongo_queue_spec',
-      :collection => 'spec',
       :timeout    => 60}
-    @db = Mongo::Connection.new('localhost', nil, :pool_size => 4)
-    @queue = Mongo::Dequeue.new(@db, opts)
+    @collection = Mongo::Connection.new('localhost', nil, :pool_size => 4).db('mongo_queue_spec').collection('spec')
+    @queue = Mongo::Dequeue.new(@collection, opts)
   end
   
   before(:each) do
@@ -25,15 +23,7 @@ describe Mongo::Dequeue do
   describe "Configuration" do
 
     it "should set the connection" do
-      @queue.connection.should be(@db)
-    end
-
-    it "should allow database option" do
-      @queue.config[:database].should eql('mongo_queue_spec')
-    end
-    
-    it "should allow collection option" do
-      @queue.config[:collection].should eql('spec')
+      @queue.collection.should be(@collection)
     end
 
     it "should allow timeout option" do
@@ -42,7 +32,6 @@ describe Mongo::Dequeue do
   
     it "should have a sane set of defaults" do
       q = Mongo::Dequeue.new(nil)
-      q.config[:collection].should eql 'mongo_dequeue'
       q.config[:timeout].should    eql 300
     end
   end
@@ -162,7 +151,7 @@ describe Mongo::Dequeue do
 	    	a = insert_and_inspect("foo")
 		    m = @queue.pop
 		    m[:body].should eq "foo"
-		    @queue.send(:collection).count.should be 1  
+		    @queue.send(:collection).count.should be 1
 	    end
 	    
 	    it "should return an id" do

metadata

@@ -2,7 +2,7 @@
 name: mongo-dequeue
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - TelegramSam
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 -06:00
+date: 2011-06-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,6 +96,8 @@ files:
 - Rakefile
 - VERSION
 - lib/mongo-dequeue.rb
+- mongo-dequeue.gemspec
+- pkg/mongo-dequeue-0.1.0.gem
 - spec/mongo_dequeue_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -112,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4221506242229050956
+      hash: -2750562918096667173
       segments: 
       - 0
       version: "0"