mongo 1.0.8 → 1.0.9

data/bin/insert.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'mongo'
+require 'date'
+require 'logger'
+include Mongo
+
+@logger = Logger.new(File.open("m.log", "w"))
+require 'ruby-prof'
+
+num_inserts = 100000
+if( ARGV.size() > 0 ) then
+num_inserts = ARGV[0].to_i()
+end
+db   = Connection.new('localhost', 27017).db('sample-db')
+coll = db.collection('test')
+coll.remove()
+sleep(2)
+
+puts "Testing #{num_inserts} inserts"
+start = Time.now()
+
+#RubyProf.start
+num_inserts.times do |i|
+  coll.insert({'a' => i+1})
+end
+#result = RubyProf.stop
+ending = Time.now
+total = ending - start
+
+puts "Took #{total} seconds, meaning #{num_inserts / total} per second."
+
+#printer = RubyProf::FlatPrinter.new(result)
+#printer.print(STDOUT, 0)

data/bin/mongo_console

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+org_argv = ARGV.dup
+ARGV.clear
+
+require 'irb'
+
+$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'mongo'
+
+include Mongo
+
+host = org_argv[0] || ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
+port = org_argv[1] || ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
+dbnm = org_argv[2] || ENV['MONGO_RUBY_DRIVER_DB']   || 'ruby-mongo-console'
+
+puts "Connecting to #{host}:#{port} (CONN) on with database #{dbnm} (DB)"
+CONN = Connection.new(host, port)
+DB = CONN.db(dbnm)
+
+puts "Starting IRB session..."
+IRB.start(__FILE__)

data/bin/oid.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+require 'mongo'
+
+TRIALS = 100000
+
+t0 = Time.now
+
+TRIALS.times do
+  BSON::BSON_CODER.serialize(:_id => BSON::ObjectId.new)
+end
+t1 = Time.now
+
+puts "Took #{t1 - t0} seconds"

data/lib/mongo.rb

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

data/lib/mongo/collection.rb

@@ -58,6 +58,7 @@ module Mongo
 
       @db, @name  = db, name
       @connection = @db.connection
+      @logger     = @connection.logger
       @pk_factory = pk_factory || BSON::ObjectId
       @hint = nil
     end
@@ -283,20 +284,19 @@ module Mongo
     # @core remove remove-instance_method
     def remove(selector={}, opts={})
       # Initial byte is 0.
-      message = BSON::ByteBuffer.new([0, 0, 0, 0])
+      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::BSON_CODER.serialize(selector, false, true).to_a)
+      message.put_binary(BSON::BSON_CODER.serialize(selector, false, true).to_s)
 
+      @logger.debug("MONGODB #{@db.name}['#{@name}'].remove(#{selector.inspect})") if @logger
       if opts[:safe]
-        @connection.send_message_with_safe_check(Mongo::Constants::OP_DELETE, message, @db.name,
-          "#{@db.name}['#{@name}'].remove(#{selector.inspect})", opts[:safe])
+        @connection.send_message_with_safe_check(Mongo::Constants::OP_DELETE, message, @db.name, nil, opts[:safe])
         # the return value of send_message_with_safe_check isn't actually meaningful --
         # only the fact that it didn't raise an error is -- so just return true
         true
       else
-        @connection.send_message(Mongo::Constants::OP_DELETE, message,
-          "#{@db.name}['#{@name}'].remove(#{selector.inspect})")
+        @connection.send_message(Mongo::Constants::OP_DELETE, message)
       end
     end
 
@@ -322,20 +322,19 @@ module Mongo
     # @core update update-instance_method
     def update(selector, document, options={})
       # Initial byte is 0.
-      message = BSON::ByteBuffer.new([0, 0, 0, 0])
+      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::BSON_CODER.serialize(selector, false, true).to_a)
-      message.put_array(BSON::BSON_CODER.serialize(document, false, true).to_a)
+      message.put_binary(BSON::BSON_CODER.serialize(selector, false, true).to_s)
+      message.put_binary(BSON::BSON_CODER.serialize(document, false, true).to_s)
+      @logger.debug("MONGODB #{@db.name}['#{@name}'].update(#{selector.inspect}, #{document.inspect})") if @logger
       if options[:safe]
