mongo 1.4.0 → 1.5.0.rc0

data/test/unit/read_test.rb

@@ -10,7 +10,7 @@ class ReadTest < Test::Unit::TestCase
 
   end
 
-  context "Read mode on connection: " do
+  context "Read mode on replica set connection: " do
     setup do
       @read_preference = :secondary
       @con = Mongo::ReplSetConnection.new(['localhost', 27017], :read => @read_preference, :connect => false)
@@ -71,19 +71,31 @@ class ReadTest < Test::Unit::TestCase
       end
 
       should "use default value on query" do
+        @cursor = @col.find({:a => 1})
+        sock = mock()
+        read_pool = stub(:checkin => true)
+        @con.stubs(:read_pool).returns(read_pool)
+        primary_pool = stub(:checkin => true)
+        @con.stubs(:primary_pool).returns(primary_pool)
+        @con.expects(:checkout_reader).returns(sock)
         @con.expects(:receive_message).with do |o, m, l, s, c, r|
-          r == :secondary
+          r == nil
         end.returns([[], 0, 0])
 
-        @col.find_one({:a => 1})
+        @cursor.next
       end
 
       should "allow override default value on query" do
+        @cursor = @col.find({:a => 1}, :read => :primary)
+        sock = mock()
+        primary_pool = stub(:checkin => true)
+        @con.stubs(:primary_pool).returns(primary_pool)
+        @con.expects(:checkout_writer).returns(sock)
         @con.expects(:receive_message).with do |o, m, l, s, c, r|
-          r == :primary
+          r == nil
         end.returns([[], 0, 0])
 
-        @col.find_one({:a => 1}, :read => :primary)
+        @cursor.next
       end
 
       should "allow override alternate value on query" do

data/test/uri_test.rb

@@ -36,6 +36,11 @@ class TestThreading < Test::Unit::TestCase
     assert_equal "s-_3#%R.t", parser.auths[0]["password"]
   end
 
+  def test_complex_usernames
+    parser = Mongo::URIParser.new('mongodb://b:ob:secret.word@a.example.com:27018/test')
+    assert_equal "b:ob", parser.auths[0]["username"]
+  end
+
   def test_passwords_contain_no_commas
     assert_raise MongoArgumentError do
       Mongo::URIParser.new('mongodb://bob:a,b@a.example.com:27018/test')
@@ -43,7 +48,7 @@ class TestThreading < Test::Unit::TestCase
   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')
+    parser = Mongo::URIParser.new('mongodb://bob:secret@a.example.com:27018,b.example.com/test')
     assert_equal 2, parser.nodes.length
     assert_equal 'a.example.com', parser.nodes[0][0]
     assert_equal 27018, parser.nodes[0][1]
@@ -53,9 +58,9 @@ class TestThreading < Test::Unit::TestCase
     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"]
+    assert_equal "bob", parser.auths[1]["username"]
+    assert_equal "secret", parser.auths[1]["password"]
+    assert_equal "test", parser.auths[1]["db_name"]
   end
 
   def test_opts_basic

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 1
-  - 4
-  - 0
-  version: 1.4.0
+  prerelease: 6
+  version: 1.5.0.rc0
 platform: ruby
 authors: 
 - Jim Menard
@@ -17,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 -04:00
+date: 2011-11-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,12 +23,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
+        version: 1.5.0.rc0
   type: :runtime
   version_requirements: *id001
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
@@ -60,6 +50,7 @@ files:
 - lib/mongo/gridfs/grid_file_system.rb
 - lib/mongo/gridfs/grid_io.rb
 - lib/mongo/gridfs/grid_io_fix.rb
+- lib/mongo/networking.rb
 - lib/mongo/repl_set_connection.rb
 - lib/mongo/util/conversions.rb
 - lib/mongo/util/core_ext.rb
@@ -116,17 +107,17 @@ files:
 - test/load/thin/load.rb
 - test/load/unicorn/load.rb
 - test/pool_test.rb
+- test/replica_sets/basic_test.rb
 - test/replica_sets/connect_test.rb
-- test/replica_sets/connection_string_test.rb
 - test/replica_sets/count_test.rb
 - test/replica_sets/insert_test.rb
-- test/replica_sets/pooled_insert_test.rb
-- test/replica_sets/query_secondaries.rb
 - test/replica_sets/query_test.rb
 - test/replica_sets/read_preference_test.rb
 - test/replica_sets/refresh_test.rb
+- test/replica_sets/refresh_with_threads_test.rb
 - test/replica_sets/replication_ack_test.rb
 - test/replica_sets/rs_test_helper.rb
+- test/replica_sets/threading_test.rb
 - test/safe_test.rb
 - test/support/hash_with_indifferent_access.rb
 - test/support/keys.rb
@@ -164,19 +155,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -217,17 +202,17 @@ test_files:
 - test/load/thin/load.rb
 - test/load/unicorn/load.rb
 - test/pool_test.rb
+- test/replica_sets/basic_test.rb
 - test/replica_sets/connect_test.rb
-- test/replica_sets/connection_string_test.rb
 - test/replica_sets/count_test.rb
 - test/replica_sets/insert_test.rb
-- test/replica_sets/pooled_insert_test.rb
-- test/replica_sets/query_secondaries.rb
 - test/replica_sets/query_test.rb
 - test/replica_sets/read_preference_test.rb
 - test/replica_sets/refresh_test.rb
