RUBY-658 fixing issue with default db from connection uri

Author: Brandon Black

lib/mongo/mongo_client.rb

@@ -30,7 +30,7 @@ class MongoClient
     DEFAULT_HOST         = 'localhost'
     DEFAULT_PORT         = 27017
     DEFAULT_DB_NAME      = 'test'
-    GENERIC_OPTS         = [:auths, :logger, :connect]
+    GENERIC_OPTS         = [:auths, :logger, :connect, :default_db]
     TIMEOUT_OPTS         = [:timeout, :op_timeout, :connect_timeout]
     SSL_OPTS             = [:ssl, :ssl_key, :ssl_cert, :ssl_verify, :ssl_ca_cert]
     POOL_OPTS            = [:pool_size, :pool_timeout]
@@ -199,7 +199,7 @@ def self.multi(nodes, opts={})
     #
     # @return [Mongo::MongoClient, Mongo::MongoReplicaSetClient]
     def self.from_uri(uri = ENV['MONGODB_URI'], extra_opts={})
-      parser = URIParser.new uri
+      parser = URIParser.new(uri)
       parser.connection(extra_opts)
     end
 
@@ -210,7 +210,7 @@ def parse_init(host, port, opts)
           raise MongoArgumentError,
             "ENV['MONGODB_URI'] implies a replica set."
         end
-        opts.merge! parser.connection_options
+        opts.merge!(parser.connection_options)
         [parser.host, parser.port]
       else
         [host || DEFAULT_HOST, port || DEFAULT_PORT]
@@ -358,13 +358,7 @@ def database_names
     # @return [Mongo::DB]
     #
     # @core databases db-instance_method
-    def db(db_name=nil, opts={})
-      if !db_name && uri = ENV['MONGODB_URI']
-        db_name = uri[%r{/([^/\?]+)(\?|$)}, 1]
-      end
-
-      db_name ||= DEFAULT_DB_NAME
-
+    def db(db_name = @default_db, opts = {})
       DB.new(db_name, self, opts)
     end
 
@@ -689,6 +683,7 @@ def setup(opts)
       end
       Mongo::ReadPreference::validate(@read)
 
+      @default_db = opts.delete(:default_db) || DEFAULT_DB_NAME
       @tag_sets = opts.delete(:tag_sets) || []
       @acceptable_latency = opts.delete(:secondary_acceptable_latency_ms) || 15
 

lib/mongo/util/uri_parser.rb

@@ -109,7 +109,7 @@ class URIParser
       :w                => lambda { |arg| Mongo::Support.is_i?(arg) ? arg.to_i : arg.to_sym },
       :wtimeout         => lambda { |arg| arg.to_i },
       :wtimeoutms       => lambda { |arg| arg.to_i }
-     }
+    }
 
     attr_reader :auths,
                 :connect,
@@ -254,6 +254,7 @@ def connection_options
         opts[:name] = replicaset
       end
 
+      opts[:default_db] = @db
       opts[:connect] = connect?
 
       opts
@@ -278,7 +279,7 @@ def parse_hosts(uri_without_proto)
       uname    = matches[2]
       pwd      = matches[3]
       hosturis = matches[4].split(',')
-      db       = matches[8]
+      @db      = matches[8]
 
       hosturis.each do |hosturi|
         # If port is present, use it, otherwise use default port
@@ -296,14 +297,16 @@ def parse_hosts(uri_without_proto)
         raise MongoArgumentError, "No nodes specified. Please ensure that you've provided at least one node."
       end
 
-      if uname && pwd && db
-        uname = URI.unescape(uname)
-        pwd = URI.unescape(pwd)
-
-        auths << {:db_name => db, :username => uname, :password => pwd}
+      if uname && pwd && @db
+        auths << {
+          :db_name  => @db,
+          :username => URI.unescape(uname),
+          :password => URI.unescape(pwd)
+        }
       elsif uname || pwd
-        raise MongoArgumentError, "MongoDB URI must include username, password, "
-          "and db if username and password are specified."
+        raise MongoArgumentError, 'MongoDB URI must include username, ' +
+                                  'password, and db if username and ' +
+                                  'password are specified.'
       end
     end
 

test/functional/connection_test.rb

@@ -122,12 +122,24 @@ def test_db_from_uri_exists_no_db_name
       ENV['MONGODB_URI'] = "mongodb://#{host_port}/"
       con = MongoClient.from_uri
       db = con.db
-      assert_equal db.name, Mongo::MongoClient::DEFAULT_DB_NAME
+      assert_equal db.name, MongoClient::DEFAULT_DB_NAME
     ensure
       ENV['MONGODB_URI'] = old_mongodb_uri
     end
   end
 
+  def test_db_from_uri_from_string_param
+    db_name = "_database"
+    db = MongoClient.from_uri("mongodb://#{host_port}/#{db_name}").db
+    assert_equal db.name, db_name
+  end
+
+  def test_db_from_uri_from_string_param_no_db_name
+    db = MongoClient.from_uri("mongodb://#{host_port}").db
+    assert_equal db.name, MongoClient::DEFAULT_DB_NAME
+  end
+
+
   def test_server_version
     assert_match(/\d\.\d+(\.\d+)?/, @client.server_version.to_s)
   end