-        @connection.send_message_with_safe_check(Mongo::Constants::OP_UPDATE, message, @db.name,
-          "#{@db.name}['#{@name}'].update(#{selector.inspect}, #{document.inspect})", options[:safe])
+        @connection.send_message_with_safe_check(Mongo::Constants::OP_UPDATE, message, @db.name, nil, options[:safe])
       else
-        @connection.send_message(Mongo::Constants::OP_UPDATE, message,
-          "#{@db.name}['#{@name}'].update(#{selector.inspect}, #{document.inspect})")
+        @connection.send_message(Mongo::Constants::OP_UPDATE, message, nil)
       end
     end
 
@@ -680,17 +679,18 @@ module Mongo
     # +check_keys+ setting.
     def insert_documents(documents, collection_name=@name, check_keys=true, safe=false)
       # Initial byte is 0.
-      message = BSON::ByteBuffer.new([0, 0, 0, 0])
+      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) }
+      documents.each do |doc|
+        message.put_binary(BSON::BSON_CODER.serialize(doc, check_keys, true).to_s)
+      end
       raise InvalidOperation, "Exceded maximum insert size of 16,000,000 bytes" if message.size > 16_000_000
 
+      @logger.debug("MONGODB #{@db.name}['#{collection_name}'].insert(#{documents.inspect})") if @logger
       if safe
-        @connection.send_message_with_safe_check(Mongo::Constants::OP_INSERT, message, @db.name,
-          "#{@db.name}['#{collection_name}'].insert(#{documents.inspect})", safe)
+        @connection.send_message_with_safe_check(Mongo::Constants::OP_INSERT, message, @db.name, nil, safe)
       else
-        @connection.send_message(Mongo::Constants::OP_INSERT, message,
-          "#{@db.name}['#{collection_name}'].insert(#{documents.inspect})")
+        @connection.send_message(Mongo::Constants::OP_INSERT, message, nil)
       end
       documents.collect { |o| o[:_id] || o['_id'] }
     end

data/lib/mongo/connection.rb

@@ -277,8 +277,8 @@ module Mongo
     # @return [Hash]
     def database_info
       doc = self['admin'].command({:listDatabases => 1})
-      returning({}) do |info|
-        doc['databases'].each { |db| info[db['name']] = db['sizeOnDisk'].to_i }
+      doc['databases'].each_with_object({}) do |db, info|
+        info[db['name']] = db['sizeOnDisk'].to_i
       end
     end
 
@@ -298,7 +298,7 @@ module Mongo
     #
     # @core databases db-instance_method
     def db(db_name, options={})
-      DB.new(db_name, self, options.merge(:logger => @logger))
+      DB.new(db_name, self)
     end
 
     # Shortcut for returning a database. Use DB#db to accept options.
@@ -309,7 +309,7 @@ module Mongo
     #
     # @core databases []-instance_method
     def [](db_name)
-      DB.new(db_name, self, :logger => @logger)
+      DB.new(db_name, self)
     end
 
     # Drop a database.
@@ -388,11 +388,9 @@ module Mongo
     #
     # @param [Integer] operation a MongoDB opcode.
     # @param [BSON::ByteBuffer] message a message to send to the database.
-    # @param [String] log_message text version of +message+ for logging.
     #
     # @return [Integer] number of bytes sent
     def send_message(operation, message, log_message=nil)
-      @logger.debug("  MONGODB #{log_message || message}") if @logger
       begin
         packed_message = add_message_headers(operation, message).to_s
         socket = checkout
@@ -408,7 +406,6 @@ module Mongo
     # @param [Integer] operation a MongoDB opcode.
     # @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.
     # @param [Hash] last_error_params parameters to be sent to getLastError. See DB#error for
     #   available options.
     #
@@ -420,7 +417,6 @@ module Mongo
     def send_message_with_safe_check(operation, message, db_name, log_message=nil, last_error_params=false)
       message_with_headers = add_message_headers(operation, message)
       message_with_check   = last_error_message(db_name, last_error_params)
-      @logger.debug("  MONGODB #{log_message || message}") if @logger
       begin
         sock = checkout
         packed_message = message_with_headers.append!(message_with_check).to_s
@@ -442,7 +438,6 @@ module Mongo
     #
     # @param [Integer] operation a MongoDB opcode.
     # @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.
     #
     # @return [Array]
