mongo 1.0 → 1.1.5

data/test/db_test.rb

@@ -1,23 +1,20 @@
-require 'test/test_helper'
+require './test/test_helper'
 require 'digest/md5'
 require 'stringio'
 require 'logger'
 
 class TestPKFactory
   def create_pk(row)
-    row['_id'] ||= BSON::ObjectID.new
+    row['_id'] ||= BSON::ObjectId.new
     row
   end
 end
 
-# NOTE: assumes Mongo is running
 class DBTest < Test::Unit::TestCase
 
   include Mongo
 
-  @@host  = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
-  @@port  = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
-  @@conn  = Connection.new(@@host, @@port)
+  @@conn  = standard_connection
   @@db    = @@conn.db(MONGO_TEST_DB)
   @@users = @@db.collection('system.users')
   @@version = @@conn.server_version
@@ -31,7 +28,7 @@ class DBTest < Test::Unit::TestCase
     rescue => ex
       assert_match /NilClass/, ex.to_s
     ensure
-      @@db = Connection.new(@@host, @@port).db(MONGO_TEST_DB)
+      @@db = standard_connection.db(MONGO_TEST_DB)
       @@users = @@db.collection('system.users')
     end
   end
@@ -40,7 +37,7 @@ class DBTest < Test::Unit::TestCase
     output = StringIO.new
     logger = Logger.new(output)
     logger.level = Logger::DEBUG
-    conn = Connection.new(@host, @port, :logger => logger)
+    conn = standard_connection(:logger => logger)
     assert_equal logger, conn.logger
     
     conn.logger.debug 'testing'
@@ -76,22 +73,8 @@ class DBTest < Test::Unit::TestCase
     assert_kind_of Collection, colls[0]
   end
 
-  def test_pair
-    @@conn.close
-    @@users = nil
-    @@conn  = Connection.paired([["this-should-fail", 27017], [@@host, @@port]])
-    @@db    = @@conn[MONGO_TEST_DB]
-    assert @@conn.connected?
-  ensure
-    unless @@conn.connected?
-      @@conn = Connection.new(@@host, @@port)
-      @@db   = @@conn.db(MONGO_TEST_DB)
-    end
-    @@users = @@db.collection('system.users')
-  end
-
   def test_pk_factory
-    db = Connection.new(@@host, @@port).db(MONGO_TEST_DB, :pk => TestPKFactory.new)
+    db = standard_connection.db(MONGO_TEST_DB, :pk => TestPKFactory.new)
     coll = db.collection('test')
     coll.remove
 
@@ -102,7 +85,7 @@ class DBTest < Test::Unit::TestCase
     assert_not_nil oid
     assert_equal insert_id, oid
 
-    oid = BSON::ObjectID.new
+    oid = BSON::ObjectId.new
     data = {'_id' => oid, 'name' => 'Barney', 'age' => 41}
     coll.insert(data)
     row = coll.find_one({'name' => data['name']})
@@ -114,7 +97,7 @@ class DBTest < Test::Unit::TestCase
   end
 
   def test_pk_factory_reset
-    conn = Connection.new(@@host, @@port)
+    conn = standard_connection
     db   = conn.db(MONGO_TEST_DB)
     db.pk_factory = Object.new # first time
     begin
@@ -142,10 +125,10 @@ class DBTest < Test::Unit::TestCase
 
   def test_authenticate_with_connection_uri
     @@db.add_user('spongebob', 'squarepants')
-    assert Mongo::Connection.from_uri("mongodb://spongebob:squarepants@localhost/#{@@db.name}")
+    assert Mongo::Connection.from_uri("mongodb://spongebob:squarepants@#{host_port}/#{@@db.name}")
 
     assert_raise Mongo::AuthenticationError do
-      Mongo::Connection.from_uri("mongodb://wrong:info@localhost/#{@@db.name}")
+      Mongo::Connection.from_uri("mongodb://wrong:info@#{host_port}/#{@@db.name}")
     end
   end
 
@@ -153,32 +136,41 @@ class DBTest < Test::Unit::TestCase
     assert @@db.logout
   end
 
