lib/uri/http.rb in rubysl-uri-1.0.0 vs lib/uri/http.rb in rubysl-uri-2.0.0

- old
+ new

@@ -1,33 +1,36 @@ -# # = uri/http.rb # # Author:: Akira Yamada <akira@ruby-lang.org> # License:: You can redistribute it and/or modify it under the same term as Ruby. -# Revision:: $Id: http.rb 11747 2007-02-15 02:41:45Z knu $ +# Revision:: $Id$ # +# See URI for general documentation +# require 'uri/generic' module URI # # The syntax of HTTP URIs is defined in RFC1738 section 3.3. # # Note that the Ruby URI library allows HTTP URLs containing usernames and - # passwords. This is not legal as per the RFC, but used to be - # supported in Internet Explorer 5 and 6, before the MS04-004 security + # passwords. This is not legal as per the RFC, but used to be + # supported in Internet Explorer 5 and 6, before the MS04-004 security # update. See <URL:http://support.microsoft.com/kb/834489>. # class HTTP < Generic + # A Default port of 80 for URI::HTTP DEFAULT_PORT = 80 + # An Array of the available components for URI::HTTP COMPONENT = [ - :scheme, - :userinfo, :host, :port, - :path, - :query, + :scheme, + :userinfo, :host, :port, + :path, + :query, :fragment ].freeze # # == Description @@ -35,25 +38,25 @@ # Create a new URI::HTTP object from components, with syntax checking. # # 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. + # 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]. # # Example: # - # newuri = URI::HTTP.build({:host => 'www.example.com', - # :path> => '/foo/bar'}) + # newuri = URI::HTTP.build({:host => 'www.example.com', + # :path => '/foo/bar'}) # - # newuri = URI::HTTP.build([nil, "www.example.com", nil, "/path", + # newuri = URI::HTTP.build([nil, "www.example.com", nil, "/path", # "query", 'fragment']) # - # Currently, if passed userinfo components this method generates + # Currently, if passed userinfo components this method generates # invalid HTTP URIs as per RFC 1738. # def self.build(args) tmp = Util::make_components_hash(self, args) return super(tmp) @@ -61,21 +64,24 @@ # # == 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 + # RFC 2396. No HTTP-specific syntax checking (as per RFC 1738) is # performed. # - # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+, + # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+, # +opaque+, +query+ and +fragment+, in that order. # # Example: # - # uri = URI::HTTP.new(['http', nil, "www.example.com", nil, "/path", - # "query", 'fragment']) + # uri = URI::HTTP.new('http', nil, "www.example.com", nil, "/path", + # "query", 'fragment') # + # + # See also URI::Generic.new + # def initialize(*arg) super(*arg) end # @@ -86,10 +92,10 @@ # If the URI contains a query, the full path is URI#path + '?' + URI#query. # Otherwise, the path is simply URI#path. # def request_uri r = path_query - if r[0] != ?/ + if r && r[0] != ?/ r = '/' + r end r end