@@ -450,7 +445,6 @@ module Mongo
     #   and [3] a cursor_id.
     def receive_message(operation, message, log_message=nil, socket=nil)
       packed_message = add_message_headers(operation, message).to_s
-      @logger.debug("  MONGODB #{log_message || message}") if @logger
       begin
         sock = socket || checkout
 
@@ -626,7 +620,7 @@ module Mongo
         if config
           update_node_list(config['hosts']) if config['hosts']
           if @logger
-            @logger.warn(config['msg']) if config['msg']
+            @logger.warn("MONGODB #{config['msg']}") if config['msg']
           end
         end
 
@@ -737,7 +731,7 @@ module Mongo
 
           # Otherwise, wait
           if @logger
-            @logger.warn "Waiting for available connection; #{@checked_out.size} of #{@size} connections checked out."
+            @logger.warn "MONGODB Waiting for available connection; #{@checked_out.size} of #{@size} connections checked out."
           end
           @queue.wait(@connection_mutex)
         end
@@ -745,14 +739,14 @@ module Mongo
     end
 
     def receive(sock)
-      receive_header(sock)
+      receive_and_discard_header(sock)
       number_received, cursor_id = receive_response_header(sock)
       read_documents(number_received, cursor_id, sock)
     end
 
     def receive_header(sock)
       header = BSON::ByteBuffer.new
-      header.put_array(receive_message_on_socket(16, sock).unpack("C*"))
+      header.put_binary(receive_message_on_socket(16, sock))
       unless header.size == STANDARD_HEADER_SIZE
         raise "Short read for DB response header: " +
           "expected #{STANDARD_HEADER_SIZE} bytes, saw #{header.size}"
@@ -763,19 +757,25 @@ module Mongo
       response_to = header.get_int
       op          = header.get_int
     end
+    
+    def receive_and_discard_header(sock)
+      bytes_read = receive_and_discard_message_on_socket(16, sock)
+      unless bytes_read == STANDARD_HEADER_SIZE
+        raise "Short read for DB response header: " +
+          "expected #{STANDARD_HEADER_SIZE} bytes, saw #{bytes_read}"
+      end
+      nil
+    end
 
     def receive_response_header(sock)
-      header_buf = BSON::ByteBuffer.new
-      header_buf.put_array(receive_message_on_socket(RESPONSE_HEADER_SIZE, sock).unpack("C*"))
+      header_buf = receive_message_on_socket(RESPONSE_HEADER_SIZE, sock)
       if header_buf.length != RESPONSE_HEADER_SIZE
         raise "Short read for DB response header; " +
           "expected #{RESPONSE_HEADER_SIZE} bytes, saw #{header_buf.length}"
       end
-      header_buf.rewind
-      check_response_flags(header_buf.get_int)
-      cursor_id        = header_buf.get_long
-      starting_from    = header_buf.get_int
-      number_remaining = header_buf.get_int
+      flags, cursor_id_a, cursor_id_b, starting_from, number_remaining = header_buf.unpack('VVVVV')
+      check_response_flags(flags)
+      cursor_id = (cursor_id_b << 32) + cursor_id_a
       [number_remaining, cursor_id]
     end
 
@@ -792,13 +792,10 @@ module Mongo
       docs = []
       number_remaining = number_received
       while number_remaining > 0 do
-        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)
+        buf = receive_message_on_socket(4, sock)
+        size = buf.unpack('V')[0]
+        buf << receive_message_on_socket(size - 4, sock)
         number_remaining -= 1
-        buf.rewind
         docs << BSON::BSON_CODER.deserialize(buf)
       end
       [docs, number_received, cursor_id]
@@ -818,26 +815,27 @@ module Mongo
         opts.assert_valid_keys(:w, :wtimeout, :fsync)
         cmd.merge!(opts)
       end
-      message.put_array(BSON::BSON_CODER.serialize(cmd, false).unpack("C*"))
+      message.put_binary(BSON::BSON_CODER.serialize(cmd, false).to_s)
       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 = BSON::ByteBuffer.new
