mongo 1.6.2 → 1.6.4

data/test/replica_sets/read_preference_test.rb

@@ -42,7 +42,7 @@ class ReadPreferenceTest < Test::Unit::TestCase
     @rs.add_arbiter
     @rs.remove_secondary_node
     
-    @conn = ReplSetConnection.new(build_seeds(2), :read => :secondary_only)
+    @conn = ReplSetConnection.new(build_seeds(3), :read => :secondary_only)
 
     @db = @conn.db(MONGO_TEST_DB)
     @coll = @db.collection("test-sets")
@@ -108,6 +108,7 @@ class ReadPreferenceTest < Test::Unit::TestCase
       @coll.save({:a => 50}, :safe => {:w => 2, :wtimeout => 10000})
     end
     @rs.restart_killed_nodes
+    sleep(1)
     @coll.save({:a => 50}, :safe => {:w => 2, :wtimeout => 10000})
     assert_equal 4, @coll.find.to_a.length
   end

data/test/replica_sets/refresh_with_threads_test.rb

@@ -49,6 +49,8 @@ class ReplicaSetRefreshWithThreadsTest < Test::Unit::TestCase
 
     @rs.add_node
     threads.each {|t| t.join }
+
+    sleep(1)
     
     @conn['admin'].command({:ismaster => 1})
 

data/test/replica_sets/rs_test_helper.rb

@@ -1,5 +1,5 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 require './test/tools/repl_set_manager'
 
 class Test::Unit::TestCase

data/test/safe_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 include Mongo
 
 class SafeTest < Test::Unit::TestCase

data/test/support_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class SupportTest < Test::Unit::TestCase
 

data/test/threading/threading_with_large_pool_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 # Essentialy the same as test_threading.rb but with an expanded pool for
 # testing multiple connections.

data/test/threading_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class TestThreading < Test::Unit::TestCase
 

data/test/timeout_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class TestTimeout < Test::Unit::TestCase
   def test_op_timeout

data/test/tools/repl_set_manager.rb

@@ -152,6 +152,7 @@ class ReplSetManager
     end
 
     con.close
+    ensure_up
 
     return secondary
   end

data/test/unit/collection_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class CollectionTest < Test::Unit::TestCase
 

data/test/unit/connection_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 include Mongo
 
 class ConnectionTest < Test::Unit::TestCase
@@ -130,5 +130,93 @@ class ConnectionTest < Test::Unit::TestCase
         end
       end
     end
+
+    context "initializing with ENV['MONGODB_URI']" do
+      setup do
+        @old_mongodb_uri = ENV['MONGODB_URI']
+      end
+
+      teardown do
+        ENV['MONGODB_URI'] = @old_mongodb_uri
+      end
+
+      should "parse a simple uri" do
+        ENV['MONGODB_URI'] = "mongodb://localhost?connect=false"
+        @conn = Connection.new
+        assert_equal ['localhost', 27017], @conn.host_to_try
+      end
+
+      should "allow a complex host names" do
+        host_name = "foo.bar-12345.org"
+        ENV['MONGODB_URI'] = "mongodb://#{host_name}?connect=false"
+        @conn = Connection.new
+        assert_equal [host_name, 27017], @conn.host_to_try
+      end
+
+      should "allow db without username and password" do
+        host_name = "foo.bar-12345.org"
+        ENV['MONGODB_URI'] = "mongodb://#{host_name}/foo?connect=false"
+        @conn = Connection.new
+        assert_equal [host_name, 27017], @conn.host_to_try
+      end
+
+      should "set safe options on connection" do
+        host_name = "localhost"
+        opts = "safe=true&w=2&wtimeoutMS=1000&fsync=true&journal=true&connect=false"
+        ENV['MONGODB_URI'] = "mongodb://#{host_name}/foo?#{opts}"
+        @conn = Connection.new
+        assert_equal({:w => 2, :wtimeout => 1000, :fsync => true, :j => true}, @conn.safe)
+      end
+
+      should "set timeout options on connection" do
+        host_name = "localhost"
+        opts = "connectTimeoutMS=1000&socketTimeoutMS=5000&connect=false"
+        ENV['MONGODB_URI'] = "mongodb://#{host_name}/foo?#{opts}"
+        @conn = Connection.new
+        assert_equal 1, @conn.connect_timeout
+        assert_equal 5, @conn.op_timeout
+      end
+
+      should "parse a uri with a hyphen & underscore in the username or password" do
+        ENV['MONGODB_URI'] = "mongodb://hyphen-user_name:p-s_s@localhost:27017/db?connect=false"
+        @conn = Connection.new
+        assert_equal ['localhost', 27017], @conn.host_to_try
+        auth_hash = { 'db_name' => 'db', 'username' => 'hyphen-user_name', "password" => 'p-s_s' }
+        assert_equal auth_hash, @conn.auths[0]
+      end
+
+      should "attempt to connect" do
+        TCPSocket.stubs(:new).returns(new_mock_socket)
+        ENV['MONGODB_URI'] = "mongodb://localhost?connect=false" # connect=false ??
+        @conn = Connection.new
+
+        admin_db = new_mock_db
+        admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1})
+        @conn.expects(:[]).with('admin').returns(admin_db)
+        @conn.connect
+      end
+
+      should "raise an error on invalid uris" do
+        ENV['MONGODB_URI'] = "mongo://localhost"
+        assert_raise MongoArgumentError do
+          Connection.new
+        end
+
+        ENV['MONGODB_URI'] = "mongodb://localhost:abc"
+        assert_raise MongoArgumentError do
+          Connection.new
+        end
+      end
+
+      should "require all of username, if password and db are specified" do
+        ENV['MONGODB_URI'] = "mongodb://kyle:jones@localhost/db?connect=false"
+        assert Connection.new
+
+        ENV['MONGODB_URI'] = "mongodb://kyle:password@localhost"
+        assert_raise MongoArgumentError do
+          Connection.new
+        end
+      end
+    end
   end
 end

