mongo 1.0.3 → 1.0.4

data/HISTORY

@@ -1,3 +1,20 @@
+1.0.4 2010-7-13
+
+* Removed deprecated
+  - Cursor admin option
+  - DB#query
+  - DB#create_index (use Collection#create_index)
+  - DB#command only takes hash options now
+* j2bson executable (neomantra)
+* Fixed bson_ext compilation on Solaris (slyphon)
+* System JS helpers (neovintage)
+* Use one mutex per thread on pooled connections (cremes)
+* Check for CursorNotFound response flag
+* MapReduce can return raw command output using :raw
+* BSON::OrderedHash equality with other Ruby hashes (Ryan Angilly)
+* Fix for broken Socket.send with large payloads (Frédéric De Jaeger)
+* Lots of minor improvements. See commmits.
+
 1.0.3 2010-6-15
 
 * Optimiztion for BSON::OrderedHash

data/lib/mongo.rb

@@ -3,7 +3,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end
 
 module Mongo
@@ -21,11 +21,18 @@ module Mongo
     OP_DELETE       = 2006
     OP_KILL_CURSORS = 2007
 
-    OP_QUERY_TAILABLE          = 2
-    OP_QUERY_SLAVE_OK          = 4
-    OP_QUERY_NO_CURSOR_TIMEOUT = 16
+    OP_QUERY_TAILABLE          = 2 ** 1
+    OP_QUERY_SLAVE_OK          = 2 ** 2
+    OP_QUERY_OPLOG_REPLAY      = 2 ** 3
+    OP_QUERY_NO_CURSOR_TIMEOUT = 2 ** 4
+    OP_QUERY_AWAIT_DATA        = 2 ** 5
+    OP_QUERY_EXHAUST           = 2 ** 6
+
+    REPLY_CURSOR_NOT_FOUND     = 2 ** 0
+    REPLY_QUERY_FAILURE        = 2 ** 1
+    REPLY_SHARD_CONFIG_STALE   = 2 ** 2
+    REPLY_AWAIT_CAPABLE        = 2 ** 3
   end
-
 end
 
 require 'bson'

data/lib/mongo/collection.rb

@@ -157,7 +157,8 @@ module Mongo
       raise RuntimeError, "Unknown options [#{opts.inspect}]" unless opts.empty?
 
       cursor = Cursor.new(self, :selector => selector, :fields => fields, :skip => skip, :limit => limit,
-                          :order => sort, :hint => hint, :snapshot => snapshot, :timeout => timeout, :batch_size => batch_size)
+        :order => sort, :hint => hint, :snapshot => snapshot, :timeout => timeout, :batch_size => batch_size)
+
       if block_given?
         yield cursor
         cursor.close()
@@ -470,6 +471,8 @@ 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
+    #   the instantiated collection that's returned by default.
     #
     # @return [Collection] a collection containing the results of the operation.
     #
@@ -477,8 +480,10 @@ module Mongo
     #
     # @core mapreduce map_reduce-instance_method
     def map_reduce(map, reduce, opts={})
+      opts.assert_valid_keys(:query, :sort, :limit, :finalize, :keeptemp, :verbose, :raw)
       map    = BSON::Code.new(map) unless map.is_a?(BSON::Code)
       reduce = BSON::Code.new(reduce) unless reduce.is_a?(BSON::Code)
+      raw    = opts.delete(:raw)
 
       hash = BSON::OrderedHash.new
       hash['mapreduce'] = self.name
@@ -487,10 +492,15 @@ module Mongo
       hash.merge! opts
 
       result = @db.command(hash)
-      unless result["ok"] == 1
+      unless Mongo::Support.ok?(result)
         raise Mongo::OperationFailure, "map-reduce failed: #{result['errmsg']}"
       end
-      @db[result["result"]]
+
+      if raw
+        result
+      else
+        @db[result["result"]]
+      end
     end
     alias :mapreduce :map_reduce
 

data/lib/mongo/connection.rb

@@ -32,7 +32,7 @@ module Mongo
     STANDARD_HEADER_SIZE = 16
     RESPONSE_HEADER_SIZE = 20
 