-
-      # Message size.
-      headers.put_int(16 + message.size)
-
-      # Unique request id.
-      headers.put_int(get_request_id)
-
-      # Response id.
-      headers.put_int(0)
-
-      # Opcode.
-      headers.put_int(operation)
+      headers = [
+        # Message size.
+        16 + message.size,
+        
+        # Unique request id.
+        get_request_id,
+        
+        # Response id.
+        0,
+        
+        # Opcode.
+        operation
+      ].pack('VVVV')
+      
       message.prepend!(headers)
     end
 
@@ -847,11 +845,14 @@ module Mongo
     # @return [Integer] number of bytes sent
     def send_message_on_socket(packed_message, socket)
       begin
-      total_bytes_sent = 0
-      while packed_message.size > 0
-        byte_sent = socket.send(packed_message, 0)
-        total_bytes_sent += byte_sent
-        packed_message.slice!(0, byte_sent)
+      total_bytes_sent = socket.send(packed_message, 0)
+      if total_bytes_sent != packed_message.size
+        packed_message.slice!(0, total_bytes_sent)
+        while packed_message.size > 0
+          byte_sent = socket.send(packed_message, 0)
+          total_bytes_sent += byte_sent
+          packed_message.slice!(0, byte_sent)
+        end
       end
       total_bytes_sent
       rescue => ex
@@ -863,12 +864,16 @@ module Mongo
     # Low-level method for receiving data from socket.
     # Requires length and an available socket.
     def receive_message_on_socket(length, socket)
-      message = ""
       begin
-        while message.length < length do
-          chunk = socket.recv(length - message.length)
-          raise ConnectionFailure, "connection closed" unless chunk.length > 0
-          message += chunk
+        message = socket.read(length)
+        raise ConnectionFailure, "connection closed" unless message.length > 0
+        if message.length < length
+          chunk = new_binary_string
+          while message.length < length
+            socket.read(length - message.length, chunk)
+            raise ConnectionFailure, "connection closed" unless chunk.length > 0
+            message << chunk
+          end
         end
         rescue => ex
           close
@@ -876,5 +881,40 @@ module Mongo
       end
       message
     end
+    
+    # Low-level data for receiving data from socket.
+    # Unlike #receive_message_on_socket, this method immediately discards the data
+    # and only returns the number of bytes read.
+    def receive_and_discard_message_on_socket(length, socket)
+      bytes_read = 0
+      begin
+        chunk = socket.read(length)
+        bytes_read = chunk.length
+        raise ConnectionFailure, "connection closed" unless bytes_read > 0
+        if bytes_read < length
+          while bytes_read < length
+            socket.read(length - bytes_read, chunk)
+            raise ConnectionFailure, "connection closed" unless chunk.length > 0
+            bytes_read += chunk.length
+          end
+        end
+        rescue => ex
+          close
+          raise ConnectionFailure, "Operation failed with the following exception: #{ex}"
+      end
+      bytes_read
+    end
+    
+    if defined?(Encoding)
+      BINARY_ENCODING = Encoding.find("binary")
+      
+      def new_binary_string
+        "".force_encoding(BINARY_ENCODING)
+      end
+    else
+      def new_binary_string
+        ""
+      end
+    end
   end
 end

data/lib/mongo/cursor.rb

@@ -37,6 +37,7 @@ module Mongo
       @db         = collection.db
       @collection = collection
       @connection = @db.connection
+      @logger     = @connection.logger
 
       @selector   = convert_selector_for_query(options[:selector])
       @fields     = convert_fields_for_query(options[:fields])
@@ -49,19 +50,20 @@ module Mongo
       @explain    = options[:explain]
       @socket     = options[:socket]
       @tailable   = options[:tailable] || false
-      @batch_size = options[:batch_size] || 0
+      batch_size(options[:batch_size] || 0)
 
       @full_collection_name = "#{@collection.db.name}.#{@collection.name}"
-      @cache = []
-      @closed = false
-      @query_run = false
+      @cache        = []
+      @closed       = false
+      @query_run    = false
+      @returned     = 0
     end
 
     # Get the next document specified the cursor options.
     #
     # @return [Hash, Nil] the next document or Nil if no documents remain.
     def next_document
-      refill_via_get_more if num_remaining == 0
+      refresh if @cache.length == 0#empty?# num_remaining == 0
       doc = @cache.shift
 
       if doc && doc['$err']
