mongo 1.2.4 → 1.3.0.rc0

data/test/bson/byte_buffer_test.rb

@@ -186,5 +186,16 @@ class ByteBufferTest < Test::Unit::TestCase
     @buf.get_int
     assert !@buf.more?
   end
+  
+  def test_equality
+    @buf = ByteBuffer.new("foo")
+    assert_equal @buf, @buf
+    assert_equal ByteBuffer.new(""), ByteBuffer.new("")
+    assert_equal ByteBuffer.new("123"), ByteBuffer.new("123")
+    assert_not_equal ByteBuffer.new("123"), ByteBuffer.new("1234")
+    assert_equal @buf, "foo"
+    assert_not_equal @buf, 123
+    assert_not_equal @buf, nil
+  end
 
 end

data/test/bson/object_id_test.rb

@@ -126,14 +126,27 @@ class ObjectIdTest < Test::Unit::TestCase
     time = Time.now.utc
     id   = ObjectId.from_time(time)
 
+    assert id.to_a[4, 8].all? {|byte| byte == 0 }
     assert_equal time.to_i, id.generation_time.to_i
   end
 
+  def test_from_time_unique
+    time = Time.now.utc
+    id   = ObjectId.from_time(time, :unique => true)
+
+    mac_id = Digest::MD5.digest(Socket.gethostname)[0, 3].unpack("C3")
+    assert_equal id.to_a[4, 3], mac_id
+    assert_equal time.to_i, id.generation_time.to_i
+
+    id2 = ObjectId.new(nil, time)
+    assert_equal time.to_i, id2.generation_time.to_i
+  end
+
   def test_json
     id = ObjectId.new
     assert_equal "{\"$oid\": \"#{id}\"}", id.to_json
   end
-  
+
   def test_as_json
     id = ObjectId.new
     assert_equal({"$oid" => id.to_s}, id.as_json)

data/test/bson/ordered_hash_test.rb

@@ -194,4 +194,11 @@ class OrderedHashTest < Test::Unit::TestCase
     copy[:foo] = 1
     assert copy.keys != @oh.keys
   end
+  
+  def test_dup
+    oh2 = @oh.dup
+    oh2['f'] = 9
+    assert_nil @oh['f']
+    assert_equal ['c', 'a', 'z'], @oh.keys
+  end
 end

data/test/bson/timestamp_test.rb

@@ -0,0 +1,24 @@
+require './test/test_helper'
+
+class TiumestampTest < Test::Unit::TestCase
+  include Mongo
+
+  def test_timestamp_equality
+    t1 = Timestamp.new(5000, 200)
+    t2 = Timestamp.new(5000, 200)
+    assert_equal t2, t1
+  end
+
+  def test_implements_array_for_backward_compatibility
+    ts = Timestamp.new(5000, 200)
+    assert_equal 200, ts[0]
+    assert_equal 5000, ts[1]
+
+    array = ts.map {|t| t }
+    assert_equal 2, array.length
+
+    assert_equal 200, array[0]
+    assert_equal 5000, array[1]
+  end
+
+end

data/test/collection_test.rb

@@ -1,7 +1,7 @@
 require './test/test_helper'
 
 class TestCollection < Test::Unit::TestCase
-  @@connection ||= standard_connection
+  @@connection ||= standard_connection(:op_timeout => 2)
   @@db   = @@connection.db(MONGO_TEST_DB)
   @@test = @@db.collection("test")
   @@version = @@connection.server_version
@@ -373,8 +373,8 @@ class TestCollection < Test::Unit::TestCase
 
     docs = [{"hello" => "world"}, {"hello" => "world"}]
     @@test.insert(docs)
-    docs.each do |doc|
-      assert(doc.include?(:_id))
+    docs.each do |d|
+      assert(d.include?(:_id))
     end
   end
 
@@ -466,31 +466,34 @@ class TestCollection < Test::Unit::TestCase
       assert res["timeMillis"]
     end
 
-    def test_map_reduce_with_collection_merge
-      @@test << {:user_id => 1}
-      @@test << {:user_id => 2}
-      output_collection = "test-map-coll"
-      m = Code.new("function() { emit(this.user_id, {count: 1}); }")
-      r = Code.new("function(k,vals) { var sum = 0;" +
-        " vals.forEach(function(v) { sum += v.count;} ); return {count: sum}; }")
-      res = @@test.map_reduce(m, r, :out => output_collection)
 
