diff options
Diffstat (limited to 'lib/uri/http.rb')
| -rw-r--r-- | lib/uri/http.rb | 93 |
1 files changed, 59 insertions, 34 deletions
diff --git a/lib/uri/http.rb b/lib/uri/http.rb index d4373e73e5..3c41cd4e93 100644 --- a/lib/uri/http.rb +++ b/lib/uri/http.rb @@ -3,12 +3,11 @@ # # Author:: Akira Yamada <akira@ruby-lang.org> # License:: You can redistribute it and/or modify it under the same term as Ruby. -# Revision:: $Id$ # # See URI for general documentation # -require 'uri/generic' +require_relative 'generic' module URI @@ -21,10 +20,10 @@ module URI # update. See <URL:http://support.microsoft.com/kb/834489>. # class HTTP < Generic - # A Default port of 80 for URI::HTTP + # A Default port of 80 for URI::HTTP. DEFAULT_PORT = 80 - # An Array of the available components for URI::HTTP + # An Array of the available components for URI::HTTP. COMPONENT = %i[ scheme userinfo host port @@ -36,22 +35,22 @@ module URI # # == Description # - # Create a new URI::HTTP object from components, with syntax checking. + # Creates a new URI::HTTP object from components, with syntax checking. # - # The components accepted are userinfo, host, port, path, query and + # The components accepted are userinfo, host, port, path, query, and # fragment. # # The components should be provided either as an Array, or as a Hash # with keys formed by preceding the component names with a colon. # - # If an Array is used, the components must be passed in the order - # [userinfo, host, port, path, query, fragment]. + # If an Array is used, the components must be passed in the + # order <code>[userinfo, host, port, path, query, fragment]</code>. # # Example: # - # newuri = URI::HTTP.build(host: 'www.example.com', path: '/foo/bar') + # uri = URI::HTTP.build(host: 'www.example.com', path: '/foo/bar') # - # newuri = URI::HTTP.build([nil, "www.example.com", nil, "/path", + # uri = URI::HTTP.build([nil, "www.example.com", nil, "/path", # "query", 'fragment']) # # Currently, if passed userinfo components this method generates @@ -62,51 +61,77 @@ module URI super(tmp) end -=begin + # Do not allow empty host names, as they are not allowed by RFC 3986. + def check_host(v) + ret = super + + if ret && v.empty? + raise InvalidComponentError, + "bad component(expected host component): #{v}" + end + + ret + end + # # == Description # - # Create a new URI::HTTP object from generic URI components as per - # RFC 2396. No HTTP-specific syntax checking (as per RFC 1738) is - # performed. + # Returns the full path for an HTTP request, as required by Net::HTTP::Get. # - # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+, - # +opaque+, +query+ and +fragment+, in that order. + # If the URI contains a query, the full path is URI#path + '?' + URI#query. + # Otherwise, the path is simply URI#path. # # Example: # - # uri = URI::HTTP.new("http", nil, "www.example.com", nil, nil, - # "/path", nil, "query", "fragment") + # uri = URI::HTTP.build(path: '/foo/bar', query: 'test=true') + # uri.request_uri # => "/foo/bar?test=true" # + def request_uri + return unless @path + + url = @query ? "#@path?#@query" : @path.dup + url.start_with?(?/.freeze) ? url : ?/ + url + end + # - # See also URI::Generic.new + # == Description # - def initialize(*arg) - super(*arg) + # Returns the authority for an HTTP uri, as defined in + # https://www.rfc-editor.org/rfc/rfc3986#section-3.2. + # + # + # Example: + # + # URI::HTTP.build(host: 'www.example.com', path: '/foo/bar').authority #=> "www.example.com" + # URI::HTTP.build(host: 'www.example.com', port: 8000, path: '/foo/bar').authority #=> "www.example.com:8000" + # URI::HTTP.build(host: 'www.example.com', port: 80, path: '/foo/bar').authority #=> "www.example.com" + # + def authority + if port == default_port + host + else + "#{host}:#{port}" + end end -=end # # == Description # - # Returns the full path for an HTTP request, as required by Net::HTTP::Get. + # Returns the origin for an HTTP uri, as defined in + # https://www.rfc-editor.org/rfc/rfc6454. # - # If the URI contains a query, the full path is URI#path + '?' + URI#query. - # Otherwise, the path is simply URI#path. # # Example: # - # newuri = URI::HTTP.build(path: '/foo/bar', query: 'test=true') - # newuri.request_uri # => "/foo/bar?test=true" + # URI::HTTP.build(host: 'www.example.com', path: '/foo/bar').origin #=> "http://www.example.com" + # URI::HTTP.build(host: 'www.example.com', port: 8000, path: '/foo/bar').origin #=> "http://www.example.com:8000" + # URI::HTTP.build(host: 'www.example.com', port: 80, path: '/foo/bar').origin #=> "http://www.example.com" + # URI::HTTPS.build(host: 'www.example.com', path: '/foo/bar').origin #=> "https://www.example.com" # - def request_uri - return unless @path - - url = @query ? "#@path?#@query" : @path.dup - url.start_with?(?/.freeze) ? url : ?/ + url + def origin + "#{scheme}://#{authority}" end end - @@schemes['HTTP'] = HTTP - + register_scheme 'HTTP', HTTP end |