mongo 0.19.3 → 0.20

data/README.rdoc

@@ -30,10 +30,14 @@ Then you can install the mongo gem as follows:
 
   $ gem install mongo
 
-For a significant performance boost, you should also install the driver's C
+The driver also requires the BSON gem:
+
+  $ gem install bson
+
+And for a significant performance boost, you'll want to install the C extensions:
 extensions:
 
-  $ gem install mongo_ext
+  $ gem install bson_ext
 
 === From the GitHub source
 
@@ -274,7 +278,7 @@ Random cursor fun facts:
 = Testing
 
 If you have the source code, you can run the tests. There's a separate rake task for testing with
-the mongo_ext C extension enabled.
+the bson_ext C extension enabled.
 
   $ rake test:c
 

data/Rakefile

@@ -27,6 +27,7 @@ namespace :test do
     ENV['C_EXT'] = 'TRUE'
     Rake::Task['test:unit'].invoke
     Rake::Task['test:functional'].invoke
+    Rake::Task['test:bson'].invoke
     Rake::Task['test:pooled_threading'].invoke
     Rake::Task['test:drop_databases'].invoke
     ENV['C_EXT'] = nil
@@ -37,10 +38,11 @@ namespace :test do
     ENV['C_EXT'] = nil
     Rake::Task['test:unit'].invoke
     Rake::Task['test:functional'].invoke
+    Rake::Task['test:bson'].invoke
     Rake::Task['test:pooled_threading'].invoke
     Rake::Task['test:drop_databases'].invoke
   end
-
+  
   Rake::TestTask.new(:unit) do |t|
     t.test_files = FileList['test/unit/*_test.rb']
     t.verbose    = true
@@ -91,13 +93,18 @@ namespace :test do
     t.verbose    = true
   end
 
+  Rake::TestTask.new(:bson) do |t|
+    t.test_files = FileList['test/mongo_bson/*_test.rb']
+    t.verbose    = true
+  end
+
   task :drop_databases do |t|
     puts "Dropping test database..."
-    require File.join(File.dirname(__FILE__), 'lib', 'mongo')
+    require File.join(File.dirname(__FILE__), 'test', 'test_helper')
     include Mongo
     con = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
       ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
-    con.drop_database('ruby-mongo-test')
+    con.drop_database(MONGO_TEST_DB)
   end
 end
 
@@ -134,9 +141,12 @@ namespace :gem do
 
   desc "Install the optional c extensions"
   task :install_extensions do
-    sh "gem build mongo-extensions.gemspec"
-    sh "gem install mongo_ext-*.gem"
-    sh "rm mongo_ext-*.gem"
+    sh "gem build bson.gemspec"
+    sh "gem build bson_ext.gemspec"
+    sh "gem install bson-*.gem"
+    sh "gem install bson_ext-*.gem"
+    sh "rm bson-*.gem"
+    sh "rm bson_ext-*.gem"
   end
 
 end

data/bin/bson_benchmark.rb

@@ -9,9 +9,9 @@ TRIALS = 100000
 
 def encode(doc)
   t0 = Time.new
-  b = BSON.new
+  b = Mongo::BSON_CODER.new
   TRIALS.times { |i|
-    b = BSON.new
+    b = Mongo::BSON_CODER.new
     b.serialize doc
   }
   print "took: #{Time.now.to_f - t0.to_f}\n"

data/examples/gridfs.rb

@@ -17,7 +17,7 @@ data = "hello, world!"
 grid = Grid.new(db)
 
 # Write a new file. data can be a string or an io object responding to #read.
-id = grid.put(data, 'hello.txt')
+id = grid.put(data, :filename => 'hello.txt')
 
 # Read it and print out the contents
 file = grid.get(id)
@@ -33,11 +33,12 @@ rescue => e
 end
 
 # Metadata
-id = grid.put(data, 'hello.txt', :content_type => 'text/plain', :metadata => {'name' => 'hello'})
+id = grid.put(data, :filename => 'hello.txt', :content_type => 'text/plain', :metadata => {'name' => 'hello'})
 file = grid.get(id)
 
 p file.content_type
 p file.metadata.inspect
 p file.chunk_size
 p file.file_length
+p file.filename
 p file.data

data/lib/mongo.rb

