mongo 1.0.7 → 1.0.8

data/HISTORY

@@ -1,3 +1,9 @@
+1.0.8 2010-8-27
+
+* Cursor#rewind! and more consistent Cursor Enumberable behavior
+* Deprecated ObjectID for ObjectId
+* Numerous minor bug fixes.
+
 1.0.7 2010-8-4
 
 * A few minor test/doc fixes.

data/lib/mongo.rb

@@ -3,7 +3,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end
 
 module Mongo

data/lib/mongo/collection.rb

@@ -58,7 +58,7 @@ module Mongo
 
       @db, @name  = db, name
       @connection = @db.connection
-      @pk_factory = pk_factory || BSON::ObjectID
+      @pk_factory = pk_factory || BSON::ObjectId
       @hint = nil
     end
 
@@ -145,15 +145,19 @@ module Mongo
       hint   = opts.delete(:hint)
       snapshot = opts.delete(:snapshot)
       batch_size = opts.delete(:batch_size)
+
       if opts[:timeout] == false && !block_given?
         raise ArgumentError, "Timeout can be set to false only when #find is invoked with a block."
+      else
+        timeout = opts.delete(:timeout) || false
       end
-      timeout = block_given? ? (opts.delete(:timeout) || true) : true
+
       if hint
         hint = normalize_hint_fields(hint)
       else
         hint = @hint        # assumed to be normalized already
       end