+  def test_command
+    assert_raise OperationFailure do
+      @@db.command({:non_command => 1}, :check_response => true)
+    end
+
+    result = @@db.command({:non_command => 1}, :check_response => false)
+    assert !Mongo::Support.ok?(result)
+  end
+
   def test_error
     @@db.reset_error_history
-    assert_nil @@db.error
+    assert_nil @@db.get_last_error['err']
     assert !@@db.error?
     assert_nil @@db.previous_error
 
-    @@db.send(:command, :forceerror => 1)
+    @@db.command({:forceerror => 1}, :check_response => false)
     assert @@db.error?
-    assert_not_nil @@db.error
+    assert_not_nil @@db.get_last_error['err']
     assert_not_nil @@db.previous_error
 
-    @@db.send(:command, :forceerror => 1)
+    @@db.command({:forceerror => 1}, :check_response => false)
     assert @@db.error?
-    assert @@db.error
+    assert @@db.get_last_error['err']
     prev_error = @@db.previous_error
     assert_equal 1, prev_error['nPrev']
-    assert_equal prev_error["err"], @@db.error
+    assert_equal prev_error["err"], @@db.get_last_error['err']
 
     @@db.collection('test').find_one
-    assert_nil @@db.error
+    assert_nil @@db.get_last_error['err']
     assert !@@db.error?
     assert @@db.previous_error
     assert_equal 2, @@db.previous_error['nPrev']
 
     @@db.reset_error_history
-    assert_nil @@db.error
+    assert_nil @@db.get_last_error['err']
     assert !@@db.error?
     assert_nil @@db.previous_error
   end
@@ -186,7 +178,7 @@ class DBTest < Test::Unit::TestCase
   def test_check_command_response
     command = {:forceerror => 1}
     assert_raise OperationFailure do 
-      @@db.command(command, false, true)
+      @@db.command(command)
     end
   end
 
@@ -195,16 +187,16 @@ class DBTest < Test::Unit::TestCase
     @@db['test'].save("i" => 1)
 
     @@db['test'].update({"i" => 1}, {"$set" => {"i" => 2}})
-    assert @@db.last_status()["updatedExisting"]
+    assert @@db.get_last_error()["updatedExisting"]
 
     @@db['test'].update({"i" => 1}, {"$set" => {"i" => 500}})
-    assert !@@db.last_status()["updatedExisting"]
+    assert !@@db.get_last_error()["updatedExisting"]
   end
 
   def test_text_port_number_raises_no_errors
-    conn = Connection.new(@@host, @@port.to_s)
+    conn = standard_connection
     db   = conn[MONGO_TEST_DB]
-    assert db.collection('users').remove
+    db.collection('users').remove
   end
 
   def test_user_management
@@ -221,6 +213,19 @@ class DBTest < Test::Unit::TestCase
     assert !@@db.remove_user("joe")
   end
 
+  def test_stored_function_management
+    @@db.add_stored_function("sum", "function (x, y) { return x + y; }")
+    assert_equal @@db.eval("return sum(2,3);"), 5
+    assert @@db.remove_stored_function("sum")
+    assert_raise OperationFailure do 
+      @@db.eval("return sum(2,3);")
+    end
+  end
+
+  def test_eval
+    @@db.eval("db.system.save({_id:'hello', value: function() { print('hello'); } })")
+    assert_equal 'hello', @@db['system'].find_one['_id']
+  end
 
   if @@version >= "1.3.5"
     def test_db_stats

data/test/grid_file_system_test.rb

@@ -1,17 +1,16 @@
-require 'test/test_helper'
+require './test/test_helper'
 include Mongo
 
 class GridFileSystemTest < Test::Unit::TestCase
   context "GridFileSystem:" do
     setup do
-      @con = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
-      @db = @con.db(MONGO_TEST_DB)
+      @con = standard_connection
+      @db  = @con.db(MONGO_TEST_DB)
     end
 
     teardown do
-      @db['fs.files'].remove
-      @db['fs.chunks'].remove
+      @db.drop_collection('fs.files')
+      @db.drop_collection('fs.chunks')
     end
 
     context "When reading:" do
