github-migration
/
mongo-ruby-driver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83 from TylerBrock/361-uri-parser 

RUBY-361 Clean up MongoDB URI parser.
This commit is contained in:
Kyle Banker 2012-01-19 08:53:10 -08:00
parent ebd31d0cd0 6f80a48fce
commit 881c73ac82
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/mongo/util/uri_parser.rb
View File

@ -20,8 +20,20 @@ module Mongo
class URIParser class URIParser
DEFAULT_PORT = 27017 DEFAULT_PORT = 27017
MONGODB_URI_MATCHER = /(([-.\w:]+):([^@,]+)@)?((?:(?:[-.\w]+)(?::(?:[\w]+))?,?)+)(\/([-\w]+))?/
USER_REGEX = /(?<username>[-.\w:]+)/
PASS_REGEX = /(?<password>[^@,]+)/
AUTH_REGEX = /(?<auth>#{USER_REGEX}:#{PASS_REGEX}@)?/
HOST_REGEX = /(?<host>[-.\w]+)/
PORT_REGEX = /(?::(?<port>\w+))?/
NODE_REGEX = /(?<nodes>(#{HOST_REGEX}#{PORT_REGEX},?)+)/
PATH_REGEX = /(?:\/(?<path>[-\w]+))?/
MONGODB_URI_MATCHER = /#{AUTH_REGEX}#{NODE_REGEX}#{PATH_REGEX}/
MONGODB_URI_SPEC = "mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/database]" MONGODB_URI_SPEC = "mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/database]"
SPEC_ATTRS = [:nodes, :auths] SPEC_ATTRS = [:nodes, :auths]
OPT_ATTRS = [:connect, :replicaset, :slaveok, :safe, :w, :wtimeout, :fsync] OPT_ATTRS = [:connect, :replicaset, :slaveok, :safe, :w, :wtimeout, :fsync]
@ -118,10 +130,10 @@ module Mongo
raise MongoArgumentError, "MongoDB URI must match this spec: #{MONGODB_URI_SPEC}" raise MongoArgumentError, "MongoDB URI must match this spec: #{MONGODB_URI_SPEC}"
end end
uname = matches[2] uname = matches['username']
pwd = matches[3] pwd = matches['password']
hosturis = matches[4].split(',') hosturis = matches['nodes'].split(',')
db = matches[6] db = matches['path']
hosturis.each do |hosturi| hosturis.each do |hosturi|
# If port is present, use it, otherwise use default port # If port is present, use it, otherwise use default port