mongodb-mongo 0.12 → 0.13

data/{tests → test}/test_collection.rb

@@ -20,11 +20,10 @@ require 'test/unit'
 
 # NOTE: assumes Mongo is running
 class TestCollection < Test::Unit::TestCase
-  include XGen::Mongo
-  include XGen::Mongo::Driver
+  include Mongo
 
-  @@db = Mongo.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-                   ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT).db('ruby-mongo-test')
+  @@db = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db('ruby-mongo-test')
   @@test = @@db.collection("test")
 
   def setup
@@ -100,6 +99,18 @@ class TestCollection < Test::Unit::TestCase
     end
   end
 
+  def test_count
+    @@test.drop
+
+    assert_equal 0, @@test.count
+    @@test.save("x" => 1)
+    @@test.save("x" => 2)
+    assert_equal 2, @@test.count
+
+    # TODO remove this test - it's deprecated
+    assert_equal 1, @@test.count("x" => 1)
+  end
+
   def test_find_one
     id = @@test.save("hello" => "world", "foo" => "bar")
 
@@ -112,6 +123,7 @@ class TestCollection < Test::Unit::TestCase
 
     assert @@test.find_one(nil, :fields => ["hello"]).include?("hello")
     assert !@@test.find_one(nil, :fields => ["foo"]).include?("hello")
+    assert_equal ["_id"], @@test.find_one(nil, :fields => []).keys()
 
     assert_equal nil, @@test.find_one("hello" => "foo")
     assert_equal nil, @@test.find_one(OrderedHash["hello", "foo"])
@@ -139,5 +151,31 @@ class TestCollection < Test::Unit::TestCase
     @@test.save(doc)
     assert doc.include? :_id
   end
+
+  def test_optional_find_block
+    10.times do |i|
+      @@test.save("i" => i)
+    end
+
+    x = nil
+    @@test.find("i" => 2) { |cursor|
+      x = cursor.count()
+    }
+    assert_equal 1, x
+
+    i = 0
+    @@test.find({}, :offset => 5) do |cursor|
+      cursor.each do |doc|
+        i = i + 1
+      end
+    end
+    assert_equal 5, i
+
+    c = nil
+    @@test.find() do |cursor|
+      c = cursor
+    end
+    assert c.closed?
+  end
 end
 

data/{tests/test_mongo.rb → test/test_connection.rb}

@@ -3,14 +3,14 @@ require 'mongo'
 require 'test/unit'
 
 # NOTE: assumes Mongo is running
-class MongoTest < Test::Unit::TestCase
+class TestConnection < Test::Unit::TestCase
 
-  include XGen::Mongo::Driver
+  include Mongo
 
   def setup
     @host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
-    @port = ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT
-    @mongo = Mongo.new(@host, @port)
+    @port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
+    @mongo = Connection.new(@host, @port)
   end
 
   def teardown
@@ -67,23 +67,47 @@ class MongoTest < Test::Unit::TestCase
   end
 
   def test_pair
-    db = Mongo.new({:left => ['foo', 123]})
+    db = Connection.new({:left => ['foo', 123]})
     pair = db.instance_variable_get('@pair')
     assert_equal 2, pair.length
     assert_equal ['foo', 123], pair[0]
-    assert_equal ['localhost', Mongo::DEFAULT_PORT], pair[1]
+    assert_equal ['localhost', Connection::DEFAULT_PORT], pair[1]
 
-    db = Mongo.new({:right => 'bar'})
+    db = Connection.new({:right => 'bar'})
     pair = db.instance_variable_get('@pair')
     assert_equal 2, pair.length
-    assert_equal ['localhost', Mongo::DEFAULT_PORT], pair[0]
-    assert_equal ['bar', Mongo::DEFAULT_PORT], pair[1]
+    assert_equal ['localhost', Connection::DEFAULT_PORT], pair[0]
+    assert_equal ['bar', Connection::DEFAULT_PORT], pair[1]
 
-    db = Mongo.new({:right => ['foo', 123], :left => 'bar'})
+    db = Connection.new({:right => ['foo', 123], :left => 'bar'})
     pair = db.instance_variable_get('@pair')
     assert_equal 2, pair.length
-    assert_equal ['bar', Mongo::DEFAULT_PORT], pair[0]
+    assert_equal ['bar', Connection::DEFAULT_PORT], pair[0]
     assert_equal ['foo', 123], pair[1]
   end
+end
+
+# Test for deprecated Mongo class
+class TestMongo < Test::Unit::TestCase
+
+  include Mongo
+
+  def setup
+    @host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
+    @port = ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT
+    @mongo = Mongo.new(@host, @port)
+  end
 
