resque-igo 1.12.5 → 1.12.6

data/lib/resque.rb

@@ -29,7 +29,12 @@ module Resque
   
   
   def mongo=(server)
-    if server.is_a? String
+    if server.is_a?(String) && server.start_with?('mongodb://')
+      raise "Connecting with a mongodb uri requires Mongo driver version 1.1.5 or higher." if Mongo::VERSION < "1.1.5"
+      conn = Mongo::Connection.from_uri(server)
+      nodes, auths = Mongo::URIParser.parse(server)
+      queuedb = auths.first['db_name']
+    elsif server.is_a? String
       opts = server.split(':')
       host = opts[0]
       if opts[1] =~ /\//
@@ -41,8 +46,8 @@ module Resque
       end
       conn = Mongo::Connection.new host, port
     elsif server.is_a? Hash
-      conn = Mongo::Connection.new(options[:server], options[:port], options)
-      queuedb = options[:queuedb] || 'resque'
+      conn = Mongo::Connection.new(server[:server], server[:port], server)
+      queuedb = server[:queuedb] || 'resque'
     elsif server.is_a? Mongo::Connection
       conn = server
     end
@@ -134,7 +139,8 @@ module Resque
   end
 
   def to_s
-    "Resque Client connected to #{mongo.connection.host}:#{mongo.connection.port}/#{mongo.name}"
+    connection_info = Mongo::VERSION >= "1.1.3" ? mongo.connection.primary_pool : mongo.connection
+    "Resque Client connected to #{connection_info.host}:#{connection_info.port}/#{mongo.name}"
   end
 
   def allows_unique_jobs(klass)

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.12.5'
+  Version = VERSION = '1.12.6'
 end

data/test/resque_test.rb

@@ -16,6 +16,13 @@ context "Resque" do
     Resque.mongo = 'localhost:27017/namespace'
     assert_equal 'namespace', Resque.mongo.name
   end
+  
+  test "can connect through a mongodb uri" do
+    Resque.mongo.connection.db('authenticated_resque_db').add_user('username', 'password')
+    uri = 'mongodb://username:password@localhost:27017/authenticated_resque_db'
+    Resque.mongo = uri
+    assert_equal 'authenticated_resque_db', Resque.mongo.name
+  end
 
   test "can put jobs on a queue" do
     assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-igo
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 1
   - 12
-  - 5
-  version: 1.12.5
+  - 6
+  version: 1.12.6
 platform: ruby
 authors: 
 - Nathan D Acuff
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 -05:00
+date: 2010-12-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency