From baa1d0b8029fe8417a23ea4150f2700c2ebcf5a8 Mon Sep 17 00:00:00 2001
From: Mauro Pompilio <hackers.are.rockstars@gmail.com>
Date: Mon, 28 Mar 2011 04:37:48 +0100
Subject: [PATCH] Method *create_colletion* behaves the same way as
 *collection* when options are passed.

---
 lib/mongo/db.rb     |  6 +++---
 test/db_api_test.rb | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/mongo/db.rb b/lib/mongo/db.rb
index c43fb4c..93d6172 100644
--- a/lib/mongo/db.rb
+++ b/lib/mongo/db.rb
@@ -69,7 +69,7 @@ module Mongo
     #   the factory should not inject a new key).
     #
     # @option opts [Boolean, Hash] :safe (false) Set the default safe-mode options
-    #   propogated to Collection objects instantiated off of this DB. If no
+    #   propagated to Collection objects instantiated off of this DB. If no
     #   value is provided, the default value set on this instance's Connection object will be used. This
     #   default can be overridden upon instantiation of any collection by explicity setting a :safe value
     #   on initialization
@@ -272,7 +272,7 @@ module Mongo
         if strict?
           raise MongoDBError, "Collection #{name} already exists. Currently in strict mode."
         else
-          return Collection.new(name, self)
+          return Collection.new(name, self, opts)
         end
       end
 
@@ -287,7 +287,7 @@ module Mongo
     # Get a collection by name.
     #
     # @param [String] name the collection name.
-    # @param [Hash] opts any valid options that can me passed to Collection#new.
+    # @param [Hash] opts any valid options that can be passed to Collection#new.
     #
     # @raise [MongoDBError] if collection does not already exist and we're in +strict+ mode.
     #
diff --git a/test/db_api_test.rb b/test/db_api_test.rb
index 323f04f..1bb5b9c 100644
--- a/test/db_api_test.rb
+++ b/test/db_api_test.rb
@@ -270,6 +270,17 @@ class DBAPITest < Test::Unit::TestCase
     end
   end
 
+  def test_collection_options_are_passed_to_the_existing_ones
+    @@db.drop_collection('foobar')
+
+    @@db.create_collection('foobar')
+
+    opts = {:safe => true}
+    coll = @@db.create_collection('foobar', opts)
+    assert_equal true, coll.safe
+  end
+
+
   def test_index_information
     assert_equal @@coll.index_information.length, 1