mongo 0.18.1 → 0.18.2

data/test/test_connection.rb

@@ -54,8 +54,8 @@ class TestConnection < Test::Unit::TestCase
   def test_copy_database
     @mongo.db('old').collection('copy-test').insert('a' => 1)
     @mongo.copy_database('old', 'new')
-    old_object = @mongo.db('old').collection('copy-test').find.next_object
-    new_object = @mongo.db('new').collection('copy-test').find.next_object
+    old_object = @mongo.db('old').collection('copy-test').find.next_document
+    new_object = @mongo.db('new').collection('copy-test').find.next_document
     assert_equal old_object, new_object
   end
 

data/test/test_conversions.rb

@@ -6,9 +6,9 @@ require 'mongo/util/ordered_hash'
 class ConversionsTest < Test::Unit::TestCase
   include Mongo::Conversions
 
-  def test_array_as_sort_parameters_with_array_of_strings
-    params = array_as_sort_parameters(["field1", "field2"])
-    assert_equal({ "field1" => 1, "field2" => 1 }, params)
+  def test_array_as_sort_parameters_with_array_of_key_and_value
+    params = array_as_sort_parameters(["field1", "asc"])
+    assert_equal({"field1" => 1}, params)
   end
 
   def test_array_as_sort_parameters_with_array_of_string_and_values

data/test/test_cursor.rb

@@ -58,36 +58,60 @@ class CursorTest < Test::Unit::TestCase
     assert_equal 0, @@db['acollectionthatdoesn'].count()
   end
 
+  def test_next_object_deprecation
+    @@coll.remove
+    @@coll.insert({"a" => 1})
+
+    assert_equal 1, @@coll.find().next_object["a"]
+  end
+
   def test_sort
     @@coll.remove
-    5.times{|x| @@coll.insert({"a" => x}) }
+    5.times{|x| @@coll.insert({"age" => x}) }
+
+    assert_kind_of Cursor, @@coll.find().sort(:age, 1)
 
-    assert_kind_of Cursor, @@coll.find().sort(:a, 1)
+    assert_equal 0, @@coll.find().sort(:age, 1).next_document["age"]
+    assert_equal 4, @@coll.find().sort(:age, -1).next_document["age"]
+    assert_equal 0, @@coll.find().sort([["age", :asc]]).next_document["age"]
 
-    assert_equal 0, @@coll.find().sort(:a, 1).next_object["a"]
-    assert_equal 4, @@coll.find().sort(:a, -1).next_object["a"]
-    assert_equal 0, @@coll.find().sort([["a", :asc]]).next_object["a"]
+    assert_kind_of Cursor, @@coll.find().sort([[:age, -1], [:b, 1]])
 
-    assert_kind_of Cursor, @@coll.find().sort([[:a, -1], [:b, 1]])
+    assert_equal 4, @@coll.find().sort(:age, 1).sort(:age, -1).next_document["age"]
+    assert_equal 0, @@coll.find().sort(:age, -1).sort(:age, 1).next_document["age"]
 
-    assert_equal 4, @@coll.find().sort(:a, 1).sort(:a, -1).next_object["a"]
-    assert_equal 0, @@coll.find().sort(:a, -1).sort(:a, 1).next_object["a"]
+    assert_equal 4, @@coll.find().sort([:age, :asc]).sort(:age, -1).next_document["age"]
+    assert_equal 0, @@coll.find().sort([:age, :desc]).sort(:age, 1).next_document["age"]
 
     cursor = @@coll.find()
-    cursor.next_object()
+    cursor.next_document
     assert_raise InvalidOperation do
-      cursor.sort(["a"])
+      cursor.sort(["age"])
     end
 
     assert_raise InvalidSortValueError do
-      @@coll.find().sort(:a, 25).next_object
+      @@coll.find().sort(:age, 25).next_document
     end
 
     assert_raise InvalidSortValueError do
-      @@coll.find().sort(25).next_object
+      @@coll.find().sort(25).next_document
     end
   end
 
+  def test_sort_date
+    @@coll.remove
+    5.times{|x| @@coll.insert({"created_at" => Time.utc(2000 + x)}) }
+
+    assert_equal 2000, @@coll.find().sort(:created_at, :asc).next_document["created_at"].year
+    assert_equal 2004, @@coll.find().sort(:created_at, :desc).next_document["created_at"].year
+
+    assert_equal 2000, @@coll.find().sort([:created_at, :asc]).next_document["created_at"].year
+    assert_equal 2004, @@coll.find().sort([:created_at, :desc]).next_document["created_at"].year
+
+    assert_equal 2000, @@coll.find().sort([[:created_at, :asc]]).next_document["created_at"].year
+    assert_equal 2004, @@coll.find().sort([[:created_at, :desc]]).next_document["created_at"].year
+  end
+
   def test_limit
     @@coll.remove
 