-      @@test.remove
-      @@test << {:user_id => 3}
-      res = @@test.map_reduce(m, r, :out => {:merge => output_collection})
-      assert res.find.to_a.any? {|doc| doc["_id"] == 3 && doc["value"]["count"] == 1}
+    if @@version >= "1.8.0"
+      def test_map_reduce_with_collection_merge
+        @@test << {:user_id => 1}
+        @@test << {:user_id => 2}
+        output_collection = "test-map-coll"
+        m = Code.new("function() { emit(this.user_id, {count: 1}); }")
+        r = Code.new("function(k,vals) { var sum = 0;" +
+          " vals.forEach(function(v) { sum += v.count;} ); return {count: sum}; }")
+        res = @@test.map_reduce(m, r, :out => output_collection)
 
-      @@test.remove
-      @@test << {:user_id => 3}
-      res = @@test.map_reduce(m, r, :out => {:reduce => output_collection})
-      assert res.find.to_a.any? {|doc| doc["_id"] == 3 && doc["value"]["count"] == 2}
+        @@test.remove
+        @@test << {:user_id => 3}
+        res = @@test.map_reduce(m, r, :out => {:merge => output_collection})
+        assert res.find.to_a.any? {|doc| doc["_id"] == 3 && doc["value"]["count"] == 1}
 
-      assert_raise ArgumentError do
-        @@test.map_reduce(m, r, :out => {:inline => 1})
-      end
+        @@test.remove
+        @@test << {:user_id => 3}
+        res = @@test.map_reduce(m, r, :out => {:reduce => output_collection})
+        assert res.find.to_a.any? {|doc| doc["_id"] == 3 && doc["value"]["count"] == 2}
 
-      @@test.map_reduce(m, r, :raw => true, :out => {:inline => 1})
-      assert res["results"]
+        assert_raise ArgumentError do
+          @@test.map_reduce(m, r, :out => {:inline => 1})
+        end
+
+        @@test.map_reduce(m, r, :raw => true, :out => {:inline => 1})
+        assert res["results"]
+      end
     end
   end
 
@@ -592,6 +595,20 @@ class TestCollection < Test::Unit::TestCase
     assert_equal 1, x
   end
 
+  def test_find_with_transformer
+    klass       = Struct.new(:id, :a)
+    transformer = Proc.new { |doc| klass.new(doc['_id'], doc['a']) }
+    cursor      = @@test.find({}, :transformer => transformer)
+    assert_equal(transformer, cursor.transformer)
+  end
+  
+  def test_find_one_with_transformer
+    klass       = Struct.new(:id, :a)
+    transformer = Proc.new { |doc| klass.new(doc['_id'], doc['a']) }
+    id          = @@test.insert('a' => 1)
+    doc         = @@test.find_one(id, :transformer => transformer)
+    assert_instance_of(klass, doc)
+  end
 
   def test_ensure_index
     @@test.drop_indexes

data/test/connection_test.rb

@@ -22,12 +22,22 @@ class TestConnection < Test::Unit::TestCase
     end
   end
 
+  def test_host_port_accessors
+    assert_equal @conn.host, TEST_HOST
+    assert_equal @conn.port, TEST_PORT
+  end
+
   def test_server_info
     server_info = @conn.server_info
     assert server_info.keys.include?("version")
     assert Mongo::Support.ok?(server_info)
   end
 
+  def test_ping
+    ping = @conn.ping
+    assert ping['ok']
+  end
+
   def test_connection_uri
     con = Connection.from_uri("mongodb://#{host_port}")
     assert_equal mongo_host, con.primary_pool.host
@@ -35,7 +45,7 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def test_server_version
-    assert_match /\d\.\d+(\.\d+)?/, @conn.server_version.to_s
+    assert_match(/\d\.\d+(\.\d+)?/, @conn.server_version.to_s)
   end
 
   def test_invalid_database_names
@@ -149,7 +159,7 @@ class TestConnection < Test::Unit::TestCase
     @conn.lock!
     assert @conn.locked?
     assert_equal 1, @conn['admin']['$cmd.sys.inprog'].find_one['fsyncLock'], "Not fsync-locked"