+
       raise RuntimeError, "Unknown options [#{opts.inspect}]" unless opts.empty?
 
       cursor = Cursor.new(self, :selector => selector, :fields => fields, :skip => skip, :limit => limit,
@@ -173,9 +177,9 @@ module Mongo
     # @return [OrderedHash, Nil]
     #   a single document or nil if no result is found.
     #
-    # @param [Hash, ObjectID, Nil] spec_or_object_id a hash specifying elements 
+    # @param [Hash, ObjectId, Nil] spec_or_object_id a hash specifying elements 
     #   which must be present for a document to be included in the result set or an 
-    #   instance of ObjectID to be used as the value for an _id query.
+    #   instance of ObjectId to be used as the value for an _id query.
     #   If nil, an empty selector, {}, will be used.
     #
     # @option opts [Hash]
@@ -187,12 +191,12 @@ module Mongo
       spec = case spec_or_object_id
              when nil
                {}
-             when BSON::ObjectID
+             when BSON::ObjectId
                {:_id => spec_or_object_id}
              when Hash
                spec_or_object_id
              else
-               raise TypeError, "spec_or_object_id must be an instance of ObjectID or Hash, or nil"
+               raise TypeError, "spec_or_object_id must be an instance of ObjectId or Hash, or nil"
              end
       find(spec, opts.merge(:limit => -1)).next_document
     end
@@ -204,7 +208,7 @@ module Mongo
     #   then an update (upsert) operation will be performed, and any existing
     #   document with that _id is overwritten. Otherwise an insert operation is performed.
     #
-    # @return [ObjectID] the _id of the saved document.
+    # @return [ObjectId] the _id of the saved document.
     #
     # @option opts [Boolean, Hash] :safe (+false+)
     #   run the operation in safe mode, which run a getlasterror command on the
@@ -230,7 +234,7 @@ module Mongo
     # @param [Hash, Array] doc_or_docs
     #   a document (as a hash) or array of documents to be inserted.
     #
-    # @return [ObjectID, Array]
+    # @return [ObjectId, Array]
     #   the _id of the inserted document or a list of _ids of all inserted documents.
     #   Note: the object may have been modified by the database's PK factory, if it has one.
     #
@@ -471,7 +475,7 @@ module Mongo
     # @option opts [String] :out (nil) the name of the output collection. If specified, the collection will not be treated as temporary.
     # @option opts [Boolean] :keeptemp (false) if true, the generated collection will be persisted. default is false.
     # @option opts [Boolean ] :verbose (false) if true, provides statistics on job execution time.
-    # @options opts [Boolean] :raw (false) if true, return the raw result object from the map_reduce command, and not
+    # @option opts [Boolean] :raw (false) if true, return the raw result object from the map_reduce command, and not
     #   the instantiated collection that's returned by default.
     #
     # @return [Collection] a collection containing the results of the operation.

data/lib/mongo/connection.rb

@@ -24,6 +24,9 @@ module Mongo
 
   # Instantiates and manages connections to MongoDB.
   class Connection
+    TCPSocket = ::TCPSocket
+    Mutex = ::Mutex
+    ConditionVariable = ::ConditionVariable
 
     # Abort connections if a ConnectionError is raised.
     Thread.abort_on_exception = true
@@ -35,7 +38,7 @@ module Mongo
     MONGODB_URI_MATCHER = /(([-_.\w\d]+):([-_\w\d]+)@)?([-.\w\d]+)(:([\w\d]+))?(\/([-\d\w]+))?/
     MONGODB_URI_SPEC = "mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/database]"
 
-    attr_reader :logger, :size, :host, :port, :nodes, :auths, :sockets, :checked_out
+    attr_reader :logger, :size, :host, :port, :nodes, :auths, :sockets, :checked_out, :primary, :secondaries, :arbiters
 
     # Counter for generating unique request ids.
     @@current_request_id = 0
@@ -50,6 +53,11 @@ module Mongo
     # replica set, you can use Connection.new, as any other host known to the set will be
     # cached.
     #
+    # Once connected to a replica set, you can find out which nodes are primary, secondary, and
+    # arbiters with the corresponding accessors: Connection#primary, Connection#secondaries, and
+    # Connection#arbiters. This is useful if your application needs to connect manually to nodes other
+    # than the primary.
+    #
     # @param [String, Hash] host.
     # @param [Integer] port specify a port number here if only one host is being specified.
     #
@@ -116,6 +124,12 @@ module Mongo
         @slave_ok = options[:slave_ok]
       end
 
+      # Cache the various node types
+      # when connecting to a replica set.
+      @primary     = nil
+      @secondaries = []
+      @arbiters    = []
+
       @logger   = options[:logger] || nil
       @options  = options
 
@@ -463,9 +477,11 @@ module Mongo
 
       while !connected? && !(nodes_to_try = @nodes - @nodes_tried).empty?
         nodes_to_try.each do |node|
-          if is_primary?(check_is_master(node))
+          config = check_is_master(node)
+          if is_primary?(config)
             set_primary(node)
-            break
+          else
+            set_auxillary(node, config)
           end
         end
       end
@@ -578,6 +594,9 @@ module Mongo
       close
       @host = nil
       @port = nil
+      @primary = nil
+      @secondaries = []
+      @arbiters    = []
       @nodes_tried = []
     end
 
@@ -592,7 +611,6 @@ module Mongo
       config && (config['ismaster'] == 1 || config['ismaster'] == true) || @slave_ok
     end
 
-    # @return
     def check_is_master(node)
       begin
         host, port = *node
@@ -622,9 +640,22 @@ module Mongo
     # apply any saved authentication credentials.
     def set_primary(node)
       @host, @port = *node
+      @primary = [@host, @port]
       apply_saved_authentication
     end
 
+    # Determines what kind of node we have and caches its host
+    # and port so that users can easily connect manually.
+    def set_auxillary(node, config)
+      if config
+        if config['secondary']
+          @secondaries << node unless @secondaries.include?(node)
+        elsif config['arbiterOnly']
+          @arbiters << node unless @arbiters.include?(node)
+        end
+      end
+    end
+
     # Update the list of known nodes. Only applies to replica sets,
     # where the response to the ismaster command will return a list
     # of known hosts.

data/lib/mongo/cursor.rb

@@ -81,6 +81,18 @@ module Mongo
       doc
     end
 
+    # Reset this cursor on the server. Cursor options, such as the
+    # query string and the values for skip and limit, are preserved.
+    def rewind!
+      close
+      @cache.clear
+      @cursor_id  = nil
+      @closed     = false
+      @query_run  = false
+      @n_received = nil
+      true
+    end
+
     # Determine whether this cursor has any remaining results.
     #
     # @return [Boolean]
@@ -187,22 +199,18 @@ module Mongo
 
     # Receive all the documents from this cursor as an array of hashes.
     #
-    # Note: use of this method is discouraged - in most cases, it's much more
+    # Notes:
+    #
+    # If you've already started iterating over the cursor, the array returned
+    # by this method contains only the remaining documents. See Cursor#rewind! if you
+    # need to reset the cursor.
+    #
+    # Use of this method is discouraged - in most cases, it's much more
     # efficient to retrieve documents as you need them by iterating over the cursor.
     #
     # @return [Array] an array of documents.
-    #
-    # @raise [InvalidOperation] if this cursor has already been used or if
-    #   this method has already been called on the cursor.
     def to_a
-      raise InvalidOperation, "can't call Cursor#to_a on a used cursor" if @query_run
-      rows = []
-      num_returned = 0
-      while has_next? && (@limit <= 0 || num_returned < @limit)
-        rows << next_document
-        num_returned += 1
-      end
-      rows
+      super
     end
 
     # Get the explain plan for this cursor.
@@ -229,7 +237,7 @@ module Mongo
     #
     # @return [True]
     def close
-      if @cursor_id
+      if @cursor_id && @cursor_id != 0
         message = BSON::ByteBuffer.new([0, 0, 0, 0])
         message.put_int(1)
         message.put_long(@cursor_id)

data/lib/mongo/db.rb

@@ -60,7 +60,7 @@ module Mongo
     # @option options [Boolean] :strict (False) If true, collections must exist to be accessed and must
     #   not exist to be created. See DB#collection and DB#create_collection.
     #
-    # @option options [Object, #create_pk(doc)] :pk (Mongo::ObjectID) A primary key factory object,
+    # @option options [Object, #create_pk(doc)] :pk (Mongo::ObjectId) A primary key factory object,
     #   which should take a hash and return a hash which merges the original hash with any primary key
     #   fields the factory wishes to inject. (NOTE: if the object already has a primary key,
     #   the factory should not inject a new key).

data/lib/mongo/gridfs/grid.rb

@@ -51,7 +51,7 @@ module Mongo
     #
     # @option opts [String] :filename (nil) a name for the file.
     # @option opts [Hash] :metadata ({}) any additional data to store with the file.
-    # @option opts [ObjectID] :_id (ObjectID) a unique id for
+    # @option opts [ObjectId] :_id (ObjectId) a unique id for
     #   the file to be use in lieu of an automatically generated one.
     # @option opts [String] :content_type ('binary/octet-stream') If no content type is specified,
     #   the content type will may be inferred from the filename extension if the mime-types gem can be
@@ -60,7 +60,7 @@ module Mongo
     # @option opts [Boolean] :safe (false) When safe mode is enabled, the chunks sent to the server
     #   will be validated using an md5 hash. If validation fails, an exception will be raised.
     #
-    # @return [Mongo::ObjectID] the file's id.
+    # @return [Mongo::ObjectId] the file's id.
     def put(data, opts={})
       filename = opts[:filename]
       opts.merge!(default_grid_io_opts)

data/lib/mongo/gridfs/grid_ext.rb

@@ -42,7 +42,7 @@ module Mongo
       #
       #   # Check for existence by _id
       #   @grid = Grid.new(@db)
-      #   @grid.exist?(:_id => BSON::ObjectID.from_string('4bddcd24beffd95a7db9b8c8'))
+      #   @grid.exist?(:_id => BSON::ObjectId.from_string('4bddcd24beffd95a7db9b8c8'))
       #
       #   # Check for existence by an arbitrary attribute.
       #   @grid = Grid.new(@db)

data/lib/mongo/gridfs/grid_file_system.rb

@@ -55,7 +55,7 @@ module Mongo
     # @param [Hash] opts see GridIO#new
     #
     # @option opts [Hash] :metadata ({}) any additional data to store with the file.
-    # @option opts [ObjectID] :_id (ObjectID) a unique id for
+    # @option opts [ObjectId] :_id (ObjectId) a unique id for
     #   the file to be use in lieu of an automatically generated one.
     # @option opts [String] :content_type ('binary/octet-stream') If no content type is specified,
     #   the content type will may be inferred from the filename extension if the mime-types gem can be

data/lib/mongo/gridfs/grid_io.rb

@@ -47,7 +47,7 @@ module Mongo
     # @option opts [String] :fs_name the file system prefix.
     # @option opts [Integer] (262144) :chunk_size size of file chunks in bytes.
     # @option opts [Hash] :metadata ({}) any additional data to store with the file.
-    # @option opts [ObjectID] :_id (ObjectID) a unique id for
+    # @option opts [ObjectId] :_id (ObjectId) a unique id for
     #   the file to be use in lieu of an automatically generated one.
     # @option opts [String] :content_type ('binary/octet-stream') If no content type is specified,
     #   the content type will may be inferred from the filename extension if the mime-types gem can be
@@ -180,7 +180,7 @@ module Mongo
     # This method will be invoked automatically when
     # on GridIO#open is passed a block. Otherwise, it must be called manually.
     #
-    # @return [BSON::ObjectID]
+    # @return [BSON::ObjectId]
     def close
       if @mode[0] == ?w
         if @current_chunk['n'].zero? && @chunk_position.zero?
@@ -200,7 +200,7 @@ module Mongo
 
     def create_chunk(n)
       chunk = BSON::OrderedHash.new
-      chunk['_id']      = BSON::ObjectID.new
+      chunk['_id']      = BSON::ObjectId.new
       chunk['n']        = n
       chunk['files_id'] = @files_id
       chunk['data']     = ''
@@ -308,7 +308,7 @@ module Mongo
 
     # Initialize the class for writing a file.
     def init_write(opts)
-      @files_id      = opts.delete(:_id) || BSON::ObjectID.new
+      @files_id      = opts.delete(:_id) || BSON::ObjectId.new
       @content_type  = opts.delete(:content_type) || (defined? MIME) && get_content_type || DEFAULT_CONTENT_TYPE
       @chunk_size    = opts.delete(:chunk_size) || DEFAULT_CHUNK_SIZE
       @metadata      = opts.delete(:metadata) if opts[:metadata]

data/mongo.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |s|
   s.email = 'mongodb-dev@googlegroups.com'
   s.homepage = 'http://www.mongodb.org'
 
-  s.add_dependency(%q<bson>, [">= 1.0.4"])
+  s.add_dependency(%q<bson>, [">= 1.0.5"])
 end

data/test/collection_test.rb

@@ -12,9 +12,9 @@ class TestCollection < Test::Unit::TestCase
 
   def test_optional_pk_factory
     @coll_default_pk = @@db.collection('stuff')
-    assert_equal BSON::ObjectID, @coll_default_pk.pk_factory
+    assert_equal BSON::ObjectId, @coll_default_pk.pk_factory
     @coll_default_pk = @@db.create_collection('more-stuff')
-    assert_equal BSON::ObjectID, @coll_default_pk.pk_factory
+    assert_equal BSON::ObjectId, @coll_default_pk.pk_factory
 
     # Create a db with a pk_factory.
     @db = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
@@ -334,7 +334,7 @@ class TestCollection < Test::Unit::TestCase
 
     assert_equal nil, @@test.find_one("hello" => "foo")
     assert_equal nil, @@test.find_one(BSON::OrderedHash["hello", "foo"])
-    assert_equal nil, @@test.find_one(ObjectID.new)
+    assert_equal nil, @@test.find_one(ObjectId.new)
 
     assert_raise TypeError do
       @@test.find_one(6)

data/test/cursor_test.rb

@@ -300,7 +300,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)
@@ -308,8 +307,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()
@@ -317,8 +314,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()
@@ -328,30 +323,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
@@ -359,8 +346,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
@@ -368,8 +353,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
@@ -413,4 +396,36 @@ class CursorTest < Test::Unit::TestCase
     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