+  def test_database_info
+    @mongo.drop_database('ruby-mongo-info-test')
+    @mongo.db('ruby-mongo-info-test').collection('info-test').insert('a' => 1)
+
+    info = @mongo.database_info
+    assert_not_nil info
+    assert_kind_of Hash, info
+    assert_not_nil info['ruby-mongo-info-test']
+    assert info['ruby-mongo-info-test'] > 0
+
+    @mongo.drop_database('ruby-mongo-info-test')
+  end
 end

data/test/test_cursor.rb

@@ -0,0 +1,223 @@
+$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'mongo'
+require 'test/unit'
+
+# NOTE: assumes Mongo is running
+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')
+  @@coll = @@db.collection('test')
+
+  def setup
+    @@coll.clear
+    @@coll.insert('a' => 1)     # collection not created until it's used
+    @@coll_full_name = 'ruby-mongo-test.test'
+  end
+
+  def teardown
+    @@coll.clear
+    @@db.error
+  end
+
+  def test_explain
+    cursor = @@coll.find('a' => 1)
+    explaination = cursor.explain
+    assert_not_nil explaination['cursor']
+    assert_kind_of Numeric, explaination['n']
+    assert_kind_of Numeric, explaination['millis']
+    assert_kind_of Numeric, explaination['nscanned']
+  end
+
+  def test_count
+    @@coll.clear
+
+    assert_equal 0, @@coll.find().count()
+
+    10.times do |i|
+      @@coll.save("x" => i)
+    end
+
+    assert_equal 10, @@coll.find().count()
+    assert_kind_of Integer, @@coll.find().count()
+    assert_equal 10, @@coll.find({}, :limit => 5).count()
+    assert_equal 10, @@coll.find({}, :offset => 5).count()
+
+    assert_equal 1, @@coll.find({"x" => 1}).count()
+    assert_equal 5, @@coll.find({"x" => {"$lt" => 5}}).count()
+
+    a = @@coll.find()
+    b = a.count()
+    a.each do |doc|
+      break
+    end
+    assert_equal b, a.count()
+
+    assert_equal 0, @@db['acollectionthatdoesn'].count()
+  end
+
+  def test_close_no_query_sent
+    begin
+      cursor = @@coll.find('a' => 1)
+      cursor.close
+      assert cursor.closed?
+    rescue => ex
+      fail ex.to_s
+    end
+  end
+
+  def test_refill_via_get_more
+    begin
+      assert_equal 1, @@coll.count
+      1000.times { |i|
+        assert_equal 1 + i, @@coll.count
+        @@coll.insert('a' => i)
+      }
+
+      assert_equal 1001, @@coll.count
+      count = 0
+      @@coll.find.each { |obj|
+        count += obj['a']
+      }
+      assert_equal 1001, @@coll.count
+
+      # do the same thing again for debugging
+      assert_equal 1001, @@coll.count
+      count2 = 0
+      @@coll.find.each { |obj|
+        count2 += obj['a']
+      }
+      assert_equal 1001, @@coll.count
+
+      assert_equal count, count2
+      assert_equal 499501, count
+    rescue Test::Unit::AssertionFailedError => ex
+      p @@db.collection_names
+      Process.exit 1
+    end
+  end
+
+  def test_refill_via_get_more_alt_coll
+    begin
+      coll = @@db.collection('test-alt-coll')
+      coll.clear
+      coll.insert('a' => 1)     # collection not created until it's used
+      assert_equal 1, coll.count
+
+      1000.times { |i|
+        assert_equal 1 + i, coll.count
+        coll.insert('a' => i)
+      }
+
+      assert_equal 1001, coll.count
+      count = 0
+      coll.find.each { |obj|
+        count += obj['a']
+      }
+      assert_equal 1001, coll.count
+
+      # do the same thing again for debugging
+      assert_equal 1001, coll.count
+      count2 = 0
+      coll.find.each { |obj|
+        count2 += obj['a']
+      }
+      assert_equal 1001, coll.count
+
+      assert_equal count, count2
+      assert_equal 499501, count
+    rescue Test::Unit::AssertionFailedError => ex
+      p @@db.collection_names
+      Process.exit 1
+    end
+  end
+
+  def test_close_after_query_sent
+    begin
+      cursor = @@coll.find('a' => 1)
+      cursor.next_object
+      cursor.close
+      assert cursor.closed?
+    rescue => ex
+      fail ex.to_s
+    end
+  end
+
+  def test_kill_cursors
+    @@coll.drop
+
+    client_cursors = @@db.db_command("cursorInfo" => 1)["clientCursors_size"]
+    by_location = @@db.db_command("cursorInfo" => 1)["byLocation_size"]
+
+    10000.times do |i|
+      @@coll.insert("i" => i)
+    end
+
+    assert_equal(client_cursors,
+                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(by_location,
+                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+
+    10.times do |i|
+      @@coll.find_one()
+    end
+
+    assert_equal(client_cursors,
+                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(by_location,
+                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+
+    10.times do |i|
+      a = @@coll.find()
+      a.next_object()
+      a.close()
+    end
+
+    assert_equal(client_cursors,
+                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(by_location,
+                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+
+    a = @@coll.find()
+    a.next_object()
+
+    assert_not_equal(client_cursors,
+                     @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+    assert_not_equal(by_location,
+                     @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+
+    a.close()
+
+    assert_equal(client_cursors,
+                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(by_location,
+                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+
+    a = @@coll.find({}, :limit => 10).next_object()
+
+    assert_equal(client_cursors,
+                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(by_location,
+                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+
+    @@coll.find() do |cursor|
+      cursor.next_object()
+    end
+
+    assert_equal(client_cursors,
+                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(by_location,
+                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+
+    @@coll.find() { |cursor|
+      cursor.next_object()
+    }
+
+    assert_equal(client_cursors,
+                 @@db.db_command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(by_location,
+                 @@db.db_command("cursorInfo" => 1)["byLocation_size"])
+  end
+end

data/{tests → test}/test_db.rb

@@ -5,7 +5,7 @@ require 'test/unit'
 
 class TestPKFactory
   def create_pk(row)
-    row['_id'] ||= XGen::Mongo::Driver::ObjectID.new
+    row['_id'] ||= Mongo::ObjectID.new
     row
   end
 end
@@ -13,11 +13,11 @@ end
 # NOTE: assumes Mongo is running
 class DBTest < Test::Unit::TestCase
 
-  include XGen::Mongo::Driver
+  include Mongo
 
   @@host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
-  @@port = ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT
-  @@db = Mongo.new(@@host, @@port).db('ruby-mongo-test')
+  @@port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
+  @@db = Connection.new(@@host, @@port).db('ruby-mongo-test')
   @@users = @@db.collection('system.users')
 
   def setup
@@ -41,7 +41,7 @@ class DBTest < Test::Unit::TestCase
     rescue => ex
       assert_match /NilClass/, ex.to_s
     ensure
-      @@db = Mongo.new(@@host, @@port).db('ruby-mongo-test')
+      @@db = Connection.new(@@host, @@port).db('ruby-mongo-test')
       @@users = @@db.collection('system.users')
     end
   end
@@ -66,15 +66,15 @@ class DBTest < Test::Unit::TestCase
   def test_pair
     @@db.close
     @@users = nil
-    @@db = Mongo.new({:left => "this-should-fail", :right => [@@host, @@port]}).db('ruby-mongo-test')
+    @@db = Connection.new({:left => "this-should-fail", :right => [@@host, @@port]}).db('ruby-mongo-test')
     assert @@db.connected?
   ensure
-    @@db = Mongo.new(@@host, @@port).db('ruby-mongo-test') unless @@db.connected?
+    @@db = Connection.new(@@host, @@port).db('ruby-mongo-test') unless @@db.connected?
     @@users = @@db.collection('system.users')
   end
 
   def test_pk_factory
-    db = Mongo.new(@@host, @@port).db('ruby-mongo-test', :pk => TestPKFactory.new)
+    db = Connection.new(@@host, @@port).db('ruby-mongo-test', :pk => TestPKFactory.new)
     coll = db.collection('test')
     coll.clear
 
@@ -85,7 +85,7 @@ class DBTest < Test::Unit::TestCase
     assert_not_nil oid
     assert_equal insert_id, oid
 
-    oid = XGen::Mongo::Driver::ObjectID.new
+    oid = ObjectID.new
     data = {'_id' => oid, 'name' => 'Barney', 'age' => 41}
     coll.insert(data)
     row = coll.find_one({'name' => data['name']})
@@ -97,7 +97,7 @@ class DBTest < Test::Unit::TestCase
   end
 
   def test_pk_factory_reset
-    db = Mongo.new(@@host, @@port).db('ruby-mongo-test')
+    db = Connection.new(@@host, @@port).db('ruby-mongo-test')
     db.pk_factory = Object.new # first time
     begin
       db.pk_factory = Object.new
@@ -121,7 +121,7 @@ class DBTest < Test::Unit::TestCase
 
   def test_auto_connect
     @@db.close
-    db = Mongo.new(@@host, @@port, :auto_reconnect => true).db('ruby-mongo-test')
+    db = Connection.new(@@host, @@port, :auto_reconnect => true).db('ruby-mongo-test')
     assert db.connected?
     assert db.auto_reconnect?
     db.close
@@ -130,7 +130,7 @@ class DBTest < Test::Unit::TestCase
     db.collection('test').insert('a' => 1)
     assert db.connected?
   ensure
-    @@db = Mongo.new(@@host, @@port).db('ruby-mongo-test')
+    @@db = Connection.new(@@host, @@port).db('ruby-mongo-test')
     @@users = @@db.collection('system.users')
   end