diff options
Diffstat (limited to 'lib/uri')
| -rw-r--r-- | lib/uri/common.rb | 12 | ||||
| -rw-r--r-- | lib/uri/generic.rb | 31 |
2 files changed, 7 insertions, 36 deletions
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)" diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb index 4fdfd140fe..f20b2d26e1 100644 --- a/lib/uri/generic.rb +++ b/lib/uri/generic.rb @@ -1,3 +1,4 @@ + # # = uri/generic.rb # @@ -783,14 +784,7 @@ module URI # return base and rel. # you can modify `base', but can not `rel'. def merge0(oth) - case oth - when Generic - when String - oth = parser.parse(oth) - else - raise ArgumentError, - "bad argument(expected URI object or URI string)" - end + oth = URI(oth, parser) if self.relative? && oth.relative? raise BadURIError, @@ -854,15 +848,7 @@ module URI private :route_from_path def route_from0(oth) - case oth - when Generic - when String - oth = parser.parse(oth) - else - raise ArgumentError, - "bad argument(expected URI object or URI string)" - end - + oth = URI(oth, parser) if self.relative? raise BadURIError, "relative URI: #{self}" @@ -966,16 +952,7 @@ module URI # #=> #<URI::Generic:0x2020c2f6 URL:/main.rbx?page=1> # def route_to(oth) - case oth - when Generic - when String - oth = parser.parse(oth) - else - raise ArgumentError, - "bad argument(expected URI object or URI string)" - end - - oth.route_from(self) + URI(oth, parser).route_from(self) end # |