mongo 1.1.5 → 1.2.rc0

data/test/connection_test.rb

@@ -165,6 +165,41 @@ class TestConnection < Test::Unit::TestCase
     assert unlocked, "mongod failed to unlock"
   end
 
+  def test_max_bson_size_value
+    conn = standard_connection
+    if conn.server_version > "1.6"
+      assert_equal conn['admin'].command({:ismaster => 1})['maxBsonObjectSize'], conn.max_bson_size
+    end
+
+    conn.connect
+    assert_equal BSON::BSON_CODER.max_bson_size, conn.max_bson_size
+    doc = {'n' => 'a' * (BSON_CODER.max_bson_size - 11)}
+    assert_raise InvalidDocument do
+      assert BSON::BSON_CODER.serialize(doc)
+    end
+
+    limit = 7 * 1024 * 1024
+    conn.stubs(:max_bson_size).returns(limit)
+    conn.connect
+    assert_equal limit, conn.max_bson_size
+    assert_equal limit, BSON::BSON_CODER.max_bson_size
+    doc = {'n' => 'a' * ((limit) - 11)}
+    assert_raise_error InvalidDocument, "limited to #{limit}" do
+      assert BSON::BSON_CODER.serialize(doc)
+    end
+  end
+
+  def test_max_bson_size_with_old_mongod
+    conn = standard_connection(:connect => false)
+
+    admin_db = Object.new
+    admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1}).twice
+    conn.expects(:[]).with('admin').returns(admin_db).twice
+
+    conn.connect
+    assert_equal Mongo::DEFAULT_MAX_BSON_SIZE, BSON::BSON_CODER.max_bson_size
+  end
+
   context "Saved authentications" do
     setup do
       @conn = standard_connection

data/test/replica_sets/connect_test.rb

@@ -16,8 +16,8 @@ class ConnectTest < Test::Unit::TestCase
 
   def test_connect_with_deprecated_multi
     @conn = Connection.multi([[RS.host, RS.ports[0]], [RS.host, RS.ports[1]]], :name => RS.name)
-    assert @conn.connected?
     assert @conn.is_a?(ReplSetConnection)
+    assert @conn.connected?
   end
 
   def test_connect_bad_name
@@ -31,6 +31,7 @@ class ConnectTest < Test::Unit::TestCase
     @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
       [RS.host, RS.ports[2]], :name => RS.name)
     assert @conn.connected?
+    assert @conn.read_primary?
 
     assert_equal RS.primary, @conn.primary
     assert_equal RS.secondaries.sort, @conn.secondaries.sort

data/test/replica_sets/connection_string_test.rb

@@ -0,0 +1,32 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require './test/replica_sets/rs_test_helper'
+
+# NOTE: This test expects a replica set of three nodes to be running on RS.host,
+# on ports TEST_PORT, RS.ports[1], and TEST + 2.
+class ConnectionStringTest < Test::Unit::TestCase
+  include Mongo
+
+  def setup
+    RS.restart_killed_nodes
+  end
+
+  def teardown
+    RS.restart_killed_nodes
+  end
+
+  def test_connect_with_connection_string
+    @conn = Connection.from_uri("mongodb://#{RS.host}:#{RS.ports[0]},#{RS.host}:#{RS.ports[1]}?replicaset=#{RS.name}")
+    assert @conn.is_a?(ReplSetConnection)
+    assert @conn.connected?
+  end
+
+  def test_connect_with_full_connection_string
+    @conn = Connection.from_uri("mongodb://#{RS.host}:#{RS.ports[0]},#{RS.host}:#{RS.ports[1]}?replicaset=#{RS.name};safe=true;w=2;fsync=true;slaveok=true")
+    assert @conn.is_a?(ReplSetConnection)
+    assert @conn.connected?
+    assert_equal 2, @conn.safe[:w]
+    assert @conn.safe[:fsync]
+    assert @conn.read_pool
+  end
+
+end

data/test/replica_sets/query_secondaries.rb

@@ -16,6 +16,10 @@ class ReplicaSetQuerySecondariesTest < Test::Unit::TestCase
     RS.restart_killed_nodes
   end
 
+  def test_read_primary
+    assert !@conn.read_primary?
+  end
+
   def test_con
     assert @conn.primary_pool, "No primary pool!"
     assert @conn.read_pool, "No read pool!"

data/test/replica_sets/replication_ack_test.rb