@@ -1,23 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "0.19.3"
-end
-
-begin
-    # Need this for running test with and without c ext in Ruby 1.9.
-    raise LoadError if ENV['TEST_MODE'] && !ENV['C_EXT']
-    require 'mongo_ext/cbson'
-    raise LoadError unless defined?(CBson::VERSION) && CBson::VERSION == Mongo::VERSION
-    require 'mongo/util/bson_c'
-    BSON = BSON_C
-  rescue LoadError
-    require 'mongo/util/bson_ruby'
-    BSON = BSON_RUBY
-    warn "\n**Notice: C extension not loaded. This is required for optimum MongoDB Ruby driver performance."
-    warn "  You can install the extension as follows:\n  gem install mongo_ext\n"
-    warn "  If you continue to receive this message after installing, make sure that the"
-    warn "  mongo_ext gem is in your load path and that the mongo_ext and mongo gems are of the same version.\n"
+  VERSION = "0.20"
 end
 
 module Mongo
@@ -41,25 +25,18 @@ module Mongo
 
 end
 
-require 'mongo/types/binary'
-require 'mongo/types/code'
-require 'mongo/types/dbref'
-require 'mongo/types/objectid'
-require 'mongo/types/regexp_of_holding'
-require 'mongo/types/min_max_keys'
+require 'bson'
 
+require 'mongo/util/conversions'
 require 'mongo/util/support'
 require 'mongo/util/core_ext'
-require 'mongo/util/conversions'
 require 'mongo/util/server_version'
-require 'mongo/util/bson_ruby'
 
 require 'mongo/collection'
 require 'mongo/connection'
 require 'mongo/cursor'
 require 'mongo/db'
 require 'mongo/exceptions'
-require 'mongo/gridfs'
 require 'mongo/gridfs/grid'
 require 'mongo/gridfs/grid_io'
 require 'mongo/gridfs/grid_file_system'

data/lib/mongo/collection.rb

@@ -26,7 +26,7 @@ module Mongo
     # @param [DB] db a MongoDB database instance.
     # @param [String, Symbol] name the name of the collection.
     #
-    # @raise [InvalidName]
+    # @raise [InvalidNSName]
     #   if collection name is empty, contains '$', or starts or ends with '.'
     #
     # @raise [TypeError]
@@ -45,18 +45,18 @@ module Mongo
       name = name.to_s
 
       if name.empty? or name.include? ".."
-        raise InvalidName, "collection names cannot be empty"
+        raise Mongo::InvalidNSName, "collection names cannot be empty"
       end
       if name.include? "$"
-        raise InvalidName, "collection names must not contain '$'" unless name =~ /((^\$cmd)|(oplog\.\$main))/
+        raise Mongo::InvalidNSName, "collection names must not contain '$'" unless name =~ /((^\$cmd)|(oplog\.\$main))/
       end
       if name.match(/^\./) or name.match(/\.$/)
-        raise InvalidName, "collection names must not start or end with '.'"
+        raise Mongo::InvalidNSName, "collection names must not start or end with '.'"
       end
 
       @db, @name  = db, name
       @connection = @db.connection
-      @pk_factory = pk_factory || ObjectID
+      @pk_factory = pk_factory || BSON::ObjectID
       @hint = nil
     end
 
@@ -66,7 +66,7 @@ module Mongo
     # @param [String] name
     #   the collection to return
     #
-    # @raise [InvalidName]
+    # @raise [Mongo::InvalidNSName]
     #   if passed an invalid collection name
     #
     # @return [Collection]
@@ -107,9 +107,11 @@ module Mongo
     #   a document specifying elements which must be present for a
     #   document to be included in the result set.
     #
-    # @option opts [Array] :fields field names that should be returned in the result
+    # @option opts [Array, Hash] :fields field names that should be returned in the result
     #   set ("_id" will always be included). By limiting results to a certain subset of fields,
-    #   you can cut down on network traffic and decoding time.
+    #   you can cut down on network traffic and decoding time. If using a Hash, keys should be field
+    #   names and values should be either 1 or 0, depending on whether you want to include or exclude
+    #   the given field.
     # @option opts [Integer] :skip number of documents to skip from the beginning of the result set
     # @option opts [Integer] :limit maximum number of documents to return
     # @option opts [Array]   :sort an array of [key, direction] pairs to sort by. Direction should
@@ -179,7 +181,7 @@ module Mongo
       spec = case spec_or_object_id
              when nil
                {}