-    MONGODB_URI_MATCHER = /(([.\w\d]+):([\w\d]+)@)?([-.\w\d]+)(:([\w\d]+))?(\/([-\d\w]+))?/
+    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
@@ -97,7 +97,11 @@ module Mongo
 
       # Mutex for synchronizing pool access
       @connection_mutex = Mutex.new
-      @safe_mutex = Mutex.new
+
+
+      # Create a mutex when a new key, in this case a socket,
+      # is added to the hash.
+      @safe_mutexes = Hash.new { |h, k| h[k] = Mutex.new }
 
       # Condition variable for signal and wait
       @queue = ConditionVariable.new
@@ -368,7 +372,7 @@ module Mongo
         sock = checkout
         packed_message = message_with_headers.append!(message_with_check).to_s
         docs = num_received = cursor_id = ''
-        @safe_mutex.synchronize do
+        @safe_mutexes[sock].synchronize do
           send_message_on_socket(packed_message, sock)
           docs, num_received, cursor_id = receive(sock)
         end
@@ -398,7 +402,7 @@ module Mongo
         sock = socket || checkout
 
         result = ''
-        @safe_mutex.synchronize do
+        @safe_mutexes[sock].synchronize do
           send_message_on_socket(packed_message, sock)
           result = receive(sock)
         end
@@ -632,13 +636,22 @@ module Mongo
           "expected #{RESPONSE_HEADER_SIZE} bytes, saw #{header_buf.length}"
       end
       header_buf.rewind
-      result_flags     = header_buf.get_int
+      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
       [number_remaining, cursor_id]
     end
 
+    def check_response_flags(flags)
+      if flags & Mongo::Constants::REPLY_CURSOR_NOT_FOUND != 0
+        raise Mongo::OperationFailure, "Query response returned CURSOR_NOT_FOUND. " +
+          "Either an invalid cursor was specified, or the cursor may have timed out on the server."
+      elsif flags & Mongo::Constants::REPLY_QUERY_FAILURE != 0
+        # Getting odd failures when a exception is raised here.
+      end
+    end
+
     def read_documents(number_received, cursor_id, sock)
       docs = []
       number_remaining = number_received
@@ -696,7 +709,10 @@ module Mongo
     # Requires a packed message and an available socket,
     def send_message_on_socket(packed_message, socket)
       begin
-      socket.send(packed_message, 0)
+      while packed_message.size > 0
+        byte_sent = socket.send(packed_message, 0)
+        packed_message.slice!(0, byte_sent)
+      end
       rescue => ex
         close
         raise ConnectionFailure, "Operation failed with the following exception: #{ex}"

data/lib/mongo/cursor.rb

@@ -21,9 +21,9 @@ module Mongo
     include Mongo::Conversions
     include Enumerable
 
-    attr_reader :collection, :selector, :admin, :fields,
+    attr_reader :collection, :selector, :fields,
       :order, :hint, :snapshot, :timeout,
-      :full_collection_name
+      :full_collection_name, :batch_size
 
     # Create a new cursor.
     #
@@ -40,10 +40,6 @@ module Mongo
 
       @selector   = convert_selector_for_query(options[:selector])
       @fields     = convert_fields_for_query(options[:fields])
-      if options[:admin]
-        warn "The admin option to Cursor#new has been deprecated. The cursor should now be passed the admin collection explicitly."
-      end
-      @admin      = options[:admin]    || false
       @skip       = options[:skip]     || 0
       @limit      = options[:limit]    || 0
       @order      = options[:order]
@@ -237,7 +233,7 @@ 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")
+        @connection.send_message(Mongo::Constants::OP_KILL_CURSORS, message, "cursor.close #{@cursor_id}")
       end
       @cursor_id = 0
       @closed    = true
@@ -255,10 +251,11 @@ module Mongo
     # @see http://www.mongodb.org/display/DOCS/Mongo+Wire+Protocol#MongoWireProtocol-Mongo::Constants::OPQUERY
     # The MongoDB wire protocol.
     def query_opts