@@ -106,7 +130,7 @@ class CursorTest < Test::Unit::TestCase
     end
 
     cursor      = @@coll.find()
-    firstResult = cursor.next_object()
+    firstResult = cursor.next_document
     assert_raise InvalidOperation, "Cannot modify the query once it has been run or closed." do
       cursor.limit(1)
     end
@@ -140,7 +164,7 @@ class CursorTest < Test::Unit::TestCase
     end
 
     cursor      = @@coll.find()
-    firstResult = cursor.next_object()
+    firstResult = cursor.next_document
     assert_raise InvalidOperation, "Cannot modify the query once it has been run or closed." do
       cursor.skip(1)
     end
@@ -233,7 +257,7 @@ class CursorTest < Test::Unit::TestCase
   def test_close_after_query_sent
     begin
       cursor = @@coll.find('a' => 1)
-      cursor.next_object
+      cursor.next_document
       cursor.close
       assert cursor.closed?
     rescue => ex
@@ -267,7 +291,7 @@ class CursorTest < Test::Unit::TestCase
 
     10.times do |i|
       a = @@coll.find()
-      a.next_object()
+      a.next_document
       a.close()
     end
 
@@ -277,7 +301,7 @@ class CursorTest < Test::Unit::TestCase
                  @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     a = @@coll.find()
-    a.next_object()
+    a.next_document
 
     assert_not_equal(client_cursors,
                      @@db.command("cursorInfo" => 1)["clientCursors_size"])
@@ -291,7 +315,7 @@ class CursorTest < Test::Unit::TestCase
     assert_equal(by_location,
                  @@db.command("cursorInfo" => 1)["byLocation_size"])
 
-    a = @@coll.find({}, :limit => 10).next_object()
+    a = @@coll.find({}, :limit => 10).next_document
 
     assert_equal(client_cursors,
                  @@db.command("cursorInfo" => 1)["clientCursors_size"])
@@ -299,7 +323,7 @@ class CursorTest < Test::Unit::TestCase
                  @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     @@coll.find() do |cursor|