data/test/unit/cursor_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class CursorTest < Test::Unit::TestCase
   context "Cursor options" do

data/test/unit/db_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 def insert_message(db, documents)
   documents = [documents] unless documents.is_a?(Array)

data/test/unit/grid_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class GridTest < Test::Unit::TestCase
 

data/test/unit/node_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class NodeTest < Test::Unit::TestCase
 

data/test/unit/pool_manager_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 include Mongo
 
 class PoolManagerTest < Test::Unit::TestCase

data/test/unit/pool_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 include Mongo
 
 class PoolTest < Test::Unit::TestCase

data/test/unit/read_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class ReadTest < Test::Unit::TestCase
 

data/test/unit/safe_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../../test_helper", __FILE__)
 
 class SafeTest < Test::Unit::TestCase
 

data/test/uri_test.rb

@@ -1,4 +1,4 @@
-require './test/test_helper'
+require File.expand_path("../test_helper", __FILE__)
 
 class URITest < Test::Unit::TestCase
   include Mongo
@@ -63,9 +63,10 @@ class URITest < Test::Unit::TestCase
     assert_equal "test", parser.auths[1]["db_name"]
   end
 
-  def test_opts_basic
+  def test_opts_with_semincolon_separator
     parser = Mongo::URIParser.new('mongodb://localhost:27018?connect=direct;slaveok=true;safe=true')
     assert_equal 'direct', parser.connect
+    assert parser.direct?
     assert parser.slaveok
     assert parser.safe
   end
@@ -73,10 +74,25 @@ class URITest < Test::Unit::TestCase
   def test_opts_with_amp_separator
     parser = Mongo::URIParser.new('mongodb://localhost:27018?connect=direct&slaveok=true&safe=true')
     assert_equal 'direct', parser.connect
+    assert parser.direct?
     assert parser.slaveok
     assert parser.safe
   end
 
+  def test_opts_with_uri_encoded_stuff
+    parser = Mongo::URIParser.new('mongodb://localhost:27018?connect=%64%69%72%65%63%74&slaveok=%74%72%75%65&safe=true')
+    assert_equal 'direct', parser.connect
+    assert parser.direct?
+    assert parser.slaveok
+    assert parser.safe
+  end
+
+  def test_opts_made_invalid_by_mixed_separators
+    assert_raise_error MongoArgumentError, "must not mix URL separators ; and &" do
+      Mongo::URIParser.new('mongodb://localhost:27018?replicaset=foo;bar&slaveok=true&safe=true')
+    end
+  end
+
   def test_opts_safe
     parser = Mongo::URIParser.new('mongodb://localhost:27018?safe=true;w=2;journal=true;fsync=true;wtimeoutMS=200')
     assert parser.safe
@@ -93,12 +109,16 @@ class URITest < Test::Unit::TestCase
   end
 
   def test_opts_replica_set
-    assert_raise_error MongoArgumentError, "specify that connect=replicaset" do
-      Mongo::URIParser.new('mongodb://localhost:27018?replicaset=foo')
-    end
     parser = Mongo::URIParser.new('mongodb://localhost:27018?connect=replicaset;replicaset=foo')
     assert_equal 'foo', parser.replicaset
     assert_equal 'replicaset', parser.connect
+    assert parser.replicaset?
+  end
+
+  def test_opts_conflicting_replica_set
+    assert_raise_error MongoArgumentError, "connect=direct conflicts with setting a replicaset name" do
+      Mongo::URIParser.new('mongodb://localhost:27018?connect=direct;replicaset=foo')
+    end
   end
 
   def test_case_insensitivity

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.4
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables:
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby driver for MongoDB