@@ -13,6 +13,8 @@ class ReplicaSetAckTest < Test::Unit::TestCase
     @slave1 = Connection.new(@conn.secondary_pools[0].host,
       @conn.secondary_pools[0].port, :slave_ok => true)
 
+    assert !@slave1.read_primary?
+
     @db = @conn.db(MONGO_TEST_DB)
     @db.drop_collection("test-sets")
     @col = @db.collection("test-sets")

data/test/replica_sets/rs_test_helper.rb

@@ -12,17 +12,15 @@ class Test::Unit::TestCase
   # Generic code for rescuing connection failures and retrying operations.
   # This could be combined with some timeout functionality.
   def rescue_connection_failure(max_retries=60)
-    success = false
-    tries   = 0
-    while !success && tries < max_retries
-      begin
-        yield
-        success = true
-      rescue Mongo::ConnectionFailure
-        puts "Rescue attempt #{tries}\n"
-        tries += 1
-        sleep(1)
-      end
+    retries = 0
+    begin
+      yield
+    rescue Mongo::ConnectionFailure => ex
+      puts "Rescue attempt #{retries}"
+      retries += 1
+      raise ex if retries > max_retries
+      sleep(1)
+      retry
     end
   end
 

data/test/unit/collection_test.rb

@@ -113,7 +113,6 @@ class CollectionTest < Test::Unit::TestCase
 
       @coll.ensure_index [["x", Mongo::DESCENDING]]
       @coll.ensure_index [["x", Mongo::DESCENDING]]
-      
     end
     
     should "call generate_indexes for each key when calling ensure_indexes" do

data/test/unit/connection_test.rb

@@ -22,8 +22,8 @@ class ConnectionTest < Test::Unit::TestCase
         TCPSocket.stubs(:new).returns(new_mock_socket)
 
         admin_db = new_mock_db
-        admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1})
-        @conn.expects(:[]).with('admin').returns(admin_db)
+        admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1}).twice
+        @conn.expects(:[]).with('admin').returns(admin_db).twice
         @conn.connect
       end
 
@@ -65,8 +65,8 @@ class ConnectionTest < Test::Unit::TestCase
         @conn = Connection.from_uri("mongodb://localhost", :connect => false)
 
         admin_db = new_mock_db
-        admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1})
-        @conn.expects(:[]).with('admin').returns(admin_db)
+        admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1}).twice
+        @conn.expects(:[]).with('admin').returns(admin_db).twice
         @conn.expects(:apply_saved_authentication)
         @conn.connect
       end

data/test/unit/repl_set_connection_test.rb

@@ -67,16 +67,6 @@ class ReplSetConnectionTest < Test::Unit::TestCase
         assert_equal ['localhost', 27017], @conn.nodes[0]
         assert_equal ['mydb.com', 27018], @conn.nodes[1]
       end
-
-      should "parse a uri specifying multiple nodes with auth" do
-        @conn = Connection.from_uri("mongodb://kyle:s3cr3t@localhost:27017/app,mickey:m0u5e@mydb.com:27018/dsny", :connect => false)
-        assert_equal ['localhost', 27017], @conn.nodes[0]
-        assert_equal ['mydb.com', 27018], @conn.nodes[1]
-        auth_hash = {'username' => 'kyle', 'password' => 's3cr3t', 'db_name' => 'app'}
-        assert_equal auth_hash, @conn.auths[0]
-        auth_hash = {'username' => 'mickey', 'password' => 'm0u5e', 'db_name' => 'dsny'}
-        assert_equal auth_hash, @conn.auths[1]
-      end
     end
   end
 end

data/test/unit/safe_test.rb

@@ -40,7 +40,7 @@ class SafeTest < Test::Unit::TestCase
         col = @db['bar']
         assert_equal @safe_value, col.safe
 
-        col = Collection.new(@db, 'bar')
+        col = Collection.new('bar', @db)
         assert_equal @safe_value, col.safe
       end
 
@@ -48,7 +48,7 @@ class SafeTest < Test::Unit::TestCase
         col = @db.collection('bar', :safe => false)
         assert_equal false, col.safe
 
-        col = Collection.new(@db, 'bar', :safe => false)
+        col = Collection.new('bar', @db, :safe => false)
         assert_equal false, col.safe
       end
     end

data/test/uri_test.rb