-      timeout  = @timeout ? 0 : Mongo::Constants::OP_QUERY_NO_CURSOR_TIMEOUT
-      slave_ok = @connection.slave_ok? ? Mongo::Constants::OP_QUERY_SLAVE_OK : 0
-      tailable = @tailable ? Mongo::Constants::OP_QUERY_TAILABLE : 0
-      slave_ok + timeout + tailable
+      opts     = 0
+      opts    |= Mongo::Constants::OP_QUERY_NO_CURSOR_TIMEOUT unless @timeout
+      opts    |= Mongo::Constants::OP_QUERY_SLAVE_OK if @connection.slave_ok?
+      opts    |= Mongo::Constants::OP_QUERY_TAILABLE if @tailable
+      opts
     end
 
     # Get the query options for this Cursor.
@@ -275,6 +272,12 @@ module Mongo
         :timeout  => @timeout }
     end
 
+    # Clean output for inspect.
+    def inspect
+      "<Mongo::Cursor:0x#{object_id.to_s(16)} namespace='#{@db.name}.#{@collection.name}' " +
+        "@selector=#{@selector.inspect}>"
+    end
+
     private
 
     # Convert the +:fields+ parameter from a single field name or an array
@@ -325,8 +328,7 @@ module Mongo
       message = BSON::ByteBuffer.new([0, 0, 0, 0])
 
       # DB name.
-      db_name = @admin ? 'admin' : @db.name
-      BSON::BSON_RUBY.serialize_cstr(message, "#{db_name}.#{@collection.name}")
+      BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@collection.name}")
 
       # Number of results to return.
       message.put_int(@batch_size)
@@ -356,8 +358,7 @@ module Mongo
     def construct_query_message
       message = BSON::ByteBuffer.new
       message.put_int(query_opts)
-      db_name = @admin ? 'admin' : @db.name
-      BSON::BSON_RUBY.serialize_cstr(message, "#{db_name}.#{@collection.name}")
+      BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@collection.name}")
       message.put_int(@skip)
       message.put_int(@limit)
       spec = query_contains_special_fields? ? construct_query_spec : @selector
@@ -367,7 +368,7 @@ module Mongo
     end
 
     def query_log_message
-      "#{@admin ? 'admin' : @db.name}['#{@collection.name}'].find(#{@selector.inspect}, #{@fields ? @fields.inspect : '{}'})" +
+      "#{@db.name}['#{@collection.name}'].find(#{@selector.inspect}, #{@fields ? @fields.inspect : '{}'})" +
       "#{@skip != 0 ? ('.skip(' + @skip.to_s + ')') : ''}#{@limit != 0 ? ('.limit(' + @limit.to_s + ')') : ''}" +
       "#{@order ? ('.sort(' + @order.inspect + ')') : ''}"
     end

data/lib/mongo/db.rb

@@ -29,6 +29,7 @@ module Mongo
     SYSTEM_INDEX_COLLECTION = "system.indexes"
     SYSTEM_PROFILE_COLLECTION = "system.profile"
     SYSTEM_USER_COLLECTION = "system.users"
+    SYSTEM_JS_COLLECTION = "system.js"
     SYSTEM_COMMAND_COLLECTION = "$cmd"
 
     # Counter for generating unique request ids.
@@ -106,6 +107,36 @@ module Mongo
       end
     end
 
+    # Adds a stored Javascript function to the database which can executed  
+    # server-side in map_reduce, db.eval and $where clauses.
+    # 
+    # @param [String] function_name
+    # @param [String] code
+    #
+    # @return [String] the function name saved to the database
+    def add_stored_function(function_name, code)
+      self[SYSTEM_JS_COLLECTION].save(
+        {
+          "_id" => function_name, 
+          :value => BSON::Code.new(code)
+        }
+      )
+    end
+    
+    # Removes stored Javascript function from the database.  Returns
+    # false if the function does not exist
+    #
+    # @param [String] function_name
+    #
+    # @return [Boolean]
+    def remove_stored_function(function_name)
+      if self[SYSTEM_JS_COLLECTION].find_one({"_id" => function_name})
+        self[SYSTEM_JS_COLLECTION].remove({"_id" => function_name}, :safe => true)
+      else
+        return false
+      end
+    end
+    
     # Adds a user to this database for use with authentication. If the user already
     # exists in the system, the password will be updated.
     #