-    assert_equal "unlock requested", @conn.unlock!['info']
+    assert_match(/unlock/, @conn.unlock!['info'])
     unlocked = false
     counter  = 0
     while counter < 5
@@ -200,6 +210,27 @@ class TestConnection < Test::Unit::TestCase
     assert_equal Mongo::DEFAULT_MAX_BSON_SIZE, BSON::BSON_CODER.max_bson_size
   end
 
+  def test_connection_activity
+    conn = standard_connection
+    assert conn.active?
+
+    conn.primary_pool.close
+    assert !conn.active?
+
+    # Simulate a dropped connection.
+    dropped_socket = Mocha::Mock.new
+    dropped_socket.stubs(:read).raises(Errno::ECONNRESET)
+    dropped_socket.stubs(:send).raises(Errno::ECONNRESET)
+    dropped_socket.stub_everything
+
+    conn.primary_pool.host = 'localhost'
+    conn.primary_pool.port = Mongo::Connection::DEFAULT_PORT
+    conn.primary_pool.instance_variable_set("@pids", {dropped_socket => Process.pid})
+    conn.primary_pool.instance_variable_set("@sockets", [dropped_socket])
+
+    assert !conn.active?
+  end
+
   context "Saved authentications" do
     setup do
       @conn = standard_connection

data/test/conversions_test.rb

@@ -1,7 +1,6 @@
 require './test/test_helper'
 require 'mongo/exceptions'
 require 'mongo/util/conversions'
-require 'bson/ordered_hash'
 
 class ConversionsTest < Test::Unit::TestCase
   include Mongo::Conversions
@@ -40,11 +39,11 @@ class ConversionsTest < Test::Unit::TestCase
   end
 
   def test_sort_value_when_value_is_negative_one
-    assert_equal -1, sort_value(-1)
+    assert_equal(-1, sort_value(-1))
   end
 
   def test_sort_value_when_value_is_negative_one_as_a_string
-    assert_equal -1, sort_value("-1")
+    assert_equal(-1, sort_value("-1"))
   end
 
   def test_sort_value_when_value_is_ascending
@@ -80,35 +79,35 @@ class ConversionsTest < Test::Unit::TestCase
   end
 
   def test_sort_value_when_value_is_descending
-    assert_equal -1, sort_value("descending")
+    assert_equal(-1, sort_value("descending"))
   end
 
   def test_sort_value_when_value_is_desc
-    assert_equal -1, sort_value("desc")
+    assert_equal(-1, sort_value("desc"))
   end
 
   def test_sort_value_when_value_is_uppercase_descending
-    assert_equal -1, sort_value("DESCENDING")
+    assert_equal(-1, sort_value("DESCENDING"))
   end
 
   def test_sort_value_when_value_is_uppercase_desc
-    assert_equal -1, sort_value("DESC")
+    assert_equal(-1, sort_value("DESC"))
   end
 
   def test_sort_value_when_value_is_symbol_descending
-    assert_equal -1, sort_value(:descending)
+    assert_equal(-1, sort_value(:descending))
   end
 
   def test_sort_value_when_value_is_symbol_desc
-    assert_equal -1, sort_value(:desc)
+    assert_equal(-1, sort_value(:desc))
   end
 
   def test_sort_value_when_value_is_uppercase_symbol_descending
-    assert_equal -1, sort_value(:DESCENDING)
+    assert_equal(-1, sort_value(:DESCENDING))
   end
 
   def test_sort_value_when_value_is_uppercase_symbol_desc
-    assert_equal -1, sort_value(:DESC)
+    assert_equal(-1, sort_value(:DESC))
   end
 
   def test_sort_value_when_value_is_invalid

data/test/cursor_fail_test.rb

@@ -1,7 +1,7 @@
 require './test/test_helper'
 require 'logger'
 
-class CursorTest < Test::Unit::TestCase
+class CursorFailTest < Test::Unit::TestCase
 
   include Mongo
 

data/test/cursor_message_test.rb

@@ -1,7 +1,7 @@
 require './test/test_helper'
 require 'logger'
 
-class CursorTest < Test::Unit::TestCase
+class CursorMessageTest < Test::Unit::TestCase
 
   include Mongo
 

data/test/cursor_test.rb

@@ -120,7 +120,7 @@ class CursorTest < Test::Unit::TestCase
     results = @@coll.find.sort([:n, :asc]).to_a
 
     assert_equal MinKey.new, results[0]['n']