@@ -25,6 +24,15 @@ class GridFileSystemTest < Test::Unit::TestCase
         @grid = GridFileSystem.new(@db)
       end
 
+      should "return existence of the file" do
+        file = @grid.exist?(:filename => 'sample.file')
+        assert_equal 'sample.file', file['filename']
+      end
+
+      should "return nil if the file doesn't exist" do
+        assert_nil @grid.exist?(:filename => 'foo.file')
+      end
+
       should "read sample data" do
         data = @grid.open('sample.file', 'r') { |f| f.read }
         assert_equal data.length, @chunks_data.length

data/test/grid_io_test.rb

@@ -1,12 +1,11 @@
-require 'test/test_helper'
+require './test/test_helper'
 include Mongo
 
 class GridIOTest < Test::Unit::TestCase
 
   context "GridIO" do
     setup do
-      @db ||= Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db(MONGO_TEST_DB)
+      @db = standard_connection.db(MONGO_TEST_DB)
       @files  = @db.collection('fs.files')
       @chunks = @db.collection('fs.chunks')
       @chunks.create_index([['files_id', Mongo::ASCENDING], ['n', Mongo::ASCENDING]])
@@ -34,6 +33,39 @@ class GridIOTest < Test::Unit::TestCase
       end
     end
 
+    context "Seeking" do
+      setup do
+        @filename = 'test'
+        @mode     = 'w'
+        @data     = "1" * 1024 * 1024
+        @file = GridIO.new(@files, @chunks, @filename, @mode)
+        @file.write(@data)
+        @file.close
+      end
+
+      should "read all data using read_length and then be able to seek" do
+        file = GridIO.new(@files, @chunks, nil, "r", :query => {:_id => @file.files_id})
+        assert_equal @data, file.read(1024 * 1024)
+        file.seek(0)
+        assert_equal @data, file.read
+      end
+
+      should "read all data using read_all and then be able to seek" do
+        file = GridIO.new(@files, @chunks, nil, "r", :query => {:_id => @file.files_id})
+        assert_equal @data, file.read
+        file.seek(0)
+        assert_equal @data, file.read
+        file.seek(1024 * 512)
+        assert_equal 524288, file.file_position
+        assert_equal @data.length / 2, file.read.length
+        assert_equal 1048576, file.file_position
+        assert_nil file.read
+        file.seek(1024 * 512)
+        assert_equal 524288, file.file_position
+      end
+
+    end
+
     context "Grid MD5 check" do
       should "run in safe mode" do
         file = GridIO.new(@files, @chunks, 'smallfile', 'w', :safe => true)
@@ -52,9 +84,7 @@ class GridIOTest < Test::Unit::TestCase
 
       should "raise an exception when check fails" do
         io = File.open(File.join(File.dirname(__FILE__), 'data', 'sample_file.pdf'), 'r')
-        db = mock()
-        db.stubs(:command).returns({'md5' => '12345'})
-        @files.expects(:db).returns(db)
+        @db.stubs(:command).returns({'md5' => '12345'})
         file = GridIO.new(@files, @chunks, 'bigfile', 'w', :safe => true)
         file.write(io)
         assert_raise GridMD5Failure do
@@ -65,7 +95,6 @@ class GridIOTest < Test::Unit::TestCase
     end
 
     context "Content types" do
-
       if defined?(MIME)
         should "determine common content types from the extension" do
           file = GridIO.new(@files, @chunks, 'sample.pdf', 'w')

data/test/grid_test.rb

@@ -1,11 +1,10 @@
-require 'test/test_helper'
+require './test/test_helper'
 include Mongo
 
 class GridTest < Test::Unit::TestCase
   context "Tests:" do
     setup do
-      @db ||= Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db(MONGO_TEST_DB)
+      @db = standard_connection.db(MONGO_TEST_DB)
       @files  = @db.collection('test-fs.files')
       @chunks = @db.collection('test-fs.chunks')
     end
@@ -19,7 +18,23 @@ class GridTest < Test::Unit::TestCase
       setup do
         @data = "GRIDDATA" * 50000
         @grid = Grid.new(@db, 'test-fs')