@@ -178,6 +180,26 @@ module Mongo
       self
     end
 
+    # Set the batch size for server responses.
+    #
+    # Note that the batch size will take effect only on queries
+    # where the number to be returned is greater than 100.
+    #
+    # @param [Integer] size either 0 or some integer greater than 1. If 0,
+    #   the server will determine the batch size.
+    #
+    # @return [Cursor]
+    def batch_size(size=0)
+      check_modifiable
+      if size < 0 || size == 1
+        raise ArgumentError, "Invalid value for batch_size #{size}; must be 0 or > 1."
+      else
+        @batch_size = size > @limit ? @limit : size
+      end
+
+      self
+    end
+
     # Iterate over each document in this cursor, yielding it to the given
     # block.
     #
@@ -190,10 +212,11 @@ module Mongo
     #     puts doc['user']
     #   end
     def each
-      num_returned = 0
-      while has_next? && (@limit <= 0 || num_returned < @limit)
-        yield next_document
-        num_returned += 1
+      #num_returned = 0
+      #while has_next? && (@limit <= 0 || num_returned < @limit)
+      while doc = next_document
+        yield doc #next_document
+        #num_returned += 1
       end
     end
 
@@ -241,7 +264,8 @@ module Mongo
         message = BSON::ByteBuffer.new([0, 0, 0, 0])
         message.put_int(1)
         message.put_long(@cursor_id)
-        @connection.send_message(Mongo::Constants::OP_KILL_CURSORS, message, "cursor.close #{@cursor_id}")
+        @logger.debug("MONGODB cursor.close #{@cursor_id}") if @logger
+        @connection.send_message(Mongo::Constants::OP_KILL_CURSORS, message, nil)
       end
       @cursor_id = 0
       @closed    = true
@@ -297,9 +321,7 @@ module Mongo
           {fields => 1}
         when Array
           return nil if fields.length.zero?
-          returning({}) do |hash|
-            fields.each { |field| hash[field] = 1 }
-          end
+          fields.each_with_object({}) { |field, hash| hash[field] = 1 }
         when Hash
           return fields
       end
@@ -325,13 +347,13 @@ module Mongo
       end
     end
 
-    # Return a number of documents remaining for this cursor.
+    # Return the number of documents remaining for this cursor.
     def num_remaining
-      refill_via_get_more if @cache.length == 0
+      refresh if @cache.length == 0
       @cache.length
     end
 
-    def refill_via_get_more
+    def refresh
       return if send_initial_query || @cursor_id.zero?
       message = BSON::ByteBuffer.new([0, 0, 0, 0])
 
@@ -339,11 +361,22 @@ module Mongo
       BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@collection.name}")
 
       # Number of results to return.
-      message.put_int(@batch_size)
+      if @limit > 0
+        limit = @limit - @returned
+        if @batch_size > 0
+          limit = limit < @batch_size ? limit : @batch_size
+        end
+        message.put_int(limit)
+      else
+        message.put_int(@batch_size)
+      end
 
       # Cursor id.
       message.put_long(@cursor_id)
-      results, @n_received, @cursor_id = @connection.receive_message(Mongo::Constants::OP_GET_MORE, message, "cursor.get_more()", @socket)
+      @logger.debug("MONGODB cursor.refresh() for cursor #{@cursor_id}") if @logger
+      results, @n_received, @cursor_id = @connection.receive_message(Mongo::Constants::OP_GET_MORE,
+                                                                     message, nil, @socket)
+      @returned += @n_received
       @cache += results
       close_cursor_if_query_complete
     end
@@ -354,8 +387,9 @@ module Mongo
         false
       else
         message = construct_query_message
-        results, @n_received, @cursor_id = @connection.receive_message(Mongo::Constants::OP_QUERY, message,
-            (query_log_message if @connection.logger), @socket)
+        @logger.debug query_log_message if @logger
+        results, @n_received, @cursor_id = @connection.receive_message(Mongo::Constants::OP_QUERY, message, nil, @socket)
+        @returned += @n_received
         @cache += results
         @query_run = true
         close_cursor_if_query_complete
@@ -370,8 +404,8 @@ module Mongo
       message.put_int(@skip)
       message.put_int(@limit)
       spec = query_contains_special_fields? ? construct_query_spec : @selector
