Merge branch 'master' of github.com:jnunemaker/mongomapper

* 'master' of github.com:jnunemaker/mongomapper:
  rename `connection_options` to `options` and create a test
  use mongodb connection options from yaml config file

lib/mongo_mapper/connection.rb

@@ -62,6 +62,10 @@ def connect(environment, options={})
       raise 'Set config before connecting. MongoMapper.config = {...}' if config.blank?
       env = config_for_environment(environment)
 
+      if env['options'].is_a? Hash
+        options = env['options'].symbolize_keys.merge(options)
+      end
+
       MongoMapper.connection = if env['hosts']
         Mongo::ReplSetConnection.new( *env['hosts'].push(options) )
       else

test/unit/test_mongo_mapper.rb

@@ -65,6 +65,15 @@ class MongoMapperTest < Test::Unit::TestCase
       MongoMapper.connect('development', :logger => logger)
     end
 
+    should "work with options from config" do
+      MongoMapper.config = {
+        'development' => {'host' => '192.168.1.1', 'port' => 2222, 'database' => 'test', 'options' => {'safe' => true}}
+      }
+      connection, logger = mock('connection'), mock('logger')
+      Mongo::Connection.expects(:new).with('192.168.1.1', 2222, :logger => logger, :safe => true)
+      MongoMapper.connect('development', :logger => logger)
+    end
+
     should "work with options using uri" do
       MongoMapper.config = {
         'development' => {'uri' => 'mongodb://127.0.0.1:27017/test'}