@@ -29,8 +29,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
@@ -62,7 +62,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
@@ -445,25 +445,6 @@ 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)
@@ -575,7 +556,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"]
@@ -596,7 +577,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)
@@ -625,14 +606,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
 

data/test/db_test.rb

@@ -6,7 +6,7 @@ require 'logger'
 
 class TestPKFactory
   def create_pk(row)
-    row['_id'] ||= BSON::ObjectID.new
+    row['_id'] ||= BSON::ObjectId.new
     row
   end
 end
@@ -102,7 +102,7 @@ class DBTest < Test::Unit::TestCase
     assert_not_nil oid
     assert_equal insert_id, oid
 
-    oid = BSON::ObjectID.new
+    oid = BSON::ObjectId.new
     data = {'_id' => oid, 'name' => 'Barney', 'age' => 41}
     coll.insert(data)
     row = coll.find_one({'name' => data['name']})

data/test/replica_sets/node_type_test.rb

@@ -0,0 +1,42 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'mongo'
+require 'test/unit'
+require 'test/test_helper'
+
+# NOTE: This test expects a replica set of three nodes, one of which is an arbiter, to be running
+# on the local host.
+class ReplicaSetNodeTypeTest < Test::Unit::TestCase
+  include Mongo
+
+  def setup
+    @conn = Mongo::Connection.multi([['localhost', 27017], ['localhost', 27018], ['localhost', 27019]])
+    @db = @conn.db(MONGO_TEST_DB)
+    @db.drop_collection("test-sets")
+    @coll = @db.collection("test-sets")
+  end
+
+  def test_correct_node_types
+    p @conn.primary
+    p @conn.secondaries
+    p @conn.arbiters
+    assert_equal 1, @conn.secondaries.length
+    assert_equal 1, @conn.arbiters.length
+
+    old_secondary = @conn.secondaries.first
+    old_primary   = @conn.primary
+
+    puts "Please disconnect the current primary and reconnect so that it becomes secondary."
+    gets
+
+    # Insert something to rescue the connection failure.
+    rescue_connection_failure do
+      @coll.insert({:a => 30}, :safe => true)
+    end
+
+    assert_equal 1, @conn.secondaries.length
+    assert_equal 1, @conn.arbiters.length
+    assert_equal old_primary, @conn.secondaries.first
+    assert_equal old_secondary, @conn.primary
+  end
+
+end