-      message.put_array(BSON::BSON_CODER.serialize(spec, false).to_a)
-      message.put_array(BSON::BSON_CODER.serialize(@fields, false).to_a) if @fields
+      message.put_binary(BSON::BSON_CODER.serialize(spec, false).to_s)
+      message.put_binary(BSON::BSON_CODER.serialize(@fields, false).to_s) if @fields
       message
     end
 
@@ -402,7 +436,9 @@ module Mongo
     end
 
     def close_cursor_if_query_complete
-      close if @limit > 0 && @n_received >= @limit
+      if @limit > 0 && @returned >= @limit
+        close
+      end
     end
 
     def check_modifiable

data/lib/mongo/util/core_ext.rb

@@ -20,10 +20,21 @@
 class Object
 
   #:nodoc:
-  def returning(value)
-    yield value
-    value
-  end
+  def tap
+    yield self
+    self
+  end unless respond_to? :tap
+
+end
+
+#:nodoc:
+module Enumerable
+
+  #:nodoc:
+  def each_with_object(memo)
+    each { |element| yield(element, memo) }
+    memo
+  end unless [].respond_to?(:each_with_object)
 
 end
 

data/mongo.gemspec

@@ -15,8 +15,11 @@ Gem::Specification.new do |s|
     'mongo.gemspec', 'LICENSE.txt']
   s.files += ['lib/mongo.rb'] + Dir['lib/mongo/**/*.rb']
   s.files += Dir['examples/**/*.rb'] + Dir['bin/**/*.rb']
+  s.files += Dir['bin/mongo_console']
   s.test_files = Dir['test/**/*.rb']
 
+  s.executables = ['mongo_console']
+
   s.has_rdoc = true
   s.test_files = Dir['test/**/*.rb']
   s.test_files -= Dir['test/mongo_bson/*.rb'] # remove these files from the manifest

data/test/auxillary/1.4_features.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # Demonstrate features in MongoDB 1.4
 class Features14Test < Test::Unit::TestCase

data/test/auxillary/authentication_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: This test requires bouncing the server.
 # It also requires that a user exists on the admin database.

data/test/auxillary/autoreconnect_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: This test requires bouncing the server
 class AutoreconnectTest < Test::Unit::TestCase

data/test/auxillary/slave_connection_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: these tests are run only if we can connect to a single MongoDB in slave mode.
 class SlaveConnectionTest < Test::Unit::TestCase

data/test/collection_test.rb

@@ -105,10 +105,11 @@ class TestCollection < Test::Unit::TestCase
   end
 
   def test_safe_insert
+    @@test.create_index("hello", :unique => true)
     a = {"hello" => "world"}
     @@test.insert(a)
     @@test.insert(a)
-    assert(@@db.error.include?("E11000"))
+    assert(@@db.get_last_error['err'].include?("11000"))
 
     assert_raise OperationFailure do
       @@test.insert(a, :safe => true)

data/test/connection_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 require 'logger'
 require 'stringio'
 require 'thread'

data/test/conversions_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 require 'mongo/exceptions'
 require 'mongo/util/conversions'
 require 'bson/ordered_hash'

data/test/cursor_fail_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 require 'logger'
 
 class CursorTest < Test::Unit::TestCase

data/test/cursor_message_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 require 'logger'
 
 class CursorTest < Test::Unit::TestCase
@@ -17,16 +17,28 @@ class CursorTest < Test::Unit::TestCase
     @@coll_full_name = "#{MONGO_TEST_DB}.test"
   end
 
-  def test_cursor_invalid
-    100.times do |n|
-      @@coll.insert({:a => "HELLO" * 50000})
+  def test_valid_batch_sizes
+    assert_raise ArgumentError do
+      @@coll.find({}, :batch_size => 1, :limit => 5)
     end
 
-    cursor = @@coll.find({}, :batch_size => 50)
-    cursor.next_document
-    p @@db.command("cursorInfo" => 1)
-    cursor.close
-    p @@db.command("cursorInfo" => 1)
-    cursor.next_document
+    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,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 require 'logger'
 
 class CursorTest < Test::Unit::TestCase