+- test/replica_sets/refresh_with_threads_test.rb
 - test/replica_sets/replication_ack_test.rb
 - test/replica_sets/rs_test_helper.rb
+- test/replica_sets/threading_test.rb
 - test/safe_test.rb
 - test/support/hash_with_indifferent_access.rb
 - test/support/keys.rb

data/test/replica_sets/connection_string_test.rb

@@ -1,29 +0,0 @@
-$:.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 teardown
-    RS.restart_killed_nodes
-    @conn.close if @conn
-  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/pooled_insert_test.rb

@@ -1,58 +0,0 @@
-$:.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 the local host.
-class ReplicaSetPooledInsertTest < Test::Unit::TestCase
-  include Mongo
-
-  def setup
-    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
-      [RS.host, RS.ports[2]], :pool_size => 5, :timeout => 5)
-    @db = @conn.db(MONGO_TEST_DB)
-    @db.drop_collection("test-sets")
-    @coll = @db.collection("test-sets")
-  end
-
-  def teardown
-    RS.restart_killed_nodes
-    @conn.close if @conn
-  end
-
-  def test_insert
-    expected_results = [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-    @coll.save({:a => -1}, :safe => true)
-
-    RS.kill_primary
-
-    threads = []
-    10.times do |i|
-      threads[i] = Thread.new do
-        rescue_connection_failure do
-          @coll.save({:a => i}, :safe => true)
-        end
-      end
-    end
-
-    threads.each {|t| t.join}
-
-    # Restart the old master and wait for sync
-    RS.restart_killed_nodes
-    sleep(1)
-    results = []
-
-    rescue_connection_failure do
-      @coll.find.each {|r| results << r}
-      expected_results.each do |a|
-        assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
-      end
-    end
-
-    @coll.save({:a => 10}, :safe => true)
-    @coll.find.each {|r| results << r}
-    (expected_results + [10]).each do |a|
-      assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a} on second find"
-    end
-  end
-
-end

data/test/replica_sets/query_secondaries.rb

@@ -1,109 +0,0 @@
-$:.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 the local host.
-class ReplicaSetQuerySecondariesTest < Test::Unit::TestCase
-  include Mongo
-
-  def setup
-    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], :read => :secondary)
-    @db = @conn.db(MONGO_TEST_DB)
-    @db.drop_collection("test-sets")
-  end
-
-  def teardown
-    RS.restart_killed_nodes
-    @conn.close if @conn
-  end
-
-  def test_read_primary
-    rescue_connection_failure do
-      assert !@conn.read_primary?
-      assert !@conn.primary?
-    end
-  end
-
-  def test_con
-    assert @conn.primary_pool, "No primary pool!"
-    assert @conn.read_pool, "No read pool!"
-    assert @conn.primary_pool.port != @conn.read_pool.port,
-      "Primary port and read port at the same!"
-  end
-
-  def test_query_secondaries
-    @coll = @db.collection("test-sets", :safe => {:w => 3, :wtimeout => 20000})
-    @coll.save({:a => 20})
-    @coll.save({:a => 30})
-    @coll.save({:a => 40})
-    results = []
-    @coll.find.each {|r| results << r["a"]}
-    assert results.include?(20)
-    assert results.include?(30)
-    assert results.include?(40)
-
-    RS.kill_primary
-
-    results = []
-    rescue_connection_failure do
-      @coll.find.each {|r| results << r}
-      [20, 30, 40].each do |a|
-        assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
-      end
-    end
-  end
-
-  def test_kill_primary
-    @coll = @db.collection("test-sets", :safe => {:w => 3, :wtimeout => 10000})
-    @coll.save({:a => 20})
-    @coll.save({:a => 30})
-    assert_equal 2, @coll.find.to_a.length
-
-    # Should still be able to read immediately after killing master node
-    RS.kill_primary
-    assert_equal 2, @coll.find.to_a.length
-    rescue_connection_failure do
-      @coll.save({:a => 50}, :safe => {:w => 2, :wtimeout => 10000})
-    end
-    RS.restart_killed_nodes
-    @coll.save({:a => 50}, :safe => {:w => 2, :wtimeout => 10000})
-    assert_equal 4, @coll.find.to_a.length
-  end
-
-  def test_kill_secondary
-    @coll = @db.collection("test-sets", {:safe => {:w => 3, :wtimeout => 20000}})
-    @coll.save({:a => 20})
-    @coll.save({:a => 30})
-    assert_equal 2, @coll.find.to_a.length
-
-    read_node = RS.get_node_from_port(@conn.read_pool.port)
-    RS.kill(read_node)
-
-    # Should fail immediately on next read
-    old_read_pool_port = @conn.read_pool.port
-    assert_raise ConnectionFailure do
-      @coll.find.to_a.length
-    end
-
-    # Should eventually reconnect and be able to read
-    rescue_connection_failure do
-      length = @coll.find.to_a.length
-      assert_equal 2, length
-    end
-    new_read_pool_port = @conn.read_pool.port
-    assert old_read_pool_port != new_read_pool_port
-  end
-
-  def test_write_lots_of_data
-    @coll = @db.collection("test-sets", {:safe => {:w => 2}})
-
-    6000.times do |n|
-      @coll.save({:a => n})
-    end
-
-    cursor = @coll.find()
-    cursor.next
-    cursor.close
-  end
-
-end