mongo 1.0 → 1.1.5

data/test/cursor_fail_test.rb

@@ -0,0 +1,75 @@
+require './test/test_helper'
+require 'logger'
+
+class CursorTest < Test::Unit::TestCase
+
+  include Mongo
+
+  @@connection = standard_connection
+  @@db   = @@connection.db(MONGO_TEST_DB)
+  @@coll = @@db.collection('test')
+  @@version = @@connection.server_version
+
+  def setup
+    @@coll.remove
+    @@coll.insert('a' => 1)     # collection not created until it's used
+    @@coll_full_name = "#{MONGO_TEST_DB}.test"
+  end
+
+  def test_refill_via_get_more
+    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
+  end
+
+  def test_refill_via_get_more_alt_coll
+    coll = @@db.collection('test-alt-coll')
+    coll.remove
+    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
+  end
+
+end

data/test/cursor_message_test.rb

@@ -0,0 +1,43 @@
+require './test/test_helper'
+require 'logger'
+
+class CursorTest < Test::Unit::TestCase
+
+  include Mongo
+
+  @@connection = standard_connection
+  @@db   = @@connection.db(MONGO_TEST_DB)
+  @@coll = @@db.collection('test')
+  @@version = @@connection.server_version
+
+  def setup
+    @@coll.remove
+    @@coll.insert('a' => 1)     # collection not created until it's used
+    @@coll_full_name = "#{MONGO_TEST_DB}.test"
+  end
+
+  def test_valid_batch_sizes
+    assert_raise ArgumentError do
+      @@coll.find({}, :batch_size => 1, :limit => 5)
+    end
+
+    assert_raise ArgumentError do
+      @@coll.find({}, :batch_size => -1, :limit => 5)
+    end
+
+    assert @@coll.find({}, :batch_size => 0, :limit => 5)
+  end
+
+  def test_batch_size
+    @@coll.remove
+    200.times do |n|
+      @@coll.insert({:a => n})
+    end
+
+    list = @@coll.find({}, :batch_size => 2, :limit => 6).to_a
+    assert_equal 6, list.length
+
+    list = @@coll.find({}, :batch_size => 100, :limit => 101).to_a
+    assert_equal 101, list.length
+  end
+end

data/test/cursor_test.rb

@@ -1,13 +1,11 @@
-require 'test/test_helper'
+require './test/test_helper'
 require 'logger'
 
-# NOTE: assumes Mongo is running
 class CursorTest < Test::Unit::TestCase
 
   include Mongo
 
-  @@connection = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
+  @@connection = standard_connection
   @@db   = @@connection.db(MONGO_TEST_DB)
   @@coll = @@db.collection('test')
   @@version = @@connection.server_version
@@ -18,6 +16,13 @@ class CursorTest < Test::Unit::TestCase
     @@coll_full_name = "#{MONGO_TEST_DB}.test"
   end
 
+  def test_inspect
+    selector = {:a => 1}
+    cursor = @@coll.find(selector)
+    assert_equal "<Mongo::Cursor:0x#{cursor.object_id.to_s(16)} namespace='#{@@db.name}.#{@@coll.name}' " +
+        "@selector=#{selector.inspect}>", cursor.inspect
+  end
+
   def test_explain
     cursor = @@coll.find('a' => 1)
     explaination = cursor.explain
@@ -41,6 +46,10 @@ class CursorTest < Test::Unit::TestCase
     assert_equal 10, @@coll.find({}, :limit => 5).count()
     assert_equal 10, @@coll.find({}, :skip => 5).count()
 
+    assert_equal 5, @@coll.find({}, :limit => 5).count(true)
+    assert_equal 5, @@coll.find({}, :skip => 5).count(true)
+    assert_equal 2, @@coll.find({}, :skip => 5, :limit => 2).count(true)
+
     assert_equal 1, @@coll.find({"x" => 1}).count()
     assert_equal 5, @@coll.find({"x" => {"$lt" => 5}}).count()
 
@@ -120,18 +129,18 @@ class CursorTest < Test::Unit::TestCase
     @@coll.remove
 
     t1 = Time.now
-    t1_id = ObjectID.from_time(t1)
+    t1_id = ObjectId.from_time(t1)
     @@coll.save({:t => 't1'})
     @@coll.save({:t => 't1'})
     @@coll.save({:t => 't1'})
     sleep(2)
     t2 = Time.now
-    t2_id = ObjectID.from_time(t2)
+    t2_id = ObjectId.from_time(t2)
     @@coll.save({:t => 't2'})
     @@coll.save({:t => 't2'})
     @@coll.save({:t => 't2'})
 