@@ -126,13 +126,13 @@ 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'})
@@ -428,4 +428,5 @@ class CursorTest < Test::Unit::TestCase
     cursor.rewind!
     assert_equal 100, cursor.map {|doc| doc }.length
   end
-end
+
+  end

data/test/db_api_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 
 class DBAPITest < Test::Unit::TestCase
   include Mongo

data/test/db_connection_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 
 class DBConnectionTest < Test::Unit::TestCase
 
@@ -10,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

data/test/db_test.rb

@@ -1,5 +1,4 @@
-$:.unshift '.'
-require 'test/test_helper'
+require './test/test_helper'
 require 'digest/md5'
 require 'stringio'
 require 'logger'
@@ -204,10 +203,10 @@ class DBTest < Test::Unit::TestCase
     @@db['test'].save("i" => 1)
 
     @@db['test'].update({"i" => 1}, {"$set" => {"i" => 2}})
-    assert @@db.last_status()["updatedExisting"]
+    assert @@db.get_last_error()["updatedExisting"]
 
     @@db['test'].update({"i" => 1}, {"$set" => {"i" => 500}})
-    assert !@@db.last_status()["updatedExisting"]
+    assert !@@db.get_last_error()["updatedExisting"]
   end
 
   def test_text_port_number_raises_no_errors

data/test/grid_file_system_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 include Mongo
 
 class GridFileSystemTest < Test::Unit::TestCase

data/test/grid_io_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 include Mongo
 
 class GridIOTest < Test::Unit::TestCase

data/test/grid_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 include Mongo
 
 class GridTest < Test::Unit::TestCase
@@ -139,7 +139,7 @@ class GridTest < Test::Unit::TestCase
           io.rewind
           data = io.read
           if data.respond_to?(:force_encoding)
-            data.force_encoding(:binary)
+            data.force_encoding("binary")
           end
           read_data = ""
           while(chunk = file.read(read_length))

data/test/replica_pairs/count_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: this test should be run only if a replica pair is running.
 class ReplicaPairCountTest < Test::Unit::TestCase

data/test/replica_pairs/insert_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: this test should be run only if a replica pair is running.
 class ReplicaPairInsertTest < Test::Unit::TestCase

data/test/replica_pairs/pooled_insert_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: this test should be run only if a replica pair is running.
 class ReplicaPairPooledInsertTest < Test::Unit::TestCase

data/test/replica_pairs/query_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: this test should be run only if a replica pair is running.
 class ReplicaPairQueryTest < Test::Unit::TestCase

data/test/replica_sets/count_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: This test expects a replica set of three nodes to be running
 # on the local host.

data/test/replica_sets/insert_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: This test expects a replica set of three nodes to be running
 # on the local host.

data/test/replica_sets/node_type_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+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.

data/test/replica_sets/pooled_insert_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: This test expects a replica set of three nodes to be running
 # on the local host.

data/test/replica_sets/query_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: This test expects a replica set of three nodes to be running
 # on the local host.

data/test/replica_sets/replication_ack_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'test/unit'
-require 'test/test_helper'
+require './test/test_helper'
 
 # NOTE: This test expects a replica set of three nodes to be running on local host.
 class ReplicaSetAckTest < Test::Unit::TestCase

data/test/support_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 
 class SupportTest < Test::Unit::TestCase
   include Mongo

data/test/threading_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 
 class TestThreading < Test::Unit::TestCase
 

data/test/unit/collection_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require File.expand_path('./test/test_helper.rb')
 
 class CollectionTest < Test::Unit::TestCase
 
@@ -12,8 +12,9 @@ class CollectionTest < Test::Unit::TestCase
       @db   = @conn['testing']
       @coll = @db.collection('books')
       @conn.expects(:send_message).with do |op, msg, log|
-        op == 2001 && log.include?("testing['books'].update")
+        op == 2001
       end
+      @logger.stubs(:debug)
       @coll.update({}, {:title => 'Moby Dick'})
     end
 
@@ -22,7 +23,10 @@ class CollectionTest < Test::Unit::TestCase
       @db   = @conn['testing']
       @coll = @db.collection('books')
       @conn.expects(:send_message).with do |op, msg, log|
-        op == 2002 && log.include?("testing['books'].insert")
+        op == 2002
+      end
+      @logger.expects(:debug).with do |msg|
+        msg.include?("Moby")
       end
       @coll.insert({:title => 'Moby Dick'})
     end
