mongo 0.15.1 → 0.16

data/test/test_connection.rb

@@ -19,6 +19,17 @@ class TestConnection < Test::Unit::TestCase
     @mongo.db('ruby-mongo-test').error
   end
 
+  def test_server_info
+    server_info = @mongo.server_info
+    assert server_info.keys.include? "version"
+    assert server_info.keys.include? "bits"
+    assert_equal 1.0, server_info["ok"]
+  end
+
+  def test_server_version
+    assert_match /\d\.\d+(\.\d+)?/, @mongo.server_version.to_s
+  end
+
   def test_invalid_database_names
     assert_raise TypeError do @mongo.db(4) end
 
@@ -61,10 +72,8 @@ class TestConnection < Test::Unit::TestCase
     logger = Logger.new(output)
     logger.level = Logger::DEBUG
     db = Connection.new(@host, @port, :logger => logger).db('ruby-mongo-test')
-    db['test'].find().to_a
 
-    assert output.string.include?("db.test.find")
-    assert !output.string.include?("db.test.remove")
+    assert output.string.include?("2004")
   end
   
   def test_connection_logger
@@ -81,7 +90,7 @@ class TestConnection < Test::Unit::TestCase
   def test_drop_database
     db = @mongo.db('ruby-mongo-will-be-deleted')
     coll = db.collection('temp')
-    coll.clear
+    coll.remove
     coll.insert(:name => 'temp')
     assert_equal 1, coll.count()
     assert @mongo.database_names.include?('ruby-mongo-will-be-deleted')

data/test/test_cursor.rb

@@ -7,18 +7,20 @@ class CursorTest < Test::Unit::TestCase
 
   include Mongo
 
-  @@db = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db('ruby-mongo-test')
+  @@connection = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
+  @@db   = @@connection.db('ruby-mongo-test')
   @@coll = @@db.collection('test')
+  @@version = @@connection.server_version
 
   def setup
-    @@coll.clear
+    @@coll.remove
     @@coll.insert('a' => 1)     # collection not created until it's used
     @@coll_full_name = 'ruby-mongo-test.test'
   end
 
   def teardown
-    @@coll.clear
+    @@coll.remove
     @@db.error
   end
 
@@ -32,7 +34,7 @@ class CursorTest < Test::Unit::TestCase
   end
 
   def test_count
-    @@coll.clear
+    @@coll.remove
 
     assert_equal 0, @@coll.find().count()
 
@@ -59,7 +61,7 @@ class CursorTest < Test::Unit::TestCase
   end
 
   def test_sort
-    @@coll.clear
+    @@coll.remove
     5.times{|x| @@coll.insert({"a" => x}) }
 
     assert_kind_of Cursor, @@coll.find().sort(:a, 1)
@@ -89,7 +91,7 @@ class CursorTest < Test::Unit::TestCase
   end
 
   def test_limit
-    @@coll.clear
+    @@coll.remove
 
     10.times do |i|
       @@coll.save("x" => i)
@@ -119,7 +121,7 @@ class CursorTest < Test::Unit::TestCase
   end
 
   def test_skip
-    @@coll.clear
+    @@coll.remove
 
     10.times do |i|
       @@coll.save("x" => i)
@@ -153,7 +155,7 @@ class CursorTest < Test::Unit::TestCase
   end
 
   def test_limit_skip_chaining
-    @@coll.clear
+    @@coll.remove
     10.times do |i|
       @@coll.save("x" => i)
     end
@@ -202,7 +204,7 @@ class CursorTest < Test::Unit::TestCase
 
   def test_refill_via_get_more_alt_coll
     coll = @@db.collection('test-alt-coll')
-    coll.clear
+    coll.remove
     coll.insert('a' => 1)     # collection not created until it's used
     assert_equal 1, coll.count
 
@@ -318,12 +320,13 @@ class CursorTest < Test::Unit::TestCase
   end
 
   def test_count_with_fields
-    @@coll.clear
+    @@coll.remove
     @@coll.save("x" => 1)
 
-    @@coll.find({}, :fields => ["a"]).each do |doc|
-      fail "shouldn't have any results here"
+    if @@version < "1.1.3"
+      assert_equal(0, @@coll.find({}, :fields => ["a"]).count())
+    else
+      assert_equal(1, @@coll.find({}, :fields => ["a"]).count())
     end
-    assert_equal(0, @@coll.find({}, :fields => ["a"]).count())
   end
 end

data/test/test_db.rb

@@ -25,12 +25,12 @@ class DBTest < Test::Unit::TestCase
   def setup
     @spongebob = 'spongebob'
     @spongebob_password = 'squarepants'
-    @@users.clear
+    @@users.remove
     @@users.insert(:user => @spongebob, :pwd => @@db.send(:hash_password, @spongebob, @spongebob_password))
   end
 
   def teardown
-    @@users.clear if @@users
+    @@users.remove if @@users
     @@db.error
   end
 
@@ -61,7 +61,7 @@ class DBTest < Test::Unit::TestCase
 
   def test_full_coll_name
     coll = @@db.collection('test')