-    assert_equal 3, @@coll.find({'_id' => {'$gt' => t1_id}, '_id' => {'$lt' => t2_id}}).count
+    assert_equal 3, @@coll.find({'_id' => {'$gt' => t1_id, '$lt' => t2_id}}).count
     @@coll.find({'_id' => {'$gt' => t2_id}}).each do |doc|
       assert_equal 't2', doc['t']
     end
@@ -149,11 +158,34 @@ class CursorTest < Test::Unit::TestCase
     assert_equal 5, results.length
   end
 
-  def test_limit_exceptions
-    assert_raise ArgumentError do
-      cursor = @@coll.find().limit('not-an-integer')
+  def test_timeout_options
+    cursor = Cursor.new(@@coll)
+    assert_equal true, cursor.timeout
+
+    cursor = @@coll.find
+    assert_equal true, cursor.timeout
+
+    cursor = @@coll.find({}, :timeout => nil)
+    assert_equal true, cursor.timeout
+
+    cursor = Cursor.new(@@coll, :timeout => false)
+    assert_equal false, cursor.timeout
+
+    @@coll.find({}, :timeout => false) do |cursor|
+      assert_equal false, cursor.timeout
     end
+  end
 
+  def test_timeout
+    opts = Cursor.new(@@coll).query_opts
+    assert_equal 0, opts & Mongo::Constants::OP_QUERY_NO_CURSOR_TIMEOUT
+
+    opts = Cursor.new(@@coll, :timeout => false).query_opts
+    assert_equal Mongo::Constants::OP_QUERY_NO_CURSOR_TIMEOUT,
+      opts & Mongo::Constants::OP_QUERY_NO_CURSOR_TIMEOUT
+  end
+
+  def test_limit_exceptions
     cursor      = @@coll.find()
     firstResult = cursor.next_document
     assert_raise InvalidOperation, "Cannot modify the query once it has been run or closed." do
@@ -184,10 +216,6 @@ class CursorTest < Test::Unit::TestCase
   end
 
   def test_skip_exceptions
-    assert_raise ArgumentError do
-      cursor = @@coll.find().skip('not-an-integer')
-    end
-
     cursor      = @@coll.find()
     firstResult = cursor.next_document
     assert_raise InvalidOperation, "Cannot modify the query once it has been run or closed." do
@@ -294,7 +322,6 @@ class CursorTest < Test::Unit::TestCase
     @@coll.drop
 
     client_cursors = @@db.command("cursorInfo" => 1)["clientCursors_size"]
-    by_location = @@db.command("cursorInfo" => 1)["byLocation_size"]
 
     10000.times do |i|
       @@coll.insert("i" => i)
@@ -302,8 +329,6 @@ class CursorTest < Test::Unit::TestCase
 
     assert_equal(client_cursors,
                  @@db.command("cursorInfo" => 1)["clientCursors_size"])