data/test/unit/connection_test.rb

@@ -7,7 +7,7 @@ class ConnectionTest < Test::Unit::TestCase
       def new_mock_socket
         socket = Object.new
         socket.stubs(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-        socket.expects(:close)
+        socket.stubs(:close)
         socket
       end
 
@@ -69,8 +69,8 @@ class ConnectionTest < Test::Unit::TestCase
 
         admin_db = new_mock_db
         @hosts = ['localhost:27017', 'localhost:27018', 'localhost:27019']
-        admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1, 'hosts' => @hosts})
-        @conn.expects(:[]).with('admin').returns(admin_db)
+        admin_db.stubs(:command).returns({'ok' => 1, 'ismaster' => 1, 'hosts' => @hosts})
+        @conn.stubs(:[]).with('admin').returns(admin_db)
         @conn.connect
       end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 1
   - 0
-  - 7
-  version: 1.0.7
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - Jim Menard
@@ -16,21 +17,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 -04:00
+date: 2010-08-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 0
-        - 4
-        version: 1.0.4
+        - 5
+        version: 1.0.5
   type: :runtime
   version_requirements: *id001
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
@@ -73,6 +76,40 @@ files:
 - examples/types.rb
 - bin/bson_benchmark.rb
 - bin/fail_if_no_c.rb
