mongodb-mongo 0.11.1 → 0.12

data/Rakefile

@@ -12,7 +12,7 @@ require 'rbconfig'
 include Config
 
 gem_command = "gem"
-gem_command = "gem1.9" if CONFIG["MAJOR"] == "1" && CONFIG["MINOR"] == "9"
+gem_command = "gem1.9" if $0.match(/1\.9$/) # use gem1.9 if we used rake1.9
 
 # NOTE: some of the tests assume Mongo is running
 Rake::TestTask.new do |t|

data/bin/standard_benchmark

@@ -80,7 +80,7 @@ benchmark('batch insert (medium, no index)', insert_batch, PER_TRIAL/BATCH_SIZE,
 benchmark('batch insert (large, no index)', insert_batch, PER_TRIAL/BATCH_SIZE, db, 'large_bulk', LARGE)
 
 find_one = Proc.new { |coll, x, i|
-  coll.find_first('x' => x)
+  coll.find_one('x' => x)
 }
 benchmark('find_one (small, no index)', find_one, PER_TRIAL, db, 'small_none', PER_TRIAL / 2)
 benchmark('find_one (medium, no index)', find_one, PER_TRIAL, db, 'medium_none', PER_TRIAL / 2)

data/examples/benchmarks.rb

@@ -1,5 +1,5 @@
 require "benchmark"
-  
+
 $LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
 require 'mongo'
 
@@ -20,21 +20,21 @@ arr = (0..OBJS_COUNT).collect {|x| { :number => x, :rndm => (rand(5)+1), :msg =>
 
 puts "Running benchmark"
 Benchmark.bmbm do |results|
-  results.report("single object inserts:  ") { 
+  results.report("single object inserts:  ") {
     TEST_COUNT.times {
       coll.clear
-      arr.each {|x| coll.insert(x)} 
+      arr.each {|x| coll.insert(x)}
     }
   }
-  results.report("multiple object insert: ") { 
+  results.report("multiple object insert: ") {
     TEST_COUNT.times {
       coll.clear
       coll.insert(arr)
     }
   }
-  results.report("find_first: ") {
+  results.report("find_one: ") {
     TEST_COUNT.times {
-      coll.find_first(:number => 0)
+      coll.find_one(:number => 0)
     }
   }
 end

data/lib/mongo.rb

@@ -4,6 +4,7 @@ require 'mongo/types/objectid'
 require 'mongo/types/regexp_of_holding'
 require 'mongo/types/undefined'
 
+require 'mongo/errors'
 require 'mongo/mongo'
 require 'mongo/message'
 require 'mongo/db'

data/lib/mongo/collection.rb

@@ -29,25 +29,36 @@ module XGen
           case name
           when Symbol, String
           else
-            raise RuntimeError, "new_name must be a string or symbol"
+            raise TypeError, "new_name must be a string or symbol"
           end
 
           name = name.to_s
 
           if name.empty? or name.include? ".."
-            raise RuntimeError, "collection names cannot be empty"
+            raise InvalidName, "collection names cannot be empty"
           end
           if name.include? "$" and not name.match(/^\$cmd/)
-            raise RuntimeError, "collection names must not contain '$'"
+            raise InvalidName, "collection names must not contain '$'"
           end
           if name.match(/^\./) or name.match(/\.$/)
-            raise RuntimeError, "collection names must not start or end with '.'"
+            raise InvalidName, "collection names must not start or end with '.'"
           end
 
           @db, @name = db, name
           @hint = nil
         end
 
+        # Get a sub-collection of this collection by name.
+        #
+        # Raises InvalidName if an invalid collection name is used.
+        #
+        # :name :: the name of the collection to get
+        def [](name)
+          name = "#{self.name}.#{name}"
+          return Collection.new(self, name) if !db.strict? || db.collection_names.include?(name)
+          raise "Collection #{name} doesn't exist. Currently in strict mode."
+        end
+
         # Set hint fields to use and return +self+. hint may be a single field
         # name, array of field names, or a hash (preferably an OrderedHash).
         # May be +nil+.
@@ -89,31 +100,82 @@ module XGen
           @db.query(self, Query.new(selector, fields, offset, limit, sort, hint, snapshot))
         end
 
+        # Get a single object from the database.
+        #
+        # Raises TypeError if the argument is of an improper type. Returns a
+        # single document (hash), or nil if no result is found.
+        #
+        # :spec_or_object_id :: a hash specifying elements which must be
+        #   present for a document to be included in the result set OR an
+        #   instance of ObjectID to be used as the value for an _id query.
+        #   if nil an empty spec, {}, will be used.
+        # :options :: options, as passed to Collection#find
+        def find_one(spec_or_object_id=nil, options={})
+          spec = case spec_or_object_id
+                 when nil
+                   {}
+                 when ObjectID
+                   {:_id => spec_or_object_id}
+                 when Hash
+                   spec_or_object_id
+                 else
+                   raise TypeError, "spec_or_object_id must be an instance of ObjectID or Hash, or nil"
+                 end
+          find(spec, options.merge(:limit => -1)).next_object
+        end
+
+        # DEPRECATED - use find_one instead
+        #
         # Find the first record that matches +selector+. See #find.
         def find_first(selector={}, options={})
-          h = options.dup
-          h[:limit] = 1
-          cursor = find(selector, h)
-          cursor.next_object    # don't need to explicitly close b/c of limit
+          warn "Collection#find_first is deprecated and will be removed. Please use Collection#find_one instead."
+          find_one(selector, options)
         end
 
-        # Save an updated +object+ to the collection, or insert it if it doesn't exist already.
-        def save(object)
-          if id = object[:_id] || object['_id']
-            repsert({:_id => id}, object)
+        # Save a document in this collection.
+        #
+        # If +to_save+ already has an '_id' then an update (upsert) operation
+        # is performed and any existing document with that _id is overwritten.
+        # Otherwise an insert operation is performed. Returns the _id of the
+        # saved document.
+        #
+        # :to_save :: the document (a hash) to be saved
+        #
+        # Options:
+        # :safe :: if true, check that the save succeeded. OperationFailure
+        #   will be raised on an error. Checking for safety requires an extra
+        #   round-trip to the database
+        def save(to_save, options={})
+          if id = to_save[:_id] || to_save['_id']
+            update({:_id => id}, to_save, :upsert => true, :safe => options.delete(:safe))
             id
           else
-            insert(object)
+            insert(to_save, :safe => options.delete(:safe))
           end
         end
 
-        # Insert +objects+, which are hashes. "<<" is aliased to this method.
-        # Returns either the single inserted object or a new array containing
-        # +objects+. The object(s) may have been modified by the database's PK
-        # factory, if it has one.
-        def insert(*objects)
-          objects = objects.first if objects.size == 1 && objects.first.is_a?(Array)
-          res = @db.insert_into_db(@name, objects)
+        # Insert a document(s) into this collection.
+        #
+        # "<<" is aliased to this method. Returns the _id of the inserted
+        # document or a list of _ids of the inserted documents. The object(s)
+        # may have been modified by the database's PK factory, if it has one.
+        #
+        # :doc_or_docs :: a document (as a hash) or Array of documents to be
+        #   inserted
+        #
+        # Options:
+        # :safe :: if true, check that the insert succeeded. OperationFailure
+        #   will be raised on an error. Checking for safety requires an extra
+        #   round-trip to the database
+        def insert(doc_or_docs, options={})
+          doc_or_docs = [doc_or_docs] if !doc_or_docs.is_a?(Array)
+          res = @db.insert_into_db(@name, doc_or_docs)
+          if options.delete(:safe)
+            error = @db.error
+            if error
+              raise OperationFailure, error
+            end
+          end
           res.size > 1 ? res : res.first
         end
         alias_method :<<, :insert
@@ -128,23 +190,60 @@ module XGen
           remove({})
         end
 
+        # DEPRECATED - use update(... :upsert => true) instead
+        #
         # Update records that match +selector+ by applying +obj+ as an update.
         # If no match, inserts (???).
         def repsert(selector, obj)
-          @db.repsert_in_db(@name, selector, obj)
+          warn "Collection#repsert is deprecated and will be removed. Please use Collection#update instead."
+          update(selector, obj, :upsert => true)
         end
 
+        # DEPRECATED - use update(... :upsert => false) instead
+        #
         # Update records that match +selector+ by applying +obj+ as an update.
         def replace(selector, obj)
-          @db.replace_in_db(@name, selector, obj)
+          warn "Collection#replace is deprecated and will be removed. Please use Collection#update instead."
+          update(selector, obj)
         end
 
+        # DEPRECATED - use update(... :upsert => false) instead
+        #
         # Update records that match +selector+ by applying +obj+ as an update.
         # Both +selector+ and +modifier_obj+ are required.
         def modify(selector, modifier_obj)
-          raise "no object" unless modifier_obj
-          raise "no selector" unless selector
-          @db.modify_in_db(@name, selector, modifier_obj)
+          warn "Collection#modify is deprecated and will be removed. Please use Collection#update instead."
+          update(selector, modifier_obj)
+        end
+
+        # Update a document(s) in this collection.
+        #
+        # :spec :: a hash specifying elements which must be present for
+        #   a document to be updated
+        # :document :: a hash specifying the fields to be changed in the
+        #   selected document(s), or (in the case of an upsert) the document to
+        #   be inserted
+        #
+        # Options:
+        # :upsert :: if true, perform an upsert operation
+        # :safe :: if true, check that the update succeeded. OperationFailure
+        #   will be raised on an error. Checking for safety requires an extra
+        #   round-trip to the database
+        def update(spec, document, options={})
+          upsert = options.delete(:upsert)
+          safe = options.delete(:safe)
+
+          if upsert
+            @db.repsert_in_db(@name, spec, document)
+          else
+            @db.replace_in_db(@name, spec, document)
+          end
+          if safe
+            error = @db.error
+            if error
+              raise OperationFailure, error
+            end
+          end
         end
 
         # Create a new index. +field_or_spec+
@@ -219,7 +318,7 @@ EOS
         # Rename this collection.
         #
         # If operating in auth mode, client must be authorized as an admin to
-        # perform this operation. Raises an error if +new_name+ is an invalid
+        # perform this operation. Raises +InvalidName+ if +new_name+ is an invalid
         # collection name.
         #
         # :new_name :: new name for this collection
@@ -227,19 +326,19 @@ EOS
           case new_name
           when Symbol, String
           else
-            raise RuntimeError, "new_name must be a string or symbol"
+            raise TypeError, "new_name must be a string or symbol"
           end
 
           new_name = new_name.to_s
 
           if new_name.empty? or new_name.include? ".."
-            raise RuntimeError, "collection names cannot be empty"
+            raise InvalidName, "collection names cannot be empty"
           end
           if new_name.include? "$"
-            raise RuntimeError, "collection names must not contain '$'"
+            raise InvalidName, "collection names must not contain '$'"
           end
           if new_name.match(/^\./) or new_name.match(/\.$/)
-            raise RuntimeError, "collection names must not start or end with '.'"
+            raise InvalidName, "collection names must not start or end with '.'"
           end
 
           @db.rename_collection(@name, new_name)

data/lib/mongo/db.rb

@@ -114,7 +114,21 @@ module XGen
         # instance and connect to that one. On socket error or if we recieve a
         # "not master" error, we again find the master of the pair.
         def initialize(db_name, nodes, options={})
-          raise "Invalid DB name \"#{db_name}\" (must be non-nil, non-zero-length, and can not contain \".\")" if !db_name || (db_name && db_name.length > 0 && db_name.include?("."))
+          case db_name
+          when Symbol, String
+          else
+            raise TypeError, "db_name must be a string or symbol"
+          end
+
+          [" ", ".", "$", "/", "\\"].each do |invalid_char|
+            if db_name.include? invalid_char
+              raise InvalidName, "database names cannot contain the character '#{invalid_char}'"
+            end
+          end
+          if db_name.empty?
+            raise InvalidName, "database name cannot be the empty string"
+          end
+
           @name, @nodes = db_name, nodes
           @strict = options[:strict]
           @pk_factory = options[:pk]
@@ -232,6 +246,7 @@ module XGen
           return Collection.new(self, name) if !strict? || collection_names.include?(name)
           raise "Collection #{name} doesn't exist. Currently in strict mode."
         end
+        alias_method :[], :collection
 
         # Drop collection +name+. Returns +true+ on success or if the
         # collection does not exist, +false+ otherwise.
@@ -364,8 +379,11 @@ module XGen
           }
         end
 
-        # Alias for #replace_in_db. Normally called by Collection.modify.
-        alias_method :modify_in_db, :replace_in_db
+        # DEPRECATED - use Collection#update instead
+        def modify_in_db(collection_name, selector, obj)
+          warn "DB#modify_in_db is deprecated and will be removed. Please use Collection#update instead."
+          replace_in_db(collection_name, selector, obj)
+        end
 
         # Update records in +collection_name+ that match +selector+ by
         # applying +obj+ as an update. If no match, inserts (???). Normally
@@ -393,7 +411,7 @@ module XGen
 
         # Dereference a DBRef, getting the document it points to.
         def dereference(dbref)
-          collection(dbref.namespace).find_first("_id" => dbref.object_id)
+          collection(dbref.namespace).find_one("_id" => dbref.object_id)
         end
 
         # Evaluate a JavaScript expression on MongoDB.
@@ -474,8 +492,8 @@ module XGen
         end
 
         # Insert +objects+ into +collection_name+. Normally called by
-        # Collection#insert. Returns a new array containing +objects+,
-        # possibly modified by @pk_factory.
+        # Collection#insert. Returns a new array containing the _ids
+        # of the inserted documents.
         def insert_into_db(collection_name, objects)
           _synchronize {
             if @pk_factory
@@ -484,7 +502,7 @@ module XGen
               }
             else
               objects = objects.collect do |o|
-                o[:_id] || o['_id'] ? o : o.merge(:_id => ObjectID.new)
+                o[:_id] || o['_id'] ? o : o.merge!(:_id => ObjectID.new)
               end
             end
             send_to_db(InsertMessage.new(@name, collection_name, true, *objects))

data/lib/mongo/errors.rb

@@ -0,0 +1,27 @@
+# Copyright 2009 10gen, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Exceptions raised by the MongoDB driver.
+
+module XGen
+  module Mongo
+    module Driver
+      # Raised when a database operation fails.
+      class OperationFailure < RuntimeError; end
+
+      # Raised when an invalid name is used.
+      class InvalidName < RuntimeError; end
+    end
+  end
+end

data/lib/mongo/util/bson.rb

@@ -104,10 +104,10 @@ class BSON
     k = k.to_s
     if check_keys
       if k[0] == ?$
-        raise RuntimeError.new("key #{k} must not start with '$'")
+        raise InvalidName.new("key #{k} must not start with '$'")
       end
       if k.include? ?.
-        raise RuntimeError.new("key #{k} must not contain '.'")
+        raise InvalidName.new("key #{k} must not contain '.'")
       end
     end
     type = bson_type(v)

data/lib/mongo/util/ordered_hash.rb

@@ -32,65 +32,82 @@ class OrderedHash < Hash
 
   # We only need the body of this class if the RUBY_VERSION is before 1.9
   if RUBY_VERSION < '1.9'
+    attr_accessor :ordered_keys
+
+    def self.[] *args
+      oh = OrderedHash.new
+      if Hash === args[0]
+        oh.merge! args[0]
+      elsif (args.size % 2) != 0
+        raise ArgumentError, "odd number of elements for Hash"
+      else
+        0.step(args.size - 1, 2) do |key|
+          value = key + 1
+          oh[args[key]] = args[value]
+        end
+      end
+      oh
+    end
 
-  attr_accessor :ordered_keys
+    def initialize(*a, &b)
+      super
+      @ordered_keys = []
+    end
 
-  def keys
-    @ordered_keys || []
-  end
+    def keys
+      @ordered_keys || []
+    end
 
-  def []=(key, value)
-    @ordered_keys ||= []
-    @ordered_keys << key unless @ordered_keys.include?(key)
-    super(key, value)
-  end
+    def []=(key, value)
+      @ordered_keys ||= []
+      @ordered_keys << key unless @ordered_keys.include?(key)
+      super(key, value)
+    end
 
-  def each
-    @ordered_keys ||= []
-    @ordered_keys.each { |k| yield k, self[k] }
-  end
+    def each
+      @ordered_keys ||= []
+      @ordered_keys.each { |k| yield k, self[k] }
+    end
 
-  def values
-    collect { |k, v| v }
-  end
+    def values
+      collect { |k, v| v }
+    end
 
-  def merge(other)
-    oh = self.dup
-    oh.merge!(other)
-    oh
-  end
+    def merge(other)
+      oh = self.dup
+      oh.merge!(other)
+      oh
+    end
 
-  def merge!(other)
-    @ordered_keys ||= []
-    @ordered_keys += other.keys # unordered if not an OrderedHash
-    @ordered_keys.uniq!
-    super(other)
-  end
+    def merge!(other)
+      @ordered_keys ||= []
+      @ordered_keys += other.keys # unordered if not an OrderedHash
+      @ordered_keys.uniq!
+      super(other)
+    end
 
-  def inspect
-    str = '{'
-    str << (@ordered_keys || []).collect { |k| "\"#{k}\"=>#{self.[](k).inspect}" }.join(", ")
-    str << '}'
-  end
+    def inspect
+      str = '{'
+      str << (@ordered_keys || []).collect { |k| "\"#{k}\"=>#{self.[](k).inspect}" }.join(", ")
+      str << '}'
+    end
 
-  def delete(key, &block)
-    @ordered_keys.delete(key) if @ordered_keys
-    super
-  end
+    def delete(key, &block)
+      @ordered_keys.delete(key) if @ordered_keys
+      super
+    end
 
-  def delete_if(&block)
-    self.each { |k,v|
-      if yield k, v
-        delete(k)
-      end
-    }
-  end
+    def delete_if(&block)
+      self.each { |k,v|
+        if yield k, v
+          delete(k)
+        end
+      }
+    end
 
-  def clear
-    super
-    @ordered_keys = []
+    def clear
+      super
+      @ordered_keys = []
+    end
   end
-
-  end                           # Ruby before 1.9
-
 end

data/mongo-ruby-driver.gemspec

@@ -24,6 +24,7 @@ PACKAGE_FILES = ['README.rdoc', 'Rakefile', 'mongo-ruby-driver.gemspec',
                  'lib/mongo/gridfs/chunk.rb',
                  'lib/mongo/gridfs/grid_store.rb',
                  'lib/mongo/gridfs.rb',
+                 'lib/mongo/errors.rb',
                  'lib/mongo/message/get_more_message.rb',
                  'lib/mongo/message/insert_message.rb',
                  'lib/mongo/message/kill_cursors_message.rb',
@@ -66,6 +67,7 @@ TEST_FILES = ['tests/mongo-qa/_common.rb',
               'tests/test_bson.rb',
               'tests/test_byte_buffer.rb',
               'tests/test_chunk.rb',
+              'tests/test_collection.rb',
               'tests/test_cursor.rb',
               'tests/test_db.rb',
               'tests/test_db_api.rb',
@@ -80,7 +82,7 @@ TEST_FILES = ['tests/mongo-qa/_common.rb',
 
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.11.1'
+  s.version = '0.12'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Ruby driver for the 10gen Mongo DB'
   s.description = 'A Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.'

data/tests/mongo-qa/stress1

@@ -22,7 +22,7 @@ n1.times { |i|
 puts
 
 n2.times { |i|
-  x = c.find_first({:id => i})
+  x = c.find_one({:id => i})
   x['subarray'] = "foo#{i}"
   p x
   c.modify({:id => i}, x)

data/tests/test_collection.rb

@@ -0,0 +1,143 @@
+# --
+# Copyright (C) 2008-2009 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+
+$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'mongo'
+require 'test/unit'
+
+# NOTE: assumes Mongo is running
+class TestCollection < Test::Unit::TestCase
+  include XGen::Mongo
+  include XGen::Mongo::Driver
+
+  @@db = Mongo.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+                   ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT).db('ruby-mongo-test')
+  @@test = @@db.collection("test")
+
+  def setup
+    @@test.drop()
+  end
+
+  def test_collection
+    assert_raise InvalidName do
+      @@db["te$t"]
+    end
+
+    assert_kind_of Collection, @@db["test"]
+    assert_equal @@db["test"].name(), @@db.collection("test").name()
+    assert_equal @@db["test"].name(), @@db[:test].name()
+
+    assert_kind_of Collection, @@db["test"]["foo"]
+    assert_equal @@db["test"]["foo"].name(), @@db.collection("test.foo").name()
+    assert_equal @@db["test"]["foo"].name(), @@db["test.foo"].name()
+  end
+
+  def test_safe_insert
+    a = {"hello" => "world"}
+    @@test.insert(a)
+    @@test.insert(a)
+    assert @@db.error.include? "E11000"
+
+    assert_raise OperationFailure do
+      @@test.insert(a, :safe => true)
+    end
+  end
+
+  def test_update
+    id1 = @@test.save("x" => 5)
+    @@test.update({}, {"$inc" => {"x" => 1}})
+    assert_equal 1, @@test.count()
+    assert_equal 6, @@test.find_one(:_id => id1)["x"]
+
+    id2 = @@test.save("x" => 1)
+    @@test.update({"x" => 6}, {"$inc" => {"x" => 1}})
+    assert_equal 7, @@test.find_one(:_id => id1)["x"]
+    assert_equal 1, @@test.find_one(:_id => id2)["x"]
+  end
+
+  def test_upsert
+    @@test.update({"page" => "/"}, {"$inc" => {"count" => 1}}, :upsert => true)
+    @@test.update({"page" => "/"}, {"$inc" => {"count" => 1}}, :upsert => true)
+
+    assert_equal 1, @@test.count()
+    assert_equal 2, @@test.find_one()["count"]
+  end
+
+  def test_safe_update
+    @@test.create_index("x")
+    @@test.insert("x" => 5)
+
+    @@test.update({}, {"$inc" => {"x" => 1}})
+    assert @@db.error?
+
+    assert_raise OperationFailure do
+      @@test.update({}, {"$inc" => {"x" => 1}}, :safe => true)
+    end
+  end
+
+  def test_safe_save
+    @@test.create_index("hello", true)
+
+    @@test.save("hello" => "world")
+    @@test.save("hello" => "world")
+    assert @@db.error.include? "E11000"
+
+    assert_raise OperationFailure do
+      @@test.save({"hello" => "world"}, :safe => true)
+    end
+  end
+
+  def test_find_one
+    id = @@test.save("hello" => "world", "foo" => "bar")
+
+    assert_equal "world", @@test.find_one()["hello"]
+    assert_equal @@test.find_one(id), @@test.find_one()
+    assert_equal @@test.find_one(nil), @@test.find_one()
+    assert_equal @@test.find_one({}), @@test.find_one()
+    assert_equal @@test.find_one("hello" => "world"), @@test.find_one()
+    assert_equal @@test.find_one(OrderedHash["hello", "world"]), @@test.find_one()
+
+    assert @@test.find_one(nil, :fields => ["hello"]).include?("hello")
+    assert !@@test.find_one(nil, :fields => ["foo"]).include?("hello")
+
+    assert_equal nil, @@test.find_one("hello" => "foo")
+    assert_equal nil, @@test.find_one(OrderedHash["hello", "foo"])
+    assert_equal nil, @@test.find_one(ObjectID.new)
+
+    assert_raise TypeError do
+      @@test.find_one(6)
+    end
+  end
+
+  def test_insert_adds_id
+    doc = {"hello" => "world"}
+    @@test.insert(doc)
+    assert doc.include? :_id
+
+    docs = [{"hello" => "world"}, {"hello" => "world"}]
+    @@test.insert(docs)
+    docs.each do |doc|
+      assert doc.include? :_id
+    end
+  end
+
+  def test_save_adds_id
+    doc = {"hello" => "world"}
+    @@test.save(doc)
+    assert doc.include? :_id
+  end
+end
+

data/tests/test_db.rb

@@ -80,7 +80,7 @@ class DBTest < Test::Unit::TestCase
 
     insert_id = coll.insert('name' => 'Fred', 'age' => 42)
     # new id gets added to returned object
-    row = coll.find_first({'name' => 'Fred'}, :limit => 1)
+    row = coll.find_one({'name' => 'Fred'})
     oid = row['_id']
     assert_not_nil oid
     assert_equal insert_id, oid
@@ -88,7 +88,7 @@ class DBTest < Test::Unit::TestCase
     oid = XGen::Mongo::Driver::ObjectID.new
     data = {'_id' => oid, 'name' => 'Barney', 'age' => 41}
     coll.insert(data)
-    row = coll.find_first({'name' => data['name']}, :limit => 1)
+    row = coll.find_one({'name' => data['name']})
     db_oid = row['_id']
     assert_equal oid, db_oid
     assert_equal data, row
@@ -152,7 +152,7 @@ class DBTest < Test::Unit::TestCase
     assert_equal 1, prev_error['nPrev']
     assert_equal prev_error["err"], @@db.error
 
-    @@db.collection('test').find_first
+    @@db.collection('test').find_one
     assert_nil @@db.error
     assert !@@db.error?
     assert @@db.previous_error

data/tests/test_db_api.rb

@@ -52,11 +52,15 @@ class DBAPITest < Test::Unit::TestCase
     oh['b'] = 'foo'
 
     oid = @@coll.save(oh)
-    assert_equal 'foo', @@coll.find_first(:_id => oid)['b']
+    assert_equal 'foo', @@coll.find_one(oid)['b']
+
+    oh = OrderedHash['a' => 1, 'b' => 'foo']
+    oid = @@coll.save(oh)
+    assert_equal 'foo', @@coll.find_one(oid)['b']
   end
 
   def test_insert_multiple
-    ids = @@coll.insert({'a' => 2}, {'b' => 3})
+    ids = @@coll.insert([{'a' => 2}, {'b' => 3}])
 
     ids.each do |i|
       assert_kind_of ObjectID, i
@@ -242,9 +246,9 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal 1, x['a']
   end
 
-  def test_find_first_no_records
+  def test_find_one_no_records
     @@coll.clear
-    x = @@coll.find_first('a' => 1)
+    x = @@coll.find_one('a' => 1)
     assert_nil x
   end
 
@@ -469,28 +473,28 @@ class DBAPITest < Test::Unit::TestCase
 
   def test_replace
     assert_equal @@coll.count, 1
-    assert_equal @@coll.find_first["a"], 1
+    assert_equal @@coll.find_one["a"], 1
 
     @@coll.replace({"a" => 1}, {"a" => 2})
     assert_equal @@coll.count, 1
-    assert_equal @@coll.find_first["a"], 2
+    assert_equal @@coll.find_one["a"], 2
 
     @@coll.replace({"b" => 1}, {"a" => 3})
     assert_equal @@coll.count, 1
-    assert_equal @@coll.find_first["a"], 2
+    assert_equal @@coll.find_one["a"], 2
   end
 
   def test_repsert
     assert_equal @@coll.count, 1
-    assert_equal @@coll.find_first["a"], 1
+    assert_equal @@coll.find_one["a"], 1
 
     @@coll.repsert({"a" => 1}, {"a" => 2})
     assert_equal @@coll.count, 1
-    assert_equal @@coll.find_first["a"], 2
+    assert_equal @@coll.find_one["a"], 2
 
     @@coll.repsert({"b" => 1}, {"a" => 3})
     assert_equal @@coll.count, 2
-    assert @@coll.find_first({"a" => 3})
+    assert @@coll.find_one({"a" => 3})
   end
 
   def test_to_a
@@ -540,7 +544,7 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal 3, @@db.eval('function (x) {return x;}', 3)
 
     assert_equal nil, @@db.eval("function (x) {db.test_eval.save({y:x});}", 5)
-    assert_equal 5, @@db.collection('test_eval').find_first['y']
+    assert_equal 5, @@db.collection('test_eval').find_one['y']
 
     assert_equal 5, @@db.eval("function (x, y) {return x + y;}", 2, 3)
     assert_equal 5, @@db.eval("function () {return 5;}")
@@ -587,7 +591,7 @@ class DBAPITest < Test::Unit::TestCase
     val = Hash.new(0)
     val["x"] = 5
     @@coll.insert val
-    id = @@coll.find_first("x" => 5)["_id"]
+    id = @@coll.find_one("x" => 5)["_id"]
     assert id != 0
   end
 
@@ -610,7 +614,7 @@ class DBAPITest < Test::Unit::TestCase
 
     assert_equal nil, @@db.dereference(DBRef.new("test", ObjectID.new))
     @@coll.insert({"x" => "hello"})
-    key = @@coll.find_first()["_id"]
+    key = @@coll.find_one()["_id"]
     assert_equal "hello", @@db.dereference(DBRef.new("test", key))["x"]
 
     assert_equal nil, @@db.dereference(DBRef.new("test", 4))
@@ -632,26 +636,25 @@ class DBAPITest < Test::Unit::TestCase
     assert_kind_of ObjectID, id
     assert_equal 1, @@coll.count
 
-    assert_equal id, @@coll.save(@@coll.find_first)
+    assert_equal id, @@coll.save(a)
     assert_equal 1, @@coll.count
 
-    assert_equal "world", @@coll.find_first()["hello"]
+    assert_equal "world", @@coll.find_one()["hello"]
 
-    doc = @@coll.find_first
-    doc["hello"] = "mike"
-    @@coll.save(doc)
+    a["hello"] = "mike"
+    @@coll.save(a)
     assert_equal 1, @@coll.count
 
-    assert_equal "mike", @@coll.find_first()["hello"]
+    assert_equal "mike", @@coll.find_one()["hello"]
 
-    @@coll.save(a)
+    @@coll.save({"hello" => "world"})
     assert_equal 2, @@coll.count
   end
 
   def test_save_long
     @@coll.clear
     @@coll.insert("x" => 9223372036854775807)
-    assert_equal 9223372036854775807, @@coll.find_first()["x"]
+    assert_equal 9223372036854775807, @@coll.find_one()["x"]
   end
 
   def test_find_by_oid
@@ -661,13 +664,13 @@ class DBAPITest < Test::Unit::TestCase
     id = @@coll.save("hello" => "world")
     assert_kind_of ObjectID, id
 
-    assert_equal "world", @@coll.find_first(:_id => id)["hello"]
+    assert_equal "world", @@coll.find_one(:_id => id)["hello"]
     @@coll.find(:_id => id).to_a.each do |doc|
       assert_equal "world", doc["hello"]
     end
 
     id = ObjectID.from_string(id.to_s)
-    assert_equal "world", @@coll.find_first(:_id => id)["hello"]
+    assert_equal "world", @@coll.find_one(:_id => id)["hello"]
   end
 
   def test_save_with_object_that_has_id_but_does_not_actually_exist_in_collection
@@ -676,12 +679,12 @@ class DBAPITest < Test::Unit::TestCase
     a = {'_id' => '1', 'hello' => 'world'}
     @@coll.save(a)
     assert_equal(1, @@coll.count)
-    assert_equal("world", @@coll.find_first()["hello"])
+    assert_equal("world", @@coll.find_one()["hello"])
 
     a["hello"] = "mike"
     @@coll.save(a)
     assert_equal(1, @@coll.count)
-    assert_equal("mike", @@coll.find_first()["hello"])
+    assert_equal("mike", @@coll.find_one()["hello"])
   end
 
   def test_invalid_key_names
@@ -690,32 +693,32 @@ class DBAPITest < Test::Unit::TestCase
     @@coll.insert({"hello" => "world"})
     @@coll.insert({"hello" => {"hello" => "world"}})
 
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       @@coll.insert({"$hello" => "world"})
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       @@coll.insert({"hello" => {"$hello" => "world"}})
     end
 
     @@coll.insert({"he$llo" => "world"})
     @@coll.insert({"hello" => {"hell$o" => "world"}})
 
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       @@coll.insert({".hello" => "world"})
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       @@coll.insert({"hello" => {".hello" => "world"}})
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       @@coll.insert({"hello." => "world"})
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       @@coll.insert({"hello" => {"hello." => "world"}})
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       @@coll.insert({"hel.lo" => "world"})
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       @@coll.insert({"hello" => {"hel.lo" => "world"}})
     end
 
@@ -723,22 +726,22 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_collection_names
-    assert_raise RuntimeError do
+    assert_raise TypeError do
       @@db.collection(5)
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       @@db.collection("")
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       @@db.collection("te$t")
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       @@db.collection(".test")
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       @@db.collection("test.")
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       @@db.collection("tes..t")
     end
   end
@@ -749,22 +752,22 @@ class DBAPITest < Test::Unit::TestCase
     a = @@db.collection("foo")
     b = @@db.collection("bar")
 
-    assert_raise RuntimeError do
+    assert_raise TypeError do
       a.rename(5)
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       a.rename("")
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       a.rename("te$t")
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       a.rename(".test")
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       a.rename("test.")
     end
-    assert_raise RuntimeError do
+    assert_raise InvalidName do
       a.rename("tes..t")
     end
 

data/tests/test_mongo.rb

@@ -17,6 +17,17 @@ class MongoTest < Test::Unit::TestCase
     @mongo.db('ruby-mongo-test').error
   end
 
+  def test_invalid_database_names
+    assert_raise TypeError do @mongo.db(4) end
+
+    assert_raise InvalidName do @mongo.db('') end
+    assert_raise InvalidName do @mongo.db('te$t') end
+    assert_raise InvalidName do @mongo.db('te.t') end
+    assert_raise InvalidName do @mongo.db('te\\t') end
+    assert_raise InvalidName do @mongo.db('te/t') end
+    assert_raise InvalidName do @mongo.db('te st') end
+  end
+
   def test_database_info
     @mongo.drop_database('ruby-mongo-info-test')
     @mongo.db('ruby-mongo-info-test').collection('info-test').insert('a' => 1)

data/tests/test_ordered_hash.rb

@@ -12,6 +12,15 @@ class OrderedHashTest < Test::Unit::TestCase
     @ordered_keys = %w(c a z)
   end
 
+  def test_initialize
+    a = OrderedHash.new
+    a['x'] = 1
+    a['y'] = 2
+
+    b = OrderedHash['x' => 1, 'y' => 2]
+    assert_equal a, b
+  end
+
   def test_empty
     assert_equal [], OrderedHash.new.keys
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.11.1
+  version: "0.12"
 platform: ruby
 authors: 
 - Jim Menard
@@ -49,6 +49,7 @@ files:
 - lib/mongo/gridfs/chunk.rb
 - lib/mongo/gridfs/grid_store.rb
 - lib/mongo/gridfs.rb
+- lib/mongo/errors.rb
 - lib/mongo/message/get_more_message.rb
 - lib/mongo/message/insert_message.rb
 - lib/mongo/message/kill_cursors_message.rb
@@ -121,6 +122,7 @@ test_files:
 - tests/test_bson.rb
 - tests/test_byte_buffer.rb
 - tests/test_chunk.rb
+- tests/test_collection.rb
 - tests/test_cursor.rb
 - tests/test_db.rb
 - tests/test_db_api.rb