-             when ObjectID
+             when BSON::ObjectID
                {:_id => spec_or_object_id}
              when Hash
                spec_or_object_id
@@ -258,10 +260,10 @@ module Mongo
     # @core remove remove-instance_method
     def remove(selector={}, opts={})
       # Initial byte is 0.
-      message = ByteBuffer.new([0, 0, 0, 0])
-      BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@name}")
+      message = BSON::ByteBuffer.new([0, 0, 0, 0])
+      BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@name}")
       message.put_int(0)
-      message.put_array(BSON.serialize(selector, false, true).to_a)
+      message.put_array(BSON::BSON_CODER.serialize(selector, false, true).to_a)
 
       if opts[:safe]
         @connection.send_message_with_safe_check(Mongo::Constants::OP_DELETE, message, @db.name,
@@ -297,14 +299,14 @@ module Mongo
     # @core update update-instance_method
     def update(selector, document, options={})
       # Initial byte is 0.
-      message = ByteBuffer.new([0, 0, 0, 0])
-      BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@name}")
+      message = BSON::ByteBuffer.new([0, 0, 0, 0])
+      BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@name}")
       update_options  = 0
       update_options += 1 if options[:upsert]
       update_options += 2 if options[:multi]
       message.put_int(update_options)
-      message.put_array(BSON.serialize(selector, false, true).to_a)
-      message.put_array(BSON.serialize(document, false, true).to_a)
+      message.put_array(BSON::BSON_CODER.serialize(selector, false, true).to_a)
+      message.put_array(BSON::BSON_CODER.serialize(document, false, true).to_a)
       if options[:safe]
         @connection.send_message_with_safe_check(Mongo::Constants::OP_UPDATE, message, @db.name,
           "#{@db.name}['#{@name}'].update(#{selector.inspect}, #{document.inspect})")
@@ -403,7 +405,6 @@ module Mongo
 
       # Note: calling drop_indexes with no args will drop them all.
       @db.drop_index(@name, '*')
-
     end
 
     # Drop the entire collection. USE WITH CAUTION.
@@ -411,17 +412,41 @@ module Mongo
       @db.drop_collection(@name)
     end
 
+
+    # Atomically update and return a document using MongoDB's findAndModify command. (MongoDB > 1.3.0)
+    #
+    # @option opts [Hash] :update (nil) the update operation to perform on the matched document.
+    # @option opts [Hash] :query ({}) a query selector document for matching the desired document.
+    # @option opts [Array, String, OrderedHash] :sort ({}) specify a sort option for the query using any
+    #   of the sort options available for Cursor#sort. Sort order is important if the query will be matching
+    #   multiple documents since only the first matching document will be updated and returned.
+    # @option opts [Boolean] :remove (false) If true, removes the the returned document from the collection.
+    # @option opts [Boolean] :new (false) If true, returns the updated document; otherwise, returns the document
+    #   prior to update.
+    #
+    # @return [Hash] the matched document.
+    #
+    # @core findandmodify find_and_modify-instance_method
+    def find_and_modify(opts={})
+      cmd = OrderedHash.new
+      cmd[:findandmodify] = @name
+      cmd.merge!(opts)
+      cmd[:sort] = Mongo::Support.format_order_clause(opts[:sort]) if opts[:sort]
+
+      @db.command(cmd, false, true)['value']
+    end
+
     # Perform a map/reduce operation on the current collection.
     #
-    # @param [String, Code] map a map function, written in JavaScript.
-    # @param [String, Code] reduce a reduce function, written in JavaScript.
+    # @param [String, BSON::Code] map a map function, written in JavaScript.
+    # @param [String, BSON::Code] reduce a reduce function, written in JavaScript.
     #
     # @option opts [Hash] :query ({}) a query selector document, like what's passed to #find, to limit
     #   the operation to a subset of the collection.
     # @option opts [Array] :sort ([]) an array of [key, direction] pairs to sort by. Direction should
     #   be specified as Mongo::ASCENDING (or :ascending / :asc) or Mongo::DESCENDING (or :descending / :desc)
     # @option opts [Integer] :limit (nil) if passing a query, number of objects to return from the collection.
-    # @option opts [String, Code] :finalize (nil) a javascript function to apply to the result set after the
+    # @option opts [String, BSON::Code] :finalize (nil) a javascript function to apply to the result set after the
     #   map/reduce operation has finished.
     # @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.