+- test/auxillary/1.4_features.rb
+- test/auxillary/authentication_test.rb
+- test/auxillary/autoreconnect_test.rb
+- test/auxillary/slave_connection_test.rb
+- test/collection_test.rb
+- test/connection_test.rb
+- test/conversions_test.rb
+- test/cursor_fail_test.rb
+- test/cursor_message_test.rb
+- test/cursor_test.rb
+- test/db_api_test.rb
+- test/db_connection_test.rb
+- test/db_test.rb
+- test/grid_file_system_test.rb
+- test/grid_io_test.rb
+- test/grid_test.rb
+- test/replica_pairs/count_test.rb
+- test/replica_pairs/insert_test.rb
+- test/replica_pairs/pooled_insert_test.rb
+- test/replica_pairs/query_test.rb
+- test/replica_sets/count_test.rb
+- test/replica_sets/insert_test.rb
+- test/replica_sets/node_type_test.rb
+- test/replica_sets/pooled_insert_test.rb
+- test/replica_sets/query_test.rb
+- test/replica_sets/replication_ack_test.rb
+- test/support_test.rb
+- test/test_helper.rb
+- test/threading/test_threading_large_pool.rb
+- test/threading_test.rb
+- test/unit/collection_test.rb
+- test/unit/connection_test.rb
+- test/unit/cursor_test.rb
+- test/unit/db_test.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -85,23 +122,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby driver for the MongoDB
@@ -128,6 +169,7 @@ test_files:
 - test/replica_pairs/query_test.rb
 - test/replica_sets/count_test.rb
 - test/replica_sets/insert_test.rb
+- test/replica_sets/node_type_test.rb
 - test/replica_sets/pooled_insert_test.rb
 - test/replica_sets/query_test.rb
 - test/replica_sets/replication_ack_test.rb