-      cursor.next_object()
+      cursor.next_document
     end
 
     assert_equal(client_cursors,
@@ -308,7 +332,7 @@ class CursorTest < Test::Unit::TestCase
                  @@db.command("cursorInfo" => 1)["byLocation_size"])
 
     @@coll.find() { |cursor|
-      cursor.next_object()
+      cursor.next_document
     }
 
     assert_equal(client_cursors,

data/test/test_db_api.rb

@@ -180,7 +180,7 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal 3, docs[2]['a']
     assert_equal 4, docs[3]['a']
 
-    docs = @@coll.find({'a' => { '$lt' => 10 }}, :sort => ['b', 'a']).to_a
+    docs = @@coll.find({'a' => { '$lt' => 10 }}, :sort => [['b', 'asc'], ['a', 'asc']]).to_a
     assert_equal 4, docs.size
     assert_equal 2, docs[0]['a']
     assert_equal 4, docs[1]['a']
@@ -553,6 +553,12 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal 1, test.group([], {"a" => {"$gt" => 1}}, {"count" => 0}, "function (obj, prev) { prev.count++; }")[0]["count"]
     assert_equal 1, test.group([], {"a" => {"$gt" => 1}}, {"count" => 0}, "function (obj, prev) { prev.count++; }", true)[0]["count"]
 
+    finalize = "function (obj) { obj.f = obj.count - 1; }"
+    assert_equal 2, test.group([], {}, {"count" => 0}, "function (obj, prev) { prev.count++; }", true, finalize)[0]["f"]
+    assert_raise OperationFailure do
+      test.group([], {}, {"count" => 0}, "function (obj, prev) { prev.count++; }", false, finalize)[0]["f"]
+    end
+
     test.insert("a" => 2, "b" => 3)
     expected = [{"a" => 2, "count" => 2},
                 {"a" => nil, "count" => 1},

data/test/test_grid_store.rb

@@ -71,9 +71,23 @@ class GridStoreTest < Test::Unit::TestCase
     assert_equal "hello", GridStore.read(@@db, 'foobar', 5)
   end
 
+  def test_read_with_and_without_length
+    GridStore.open(@@db, 'read-types', 'w') do |f|
+      f.write('hello, there')
+    end
+
+    GridStore.open(@@db, 'read-types', 'r') do |f|
+      assert_equal 'hello, ', f.read(7)
+      assert_equal 'there', f.read
+    end
+  end
+
+  def test_access_length
+    assert_equal 13, GridStore.new(@@db, 'foobar').length
+  end
+
   # Also tests seek
   def test_read_with_offset
-    assert_equal "world", GridStore.read(@@db, 'foobar', 5, 7)
     assert_equal "world!", GridStore.read(@@db, 'foobar', nil, 7)
   end
 
@@ -116,7 +130,7 @@ class GridStoreTest < Test::Unit::TestCase
     }
 
     assert_equal 3, @@chunks.count
-    assert_equal ('x' * size) + ('y' * size) + ('z' * size), GridStore.read(@@db, 'biggie')
+    #assert_equal ('x' * size) + ('y' * size) + ('z' * size), GridStore.read(@@db, 'biggie')
   end
 
   def test_puts_and_readlines

data/test/test_objectid.rb

@@ -79,6 +79,12 @@ class ObjectIDTest < Test::Unit::TestCase
     assert_equal @o.to_s, o2.to_s
   end
 
+  def test_illegal_from_string
+    assert_raise InvalidObjectID do 
+      ObjectID.from_string("")
+    end
+  end
+
   def test_from_string_legacy
     hex_str = @o.to_s_legacy
     o2 = ObjectID.from_string_legacy(hex_str)
@@ -87,6 +93,12 @@ class ObjectIDTest < Test::Unit::TestCase
     assert_equal @o.to_s, o2.to_s
   end
 
+  def test_illegal_from_string_legacy
+    assert_raise InvalidObjectID do 
+      ObjectID.from_string_legacy("")
+    end
+  end
+
   def test_legal
     assert !ObjectID.legal?(nil)
     assert !ObjectID.legal?("fred")

data/test/test_ordered_hash.rb

@@ -23,6 +23,22 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal [], OrderedHash.new.keys
   end
 
+  def test_uniq
+    list = []
+    doc  = OrderedHash.new
+    doc['_id']  = 'ab12'
+    doc['name'] = 'test'
+
+    same_doc = OrderedHash.new
+    same_doc['_id']  = 'ab12'
+    same_doc['name'] = 'test'
+    list << doc
+    list << same_doc
+
+    assert_equal 2, list.size
+    assert_equal 1, list.uniq.size
+  end
+
   def test_equality
     a = OrderedHash.new
     a['x'] = 1

data/test/test_threading.rb

@@ -4,7 +4,7 @@ class TestThreading < Test::Unit::TestCase
 
   include Mongo
 
-  @@db = Connection.new('localhost', 27017, :pool_size => 1, :timeout => 3).db('ruby-mongo-test')
+  @@db = Connection.new('localhost', 27017, :pool_size => 1, :timeout => 30).db('ruby-mongo-test')
   @@coll = @@db.collection('thread-test-collection')
 
   def set_up_safe_data
@@ -34,7 +34,7 @@ class TestThreading < Test::Unit::TestCase
         end
       end
     end
-  
+
     100.times do |i|
       threads[i].join
     end
@@ -54,7 +54,7 @@ class TestThreading < Test::Unit::TestCase
         end
       end
     end
-  
+
     100.times do |i|
       threads[i].join
     end

data/test/threading/test_threading_large_pool.rb

@@ -6,7 +6,7 @@ class TestThreadingLargePool < Test::Unit::TestCase
 
   include Mongo
 
-  @@db = Connection.new('localhost', 27017, :pool_size => 50, :timeout => 15).db('ruby-mongo-test')
+  @@db = Connection.new('localhost', 27017, :pool_size => 50, :timeout => 60).db('ruby-mongo-test')
   @@coll = @@db.collection('thread-test-collection')
 
   def set_up_safe_data
@@ -25,7 +25,7 @@ class TestThreadingLargePool < Test::Unit::TestCase
   def test_safe_update
     set_up_safe_data
     threads = []
-    100.times do |i|
+    1000.times do |i|
       threads[i] = Thread.new do
         if i % 2 == 0
           assert_raise Mongo::OperationFailure do
@@ -36,8 +36,8 @@ class TestThreadingLargePool < Test::Unit::TestCase
         end
       end
     end
-  
-    100.times do |i|
+
+    1000.times do |i|
       threads[i].join
     end
   end
@@ -45,7 +45,7 @@ class TestThreadingLargePool < Test::Unit::TestCase
   def test_safe_insert
     set_up_safe_data
     threads = []
-    100.times do |i|
+    1000.times do |i|
       threads[i] = Thread.new do
         if i % 2 == 0
           assert_raise Mongo::OperationFailure do
@@ -56,8 +56,8 @@ class TestThreadingLargePool < Test::Unit::TestCase
         end
       end
     end
-  
-    100.times do |i|
+
+    1000.times do |i|
       threads[i].join
     end
   end

data/test/unit/collection_test.rb

@@ -2,26 +2,26 @@ require 'test/test_helper'
 
 class ConnectionTest < Test::Unit::TestCase
 
-  context "Basic operations: " do 
-    setup do 
+  context "Basic operations: " do
+    setup do
       @logger = mock()
     end
 
-    should "send update message" do 
+    should "send update message" do
       @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
       @db   = @conn['testing']
       @coll = @db.collection('books')
-      @conn.expects(:send_message).with do |op, msg, log| 
+      @conn.expects(:send_message).with do |op, msg, log|
         op == 2001 && log.include?("db.books.update")
       end
       @coll.update({}, {:title => 'Moby Dick'})
     end
 
-    should "send insert message" do 
+    should "send insert message" do
       @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
       @db   = @conn['testing']
       @coll = @db.collection('books')
-      @conn.expects(:send_message).with do |op, msg, log| 
+      @conn.expects(:send_message).with do |op, msg, log|
         op == 2002 && log.include?("db.books.insert")
       end
       @coll.insert({:title => 'Moby Dick'})
@@ -49,4 +49,4 @@ class ConnectionTest < Test::Unit::TestCase
   end
 end
 
- 
+

data/test/unit/connection_test.rb

@@ -12,11 +12,6 @@ class ConnectionTest < Test::Unit::TestCase
     db = Object.new
   end
 
-  # Make a few methods public for these tests.
-  class Mongo::Connection
-    public :checkin, :checkout, :clear_stale_cached_connections!
-  end
-
   context "Initialization: " do
 
     context "given a single node" do
@@ -60,79 +55,5 @@ class ConnectionTest < Test::Unit::TestCase
       assert_equal 2500, @conn.port
     end
   end
-
-  context "Connection pooling: " do
-    setup do
-      TCPSocket.stubs(:new).returns(new_mock_socket)
-      @conn = Connection.new('localhost', 27107, :connect => false,
-                                   :pool_size => 3)
-
-      admin_db = new_mock_db
-      admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1})
-      @conn.expects(:[]).with('admin').returns(admin_db)
-      @conn.connect_to_master
-    end
-
-    should "check out a new connection" do
-      socket = @conn.checkout
-      assert @conn.reserved_connections.keys.include?(Thread.current.object_id)
-    end
-
-    context "with multiple threads" do
-      setup do
-        @thread1 = Object.new
-        @thread2 = Object.new
-        @thread3 = Object.new
-        @thread4 = Object.new
-
-        Thread.stubs(:current).returns(@thread1)
-        @socket1 = @conn.checkout
-        Thread.stubs(:current).returns(@thread2)
-        @socket2 = @conn.checkout
-        Thread.stubs(:current).returns(@thread3)
-        @socket3 = @conn.checkout
-      end
-
-      should "add each thread to the reserved pool" do
-        assert @conn.reserved_connections.keys.include?(@thread1.object_id)
-        assert @conn.reserved_connections.keys.include?(@thread2.object_id)
-        assert @conn.reserved_connections.keys.include?(@thread3.object_id)
-      end
-
-      should "only add one socket per thread" do
-        @conn.reserved_connections.values do |socket|
-          assert [@socket1, @socket2, @socket3].include?(socket)
-        end
-      end
-
-      should "check out all sockets" do
-        assert_equal @conn.sockets.size, @conn.checked_out.size
-        @conn.sockets.each do |sock|
-          assert @conn.checked_out.include?(sock)
-        end
-      end
-
-      should "raise an error if no more sockets can be checked out" do
-        # This can't be tested with mock threads.
-        # Will test in integration tests.
-      end
-
-      context "when releasing dead threads" do
-        setup do
-          @thread1.expects(:alive?).returns(false)
-          @thread2.expects(:alive?).returns(true)
-          @thread3.expects(:alive?).returns(true)
-          Thread.expects(:list).returns([@thread1, @thread2, @thread3])
-          @conn.clear_stale_cached_connections!
-        end
-
-        should "return connections for dead threads" do
-          assert !@conn.checked_out.include?(@socket1)
-          assert_nil @conn.reserved_connections[@thread1.object_id]
-        end
-      end
-
-    end
-  end
 end