@@ -32,8 +36,11 @@ class CollectionTest < Test::Unit::TestCase
       @db   = @conn['testing']
       @coll = @db.collection('books')
       @conn.expects(:receive_message).with do |op, msg, log, sock|
-        op == 2004 && log.include?("sort")
+        op == 2004
       end.returns([[], 0, 0])
+      @logger.expects(:debug).with do |msg|
+        msg.include?('Moby')
+      end
       @coll.find({:title => 'Moby Dick'}).sort([['title', 1], ['author', 1]]).next_document
     end
 
@@ -43,7 +50,10 @@ class CollectionTest < Test::Unit::TestCase
       @coll = @db.collection('books')
       data = BSON::Binary.new(("BINARY " * 1000).unpack("c*"))
       @conn.expects(:send_message).with do |op, msg, log|
-        op == 2002 && log.include?("BSON::Binary")
+        op == 2002
+      end
+      @logger.expects(:debug).with do |msg|
+        msg.include?("Binary")
       end
       @coll.insert({:data => data})
     end
@@ -53,7 +63,10 @@ class CollectionTest < Test::Unit::TestCase
       @db   = @conn['testing']
       @coll = @db.collection('books')
       @conn.expects(:send_message_with_safe_check).with do |op, msg, db_name, log|
-        op == 2001 && log.include?("testing['books'].update")
+        op == 2001
+      end
+      @logger.expects(:debug).with do |msg|
+        msg.include?("testing['books'].update")
       end
       @coll.update({}, {:title => 'Moby Dick'}, :safe => true)
     end
@@ -63,8 +76,9 @@ class CollectionTest < Test::Unit::TestCase
       @db   = @conn['testing']
       @coll = @db.collection('books')
       @conn.expects(:send_message_with_safe_check).with do |op, msg, db_name, log|
-        op == 2001 && log.include?("testing['books'].update")
+        op == 2001
       end
+      @logger.stubs(:debug)
       @coll.update({}, {:title => 'Moby Dick'}, :safe => true)
     end
   end

data/test/unit/connection_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 include Mongo
 
 class ConnectionTest < Test::Unit::TestCase

data/test/unit/cursor_test.rb

@@ -1,9 +1,11 @@
-require 'test/test_helper'
+require './test/test_helper'
 
 class CursorTest < Test::Unit::TestCase
   context "Cursor options" do
     setup do
-      @connection = stub(:class => Connection)
+      @logger     = mock()
+      @logger.stubs(:debug)
+      @connection = stub(:class => Connection, :logger => @logger)
       @db         = stub(:name => "testing", :slave_ok? => false, :connection => @connection)
       @collection = stub(:db => @db, :name => "items")
       @cursor     = Cursor.new(@collection)
@@ -70,7 +72,7 @@ class CursorTest < Test::Unit::TestCase
 
   context "Query fields" do
     setup do
-      @connection = stub(:class => Collection)
+      @connection = stub(:class => Collection, :logger => @logger)
       @db = stub(:slave_ok? => true, :name => "testing", :connection => @connection)
       @collection = stub(:db => @db, :name => "items")
     end

data/test/unit/db_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require './test/test_helper'
 
 class DBTest < Test::Unit::TestCase
   context "DBTest: " do
@@ -71,7 +71,7 @@ class DBTest < Test::Unit::TestCase
       should "raise an error if getlasterror fails" do
         @db.expects(:command).returns({})
         assert_raise Mongo::MongoDBError do
-          @db.error
+          @db.get_last_error
         end
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 0
-  - 8
-  version: 1.0.8
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - Jim Menard
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 -04:00
+date: 2010-09-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,8 +38,8 @@ dependencies:
   version_requirements: *id001
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
-executables: []
-
+executables: 
+- mongo_console
 extensions: []
 
 extra_rdoc_files: 
@@ -76,6 +76,9 @@ files:
 - examples/types.rb
 - bin/bson_benchmark.rb
 - bin/fail_if_no_c.rb
+- bin/insert.rb
+- bin/oid.rb
+- bin/mongo_console
 - test/auxillary/1.4_features.rb
 - test/auxillary/authentication_test.rb
 - test/auxillary/autoreconnect_test.rb