@@ -238,7 +269,7 @@ module Mongo
     #
     # @param [String] name
     #
-    # @return [Boolean] True on success or if the collection names doesn't exist.
+    # @return [Boolean] +true+ on success or +false+ if the collection name doesn't exist.
     def drop_collection(name)
       return true unless collection_names.include?(name)
 
@@ -304,17 +335,6 @@ module Mongo
       command(:reseterror => 1)
     end
 
-    # @deprecated please use Collection#find to create queries.
-    #
-    # Returns a Cursor over the query results.
-    #
-    # Note that the query gets sent lazily; the cursor calls
-    # Connection#send_message when needed. If the caller never requests an
-    # object from the cursor, the query never gets sent.
-    def query(collection, query, admin=false)
-      Cursor.new(self, collection, query, admin)
-    end
-
     # Dereference a DBRef, returning the document it points to.
     #
     # @param [Mongo::DBRef] dbref
@@ -375,7 +395,7 @@ module Mongo
       oh = BSON::OrderedHash.new
       oh[:deleteIndexes] = collection_name
       oh[:index] = index_name
-      doc = command(oh)
+      doc = command(oh, :check_response => false)
       ok?(doc) || raise(MongoDBError, "Error with drop_index command: #{doc.inspect}")
     end
 
@@ -403,23 +423,6 @@ module Mongo
       self.command({:dbstats => 1})
     end
 
-    # Create a new index on the given collection.
-    # Normally called by Collection#create_index.
-    #
-    # @param [String] collection_name
-    # @param [String, Array] field_or_spec either either a single field name
-    #   or an array of [field name, direction] pairs. Directions should be specified as
-    #   Mongo::ASCENDING or Mongo::DESCENDING.
-    # @param [Boolean] unique if +true+, the created index will enforce a uniqueness constraint.
-    #
-    # @return [String] the name of the index created.
-    #
-    # @deprecated
-    def create_index(collection_name, field_or_spec, unique=false)
-      warn "DB#create_index is now deprecated. Please use Collection#create_index instead."
-      self.collection(collection_name).create_index(field_or_spec, :unique => unique)
-    end
-
     # Return +true+ if the supplied +doc+ contains an 'ok' field with the value 1.
     #
     # @param [Hash] doc
@@ -453,24 +456,19 @@ module Mongo
     #
     # @core commands command_instance-method
     def command(selector, opts={}, old_check_response=false, old_sock=nil)
-      if opts.is_a?(Hash)
-        check_response = opts[:check_response].nil? ? true : opts[:check_response]
-        sock           = opts[:sock]
-      else
-        warn "The options passed to DB#command should now be passed as hash keys; the admin option has been deprecated."
-        admin          = opts
-        check_response = old_check_response
-        sock           = old_sock
-      end
+      check_response = opts[:check_response].nil? ? true : opts[:check_response]
+      sock           = opts[:sock]
       raise MongoArgumentError, "command must be given a selector" unless selector.is_a?(Hash) && !selector.empty?
       if selector.keys.length > 1 && RUBY_VERSION < '1.9' && selector.class != BSON::OrderedHash
         raise MongoArgumentError, "DB#command requires an OrderedHash when hash contains multiple keys"
       end
 