-    assert_equal 'ruby-mongo-test.test', @@db.full_coll_name(coll.name)
+    assert_equal 'ruby-mongo-test.test', @@db.full_collection_name(coll.name)
   end
 
   def test_collection_names
@@ -101,7 +101,7 @@ class DBTest < Test::Unit::TestCase
   def test_pk_factory
     db = Connection.new(@@host, @@port).db('ruby-mongo-test', :pk => TestPKFactory.new)
     coll = db.collection('test')
-    coll.clear
+    coll.remove
 
     insert_id = coll.insert('name' => 'Fred', 'age' => 42)
     # new id gets added to returned object
@@ -118,7 +118,7 @@ class DBTest < Test::Unit::TestCase
     assert_equal oid, db_oid
     assert_equal data, row
 
-    coll.clear
+    coll.remove
   end
 
   def test_pk_factory_reset
@@ -190,7 +190,7 @@ class DBTest < Test::Unit::TestCase
   end
 
   def test_last_status
-    @@db['test'].clear
+    @@db['test'].remove
     @@db['test'].save("i" => 1)
 
     @@db['test'].update({"i" => 1}, {"$set" => {"i" => 2}})
@@ -203,7 +203,7 @@ class DBTest < Test::Unit::TestCase
   def test_text_port_number
     db = DB.new('ruby-mongo-test', [[@@host, @@port.to_s]])
     # If there is no error, all is well
-    db.collection('users').clear
+    db.collection('users').remove
   end
 
 end

data/test/test_db_api.rb

@@ -6,25 +6,27 @@ require 'test/unit'
 class DBAPITest < Test::Unit::TestCase
   include Mongo
 
-  @@db = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db('ruby-mongo-test')
+  @@connection = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
+  @@db   = @@connection.db("ruby-mongo-test")
   @@coll = @@db.collection('test')
+  @@version = @@connection.server_version
 
   def setup
-    @@coll.clear
+    @@coll.remove
     @r1 = {'a' => 1}
     @@coll.insert(@r1) # collection not created until it's used
     @@coll_full_name = 'ruby-mongo-test.test'
   end
 
   def teardown
-    @@coll.clear
+    @@coll.remove
     @@db.error
   end
 
   def test_clear
     assert_equal 1, @@coll.count
-    @@coll.clear
+    @@coll.remove
     assert_equal 0, @@coll.count
   end
 
@@ -142,7 +144,7 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_find_sorting
-    @@coll.clear
+    @@coll.remove
     @@coll.insert('a' => 1, 'b' => 2)
     @@coll.insert('a' => 2, 'b' => 1)
     @@coll.insert('a' => 3, 'b' => 2)
@@ -233,7 +235,7 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_find_one_no_records
-    @@coll.clear
+    @@coll.remove
     x = @@coll.find_one('a' => 1)
     assert_nil x
   end
@@ -386,16 +388,26 @@ class DBAPITest < Test::Unit::TestCase
   def test_array
     @@coll << {'b' => [1, 2, 3]}
     rows = @@coll.find({}, {:fields => ['b']}).to_a
-    assert_equal 1, rows.length
-    assert_equal [1, 2, 3], rows[0]['b']
+    if @@version < "1.1.3"
+      assert_equal 1, rows.length
+      assert_equal [1, 2, 3], rows[0]['b']
+    else
+      assert_equal 2, rows.length
+      assert_equal [1, 2, 3], rows[1]['b']
+    end
   end
 
   def test_regex
     regex = /foobar/i
     @@coll << {'b' => regex}
     rows = @@coll.find({}, {:fields => ['b']}).to_a
-    assert_equal 1, rows.length
-    assert_equal regex, rows[0]['b']
+    if @@version < "1.1.3"
+      assert_equal 1, rows.length
+      assert_equal regex, rows[0]['b']
+    else
+      assert_equal 2, rows.length
+      assert_equal regex, rows[1]['b']
+    end
   end
 
   def test_non_oid_id
@@ -580,7 +592,7 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_deref
-    @@coll.clear
+    @@coll.remove
 
     assert_equal nil, @@db.dereference(DBRef.new("test", ObjectID.new))
     @@coll.insert({"x" => "hello"})
@@ -592,13 +604,13 @@ class DBAPITest < Test::Unit::TestCase
     @@coll.insert(obj)
     assert_equal obj, @@db.dereference(DBRef.new("test", 4))
 
-    @@coll.clear
+    @@coll.remove
     @@coll.insert({"x" => "hello"})
     assert_equal nil, @@db.dereference(DBRef.new("test", nil))
   end
 
   def test_save
-    @@coll.clear
+    @@coll.remove
 
     a = {"hello" => "world"}
 
@@ -622,13 +634,13 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_save_long
-    @@coll.clear
+    @@coll.remove
     @@coll.insert("x" => 9223372036854775807)
     assert_equal 9223372036854775807, @@coll.find_one()["x"]
   end
 
   def test_find_by_oid
-    @@coll.clear
+    @@coll.remove
 
     @@coll.save("hello" => "mike")
     id = @@coll.save("hello" => "world")