@@ -433,8 +458,8 @@ module Mongo
     #
     # @core mapreduce map_reduce-instance_method
     def map_reduce(map, reduce, opts={})
-      map    = Code.new(map) unless map.is_a?(Code)
-      reduce = Code.new(reduce) unless reduce.is_a?(Code)
+      map    = BSON::Code.new(map) unless map.is_a?(BSON::Code)
+      reduce = BSON::Code.new(reduce) unless reduce.is_a?(BSON::Code)
 
       hash = OrderedHash.new
       hash['mapreduce'] = self.name
@@ -452,28 +477,18 @@ module Mongo
 
     # Perform a group aggregation.
     #
-    # @param [Array, String, Code, Nil] :key either 1) an array of fields to group by,
+    # @param [Array, String, BSON::Code, Nil] :key either 1) an array of fields to group by,
     #   2) a javascript function to generate the key object, or 3) nil.
     # @param [Hash] condition an optional document specifying a query to limit the documents over which group is run.
     # @param [Hash] initial initial value of the aggregation counter object
-    # @param [String, Code] reduce aggregation function, in JavaScript
-    # @param [String, Code] finalize :: optional. a JavaScript function that receives and modifies
+    # @param [String, BSON::Code] reduce aggregation function, in JavaScript
+    # @param [String, BSON::Code] finalize :: optional. a JavaScript function that receives and modifies
     #              each of the resultant grouped objects. Available only when group is run
     #              with command set to true.
-    # @param [Nil] deprecated this param in a placeholder for a deprecated param. It will be removed
-    #   in the next release.
     #
     # @return [Array] the grouped items.