-      result = Cursor.new(system_command_collection, :admin => admin,
+      result = Cursor.new(system_command_collection,
         :limit => -1, :selector => selector, :socket => sock).next_document
 
-      if result.nil? || (check_response && !ok?(result))
+      if result.nil?
+        raise OperationFailure, "Database command '#{selector.keys.first}' failed: returned null."
+      elsif (check_response && !ok?(result))
         raise OperationFailure, "Database command '#{selector.keys.first}' failed: #{result.inspect}"
       else
         result

data/lib/mongo/gridfs/grid.rb

@@ -41,10 +41,11 @@ module Mongo
       @chunks.create_index([['files_id', Mongo::ASCENDING], ['n', Mongo::ASCENDING]], :unique => true)
     end
 
-    # Store a file in the file store.
+    # Store a file in the file store. This method is designed only for writing new files;
+    # if you need to update a given file, first delete it using #Grid#delete.
     #
     # Note that arbitary metadata attributes can be saved to the file by passing
-    # them is as options.
+    # them in as options.
     #
     # @param [String, #read] data a string or io-like object to store.
     #

data/lib/mongo/gridfs/grid_io.rb

@@ -315,11 +315,18 @@ module Mongo
       @aliases       = opts.delete(:aliases) if opts[:aliases]
       @file_length   = 0
       opts.each {|k, v| self[k] = v}
+      check_existing_file if @safe
 
       @current_chunk = create_chunk(0)
       @file_position = 0
     end
 
+    def check_existing_file
+      if @files.find_one('_id' => @files_id)
+        raise GridError, "Attempting to overwrite with Grid#put. You must delete the file first."
+      end
+    end
+
     def to_mongo_object
       h                = BSON::OrderedHash.new
       h['_id']         = @files_id

data/test/collection_test.rb

@@ -393,7 +393,7 @@ class TestCollection < Test::Unit::TestCase
     assert c.closed?
   end
 
-  if @@version < "1.1.1"
+  if @@version > "1.1.1"
     def test_map_reduce
       @@test << { "user_id" => 1 }
       @@test << { "user_id" => 2 }
@@ -429,6 +429,23 @@ class TestCollection < Test::Unit::TestCase
       assert res.find_one({"_id" => 2})
       assert res.find_one({"_id" => 3})
     end
+
+    def test_map_reduce_with_raw_response
+      m = Code.new("function() { emit(this.user_id, 1); }")
+      r = Code.new("function(k,vals) { return 1; }")
+      res = @@test.map_reduce(m, r, :raw => true)
+      assert res["result"]
+      assert res["counts"]
+      assert res["timeMillis"]
+    end
+
+    def test_allows_only_valid_keys
+      m = Code.new("function() { emit(this.user_id, 1); }")
+      r = Code.new("function(k,vals) { return 1; }")
+      assert_raise ArgumentError do
+        @@test.map_reduce(m, r, :foo => true)
+      end
+    end
   end
 
   if @@version > "1.3.0"
@@ -686,7 +703,7 @@ class TestCollection < Test::Unit::TestCase
       assert_nil cursor.next_document
     end
 
-    should "" do
+    should "fail tailable cursor on a non-capped collection" do
       col = @@db['regular-collection']
       col.insert({:a => 1000})
       tail = Cursor.new(col, :tailable => true, :order => [['$natural', 1]])

data/test/cursor_fail_test.rb

@@ -0,0 +1,76 @@
+require 'test/test_helper'
+require 'logger'
+
+class CursorTest < Test::Unit::TestCase
+
+  include Mongo
+
+  @@connection = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
+  @@db   = @@connection.db(MONGO_TEST_DB)
+  @@coll = @@db.collection('test')
+  @@version = @@connection.server_version
+
+  def setup
+    @@coll.remove
+    @@coll.insert('a' => 1)     # collection not created until it's used
+    @@coll_full_name = "#{MONGO_TEST_DB}.test"
+  end
+
+  def test_refill_via_get_more
+    assert_equal 1, @@coll.count
+    1000.times { |i|
+      assert_equal 1 + i, @@coll.count
+      @@coll.insert('a' => i)
+    }
+
+    assert_equal 1001, @@coll.count
+    count = 0
+    @@coll.find.each { |obj|
+      count += obj['a']
+    }
+    assert_equal 1001, @@coll.count
+
+    # do the same thing again for debugging
+    assert_equal 1001, @@coll.count
+    count2 = 0
+    @@coll.find.each { |obj|
+      count2 += obj['a']
+    }
+    assert_equal 1001, @@coll.count
+
+    assert_equal count, count2
+    assert_equal 499501, count
+  end
+
+  def test_refill_via_get_more_alt_coll
+    coll = @@db.collection('test-alt-coll')
+    coll.remove
+    coll.insert('a' => 1)     # collection not created until it's used
+    assert_equal 1, coll.count
+
+    1000.times { |i|
+      assert_equal 1 + i, coll.count
+      coll.insert('a' => i)
+    }
+
+    assert_equal 1001, coll.count
+    count = 0
+    coll.find.each { |obj|
+      count += obj['a']
+    }
+    assert_equal 1001, coll.count
+
+    # do the same thing again for debugging
+    assert_equal 1001, coll.count
+    count2 = 0
+    coll.find.each { |obj|
+      count2 += obj['a']
+    }
+    assert_equal 1001, coll.count
+
+    assert_equal count, count2
+    assert_equal 499501, count
+  end
+
+end

data/test/cursor_message_test.rb

@@ -0,0 +1,32 @@
+require 'test/test_helper'
+require 'logger'
+
+class CursorTest < Test::Unit::TestCase
+
+  include Mongo
+
+  @@connection = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
+  @@db   = @@connection.db(MONGO_TEST_DB)
+  @@coll = @@db.collection('test')
+  @@version = @@connection.server_version
+
+  def setup
+    @@coll.remove
+    @@coll.insert('a' => 1)     # collection not created until it's used
+    @@coll_full_name = "#{MONGO_TEST_DB}.test"
+  end
+
+  def test_cursor_invalid
+    100.times do |n|
+      @@coll.insert({:a => "HELLO" * 50000})
+    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
+  end
+end

data/test/cursor_test.rb

@@ -17,6 +17,13 @@ class CursorTest < Test::Unit::TestCase
     @@coll_full_name = "#{MONGO_TEST_DB}.test"
   end
 
+  def test_inspect
+    selector = {:a => 1}
+    cursor = @@coll.find(selector)
+    assert_equal "<Mongo::Cursor:0x#{cursor.object_id.to_s(16)} namespace='#{@@db.name}.#{@@coll.name}' " +
+        "@selector=#{selector.inspect}>", cursor.inspect
+  end
+
   def test_explain
     cursor = @@coll.find('a' => 1)
     explaination = cursor.explain
@@ -130,7 +137,7 @@ class CursorTest < Test::Unit::TestCase
     @@coll.save({:t => 't2'})
     @@coll.save({:t => 't2'})
 
-    assert_equal 3, @@coll.find({'_id' => {'$gt' => t1_id}, '_id' => {'$lt' => t2_id}}).count
+    assert_equal 3, @@coll.find({'_id' => {'$gt' => t1_id, '$lt' => t2_id}}).count
     @@coll.find({'_id' => {'$gt' => t2_id}}).each do |doc|
       assert_equal 't2', doc['t']
     end
@@ -389,4 +396,21 @@ class CursorTest < Test::Unit::TestCase
 
     assert_equal false, cursor.has_next?
   end
+
+  def test_cursor_invalid
+    @@coll.remove
+    1000.times do |n|
+      @@coll.insert({:a => n})
+    end
+
+    cursor = @@coll.find({})
+    cursor.next_document
+    cursor.close
+
+    assert_raise_error(Mongo::OperationFailure, "CURSOR_NOT_FOUND") do
+      999.times do
+        cursor.next_document
+      end
+    end
+  end
 end

data/test/db_api_test.rb

@@ -289,7 +289,7 @@ class DBAPITest < Test::Unit::TestCase
   def test_index_create_with_symbol
     assert_equal @@coll.index_information.length, 1
 
-    name = @@db.create_index(@@coll.name, :a)
+    name = @@coll.create_index([['a', 1]])
     info = @@db.index_information(@@coll.name)
     assert_equal name, "a_1"
     assert_equal @@coll.index_information, info

data/test/db_test.rb

@@ -230,7 +230,7 @@ class DBTest < Test::Unit::TestCase
   def test_text_port_number_raises_no_errors
     conn = Connection.new(@@host, @@port.to_s)
     db   = conn[MONGO_TEST_DB]
-    assert db.collection('users').remove
+    db.collection('users').remove
   end
 
   def test_user_management
@@ -247,6 +247,14 @@ class DBTest < Test::Unit::TestCase
     assert !@@db.remove_user("joe")
   end
 
+  def test_stored_function_management
+    @@db.add_stored_function("sum", "function (x, y) { return x + y; }")
+    assert_equal @@db.eval("return sum(2,3);"), 5
+    assert @@db.remove_stored_function("sum")
+    assert_raise OperationFailure do 
+      @@db.eval("return sum(2,3);")
+    end
+  end
 
   if @@version >= "1.3.5"
     def test_db_stats

data/test/grid_io_test.rb

@@ -52,9 +52,7 @@ class GridIOTest < Test::Unit::TestCase
 
       should "raise an exception when check fails" do
         io = File.open(File.join(File.dirname(__FILE__), 'data', 'sample_file.pdf'), 'r')
-        db = mock()
-        db.stubs(:command).returns({'md5' => '12345'})
-        @files.expects(:db).returns(db)
+        @db.stubs(:command).returns({'md5' => '12345'})
         file = GridIO.new(@files, @chunks, 'bigfile', 'w', :safe => true)
         file.write(io)
         assert_raise GridMD5Failure do

data/test/grid_test.rb

@@ -27,6 +27,12 @@ class GridTest < Test::Unit::TestCase
         assert_equal 'sample', file['filename']
       end
 
+      should "not be able to overwrite an exising file" do
+        assert_raise GridError do
+          @grid.put(@data, :filename => 'sample', :_id => @id, :safe => true)
+        end
+      end
+
       should "return nil if it doesn't exist" do
         assert_nil @grid.exist?(:metadata => 'foo')
       end

data/test/unit/connection_test.rb

@@ -88,6 +88,13 @@ class ConnectionTest < Test::Unit::TestCase
         assert_equal auth_hash, @conn.auths[1]
       end
 
+      should "parse a uri with a hyphen & underscore in the username or password" do
+        @conn = Connection.from_uri("mongodb://hyphen-user_name:p-s_s@localhost:27017/db", :connect => false)
+        assert_equal ['localhost', 27017], @conn.nodes[0]
+        auth_hash = { 'db_name' => 'db', 'username' => 'hyphen-user_name', "password" => 'p-s_s' }
+        assert_equal auth_hash, @conn.auths[0]
+      end
+
       should "attempt to connect" do
         TCPSocket.stubs(:new).returns(new_mock_socket)
         @conn = Connection.from_uri("mongodb://localhost", :connect => false)

data/test/unit/cursor_test.rb

@@ -9,13 +9,6 @@ class CursorTest < Test::Unit::TestCase
       @cursor     = Cursor.new(@collection)
     end
 
-    should "set admin to false" do
-      assert_equal false, @cursor.admin
-
-      @cursor = Cursor.new(@collection, :admin => true)
-      assert_equal true, @cursor.admin
-    end
-
     should "set selector" do
       assert @cursor.selector == {}
 

data/test/unit/db_test.rb

@@ -31,25 +31,25 @@ class DBTest < Test::Unit::TestCase
 
       should "raise an error if the selector is omitted" do
         assert_raise MongoArgumentError do
-          @db.command({}, true)
+          @db.command({}, :check_response => true)
         end
       end
 
       should "create the proper cursor" do
         @cursor = mock(:next_document => {"ok" => 1})
-        Cursor.expects(:new).with(@collection, :admin => true,
+        Cursor.expects(:new).with(@collection,
           :limit => -1, :selector => {:buildinfo => 1}, :socket => nil).returns(@cursor)
         command = {:buildinfo => 1}
-        @db.command(command, true)
+        @db.command(command, :check_response => true)
       end
 
       should "raise an error when the command fails" do
         @cursor = mock(:next_document => {"ok" => 0})
-        Cursor.expects(:new).with(@collection, :admin => true,
+        Cursor.expects(:new).with(@collection,
           :limit => -1, :selector => {:buildinfo => 1}, :socket => nil).returns(@cursor)
         assert_raise OperationFailure do
           command = {:buildinfo => 1}
-          @db.command(command, true, true)
+          @db.command(command, :check_response => true)
         end
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Jim Menard
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 -04:00
+date: 2010-07-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,8 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 3
-        version: 1.0.3
+        - 4
+        version: 1.0.4
   type: :runtime
   version_requirements: *id001
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
@@ -112,6 +112,8 @@ test_files:
 - 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