@@ -644,7 +656,7 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_save_with_object_that_has_id_but_does_not_actually_exist_in_collection
-    @@coll.clear
+    @@coll.remove
 
     a = {'_id' => '1', 'hello' => 'world'}
     @@coll.save(a)
@@ -658,7 +670,7 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_invalid_key_names
-    @@coll.clear
+    @@coll.remove
 
     @@coll.insert({"hello" => "world"})
     @@coll.insert({"hello" => {"hello" => "world"}})
@@ -779,7 +791,7 @@ class DBAPITest < Test::Unit::TestCase
       assert_equal "UTF-8", utf8.encoding.name
       assert_equal "ISO-8859-1", iso8859.encoding.name
 
-      @@coll.clear
+      @@coll.remove
       @@coll.save("ascii" => ascii, "utf8" => utf8, "iso8859" => iso8859)
       doc = @@coll.find_one()
 

data/test/test_db_connection.rb

@@ -12,7 +12,7 @@ class DBConnectionTest < Test::Unit::TestCase
     port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
     db = Connection.new(host, port).db('ruby-mongo-demo')
     coll = db.collection('test')
-    coll.clear
+    coll.remove
     db.error
   end
 end

data/test/test_grid_store.rb

@@ -14,14 +14,14 @@ class GridStoreTest < Test::Unit::TestCase
   @@chunks = @@db.collection('fs.chunks')
 
   def setup
-    @@chunks.clear
-    @@files.clear
+    @@chunks.remove
+    @@files.remove
     GridStore.open(@@db, 'foobar', 'w') { |f| f.write("hello, world!") }
   end
 
   def teardown
-    @@chunks.clear
-    @@files.clear
+    @@chunks.remove
+    @@files.remove
     @@db.error
   end
 
@@ -106,8 +106,8 @@ class GridStoreTest < Test::Unit::TestCase
   end
 
   def test_multi_chunk
-    @@chunks.clear
-    @@files.clear
+    @@chunks.remove
+    @@files.remove
 
     size = 512
     GridStore.open(@@db, 'biggie', 'w') { |f|
@@ -167,8 +167,8 @@ class GridStoreTest < Test::Unit::TestCase
   end
 
   def test_save_empty_file
-    @@chunks.clear
-    @@files.clear
+    @@chunks.remove
+    @@files.remove
     GridStore.open(@@db, 'empty', 'w') {} # re-write with zero bytes
     assert_equal 1, @@files.count
     assert_equal 0, @@chunks.count

data/test/test_helper.rb

@@ -0,0 +1,25 @@
+$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'rubygems'
+require 'test/unit'
+
+begin
+  require 'shoulda'
+  require 'mocha'
+  rescue LoadError
+    puts <<MSG
+
+This test suite now requires shoulda and mocha.
+You can install these gems as follows:
+  gem install shoulda
+  gem install mocha
+
+MSG
+    exit
+end
+
+require 'mongo'
+
+# NOTE: most tests assume that MongoDB is running.
+class Test::Unit::TestCase
+  include Mongo
+end

data/test/test_objectid.rb

@@ -10,6 +10,16 @@ class ObjectIDTest < Test::Unit::TestCase
     @o = ObjectID.new()
   end
 
+  def test_create_pk_method
+    doc = {:name => 'Mongo'}
+    doc = ObjectID.create_pk(doc)
+    assert doc[:_id]
+    
+    doc = {:name => 'Mongo', :_id => '12345'}
+    doc = ObjectID.create_pk(doc)
+    assert_equal '12345', doc[:_id]
+  end
+
   def test_different
     a = ObjectID.new
     b = ObjectID.new
@@ -44,7 +54,7 @@ class ObjectIDTest < Test::Unit::TestCase
     db = Connection.new(host, port).db('ruby-mongo-test')
     coll = db.collection('test')
 
-    coll.clear
+    coll.remove
     coll << {'a' => 1, '_id' => @o}
 
     row = coll.find().collect.first

data/test/test_slave_connection.rb

@@ -0,0 +1,37 @@
+$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'mongo'
+require 'test/unit'
+
+# NOTE: these tests are run only if we can connect to a single MongoDB in slave mode.
+class SlaveConnectionTest < Test::Unit::TestCase
+  include Mongo
+
+  def self.connect_to_slave
+    @@host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
+    @@port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
+    db = Connection.new(@@host, @@port, :slave_ok => true).db('ruby-mongo-demo')
+    !db.master?
+  end
+
+  if self.connect_to_slave
+    puts "Connected to slave; running slave tests."
+
+    def test_connect_to_slave
+      assert_raise Mongo::ConfigurationError do 
+        @db = Connection.new(@@host, @@port, :slave_ok => false).db('ruby-mongo-demo')
+      end
+    end
+
+    def test_slave_ok_sent_to_queries
+      @db   = Connection.new(@@host, @@port, :slave_ok => true).db('ruby-mongo-demo')
+      assert_equal true, @db.slave_ok?
+    end
+  else
+    puts "Not connected to slave; skipping slave connection tests."
+
+    def test_slave_ok_false_on_queries
+      @db = Connection.new(@@host, @@port).db('ruby-mongo-demo')
+      assert !@db.slave_ok?
+    end
+  end
+end