-    assert_equal(by_location,
-                 @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     10.times do |i|
       @@coll.find_one()
@@ -311,8 +336,6 @@ class CursorTest < Test::Unit::TestCase
 
     assert_equal(client_cursors,
                  @@db.command("cursorInfo" => 1)["clientCursors_size"])
-    assert_equal(by_location,
-                 @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     10.times do |i|
       a = @@coll.find()
@@ -322,30 +345,22 @@ class CursorTest < Test::Unit::TestCase
 
     assert_equal(client_cursors,
                  @@db.command("cursorInfo" => 1)["clientCursors_size"])
-    assert_equal(by_location,
-                 @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     a = @@coll.find()
     a.next_document
 
     assert_not_equal(client_cursors,
                      @@db.command("cursorInfo" => 1)["clientCursors_size"])
-    assert_not_equal(by_location,
-                     @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     a.close()
 
     assert_equal(client_cursors,
                  @@db.command("cursorInfo" => 1)["clientCursors_size"])
-    assert_equal(by_location,
-                 @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     a = @@coll.find({}, :limit => 10).next_document
 
     assert_equal(client_cursors,
                  @@db.command("cursorInfo" => 1)["clientCursors_size"])
-    assert_equal(by_location,
-                 @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     @@coll.find() do |cursor|
       cursor.next_document
@@ -353,8 +368,6 @@ class CursorTest < Test::Unit::TestCase
 
     assert_equal(client_cursors,
                  @@db.command("cursorInfo" => 1)["clientCursors_size"])
-    assert_equal(by_location,
-                 @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     @@coll.find() { |cursor|
       cursor.next_document
@@ -362,8 +375,6 @@ class CursorTest < Test::Unit::TestCase
 
     assert_equal(client_cursors,
                  @@db.command("cursorInfo" => 1)["clientCursors_size"])
-    assert_equal(by_location,
-                 @@db.command("cursorInfo" => 1)["byLocation_size"])
   end
 
   def test_count_with_fields
@@ -390,4 +401,54 @@ class CursorTest < Test::Unit::TestCase
 
     assert_equal false, cursor.has_next?
   end
-end
+
+  def test_cursor_invalid
+    @@coll.remove
+    10000.times do |n|
+      @@coll.insert({:a => n})
+    end
+
+    cursor = @@coll.find({})
+
+    assert_raise_error Mongo::OperationFailure, "CURSOR_NOT_FOUND" do
+      9999.times do
+        cursor.next_document
+        cursor.instance_variable_set(:@cursor_id, 1234567890)
+      end
+    end
+  end
+
+  def test_enumberables
+    @@coll.remove
+    100.times do |n|
+      @@coll.insert({:a => n})
+    end
+
+    assert_equal 100, @@coll.find.to_a.length
+    assert_equal 100, @@coll.find.to_set.length
+
+    cursor = @@coll.find
+    50.times { |n| cursor.next_document }
+    assert_equal 50, cursor.to_a.length
+  end
+
+  def test_rewind
+    @@coll.remove
+    100.times do |n|
+      @@coll.insert({:a => n})
+    end
+
+    cursor = @@coll.find
+    cursor.to_a
+    assert_equal [], cursor.map {|doc| doc }
+
+    cursor.rewind!
+    assert_equal 100, cursor.map {|doc| doc }.length
+
+    cursor.rewind!
+    5.times { cursor.next_document }
+    cursor.rewind!
+    assert_equal 100, cursor.map {|doc| doc }.length
+  end
+
+  end

data/test/db_api_test.rb

@@ -1,12 +1,10 @@
-require 'test/test_helper'
+require './test/test_helper'
 
-# NOTE: assumes Mongo is running
 class DBAPITest < Test::Unit::TestCase
   include Mongo
   include BSON
 
-  @@conn = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
+  @@conn = standard_connection
   @@db   = @@conn.db(MONGO_TEST_DB)
   @@coll = @@db.collection('test')
   @@version = @@conn.server_version
@@ -20,7 +18,7 @@ class DBAPITest < Test::Unit::TestCase
 
   def teardown
     @@coll.remove
-    @@db.error
+    @@db.get_last_error
   end
 
   def test_clear
@@ -30,8 +28,8 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_insert
-    assert_kind_of BSON::ObjectID, @@coll.insert('a' => 2)
-    assert_kind_of BSON::ObjectID, @@coll.insert('b' => 3)
+    assert_kind_of BSON::ObjectId, @@coll.insert('a' => 2)
+    assert_kind_of BSON::ObjectId, @@coll.insert('b' => 3)
 
     assert_equal 3, @@coll.count
     docs = @@coll.find().to_a
@@ -47,14 +45,14 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_save_ordered_hash
-    oh = OrderedHash.new
+    oh = BSON::OrderedHash.new
     oh['a'] = -1
     oh['b'] = 'foo'
 
     oid = @@coll.save(oh)
     assert_equal 'foo', @@coll.find_one(oid)['b']
 
-    oh = OrderedHash['a' => 1, 'b' => 'foo']
+    oh = BSON::OrderedHash['a' => 1, 'b' => 'foo']
     oid = @@coll.save(oh)
     assert_equal 'foo', @@coll.find_one(oid)['b']
   end
@@ -63,7 +61,7 @@ class DBAPITest < Test::Unit::TestCase
     ids = @@coll.insert([{'a' => 2}, {'b' => 3}])
 
     ids.each do |i|
-      assert_kind_of BSON::ObjectID, i
+      assert_kind_of BSON::ObjectId, i
     end
 
     assert_equal 3, @@coll.count
@@ -188,7 +186,7 @@ class DBAPITest < Test::Unit::TestCase
 
     # Sorting using ordered hash. You can use an unordered one, but then the
     # order of the keys won't be guaranteed thus your sort won't make sense.
-    oh = OrderedHash.new
+    oh = BSON::OrderedHash.new
     oh['a'] = -1
     assert_raise InvalidSortValueError do 
       docs = @@coll.find({'a' => { '$lt' => 10 }}, :sort => oh).to_a
@@ -290,7 +288,7 @@ class DBAPITest < Test::Unit::TestCase
   def test_index_create_with_symbol
     assert_equal @@coll.index_information.length, 1
 
-    name = @@db.create_index(@@coll.name, :a)
+    name = @@coll.create_index([['a', 1]])
     info = @@db.index_information(@@coll.name)
     assert_equal name, "a_1"
     assert_equal @@coll.index_information, info
@@ -366,15 +364,12 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_array
-    @@coll << {'b' => [1, 2, 3]}
+    @@coll.remove
+    @@coll.insert({'b' => [1, 2, 3]})
+    @@coll.insert({'b' => [1, 2, 3]})
     rows = @@coll.find({}, {:fields => ['b']}).to_a
-    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
+    assert_equal 2, rows.length
+    assert_equal [1, 2, 3], rows[1]['b']
   end
 
   def test_regex
@@ -446,32 +441,13 @@ class DBAPITest < Test::Unit::TestCase
     @@db.drop_collection('foobar')
   end
 
-  def test_to_a
-    cursor = @@coll.find()
-    rows = cursor.to_a
-
-    assert_raise InvalidOperation do
-      cursor.to_a
-    end
-
-    cursor.each { |doc| fail "should be no docs in each now" }
-  end
-
-  def test_to_a_after_each
-    cursor = @@coll.find
-    cursor.each { |row| row }
-    assert_raise InvalidOperation do
-      cursor.to_a
-    end
-  end
-
   def test_where
     @@coll.insert('a' => 2)
     @@coll.insert('a' => 3)
 
     assert_equal 3, @@coll.count
-    assert_equal 1, @@coll.find('$where' => Code.new('this.a > 2')).count()
-    assert_equal 2, @@coll.find('$where' => Code.new('this.a > i', {'i' => 1})).count()
+    assert_equal 1, @@coll.find('$where' => BSON::Code.new('this.a > 2')).count()
+    assert_equal 2, @@coll.find('$where' => BSON::Code.new('this.a > i', {'i' => 1})).count()
   end
 
   def test_eval
@@ -566,7 +542,7 @@ class DBAPITest < Test::Unit::TestCase
   def test_deref
     @@coll.remove
 
-    assert_equal nil, @@db.dereference(DBRef.new("test", ObjectID.new))
+    assert_equal nil, @@db.dereference(DBRef.new("test", ObjectId.new))
     @@coll.insert({"x" => "hello"})
     key = @@coll.find_one()["_id"]
     assert_equal "hello", @@db.dereference(DBRef.new("test", key))["x"]
@@ -587,7 +563,7 @@ class DBAPITest < Test::Unit::TestCase
     a = {"hello" => "world"}
 
     id = @@coll.save(a)
-    assert_kind_of ObjectID, id
+    assert_kind_of ObjectId, id
     assert_equal 1, @@coll.count
 
     assert_equal id, @@coll.save(a)
@@ -616,14 +592,14 @@ class DBAPITest < Test::Unit::TestCase
 
     @@coll.save("hello" => "mike")
     id = @@coll.save("hello" => "world")
-    assert_kind_of ObjectID, id
+    assert_kind_of ObjectId, id
 
     assert_equal "world", @@coll.find_one(:_id => id)["hello"]
     @@coll.find(:_id => id).to_a.each do |doc|
       assert_equal "world", doc["hello"]
     end
 
-    id = ObjectID.from_string(id.to_s)
+    id = ObjectId.from_string(id.to_s)
     assert_equal "world", @@coll.find_one(:_id => id)["hello"]
   end
 
@@ -650,6 +626,7 @@ class DBAPITest < Test::Unit::TestCase
     assert_raise BSON::InvalidKeyName do
       @@coll.insert({"$hello" => "world"})
     end
+
     assert_raise BSON::InvalidKeyName do
       @@coll.insert({"hello" => {"$hello" => "world"}})
     end
@@ -733,16 +710,7 @@ class DBAPITest < Test::Unit::TestCase
 
     a.rename("bar")
 
-    assert_equal 0, a.count()
-    assert_equal 2, b.count()
-
-    assert_equal 1, b.find().to_a()[0]["x"]
-    assert_equal 2, b.find().to_a()[1]["x"]
-
-    b.rename(:foo)
-
     assert_equal 2, a.count()
-    assert_equal 0, b.count()
   end
 
   # doesn't really test functionality, just that the option is set correctly
@@ -759,7 +727,12 @@ class DBAPITest < Test::Unit::TestCase
       utf8 = "hello world".encode("UTF-8")
       iso8859 = "hello world".encode("ISO-8859-1")
 
-      assert_equal "US-ASCII", ascii.encoding.name
+      if RUBY_PLATFORM =~ /jruby/
+        assert_equal "ASCII-8BIT", ascii.encoding.name
+      else
+        assert_equal "US-ASCII", ascii.encoding.name
+      end
+
       assert_equal "UTF-8", utf8.encoding.name
       assert_equal "ISO-8859-1", iso8859.encoding.name
 

data/test/db_connection_test.rb

@@ -1,6 +1,5 @@
-require 'test/test_helper'
+require './test/test_helper'
 
-# NOTE: assumes Mongo is running
 class DBConnectionTest < Test::Unit::TestCase
 
   include Mongo
@@ -11,6 +10,6 @@ class DBConnectionTest < Test::Unit::TestCase
     db = Connection.new(host, port).db(MONGO_TEST_DB)
     coll = db.collection('test')
     coll.remove
-    db.error
+    db.get_last_error
   end
 end