-    assert_equal -1000000,   results[1]['n']
+    assert_equal(-1000000,   results[1]['n'])
     assert_equal 1000000,    results[2]['n']
     assert_equal MaxKey.new, results[3]['n']
   end
@@ -171,8 +171,8 @@ class CursorTest < Test::Unit::TestCase
     cursor = Cursor.new(@@coll, :timeout => false)
     assert_equal false, cursor.timeout
 
-    @@coll.find({}, :timeout => false) do |cursor|
-      assert_equal false, cursor.timeout
+    @@coll.find({}, :timeout => false) do |c|
+      assert_equal false, c.timeout
     end
   end
 
@@ -395,10 +395,13 @@ class CursorTest < Test::Unit::TestCase
     end
 
     cursor = @@coll.find
+    n = 0
     while cursor.has_next?
-      assert cursor.next_document
+      assert cursor.next
+      n += 1
     end
 
+    assert_equal n, 200
     assert_equal false, cursor.has_next?
   end
 
@@ -451,4 +454,30 @@ class CursorTest < Test::Unit::TestCase
     assert_equal 100, cursor.map {|doc| doc }.length
   end
 
+  def test_transformer
+    transformer = Proc.new { |doc| doc }
+    cursor = Cursor.new(@@coll, :transformer => transformer)
+    assert_equal(transformer, cursor.transformer)
   end
+
+  def test_instance_transformation_with_next
+    klass       = Struct.new(:id, :a)
+    transformer = Proc.new { |doc| klass.new(doc['_id'], doc['a']) }
+    cursor      = Cursor.new(@@coll, :transformer => transformer)
+    instance    = cursor.next
+
+    assert_instance_of(klass, instance)
+    assert_instance_of(BSON::ObjectId, instance.id)
+    assert_equal(1, instance.a)
+  end
+
+  def test_instance_transformation_with_each
+    klass       = Struct.new(:id, :a)
+    transformer = Proc.new { |doc| klass.new(doc['_id'], doc['a']) }
+    cursor      = Cursor.new(@@coll, :transformer => transformer)
+
+    cursor.each do |instance|
+      assert_instance_of(klass, instance)
+    end
+  end
+end

data/test/db_api_test.rb

@@ -239,7 +239,7 @@ class DBAPITest < Test::Unit::TestCase
     names = @@db.collection_names
     assert names.length >= 2
     assert names.include?(@@coll.name)
-    assert names.include?('mongo-ruby-test.test2')
+    assert names.include?('test2')
   ensure
     @@db.drop_collection('test2')
   end
@@ -270,6 +270,17 @@ class DBAPITest < Test::Unit::TestCase
     end
   end
 
+  def test_collection_options_are_passed_to_the_existing_ones
+    @@db.drop_collection('foobar')
+
+    @@db.create_collection('foobar')
+
+    opts = {:safe => true}
+    coll = @@db.create_collection('foobar', opts)
+    assert_equal true, coll.safe
+  end
+
+
   def test_index_information
     assert_equal @@coll.index_information.length, 1
 
@@ -621,7 +632,7 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal("mike", @@coll.find_one()["hello"])
   end
 
-  def test_collection_names
+  def test_collection_names_errors
     assert_raise TypeError do
       @@db.collection(5)
     end

data/test/db_test.rb

@@ -26,7 +26,7 @@ class DBTest < Test::Unit::TestCase
       @@db.collection('test').insert('a' => 1)
       fail "expected 'NilClass' exception"
     rescue => ex
-      assert_match /NilClass/, ex.to_s
+      assert_match(/NilClass/, ex.to_s)
     ensure
       @@db = standard_connection.db(MONGO_TEST_DB)
       @@users = @@db.collection('system.users')
@@ -104,7 +104,7 @@ class DBTest < Test::Unit::TestCase
       db.pk_factory = Object.new
       fail "error: expected exception"
     rescue => ex
-      assert_match /Cannot change/, ex.to_s
+      assert_match(/Cannot change/, ex.to_s)
     ensure
       conn.close
     end
@@ -280,7 +280,7 @@ class DBTest < Test::Unit::TestCase
       assert_not_nil doc
       result = doc['result']
       assert_not_nil result
-      assert_match /firstExtent/, result
+      assert_match(/firstExtent/, result)
     end
 
   end