@@ -0,0 +1,75 @@
+require './test/test_helper'
+
+class TestThreading < Test::Unit::TestCase
+  include Mongo
+
+  def test_uri_without_port
+    parser = Mongo::URIParser.new('mongodb://localhost')
+    assert_equal 1, parser.nodes.length
+    assert_equal 'localhost', parser.nodes[0][0]
+    assert_equal 27017, parser.nodes[0][1]
+  end
+
+  def test_basic_uri
+    parser = Mongo::URIParser.new('mongodb://localhost:27018')
+    assert_equal 1, parser.nodes.length
+    assert_equal 'localhost', parser.nodes[0][0]
+    assert_equal 27018, parser.nodes[0][1]
+  end
+
+  def test_multiple_uris
+    parser = Mongo::URIParser.new('mongodb://a.example.com:27018,b.example.com')
+    assert_equal 2, parser.nodes.length
+    assert_equal 'a.example.com', parser.nodes[0][0]
+    assert_equal 27018, parser.nodes[0][1]
+    assert_equal 'b.example.com', parser.nodes[1][0]
+    assert_equal 27017, parser.nodes[1][1]
+  end
+
+  def test_multiple_uris_with_auths
+    parser = Mongo::URIParser.new('mongodb://bob:secret@a.example.com:27018/test,joe:secret2@b.example.com/test2')
+    assert_equal 2, parser.nodes.length
+    assert_equal 'a.example.com', parser.nodes[0][0]
+    assert_equal 27018, parser.nodes[0][1]
+    assert_equal 'b.example.com', parser.nodes[1][0]
+    assert_equal 27017, parser.nodes[1][1]
+    assert_equal 2, parser.auths.length
+    assert_equal "bob", parser.auths[0]["username"]
+    assert_equal "secret", parser.auths[0]["password"]
+    assert_equal "test", parser.auths[0]["db_name"]
+    assert_equal "joe", parser.auths[1]["username"]
+    assert_equal "secret2", parser.auths[1]["password"]
+    assert_equal "test2", parser.auths[1]["db_name"]
+  end
+
+  def test_opts_basic
+    parser = Mongo::URIParser.new('mongodb://localhost:27018?connect=direct;slaveok=true;safe=true')
+    assert_equal 'direct', parser.connect
+    assert parser.slaveok
+    assert parser.safe
+  end
+
+  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.slaveok
+    assert parser.safe
+  end
+
+  def test_opts_safe
+    parser = Mongo::URIParser.new('mongodb://localhost:27018?safe=true;w=2;wtimeout=200;fsync=true')
+    assert parser.safe
+    assert_equal 2, parser.w
+    assert_equal 200, parser.wtimeout
+    assert parser.fsync
+  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
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 977940448
+  prerelease: true
   segments: 
   - 1
-  - 1
-  - 5
-  version: 1.1.5
+  - 2
+  - rc0
+  version: 1.2.rc0
 platform: ruby
 authors: 
 - Jim Menard
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -05:00
+date: 2011-01-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,12 +28,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 977940448
         segments: 
         - 1
-        - 1
-        - 5
-        version: 1.1.5
+        - 2
+        - rc0
+        version: 1.2.rc0
   type: :runtime
   version_requirements: *id001
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
@@ -96,6 +96,7 @@ files:
 - test/auxillary/1.4_features.rb
 - test/conversions_test.rb
 - test/connection_test.rb
+- test/uri_test.rb
 - test/cursor_message_test.rb
 - test/tools/test.rb
 - test/tools/repl_set_manager.rb
@@ -119,6 +120,7 @@ files:
 - test/replica_sets/replication_ack_test.rb
 - test/replica_sets/query_secondaries.rb
 - test/replica_sets/query_test.rb
+- test/replica_sets/connection_string_test.rb
 - test/replica_sets/insert_test.rb
 - test/replica_sets/connect_test.rb
 - test/safe_test.rb
@@ -147,12 +149,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -181,6 +185,7 @@ test_files:
 - test/auxillary/1.4_features.rb
 - test/conversions_test.rb
 - test/connection_test.rb
+- test/uri_test.rb
 - test/cursor_message_test.rb
 - test/tools/test.rb
 - test/tools/repl_set_manager.rb
@@ -204,6 +209,7 @@ test_files:
 - test/replica_sets/replication_ack_test.rb
 - test/replica_sets/query_secondaries.rb
 - test/replica_sets/query_test.rb
+- test/replica_sets/connection_string_test.rb
 - test/replica_sets/insert_test.rb
 - test/replica_sets/connect_test.rb
 - test/safe_test.rb