-        @id   = @grid.put(@data, :filename => 'sample', :metadata => {'app' => 'photos'})
+        @id   = @grid.put(@data, :filename => 'sample',
+                          :metadata => {'app' => 'photos'})
+      end
+
+      should "check existence" do
+        file = @grid.exist?(:filename => 'sample')
+        assert_equal 'sample', file['filename']
+      end
+
+      should "not be able to overwrite an exising file" do
+        assert_raise GridError do
+          @grid.put(@data, :filename => 'sample', :_id => @id, :safe => true)
+        end
+      end
+
+      should "return nil if it doesn't exist" do
+        assert_nil @grid.exist?(:metadata => 'foo')
       end
 
       should "retrieve the stored data" do
@@ -106,7 +121,8 @@ class GridTest < Test::Unit::TestCase
     context "Storing data with a length of zero" do
       setup do
         @grid = Grid.new(@db, 'test-fs')
-        @id   = @grid.put('', :filename => 'sample', :metadata => {'app' => 'photos'})
+        @id   = @grid.put('', :filename => 'sample',
+                          :metadata => {'app' => 'photos'})
       end
 
       should "return the zero length" do
@@ -115,6 +131,34 @@ class GridTest < Test::Unit::TestCase
       end
     end
 
+    context "Grid streaming: " do
+      setup do
+        @grid = Grid.new(@db, 'test-fs')
+        filename = 'sample_data'
+        @io   = File.open(File.join(File.dirname(__FILE__), 'data', filename), 'r')
+        id    = @grid.put(@io, :filename => filename)
+        @file = @grid.get(id)
+        @io.rewind
+        @data = @io.read
+        if @data.respond_to?(:force_encoding)
+          @data.force_encoding("binary")
+        end
+      end
+
+      should "read the file" do
+        read_data = ""
+        @file.each do |chunk|
+          read_data << chunk
+        end
+        assert_equal @data.length, read_data.length
+      end
+
+      should "read the file if no block is given" do
+        read_data = @file.each
+        assert_equal @data.length, read_data.length
+      end
+    end
+
     context "Streaming: " do || {}
       setup do
         def read_and_write_stream(filename, read_length, opts={})
@@ -124,7 +168,7 @@ class GridTest < Test::Unit::TestCase
           io.rewind
           data = io.read
           if data.respond_to?(:force_encoding)
-            data.force_encoding(:binary)
+            data.force_encoding("binary")
           end
           read_data = ""
           while(chunk = file.read(read_length))
@@ -144,12 +188,12 @@ class GridTest < Test::Unit::TestCase
         read_and_write_stream('small_data.txt', 1)
       end
 
-      should "put and get a large io object when reading smaller than the chunk size" do
-        read_and_write_stream('sample_file.pdf', 256 * 1024)
+      should "put and get a large io object if reading less than the chunk size" do
+        read_and_write_stream('sample_data', 256 * 1024)
       end
 
-      should "put and get a large io object when reading larger than the chunk size" do
-        read_and_write_stream('sample_file.pdf', 300 * 1024)
+      should "put and get a large io object if reading more than the chunk size" do
+        read_and_write_stream('sample_data', 300 * 1024)
       end
     end
   end

data/test/replica_sets/connect_test.rb