-    def group(key, condition, initial, reduce, finalize=nil, deprecated=nil)
-
-      # Warn of changed API post eval deprecation.
-      if finalize == true || finalize == false || deprecated
-        warn "The API for Collection#group has changed. 'Finalize' is now the fifth parameter, " +
-          "since it's no longer necessary to specify whether #group is run as a command. " +
-          "See http://api.mongodb.org/ruby/current/Mongo/Collection.html#group-instance_method for details."
-      end
-
-      reduce = Code.new(reduce) unless reduce.is_a?(Code)
+    def group(key, condition, initial, reduce, finalize=nil)
+      reduce = BSON::Code.new(reduce) unless reduce.is_a?(BSON::Code)
 
       group_command = {
         "group" => {
@@ -491,17 +506,14 @@ module Mongo
           key.each { |k| key_value[k] = 1 }
         else
           key_type  = "$keyf"
-          key_value = key.is_a?(Code) ? key : Code.new(key)
+          key_value = key.is_a?(BSON::Code) ? key : BSON::Code.new(key)
         end
 
         group_command["group"][key_type] = key_value
       end
 
-      # only add finalize if specified
-      # check to see if users have sent the finalizer as the last argument.
-      finalize = deprecated if deprecated.is_a?(String) || deprecated.is_a?(Code)
-      finalize = Code.new(finalize) if finalize.is_a?(String)
-      if finalize.is_a?(Code)
+      finalize = BSON::Code.new(finalize) if finalize.is_a?(String)
+      if finalize.is_a?(BSON::Code)
         group_command['group']['finalize'] = finalize
       end
 
@@ -556,7 +568,7 @@ module Mongo
     #
     # @param [String] new_name the new name for this collection
     #
-    # @raise [InvalidName] if +new_name+ is an invalid collection name.
+    # @raise [Mongo::InvalidNSName] if +new_name+ is an invalid collection name.
     def rename(new_name)
       case new_name
       when Symbol, String
@@ -567,13 +579,13 @@ module Mongo
       new_name = new_name.to_s
 
       if new_name.empty? or new_name.include? ".."
-        raise InvalidName, "collection names cannot be empty"
+        raise Mongo::InvalidNSName, "collection names cannot be empty"
       end
       if new_name.include? "$"
-        raise InvalidName, "collection names must not contain '$'"
+        raise Mongo::InvalidNSName, "collection names must not contain '$'"
       end
       if new_name.match(/^\./) or new_name.match(/\.$/)
-        raise InvalidName, "collection names must not start or end with '.'"
+        raise Mongo::InvalidNSName, "collection names must not start or end with '.'"
       end
 
       @db.rename_collection(@name, new_name)
@@ -596,6 +608,13 @@ module Mongo
       @db.collections_info(@name).next_document['options']
     end
 
+    # Return stats on the collection. Uses MongoDB's collstats command.
+    #
+    # @return [Hash]
+    def stats
+      @db.command({:collstats => @name})
+    end
+
     # Get the number of documents in this collection.
     #
     # @return [Integer]
@@ -629,9 +648,9 @@ module Mongo
     # +check_keys+ setting.
     def insert_documents(documents, collection_name=@name, check_keys=true, safe=false)
       # Initial byte is 0.
-      message = ByteBuffer.new([0, 0, 0, 0])
-      BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{collection_name}")
-      documents.each { |doc| message.put_array(BSON.serialize(doc, check_keys, true).to_a) }
+      message = BSON::ByteBuffer.new([0, 0, 0, 0])
+      BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{collection_name}")
+      documents.each { |doc| message.put_array(BSON::BSON_CODER.serialize(doc, check_keys, true).to_a) }
       if safe
         @connection.send_message_with_safe_check(Mongo::Constants::OP_INSERT, message, @db.name,
           "#{@db.name}['#{collection_name}'].insert(#{documents.inspect})")

data/lib/mongo/connection.rb

@@ -44,27 +44,21 @@ module Mongo
     # If connecting to just one server, you may specify whether connection to slave is permitted.
     # In all cases, the default host is "localhost" and the default port is 27017.
     #
-    # When specifying a pair, +pair_or_host+, is a hash with two keys: :left and :right. Each key maps to either
-    # * a server name, in which case port is 27017,
-    # * a port number, in which case the server is "localhost", or
-    # * an array containing [server_name, port_number]
+    # To specify a pair, use Connection.paired.
     #
     # Note that there are a few issues when using connection pooling with Ruby 1.9 on Windows. These
     # should be resolved in the next release.
     #
-    # @param [String, Hash] pair_or_host See explanation above.
-    # @param [Integer] port specify a port number here if only one host is being specified. Leave nil if
-    #   specifying a pair of servers in +pair_or_host+.
+    # @param [String, Hash] host.
+    # @param [Integer] port specify a port number here if only one host is being specified.
     #
     # @option options [Boolean] :slave_ok (false) Must be set to +true+ when connecting
     #   to a single, slave node.
     # @option options [Logger, #debug] :logger (nil) Logger instance to receive driver operation log.
-    # @option options [Boolean] :auto_reconnect DEPRECATED. See http://www.mongodb.org/display/DOCS/Replica+Pairs+in+Ruby
     # @option options [Integer] :pool_size (1) The maximum number of socket connections that can be opened to the database.
     # @option options [Float] :timeout (5.0) When all of the connections to the pool are checked out,
     #   this is the number of seconds to wait for a new connection to be released before throwing an exception.
     #
-    #
     # @example localhost, 27017
     #   Connection.new
     #
@@ -77,25 +71,16 @@ module Mongo
     # @example localhost, 3000, where this node may be a slave
     #   Connection.new("localhost", 3000, :slave_ok => true)
     #
-    # @example DEPRECATED. To initialize a paired connection, use Connection.paired instead.
-    #   Connection.new({:left  => ["db1.example.com", 27017],
-    #                  :right => ["db2.example.com", 27017]})
-    #
-    # @example DEPRECATED. To initialize a paired connection, use Connection.paired instead.
-    #   Connection.new({:left  => ["db1.example.com", 27017],
-    #                   :right => ["db2.example.com", 27017]}, nil,
-    #                   :pool_size => 20, :timeout => 5)
-    #
     # @see http://www.mongodb.org/display/DOCS/Replica+Pairs+in+Ruby Replica pairs in Ruby
     #
     # @core connections
-    def initialize(pair_or_host=nil, port=nil, options={})
+    def initialize(host=nil, port=nil, options={})
       @auths        = []
 
       if block_given?
         @nodes = yield self
       else
-        @nodes = format_pair(pair_or_host, port)
+        @nodes = format_pair(host, port)
       end
 
       # Host and port of current master.
@@ -118,10 +103,6 @@ module Mongo
       @sockets      = []
       @checked_out  = []
 
-      if options[:auto_reconnect]
-        warn(":auto_reconnect is deprecated. see http://www.mongodb.org/display/DOCS/Replica+Pairs+in+Ruby")
-      end
-
       # slave_ok can be true only if one node is specified
       @slave_ok = options[:slave_ok] && @nodes.length == 1
       @logger   = options[:logger] || nil
@@ -344,7 +325,7 @@ module Mongo
     # Send a message to MongoDB, adding the necessary headers.
     #
     # @param [Integer] operation a MongoDB opcode.
-    # @param [ByteBuffer] message a message to send to the database.
+    # @param [BSON::ByteBuffer] message a message to send to the database.
     # @param [String] log_message text version of +message+ for logging.
     #
     # @return [True]
@@ -363,7 +344,7 @@ module Mongo
     # an exception if the operation has failed.
     #
     # @param [Integer] operation a MongoDB opcode.
-    # @param [ByteBuffer] message a message to send to the database.
+    # @param [BSON::ByteBuffer] message a message to send to the database.
     # @param [String] db_name the name of the database. used on call to get_last_error.
     # @param [String] log_message text version of +message+ for logging.
     #
@@ -394,7 +375,7 @@ module Mongo
     # Sends a message to the database and waits for the response.
     #
     # @param [Integer] operation a MongoDB opcode.
-    # @param [ByteBuffer] message a message to send to the database.
+    # @param [BSON::ByteBuffer] message a message to send to the database.
     # @param [String] log_message text version of +message+ for logging.
     # @param [Socket] socket a socket to use in lieu of checking out a new one.
     #
@@ -479,12 +460,6 @@ module Mongo
       case pair_or_host
         when String
           [[pair_or_host, port ? port.to_i : DEFAULT_PORT]]
-        when Hash
-         warn "Initializing a paired connection with Connection.new is deprecated. Use Connection.pair instead."
-         connections = []
-         connections << pair_val_to_connection(pair_or_host[:left])
-         connections << pair_val_to_connection(pair_or_host[:right])
-         connections
         when nil
           [['localhost', DEFAULT_PORT]]
       end
@@ -625,7 +600,7 @@ module Mongo
     end
 
     def receive_header(sock)
-      header = ByteBuffer.new
+      header = BSON::ByteBuffer.new
       header.put_array(receive_message_on_socket(16, sock).unpack("C*"))
       unless header.size == STANDARD_HEADER_SIZE
         raise "Short read for DB response header: " +
@@ -639,7 +614,7 @@ module Mongo
     end
 
     def receive_response_header(sock)
-      header_buf = ByteBuffer.new
+      header_buf = BSON::ByteBuffer.new
       header_buf.put_array(receive_message_on_socket(RESPONSE_HEADER_SIZE, sock).unpack("C*"))
       if header_buf.length != RESPONSE_HEADER_SIZE
         raise "Short read for DB response header; " +
@@ -657,32 +632,32 @@ module Mongo
       docs = []
       number_remaining = number_received
       while number_remaining > 0 do
-        buf = ByteBuffer.new
+        buf = BSON::ByteBuffer.new
         buf.put_array(receive_message_on_socket(4, sock).unpack("C*"))
         buf.rewind
         size = buf.get_int
         buf.put_array(receive_message_on_socket(size - 4, sock).unpack("C*"), 4)
         number_remaining -= 1
         buf.rewind
-        docs << BSON.deserialize(buf)
+        docs << BSON::BSON_CODER.deserialize(buf)
       end
       [docs, number_received, cursor_id]
     end
 
     def last_error_message(db_name)
-      message = ByteBuffer.new
+      message = BSON::ByteBuffer.new
       message.put_int(0)
-      BSON_RUBY.serialize_cstr(message, "#{db_name}.$cmd")
+      BSON::BSON_RUBY.serialize_cstr(message, "#{db_name}.$cmd")
       message.put_int(0)
       message.put_int(-1)
-      message.put_array(BSON.serialize({:getlasterror => 1}, false).unpack("C*"))
+      message.put_array(BSON::BSON_CODER.serialize({:getlasterror => 1}, false).unpack("C*"))
       add_message_headers(Mongo::Constants::OP_QUERY, message)
     end
 
     # Prepares a message for transmission to MongoDB by
     # constructing a valid message header.
     def add_message_headers(operation, message)
-      headers = ByteBuffer.new
+      headers = BSON::ByteBuffer.new
 
       # Message size.
       headers.put_int(16 + message.size)