Merge pull request mongomapper#391 from dgraham/fix_setup_with_symbols

Make MongoMapper.setup work with symbol environment parameter.
sabdullah-zz · Feb 15, 2012 · c2614d7 · c2614d7
2 parents 6ca8580 + 1f9c3a6
commit c2614d7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/mongo_mapper/connection.rb b/lib/mongo_mapper/connection.rb
@@ -44,7 +44,7 @@ def config
 
     # @api private
     def config_for_environment(environment)
-      env = config[environment] || {}
+      env = config[environment.to_s] || {}
       return env if env['uri'].blank?
 
       uri = URI.parse(env['uri'])

diff --git a/test/unit/test_mongo_mapper.rb b/test/unit/test_mongo_mapper.rb
@@ -56,6 +56,16 @@ class MongoMapperTest < Test::Unit::TestCase
       MongoMapper.connect('development')
     end
 
+    should "work with sinatra environment symbol" do
+      MongoMapper.config = {
+        'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
+      }
+      Mongo::Connection.expects(:new).with('127.0.0.1', 27017, {})
+      MongoMapper.expects(:database=).with('test')
+      Mongo::DB.any_instance.expects(:authenticate).never
+      MongoMapper.connect(:development)
+    end
+
     should "work with options" do
       MongoMapper.config = {
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}