@@ -0,0 +1,84 @@
+$:.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 ConnectTest < Test::Unit::TestCase
+  include Mongo
+
+  def setup
+    RS.restart_killed_nodes
+  end
+
+  def teardown
+    RS.restart_killed_nodes
+  end
+
+  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)
+  end
+
+  def test_connect_bad_name
+    assert_raise_error(ReplicaSetConnectionError, "-wrong") do
+      ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+        [RS.host, RS.ports[2]], :rs_name => RS.name + "-wrong")
+    end
+  end
+
+  def test_connect
+    @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_equal RS.primary, @conn.primary
+    assert_equal RS.secondaries.sort, @conn.secondaries.sort
+    assert_equal RS.arbiters.sort, @conn.arbiters.sort
+  end
+
+  def test_connect_with_primary_node_killed
+    node = RS.kill_primary
+
+    # Becuase we're killing the primary and trying to connect right away,
+    # this is going to fail right away.
+    assert_raise_error(ConnectionFailure, "Failed to connect to primary node") do
+      @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+        [RS.host, RS.ports[2]])
+    end
+
+    # This allows the secondary to come up as a primary
+    rescue_connection_failure do
+      @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+        [RS.host, RS.ports[2]])
+    end
+    assert @conn.connected?
+  end
+
+  def test_connect_with_secondary_node_killed
+    node = RS.kill_secondary
+
+    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+      [RS.host, RS.ports[2]])
+    assert @conn.connected?
+  end
+
+  def test_connect_with_third_node_killed
+    RS.kill(RS.get_node_from_port(RS.ports[2]))
+
+    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+      [RS.host, RS.ports[2]])
+    assert @conn.connected?
+  end
+
+  def test_connect_with_primary_stepped_down
+    RS.step_down_primary
+
+    rescue_connection_failure do
+      @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+        [RS.host, RS.ports[2]])
+    end
+    assert @conn.connected?
+  end
+
+end

data/test/replica_sets/count_test.rb

@@ -0,0 +1,35 @@
+$:.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 ReplicaSetCountTest < 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]])
+    @db = @conn.db(MONGO_TEST_DB)
+    @db.drop_collection("test-sets")
+    @coll = @db.collection("test-sets")
+  end
+
+  def teardown
+    RS.restart_killed_nodes
+  end
+
+  def test_correct_count_after_insertion_reconnect
+    @coll.insert({:a => 20}, :safe => {:w => 2, :wtimeout => 10000})
+    assert_equal 1, @coll.count
+
+    # Kill the current master node
+    @node = RS.kill_primary
+
+    rescue_connection_failure do
+      @coll.insert({:a => 30}, :safe => true)
+    end
+
+    @coll.insert({:a => 40}, :safe => true)
+    assert_equal 3, @coll.count, "Second count failed"
+  end
+
+end

data/test/{replica → replica_sets}/insert_test.rb

@@ -1,23 +1,26 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'mongo'
-require 'test/unit'
-require 'test/test_helper'
+require './test/replica_sets/rs_test_helper'
 
-# NOTE: this test should be run only if a replica pair is running.
-class ReplicaPairInsertTest < Test::Unit::TestCase
+# NOTE: This test expects a replica set of three nodes to be running
+# on the local host.
+class ReplicaSetInsertTest < Test::Unit::TestCase
   include Mongo
 
   def setup
-    @conn = Mongo::Connection.new({:left => ["localhost", 27017], :right => ["localhost", 27018]}, nil)
-    @db = @conn.db('mongo-ruby-test')
-    @db.drop_collection("test-pairs")
-    @coll = @db.collection("test-pairs")
+    @conn = ReplSetConnection.new([TEST_HOST, RS.ports[0]], [TEST_HOST, RS.ports[1]], [TEST_HOST, RS.ports[2]])
+    @db = @conn.db(MONGO_TEST_DB)
+    @db.drop_collection("test-sets")
+    @coll = @db.collection("test-sets")
+  end
+
+  def teardown
+    RS.restart_killed_nodes
   end
 
   def test_insert
     @coll.save({:a => 20}, :safe => true)
-    puts "Please disconnect the current master."
-    gets
+
+    RS.kill_primary
 
     rescue_connection_failure do
       @coll.save({:a => 30}, :safe => true)
@@ -28,9 +31,9 @@ class ReplicaPairInsertTest < Test::Unit::TestCase
     @coll.save({:a => 60}, :safe => true)
     @coll.save({:a => 70}, :safe => true)
 
-    puts "Please reconnect the old master to make sure that the new master " +
-         "has synced with the previous master. Note: this may have happened already."
-    gets
+    # Restart the old master and wait for sync
+    RS.restart_killed_nodes
+    sleep(1)
     results = []
 
     rescue_connection_failure do

data/test/replica_sets/pooled_insert_test.rb

@@ -0,0 +1,55 @@
+$:.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 => 10, :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
+  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
+
+    # 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