From 5647b2cd881bc45e531a71d51c1b9f9bbee9ce7f Mon Sep 17 00:00:00 2001 From: marcandre Date: Wed, 21 Jul 2010 04:38:40 +0000 Subject: * lib/uri/common.rb: Have URI#route_to, URI#route_from accept string-like arguments [ruby-core:30961] * lib/uri/generic.rb: ditto for URI.join, URI#merge git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28699 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/uri/common.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'lib/uri/common.rb') diff --git a/lib/uri/common.rb b/lib/uri/common.rb index a41cd678d9..1240e6749c 100644 --- a/lib/uri/common.rb +++ b/lib/uri/common.rb @@ -185,13 +185,7 @@ module URI end def join(*uris) - if uris[0].is_a?(URI::Generic) - elsif uri = String.try_convert(uris[0]) - uris[0] = self.parse(uri) - else - raise ArgumentError, - "bad argument(expected URI object or URI string)" - end + uris[0] = URI(uris[0], self) uris.inject :merge end @@ -844,11 +838,11 @@ module Kernel # # Returns +uri+ converted to a URI object. # - def URI(uri) + def URI(uri, parser = URI::DEFAULT_PARSER) if uri.is_a?(URI::Generic) uri elsif uri = String.try_convert(uri) - URI.parse(uri) + parser.parse(uri) else raise ArgumentError, "bad argument (expected URI object or URI string)" -- cgit v1.2.3