RubyGems - addressable - Versions diffs - 0.1.1 → 0.1.2 - Mend

addressable 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

data/CHANGELOG +5 -0
data/coverage/index.html +5 -5
data/coverage/lib-addressable-uri_rb.html +927 -896
data/coverage/lib-addressable-version_rb.html +33 -33
data/doc/classes/Addressable.html +2 -2
data/doc/classes/Addressable/URI.html +829 -772
data/doc/classes/Addressable/URI/CharacterClasses.html +2 -2
data/doc/classes/Addressable/URI/IDNA.html +36 -36
data/doc/classes/Addressable/URI/InvalidOptionError.html +2 -2
data/doc/classes/Addressable/URI/InvalidTemplateValue.html +2 -2
data/doc/classes/Addressable/URI/InvalidURIError.html +2 -2
data/doc/created.rid +1 -1
data/doc/files/CHANGELOG.html +10 -4
data/doc/files/LICENSE.html +2 -2
data/doc/files/README.html +2 -2
data/doc/files/lib/addressable/uri_rb.html +3 -3
data/doc/files/lib/addressable/version_rb.html +3 -3
data/doc/fr_class_index.html +2 -2
data/doc/fr_file_index.html +2 -2
data/doc/fr_method_index.html +19 -17
data/doc/index.html +2 -2
data/lib/addressable/uri.rb +35 -4
data/lib/addressable/version.rb +1 -1
data/rakefile +6 -6
data/spec/addressable/uri_spec.rb +841 -664
data/specdoc/index.html +703 -576
metadata +5 -5

data/CHANGELOG CHANGED

@@ -1,3 +1,8 @@
+=== Addressable 0.1.2
+  * improved normalization
+  * fixed bug in joining algorithm
+  * updated specifications
 === Addressable 0.1.1
   * updated documentation
   * added URI Template variable extraction

data/coverage/index.html CHANGED

@@ -151,7 +151,7 @@ table.report tr.dark {
       </head>
       <body>
         <h3>C0 code coverage information</h3>
-        <p>Generated on Wed Sep 05 16:05:30 -0400 2007 with <a href='http://eigenclass.org/hiki.rb?rcov'>rcov 0.8.0</a>
+        <p>Generated on Sun Oct 28 17:27:26 -0400 2007 with <a href='http://eigenclass.org/hiki.rb?rcov'>rcov 0.8.0</a>
         </p>
         <hr />    <table class='report'>
       <thead>
@@ -167,10 +167,10 @@ table.report tr.dark {
         <tr class='light'>
           <td>TOTAL</td>
           <td class='lines_total'>
-            <tt>1207</tt>
+            <tt>1238</tt>
           </td>
           <td class='lines_code'>
-            <tt>852</tt>
+            <tt>870</tt>
           </td>
           <td>
             <table cellspacing='0' cellpadding='0' align='right'>
@@ -210,10 +210,10 @@ table.report tr.dark {
             <a href='lib-addressable-uri_rb.html'>lib/addressable/uri.rb</a>
           </td>
           <td class='lines_total'>
-            <tt>1175</tt>
+            <tt>1206</tt>
           </td>
           <td class='lines_code'>
-            <tt>844</tt>
+            <tt>862</tt>
           </td>
           <td>
             <table cellspacing='0' cellpadding='0' align='right'>

data/coverage/lib-addressable-uri_rb.html CHANGED

@@ -556,7 +556,7 @@ span.run100 {
       </head>
       <body>
         <h3>C0 code coverage information</h3>
-        <p>Generated on Wed Sep 05 16:05:34 -0400 2007 with <a href='http://eigenclass.org/hiki.rb?rcov'>rcov 0.8.0</a>
+        <p>Generated on Sun Oct 28 17:27:34 -0400 2007 with <a href='http://eigenclass.org/hiki.rb?rcov'>rcov 0.8.0</a>
         </p>
         <hr /><pre><span class='marked0'>Code reported as executed by Ruby looks like this...
 </span><span class='marked1'>and this: this line is also marked as covered.
@@ -580,10 +580,10 @@ span.run100 {
             <a href='lib-addressable-uri_rb.html'>lib/addressable/uri.rb</a>
           </td>
           <td class='lines_total'>
-            <tt>1175</tt>
+            <tt>1206</tt>
           </td>
           <td class='lines_code'>
-            <tt>844</tt>
+            <tt>862</tt>
           </td>
           <td>
             <table cellspacing='0' cellpadding='0' align='right'>
@@ -648,7 +648,7 @@ span.run100 {
 </span><span class="marked1"><a name="line27" />  27 require 'addressable/version'
 </span><span class="inferred0"><a name="line28" />  28
 </span><span class="marked1"><a name="line29" />  29 module Addressable
-</span><span class="inferred0"><a name="line30" />  30   # This is an implementation of a URI parser based on RFC 3986.
+</span><span class="inferred0"><a name="line30" />  30   # This is an implementation of a URI parser based on RFC 3986, 3987.
 </span><span class="marked1"><a name="line31" />  31   class URI
 </span><span class="inferred0"><a name="line32" />  32     # Raised if something other than a uri is supplied.
 </span><span class="marked1"><a name="line33" />  33     class InvalidURIError &lt; StandardError
@@ -901,899 +901,930 @@ span.run100 {
 </span><span class="inferred0"><a name="line280" /> 280         end
 </span><span class="marked1"><a name="line281" /> 281         return mapping
 </span><span class="inferred0"><a name="line282" /> 282       else
-</span><span class="marked1"><a name="line283" /> 283         return nil
-</span><span class="inferred0"><a name="line284" /> 284       end
-</span><span class="inferred1"><a name="line285" /> 285     end
-</span><span class="inferred0"><a name="line286" /> 286
-</span><span class="inferred1"><a name="line287" /> 287     # Joins several uris together.
-</span><span class="marked0"><a name="line288" /> 288     def self.join(*uris)
-</span><span class="marked1"><a name="line289" /> 289       uri_objects = uris.collect do |uri|
-</span><span class="marked0"><a name="line290" /> 290         uri.kind_of?(self) ? uri : self.parse(uri.to_s)
-</span><span class="inferred1"><a name="line291" /> 291       end
-</span><span class="marked0"><a name="line292" /> 292       result = uri_objects.shift.dup
-</span><span class="marked1"><a name="line293" /> 293       for uri in uri_objects
-</span><span class="marked0"><a name="line294" /> 294         result.merge!(uri)
-</span><span class="inferred1"><a name="line295" /> 295       end
-</span><span class="marked0"><a name="line296" /> 296       return result
-</span><span class="inferred1"><a name="line297" /> 297     end
-</span><span class="inferred0"><a name="line298" /> 298
-</span><span class="inferred1"><a name="line299" /> 299     # Percent encodes a URI segment.  Returns a string.  Takes an optional
-</span><span class="inferred0"><a name="line300" /> 300     # character class parameter, which should be specified as a string
-</span><span class="inferred1"><a name="line301" /> 301     # containing a regular expression character class (not including the
-</span><span class="inferred0"><a name="line302" /> 302     # surrounding square brackets).  The character class parameter defaults
-</span><span class="inferred1"><a name="line303" /> 303     # to the reserved plus unreserved character classes specified in
-</span><span class="inferred0"><a name="line304" /> 304     # RFC 3986.  Usage of the constants within the CharacterClasses module is
-</span><span class="inferred1"><a name="line305" /> 305     # highly recommended when using this method.
-</span><span class="inferred0"><a name="line306" /> 306     #
-</span><span class="inferred1"><a name="line307" /> 307     # An example:
-</span><span class="inferred0"><a name="line308" /> 308     #
-</span><span class="inferred1"><a name="line309" /> 309     #  Addressable::URI.escape_segment(&quot;simple-example&quot;, &quot;b-zB-Z0-9&quot;)
-</span><span class="inferred0"><a name="line310" /> 310     #  =&gt; &quot;simple%2Dex%61mple&quot;
-</span><span class="marked1"><a name="line311" /> 311     def self.encode_segment(segment, character_class=
-</span><span class="inferred0"><a name="line312" /> 312         Addressable::URI::CharacterClasses::RESERVED +
-</span><span class="marked1"><a name="line313" /> 313         Addressable::URI::CharacterClasses::UNRESERVED)
-</span><span class="marked0"><a name="line314" /> 314       return nil if segment.nil?
-</span><span class="inferred1"><a name="line315" /> 315       return segment.gsub(
-</span><span class="inferred0"><a name="line316" /> 316         /[^#{character_class}]/
-</span><span class="inferred1"><a name="line317" /> 317       ) do |sequence|
-</span><span class="marked0"><a name="line318" /> 318         (&quot;%&quot; + sequence.unpack('C')[0].to_s(16).upcase)
-</span><span class="marked1"><a name="line319" /> 319       end
-</span><span class="inferred0"><a name="line320" /> 320     end
-</span><span class="inferred1"><a name="line321" /> 321
-</span><span class="inferred0"><a name="line322" /> 322     # Unencodes any percent encoded characters within a URI segment.
-</span><span class="inferred1"><a name="line323" /> 323     # Returns a string.
-</span><span class="marked0"><a name="line324" /> 324     def self.unencode_segment(segment)
-</span><span class="marked1"><a name="line325" /> 325       return nil if segment.nil?
-</span><span class="inferred0"><a name="line326" /> 326       return segment.to_s.gsub(/%[0-9a-f]{2}/i) do |sequence|
-</span><span class="marked1"><a name="line327" /> 327         sequence[1..3].to_i(16).chr
-</span><span class="marked0"><a name="line328" /> 328       end
-</span><span class="inferred1"><a name="line329" /> 329     end
-</span><span class="inferred0"><a name="line330" /> 330
-</span><span class="inferred1"><a name="line331" /> 331     # Percent encodes any special characters in the URI.  This method does
-</span><span class="inferred0"><a name="line332" /> 332     # not take IRIs or IDNs into account.
-</span><span class="marked1"><a name="line333" /> 333     def self.encode(uri)
-</span><span class="marked0"><a name="line334" /> 334       uri_object = uri.kind_of?(self) ? uri : self.parse(uri.to_s)
-</span><span class="marked1"><a name="line335" /> 335       return Addressable::URI.new(
-</span><span class="marked0"><a name="line336" /> 336         self.encode_segment(uri_object.scheme,
-</span><span class="inferred1"><a name="line337" /> 337           Addressable::URI::CharacterClasses::SCHEME),
-</span><span class="marked0"><a name="line338" /> 338         self.encode_segment(uri_object.user,
-</span><span class="inferred1"><a name="line339" /> 339           Addressable::URI::CharacterClasses::AUTHORITY),
-</span><span class="marked0"><a name="line340" /> 340         self.encode_segment(uri_object.password,
-</span><span class="inferred1"><a name="line341" /> 341           Addressable::URI::CharacterClasses::AUTHORITY),
-</span><span class="marked0"><a name="line342" /> 342         self.encode_segment(uri_object.host,
-</span><span class="inferred1"><a name="line343" /> 343           Addressable::URI::CharacterClasses::AUTHORITY),
-</span><span class="marked0"><a name="line344" /> 344         self.encode_segment(uri_object.specified_port,
-</span><span class="inferred1"><a name="line345" /> 345           Addressable::URI::CharacterClasses::AUTHORITY),
-</span><span class="marked0"><a name="line346" /> 346         self.encode_segment(uri_object.path,
-</span><span class="inferred1"><a name="line347" /> 347           Addressable::URI::CharacterClasses::PATH),
-</span><span class="marked0"><a name="line348" /> 348         self.encode_segment(uri_object.query,
-</span><span class="inferred1"><a name="line349" /> 349           Addressable::URI::CharacterClasses::QUERY),
-</span><span class="marked0"><a name="line350" /> 350         self.encode_segment(uri_object.fragment,
-</span><span class="inferred1"><a name="line351" /> 351           Addressable::URI::CharacterClasses::FRAGMENT)
-</span><span class="marked0"><a name="line352" /> 352       ).to_s
-</span><span class="inferred1"><a name="line353" /> 353     end
-</span><span class="inferred0"><a name="line354" /> 354
-</span><span class="marked1"><a name="line355" /> 355     class &lt;&lt; self
-</span><span class="marked0"><a name="line356" /> 356       alias_method :escape, :encode
-</span><span class="inferred1"><a name="line357" /> 357     end
-</span><span class="inferred0"><a name="line358" /> 358
-</span><span class="inferred1"><a name="line359" /> 359     # Normalizes the encoding of a URI.  Characters within a hostname are
-</span><span class="inferred0"><a name="line360" /> 360     # not percent encoded to allow for internationalized domain names.
-</span><span class="marked1"><a name="line361" /> 361     def self.normalized_encode(uri)
-</span><span class="marked0"><a name="line362" /> 362       uri_object = uri.kind_of?(self) ? uri : self.parse(uri.to_s)
-</span><span class="marked1"><a name="line363" /> 363       segments = {
-</span><span class="marked0"><a name="line364" /> 364         :scheme =&gt; self.unencode_segment(uri_object.scheme),
-</span><span class="marked1"><a name="line365" /> 365         :user =&gt; self.unencode_segment(uri_object.user),
-</span><span class="marked0"><a name="line366" /> 366         :password =&gt; self.unencode_segment(uri_object.password),
-</span><span class="marked1"><a name="line367" /> 367         :host =&gt; self.unencode_segment(uri_object.host),
-</span><span class="marked0"><a name="line368" /> 368         :port =&gt; self.unencode_segment(uri_object.specified_port),
-</span><span class="marked1"><a name="line369" /> 369         :path =&gt; self.unencode_segment(uri_object.path),
-</span><span class="marked0"><a name="line370" /> 370         :query =&gt; self.unencode_segment(uri_object.query),
-</span><span class="marked1"><a name="line371" /> 371         :fragment =&gt; self.unencode_segment(uri_object.fragment)
-</span><span class="inferred0"><a name="line372" /> 372       }
-</span><span class="marked1"><a name="line373" /> 373       if URI::IDNA.send(:use_libidn?)
-</span><span class="marked0"><a name="line374" /> 374         segments.each do |key, value|
-</span><span class="marked1"><a name="line375" /> 375           if value != nil
-</span><span class="marked0"><a name="line376" /> 376             segments[key] = IDN::Stringprep.nfkc_normalize(value.to_s)
-</span><span class="inferred1"><a name="line377" /> 377           end
-</span><span class="inferred0"><a name="line378" /> 378         end
-</span><span class="inferred1"><a name="line379" /> 379       end
-</span><span class="marked0"><a name="line380" /> 380       return Addressable::URI.new(
-</span><span class="marked1"><a name="line381" /> 381         self.encode_segment(segments[:scheme],
-</span><span class="inferred0"><a name="line382" /> 382           Addressable::URI::CharacterClasses::SCHEME),
-</span><span class="marked1"><a name="line383" /> 383         self.encode_segment(segments[:user],
-</span><span class="inferred0"><a name="line384" /> 384           Addressable::URI::CharacterClasses::AUTHORITY),
-</span><span class="marked1"><a name="line385" /> 385         self.encode_segment(segments[:password],
-</span><span class="inferred0"><a name="line386" /> 386           Addressable::URI::CharacterClasses::AUTHORITY),
-</span><span class="inferred1"><a name="line387" /> 387         segments[:host],
-</span><span class="inferred0"><a name="line388" /> 388         segments[:port],
-</span><span class="marked1"><a name="line389" /> 389         self.encode_segment(segments[:path],
-</span><span class="inferred0"><a name="line390" /> 390           Addressable::URI::CharacterClasses::PATH),
-</span><span class="marked1"><a name="line391" /> 391         self.encode_segment(segments[:query],
-</span><span class="inferred0"><a name="line392" /> 392           Addressable::URI::CharacterClasses::QUERY),
-</span><span class="marked1"><a name="line393" /> 393         self.encode_segment(segments[:fragment],
-</span><span class="inferred0"><a name="line394" /> 394           Addressable::URI::CharacterClasses::FRAGMENT)
-</span><span class="marked1"><a name="line395" /> 395       ).to_s
-</span><span class="inferred0"><a name="line396" /> 396     end
-</span><span class="inferred1"><a name="line397" /> 397
-</span><span class="inferred0"><a name="line398" /> 398     # Extracts uris from an arbitrary body of text.
-</span><span class="marked1"><a name="line399" /> 399     def self.extract(text, options={})
-</span><span class="marked0"><a name="line400" /> 400       defaults = {:base =&gt; nil, :parse =&gt; false}
-</span><span class="marked1"><a name="line401" /> 401       options = defaults.merge(options)
-</span><span class="marked0"><a name="line402" /> 402       raise InvalidOptionError unless (options.keys - defaults.keys).empty?
-</span><span class="inferred1"><a name="line403" /> 403       # This regular expression needs to be less forgiving or else it would
-</span><span class="inferred0"><a name="line404" /> 404       # match virtually all text.  Which isn't exactly what we're going for.
-</span><span class="marked1"><a name="line405" /> 405       extract_regex = /((([a-z\+]+):)[^ \n\&lt;\&gt;\&quot;\\]+[\w\/])/
-</span><span class="marked0"><a name="line406" /> 406       extracted_uris =
-</span><span class="marked1"><a name="line407" /> 407         text.scan(extract_regex).collect { |match| match[0] }
-</span><span class="marked0"><a name="line408" /> 408       sgml_extract_regex = /&lt;[^&gt;]+href=\&quot;([^\&quot;]+?)\&quot;[^&gt;]*&gt;/
-</span><span class="marked1"><a name="line409" /> 409       sgml_extracted_uris =
-</span><span class="inferred0"><a name="line410" /> 410         text.scan(sgml_extract_regex).collect { |match| match[0] }
-</span><span class="marked1"><a name="line411" /> 411       extracted_uris.concat(sgml_extracted_uris - extracted_uris)
-</span><span class="marked0"><a name="line412" /> 412       textile_extract_regex = /\&quot;.+?\&quot;:([^ ]+\/[^ ]+)[ \,\.\;\:\?\!\&lt;\&gt;\&quot;]/i
-</span><span class="marked1"><a name="line413" /> 413       textile_extracted_uris =
-</span><span class="inferred0"><a name="line414" /> 414         text.scan(textile_extract_regex).collect { |match| match[0] }
-</span><span class="marked1"><a name="line415" /> 415       extracted_uris.concat(textile_extracted_uris - extracted_uris)
-</span><span class="marked0"><a name="line416" /> 416       parsed_uris = []
-</span><span class="marked1"><a name="line417" /> 417       base_uri = nil
-</span><span class="marked0"><a name="line418" /> 418       if options[:base] != nil
-</span><span class="marked1"><a name="line419" /> 419         base_uri = options[:base] if options[:base].kind_of?(self)
-</span><span class="marked0"><a name="line420" /> 420         base_uri = self.parse(options[:base].to_s) if base_uri == nil
-</span><span class="inferred1"><a name="line421" /> 421       end
-</span><span class="marked0"><a name="line422" /> 422       for uri_string in extracted_uris
-</span><span class="marked1"><a name="line423" /> 423         begin
-</span><span class="marked0"><a name="line424" /> 424           if base_uri == nil
-</span><span class="marked1"><a name="line425" /> 425             parsed_uris &lt;&lt; self.parse(uri_string)
-</span><span class="inferred0"><a name="line426" /> 426           else
-</span><span class="marked1"><a name="line427" /> 427             parsed_uris &lt;&lt; (base_uri + self.parse(uri_string))
-</span><span class="inferred0"><a name="line428" /> 428           end
-</span><span class="inferred1"><a name="line429" /> 429         rescue Exception
-</span><span class="marked0"><a name="line430" /> 430           nil
-</span><span class="inferred1"><a name="line431" /> 431         end
-</span><span class="inferred0"><a name="line432" /> 432       end
-</span><span class="marked1"><a name="line433" /> 433       parsed_uris.reject! do |uri|
-</span><span class="marked0"><a name="line434" /> 434         (uri.scheme =~ /T\d+/ ||
-</span><span class="marked1"><a name="line435" /> 435          uri.scheme == &quot;xmlns&quot; ||
-</span><span class="marked0"><a name="line436" /> 436          uri.scheme == &quot;xml&quot; ||
-</span><span class="marked1"><a name="line437" /> 437          uri.scheme == &quot;thr&quot; ||
-</span><span class="marked0"><a name="line438" /> 438          uri.scheme == &quot;this&quot; ||
-</span><span class="marked1"><a name="line439" /> 439          uri.scheme == &quot;float&quot; ||
-</span><span class="marked0"><a name="line440" /> 440          uri.scheme == &quot;user&quot; ||
-</span><span class="marked1"><a name="line441" /> 441          uri.scheme == &quot;username&quot; ||
-</span><span class="marked0"><a name="line442" /> 442          uri.scheme == &quot;out&quot;)
-</span><span class="inferred1"><a name="line443" /> 443       end
-</span><span class="marked0"><a name="line444" /> 444       if options[:parse]
-</span><span class="marked1"><a name="line445" /> 445         return parsed_uris
-</span><span class="inferred0"><a name="line446" /> 446       else
-</span><span class="marked1"><a name="line447" /> 447         return parsed_uris.collect { |uri| uri.to_s }
-</span><span class="inferred0"><a name="line448" /> 448       end
-</span><span class="inferred1"><a name="line449" /> 449     end
-</span><span class="inferred0"><a name="line450" /> 450
-</span><span class="inferred1"><a name="line451" /> 451     # Creates a new uri object from component parts.  Passing nil for
-</span><span class="inferred0"><a name="line452" /> 452     # any of these parameters is acceptable.
-</span><span class="marked1"><a name="line453" /> 453     def initialize(scheme, user, password, host, port, path, query, fragment)
-</span><span class="marked0"><a name="line454" /> 454       @scheme = scheme
-</span><span class="marked1"><a name="line455" /> 455       @scheme = nil if @scheme.to_s.strip == &quot;&quot;
-</span><span class="marked0"><a name="line456" /> 456       @user = user
-</span><span class="marked1"><a name="line457" /> 457       @password = password
-</span><span class="marked0"><a name="line458" /> 458       @host = host
-</span><span class="marked1"><a name="line459" /> 459       @specified_port = port.to_s
-</span><span class="marked0"><a name="line460" /> 460       @port = port
-</span><span class="marked1"><a name="line461" /> 461       @port = @port.to_s if @port.kind_of?(Fixnum)
-</span><span class="marked0"><a name="line462" /> 462       if @port != nil &amp;&amp; !(@port =~ /^\d+$/)
-</span><span class="marked1"><a name="line463" /> 463         raise InvalidURIError,
-</span><span class="inferred0"><a name="line464" /> 464           &quot;Invalid port number: #{@port.inspect}&quot;
-</span><span class="inferred1"><a name="line465" /> 465       end
-</span><span class="marked0"><a name="line466" /> 466       @port = @port.to_i
-</span><span class="marked1"><a name="line467" /> 467       @port = nil if @port == 0
-</span><span class="marked0"><a name="line468" /> 468       @path = path
-</span><span class="marked1"><a name="line469" /> 469       @query = query
-</span><span class="marked0"><a name="line470" /> 470       @fragment = fragment
-</span><span class="inferred1"><a name="line471" /> 471
-</span><span class="marked0"><a name="line472" /> 472       validate()
-</span><span class="inferred1"><a name="line473" /> 473     end
-</span><span class="inferred0"><a name="line474" /> 474
-</span><span class="inferred1"><a name="line475" /> 475     # Returns the scheme (protocol) for this URI.
-</span><span class="marked0"><a name="line476" /> 476     def scheme
-</span><span class="marked1"><a name="line477" /> 477       return @scheme
-</span><span class="marked0"><a name="line478" /> 478     end
-</span><span class="inferred1"><a name="line479" /> 479
-</span><span class="inferred0"><a name="line480" /> 480     # Sets the scheme (protocol for this URI.)
-</span><span class="marked1"><a name="line481" /> 481     def scheme=(new_scheme)
-</span><span class="marked0"><a name="line482" /> 482       @scheme = new_scheme
-</span><span class="marked1"><a name="line483" /> 483     end
-</span><span class="inferred0"><a name="line484" /> 484
-</span><span class="inferred1"><a name="line485" /> 485     # Returns the user for this URI.
-</span><span class="marked0"><a name="line486" /> 486     def user
-</span><span class="marked1"><a name="line487" /> 487       return @user
-</span><span class="marked0"><a name="line488" /> 488     end
-</span><span class="inferred1"><a name="line489" /> 489
-</span><span class="inferred0"><a name="line490" /> 490     # Sets the user for this URI.
-</span><span class="marked1"><a name="line491" /> 491     def user=(new_user)
-</span><span class="marked0"><a name="line492" /> 492       @user = new_user
-</span><span class="inferred1"><a name="line493" /> 493
-</span><span class="inferred0"><a name="line494" /> 494       # You can't have a nil user with a non-nil password
-</span><span class="marked1"><a name="line495" /> 495       if @password != nil
-</span><span class="marked0"><a name="line496" /> 496         @user = &quot;&quot; if @user.nil?
-</span><span class="inferred1"><a name="line497" /> 497       end
-</span><span class="inferred0"><a name="line498" /> 498
-</span><span class="inferred1"><a name="line499" /> 499       # Reset dependant values
-</span><span class="marked0"><a name="line500" /> 500       @userinfo = nil
-</span><span class="marked1"><a name="line501" /> 501       @authority = nil
-</span><span class="inferred0"><a name="line502" /> 502
-</span><span class="inferred1"><a name="line503" /> 503       # Ensure we haven't created an invalid URI
-</span><span class="marked0"><a name="line504" /> 504       validate()
-</span><span class="inferred1"><a name="line505" /> 505     end
-</span><span class="inferred0"><a name="line506" /> 506
-</span><span class="inferred1"><a name="line507" /> 507     # Returns the password for this URI.
-</span><span class="marked0"><a name="line508" /> 508     def password
-</span><span class="marked1"><a name="line509" /> 509       return @password
-</span><span class="marked0"><a name="line510" /> 510     end
-</span><span class="inferred1"><a name="line511" /> 511
-</span><span class="inferred0"><a name="line512" /> 512     # Sets the password for this URI.
-</span><span class="marked1"><a name="line513" /> 513     def password=(new_password)
-</span><span class="marked0"><a name="line514" /> 514       @password = new_password
-</span><span class="inferred1"><a name="line515" /> 515
-</span><span class="inferred0"><a name="line516" /> 516       # You can't have a nil user with a non-nil password
-</span><span class="marked1"><a name="line517" /> 517       if @password != nil
-</span><span class="marked0"><a name="line518" /> 518         @user = &quot;&quot; if @user.nil?
-</span><span class="inferred1"><a name="line519" /> 519       end
-</span><span class="inferred0"><a name="line520" /> 520
-</span><span class="inferred1"><a name="line521" /> 521       # Reset dependant values
-</span><span class="marked0"><a name="line522" /> 522       @userinfo = nil
-</span><span class="marked1"><a name="line523" /> 523       @authority = nil
-</span><span class="inferred0"><a name="line524" /> 524
-</span><span class="inferred1"><a name="line525" /> 525       # Ensure we haven't created an invalid URI
-</span><span class="marked0"><a name="line526" /> 526       validate()
-</span><span class="inferred1"><a name="line527" /> 527     end
-</span><span class="inferred0"><a name="line528" /> 528
-</span><span class="inferred1"><a name="line529" /> 529     # Returns the username and password segment of this URI.
-</span><span class="marked0"><a name="line530" /> 530     def userinfo
-</span><span class="marked1"><a name="line531" /> 531       if !defined?(@userinfo) || @userinfo.nil?
-</span><span class="marked0"><a name="line532" /> 532         current_user = self.user
-</span><span class="marked1"><a name="line533" /> 533         current_password = self.password
-</span><span class="marked0"><a name="line534" /> 534         if current_user == nil &amp;&amp; current_password == nil
-</span><span class="marked1"><a name="line535" /> 535           @userinfo = nil
-</span><span class="marked0"><a name="line536" /> 536         elsif current_user != nil &amp;&amp; current_password == nil
-</span><span class="marked1"><a name="line537" /> 537           @userinfo = &quot;#{current_user}&quot;
-</span><span class="marked0"><a name="line538" /> 538         elsif current_user != nil &amp;&amp; current_password != nil
-</span><span class="marked1"><a name="line539" /> 539           @userinfo = &quot;#{current_user}:#{current_password}&quot;
-</span><span class="inferred0"><a name="line540" /> 540         end
-</span><span class="inferred1"><a name="line541" /> 541       end
-</span><span class="marked0"><a name="line542" /> 542       return @userinfo
-</span><span class="inferred1"><a name="line543" /> 543     end
-</span><span class="inferred0"><a name="line544" /> 544
-</span><span class="inferred1"><a name="line545" /> 545     # Sets the username and password segment of this URI.
-</span><span class="marked0"><a name="line546" /> 546     def userinfo=(new_userinfo)
-</span><span class="marked1"><a name="line547" /> 547       new_user = new_userinfo.to_s.strip.scan(/^(.*):/).flatten[0]
-</span><span class="marked0"><a name="line548" /> 548       new_password = new_userinfo.to_s.strip.scan(/:(.*)$/).flatten[0]
-</span><span class="inferred1"><a name="line549" /> 549
-</span><span class="inferred0"><a name="line550" /> 550       # Password assigned first to ensure validity in case of nil
-</span><span class="marked1"><a name="line551" /> 551       self.password = new_password
-</span><span class="marked0"><a name="line552" /> 552       self.user = new_user
-</span><span class="inferred1"><a name="line553" /> 553
-</span><span class="inferred0"><a name="line554" /> 554       # Reset dependant values
-</span><span class="marked1"><a name="line555" /> 555       @authority = nil
-</span><span class="inferred0"><a name="line556" /> 556
-</span><span class="inferred1"><a name="line557" /> 557       # Ensure we haven't created an invalid URI
-</span><span class="marked0"><a name="line558" /> 558       validate()
-</span><span class="inferred1"><a name="line559" /> 559     end
-</span><span class="inferred0"><a name="line560" /> 560
-</span><span class="inferred1"><a name="line561" /> 561     # Returns the host for this URI.
-</span><span class="marked0"><a name="line562" /> 562     def host
-</span><span class="marked1"><a name="line563" /> 563       return @host
-</span><span class="marked0"><a name="line564" /> 564     end
-</span><span class="inferred1"><a name="line565" /> 565
-</span><span class="inferred0"><a name="line566" /> 566     # Sets the host for this URI.
-</span><span class="marked1"><a name="line567" /> 567     def host=(new_host)
-</span><span class="marked0"><a name="line568" /> 568       @host = new_host
-</span><span class="inferred1"><a name="line569" /> 569
-</span><span class="inferred0"><a name="line570" /> 570       # Reset dependant values
-</span><span class="marked1"><a name="line571" /> 571       @authority = nil
-</span><span class="inferred0"><a name="line572" /> 572
-</span><span class="inferred1"><a name="line573" /> 573       # Ensure we haven't created an invalid URI
-</span><span class="marked0"><a name="line574" /> 574       validate()
-</span><span class="inferred1"><a name="line575" /> 575     end
-</span><span class="inferred0"><a name="line576" /> 576
-</span><span class="inferred1"><a name="line577" /> 577     # Returns the authority segment of this URI.
-</span><span class="marked0"><a name="line578" /> 578     def authority
-</span><span class="marked1"><a name="line579" /> 579       if !defined?(@authority) || @authority.nil?
-</span><span class="marked0"><a name="line580" /> 580         return nil if self.host.nil?
-</span><span class="marked1"><a name="line581" /> 581         @authority = &quot;&quot;
-</span><span class="marked0"><a name="line582" /> 582         if self.userinfo != nil
-</span><span class="marked1"><a name="line583" /> 583           @authority &lt;&lt; &quot;#{self.userinfo}@&quot;
-</span><span class="inferred0"><a name="line584" /> 584         end
-</span><span class="marked1"><a name="line585" /> 585         @authority &lt;&lt; self.host
-</span><span class="marked0"><a name="line586" /> 586         if self.specified_port != nil
-</span><span class="marked1"><a name="line587" /> 587           @authority &lt;&lt; &quot;:#{self.specified_port}&quot;
-</span><span class="inferred0"><a name="line588" /> 588         end
-</span><span class="inferred1"><a name="line589" /> 589       end
-</span><span class="marked0"><a name="line590" /> 590       return @authority
-</span><span class="inferred1"><a name="line591" /> 591     end
-</span><span class="inferred0"><a name="line592" /> 592
-</span><span class="inferred1"><a name="line593" /> 593     # Sets the authority segment of this URI.
-</span><span class="marked0"><a name="line594" /> 594     def authority=(new_authority)
-</span><span class="marked1"><a name="line595" /> 595       if new_authority != nil
-</span><span class="marked0"><a name="line596" /> 596         new_userinfo = new_authority.scan(/^([^\[\]]*)@/).flatten[0]
-</span><span class="marked1"><a name="line597" /> 597         if new_userinfo != nil
-</span><span class="marked0"><a name="line598" /> 598           new_user = new_userinfo.strip.scan(/^([^:]*):?/).flatten[0]
-</span><span class="marked1"><a name="line599" /> 599           new_password = new_userinfo.strip.scan(/:(.*)$/).flatten[0]
-</span><span class="inferred0"><a name="line600" /> 600         end
-</span><span class="marked1"><a name="line601" /> 601         new_host =
-</span><span class="inferred0"><a name="line602" /> 602           new_authority.gsub(/^([^\[\]]*)@/, &quot;&quot;).gsub(/:([^:@\[\]]*?)$/, &quot;&quot;)
-</span><span class="marked1"><a name="line603" /> 603         new_port =
-</span><span class="inferred0"><a name="line604" /> 604           new_authority.scan(/:([^:@\[\]]*?)$/).flatten[0]
-</span><span class="inferred1"><a name="line605" /> 605       end
-</span><span class="marked0"><a name="line606" /> 606       new_port = nil if new_port == &quot;&quot;
-</span><span class="inferred1"><a name="line607" /> 607
-</span><span class="inferred0"><a name="line608" /> 608       # Password assigned first to ensure validity in case of nil
-</span><span class="marked1"><a name="line609" /> 609       self.password = new_password
-</span><span class="marked0"><a name="line610" /> 610       self.user = new_user
-</span><span class="marked1"><a name="line611" /> 611       self.host = new_host
-</span><span class="inferred0"><a name="line612" /> 612
-</span><span class="inferred1"><a name="line613" /> 613       # Port reset to allow port normalization
-</span><span class="marked0"><a name="line614" /> 614       @port = nil
-</span><span class="marked1"><a name="line615" /> 615       @specified_port = new_port
-</span><span class="inferred0"><a name="line616" /> 616
-</span><span class="inferred1"><a name="line617" /> 617       # Ensure we haven't created an invalid URI
-</span><span class="marked0"><a name="line618" /> 618       validate()
-</span><span class="inferred1"><a name="line619" /> 619     end
-</span><span class="inferred0"><a name="line620" /> 620
-</span><span class="inferred1"><a name="line621" /> 621     # Returns an array of known ip-based schemes.  These schemes typically
-</span><span class="inferred0"><a name="line622" /> 622     # use a similar URI form:
-</span><span class="inferred1"><a name="line623" /> 623     # //&lt;user&gt;:&lt;password&gt;@&lt;host&gt;:&lt;port&gt;/&lt;url-path&gt;
-</span><span class="marked0"><a name="line624" /> 624     def self.ip_based_schemes
-</span><span class="marked1"><a name="line625" /> 625       return self.scheme_mapping.keys
-</span><span class="marked0"><a name="line626" /> 626     end
-</span><span class="inferred1"><a name="line627" /> 627
-</span><span class="inferred0"><a name="line628" /> 628     # Returns a hash of common IP-based schemes and their default port
-</span><span class="inferred1"><a name="line629" /> 629     # numbers.  Adding new schemes to this hash, as necessary, will allow
-</span><span class="inferred0"><a name="line630" /> 630     # for better URI normalization.
-</span><span class="marked1"><a name="line631" /> 631     def self.scheme_mapping
-</span><span class="marked0"><a name="line632" /> 632       if !defined?(@protocol_mapping) || @protocol_mapping.nil?
-</span><span class="marked1"><a name="line633" /> 633         @protocol_mapping = {
-</span><span class="inferred0"><a name="line634" /> 634           &quot;http&quot; =&gt; 80,
-</span><span class="inferred1"><a name="line635" /> 635           &quot;https&quot; =&gt; 443,
-</span><span class="inferred0"><a name="line636" /> 636           &quot;ftp&quot; =&gt; 21,
-</span><span class="inferred1"><a name="line637" /> 637           &quot;tftp&quot; =&gt; 69,
-</span><span class="inferred0"><a name="line638" /> 638           &quot;ssh&quot; =&gt; 22,
-</span><span class="inferred1"><a name="line639" /> 639           &quot;svn+ssh&quot; =&gt; 22,
-</span><span class="inferred0"><a name="line640" /> 640           &quot;telnet&quot; =&gt; 23,
-</span><span class="inferred1"><a name="line641" /> 641           &quot;nntp&quot; =&gt; 119,
-</span><span class="inferred0"><a name="line642" /> 642           &quot;gopher&quot; =&gt; 70,
-</span><span class="inferred1"><a name="line643" /> 643           &quot;wais&quot; =&gt; 210,
-</span><span class="inferred0"><a name="line644" /> 644           &quot;ldap&quot; =&gt; 389,
-</span><span class="inferred1"><a name="line645" /> 645           &quot;prospero&quot; =&gt; 1525
-</span><span class="inferred0"><a name="line646" /> 646         }
-</span><span class="inferred1"><a name="line647" /> 647       end
-</span><span class="marked0"><a name="line648" /> 648       return @protocol_mapping
-</span><span class="inferred1"><a name="line649" /> 649     end
-</span><span class="inferred0"><a name="line650" /> 650
-</span><span class="inferred1"><a name="line651" /> 651     # Returns the port number for this URI.  This method will normalize to the
-</span><span class="inferred0"><a name="line652" /> 652     # default port for the URI's scheme if the port isn't explicitly specified
-</span><span class="inferred1"><a name="line653" /> 653     # in the URI.
-</span><span class="marked0"><a name="line654" /> 654     def port
-</span><span class="marked1"><a name="line655" /> 655       if @port.to_i == 0
-</span><span class="marked0"><a name="line656" /> 656         if self.scheme.nil?
-</span><span class="marked1"><a name="line657" /> 657           @port = nil
-</span><span class="inferred0"><a name="line658" /> 658         else
-</span><span class="marked1"><a name="line659" /> 659           @port = self.class.scheme_mapping[self.scheme.strip.downcase]
-</span><span class="inferred0"><a name="line660" /> 660         end
-</span><span class="marked1"><a name="line661" /> 661         return @port
-</span><span class="inferred0"><a name="line662" /> 662       else
-</span><span class="marked1"><a name="line663" /> 663         @port = @port.to_i
-</span><span class="marked0"><a name="line664" /> 664         return @port
-</span><span class="inferred1"><a name="line665" /> 665       end
-</span><span class="marked0"><a name="line666" /> 666     end
-</span><span class="inferred1"><a name="line667" /> 667
-</span><span class="inferred0"><a name="line668" /> 668     # Sets the port for this URI.
-</span><span class="marked1"><a name="line669" /> 669     def port=(new_port)
-</span><span class="marked0"><a name="line670" /> 670       @port = new_port.to_s.to_i
-</span><span class="marked1"><a name="line671" /> 671       @specified_port = @port
-</span><span class="marked0"><a name="line672" /> 672       @authority = nil
-</span><span class="inferred1"><a name="line673" /> 673     end
-</span><span class="inferred0"><a name="line674" /> 674
-</span><span class="inferred1"><a name="line675" /> 675     # Returns the port number that was actually specified in the URI string.
-</span><span class="marked0"><a name="line676" /> 676     def specified_port
-</span><span class="marked1"><a name="line677" /> 677       port = @specified_port.to_s.to_i
-</span><span class="marked0"><a name="line678" /> 678       if port == 0
-</span><span class="marked1"><a name="line679" /> 679         return nil
-</span><span class="inferred0"><a name="line680" /> 680       else
-</span><span class="marked1"><a name="line681" /> 681         return port
-</span><span class="inferred0"><a name="line682" /> 682       end
-</span><span class="inferred1"><a name="line683" /> 683     end
-</span><span class="inferred0"><a name="line684" /> 684
-</span><span class="inferred1"><a name="line685" /> 685     # Returns the path for this URI.
-</span><span class="marked0"><a name="line686" /> 686     def path
-</span><span class="marked1"><a name="line687" /> 687       return @path
-</span><span class="marked0"><a name="line688" /> 688     end
-</span><span class="inferred1"><a name="line689" /> 689
-</span><span class="inferred0"><a name="line690" /> 690     # Sets the path for this URI.
-</span><span class="marked1"><a name="line691" /> 691     def path=(new_path)
-</span><span class="marked0"><a name="line692" /> 692       @path = new_path
-</span><span class="marked1"><a name="line693" /> 693     end
-</span><span class="inferred0"><a name="line694" /> 694
-</span><span class="inferred1"><a name="line695" /> 695     # Returns the basename, if any, of the file at the path being referenced.
-</span><span class="inferred0"><a name="line696" /> 696     # Returns nil if there is no path component.
-</span><span class="marked1"><a name="line697" /> 697     def basename
-</span><span class="marked0"><a name="line698" /> 698       return nil if self.path == nil
-</span><span class="marked1"><a name="line699" /> 699       return File.basename(self.path).gsub(/;[^\/]*$/, &quot;&quot;)
-</span><span class="inferred0"><a name="line700" /> 700     end
-</span><span class="inferred1"><a name="line701" /> 701
-</span><span class="inferred0"><a name="line702" /> 702     # Returns the extension, if any, of the file at the path being referenced.
-</span><span class="inferred1"><a name="line703" /> 703     # Returns &quot;&quot; if there is no extension or nil if there is no path
-</span><span class="inferred0"><a name="line704" /> 704     # component.
-</span><span class="marked1"><a name="line705" /> 705     def extname
-</span><span class="marked0"><a name="line706" /> 706       return nil if self.path == nil
-</span><span class="marked1"><a name="line707" /> 707       return File.extname(self.basename.gsub(/;[^\/]*$/, &quot;&quot;))
-</span><span class="inferred0"><a name="line708" /> 708     end
-</span><span class="inferred1"><a name="line709" /> 709
-</span><span class="inferred0"><a name="line710" /> 710     # Returns the query string for this URI.
-</span><span class="marked1"><a name="line711" /> 711     def query
-</span><span class="marked0"><a name="line712" /> 712       return @query
-</span><span class="marked1"><a name="line713" /> 713     end
-</span><span class="inferred0"><a name="line714" /> 714
-</span><span class="inferred1"><a name="line715" /> 715     # Sets the query string for this URI.
-</span><span class="marked0"><a name="line716" /> 716     def query=(new_query)
-</span><span class="marked1"><a name="line717" /> 717       @query = new_query
-</span><span class="marked0"><a name="line718" /> 718     end
-</span><span class="inferred1"><a name="line719" /> 719
-</span><span class="inferred0"><a name="line720" /> 720     # Returns the fragment for this URI.
-</span><span class="marked1"><a name="line721" /> 721     def fragment
-</span><span class="marked0"><a name="line722" /> 722       return @fragment
-</span><span class="marked1"><a name="line723" /> 723     end
-</span><span class="inferred0"><a name="line724" /> 724
-</span><span class="inferred1"><a name="line725" /> 725     # Sets the fragment for this URI.
-</span><span class="marked0"><a name="line726" /> 726     def fragment=(new_fragment)
-</span><span class="marked1"><a name="line727" /> 727       @fragment = new_fragment
-</span><span class="marked0"><a name="line728" /> 728     end
-</span><span class="inferred1"><a name="line729" /> 729
-</span><span class="inferred0"><a name="line730" /> 730     # Returns true if the URI uses an IP-based protocol.
-</span><span class="marked1"><a name="line731" /> 731     def ip_based?
-</span><span class="marked0"><a name="line732" /> 732       return false if self.scheme.nil?
-</span><span class="marked1"><a name="line733" /> 733       return self.class.ip_based_schemes.include?(self.scheme.strip.downcase)
-</span><span class="inferred0"><a name="line734" /> 734     end
-</span><span class="inferred1"><a name="line735" /> 735
-</span><span class="inferred0"><a name="line736" /> 736     # Returns true if this URI is known to be relative.
-</span><span class="marked1"><a name="line737" /> 737     def relative?
-</span><span class="marked0"><a name="line738" /> 738       return self.scheme.nil?
-</span><span class="marked1"><a name="line739" /> 739     end
-</span><span class="inferred0"><a name="line740" /> 740
-</span><span class="inferred1"><a name="line741" /> 741     # Returns true if this URI is known to be absolute.
-</span><span class="marked0"><a name="line742" /> 742     def absolute?
-</span><span class="marked1"><a name="line743" /> 743       return !relative?
-</span><span class="marked0"><a name="line744" /> 744     end
-</span><span class="inferred1"><a name="line745" /> 745
-</span><span class="inferred0"><a name="line746" /> 746     # Joins two URIs together.
-</span><span class="marked1"><a name="line747" /> 747     def +(uri)
-</span><span class="marked0"><a name="line748" /> 748       if !uri.kind_of?(self.class)
-</span><span class="marked1"><a name="line749" /> 749         uri = URI.parse(uri.to_s)
-</span><span class="inferred0"><a name="line750" /> 750       end
-</span><span class="marked1"><a name="line751" /> 751       if uri.to_s == &quot;&quot;
-</span><span class="marked0"><a name="line752" /> 752         return self.dup
-</span><span class="inferred1"><a name="line753" /> 753       end
-</span><span class="inferred0"><a name="line754" /> 754
-</span><span class="marked1"><a name="line755" /> 755       joined_scheme = nil
-</span><span class="marked0"><a name="line756" /> 756       joined_user = nil
-</span><span class="marked1"><a name="line757" /> 757       joined_password = nil
-</span><span class="marked0"><a name="line758" /> 758       joined_host = nil
-</span><span class="marked1"><a name="line759" /> 759       joined_port = nil
-</span><span class="marked0"><a name="line760" /> 760       joined_path = nil
-</span><span class="marked1"><a name="line761" /> 761       joined_query = nil
-</span><span class="marked0"><a name="line762" /> 762       joined_fragment = nil
-</span><span class="inferred1"><a name="line763" /> 763
-</span><span class="inferred0"><a name="line764" /> 764       # Section 5.2.2 of RFC 3986
-</span><span class="marked1"><a name="line765" /> 765       if uri.scheme != nil
-</span><span class="marked0"><a name="line766" /> 766         joined_scheme = uri.scheme
-</span><span class="marked1"><a name="line767" /> 767         joined_user = uri.user
-</span><span class="marked0"><a name="line768" /> 768         joined_password = uri.password
-</span><span class="marked1"><a name="line769" /> 769         joined_host = uri.host
-</span><span class="marked0"><a name="line770" /> 770         joined_port = uri.specified_port
-</span><span class="marked1"><a name="line771" /> 771         joined_path = self.class.normalize_path(uri.path)
-</span><span class="marked0"><a name="line772" /> 772         joined_query = uri.query
-</span><span class="inferred1"><a name="line773" /> 773       else
-</span><span class="marked0"><a name="line774" /> 774         if uri.authority != nil
-</span><span class="marked1"><a name="line775" /> 775           joined_user = uri.user
-</span><span class="marked0"><a name="line776" /> 776           joined_password = uri.password
-</span><span class="marked1"><a name="line777" /> 777           joined_host = uri.host
-</span><span class="marked0"><a name="line778" /> 778           joined_port = uri.specified_port
-</span><span class="marked1"><a name="line779" /> 779           joined_path = self.class.normalize_path(uri.path)
-</span><span class="marked0"><a name="line780" /> 780           joined_query = uri.query
-</span><span class="inferred1"><a name="line781" /> 781         else
-</span><span class="marked0"><a name="line782" /> 782           if uri.path == nil || uri.path == &quot;&quot;
-</span><span class="marked1"><a name="line783" /> 783             joined_path = self.path
-</span><span class="marked0"><a name="line784" /> 784             if uri.query != nil
-</span><span class="marked1"><a name="line785" /> 785               joined_query = uri.query
-</span><span class="inferred0"><a name="line786" /> 786             else
-</span><span class="marked1"><a name="line787" /> 787               joined_query = self.query
-</span><span class="inferred0"><a name="line788" /> 788             end
-</span><span class="inferred1"><a name="line789" /> 789           else
-</span><span class="marked0"><a name="line790" /> 790             if uri.path[0..0] == &quot;/&quot;
-</span><span class="marked1"><a name="line791" /> 791               joined_path = self.class.normalize_path(uri.path)
-</span><span class="inferred0"><a name="line792" /> 792             else
-</span><span class="marked1"><a name="line793" /> 793               base_path = self.path.nil? ? &quot;&quot; : self.path.dup
-</span><span class="marked0"><a name="line794" /> 794               base_path = self.class.normalize_path(base_path)
-</span><span class="marked1"><a name="line795" /> 795               base_path.gsub!(/\/[^\/]+$/, &quot;/&quot;)
-</span><span class="marked0"><a name="line796" /> 796               joined_path = self.class.normalize_path(base_path + uri.path)
-</span><span class="inferred1"><a name="line797" /> 797             end
-</span><span class="marked0"><a name="line798" /> 798             joined_query = uri.query
-</span><span class="inferred1"><a name="line799" /> 799           end
-</span><span class="marked0"><a name="line800" /> 800           joined_user = self.user
-</span><span class="marked1"><a name="line801" /> 801           joined_password = self.password
-</span><span class="marked0"><a name="line802" /> 802           joined_host = self.host
-</span><span class="marked1"><a name="line803" /> 803           joined_port = self.specified_port
-</span><span class="inferred0"><a name="line804" /> 804         end
-</span><span class="marked1"><a name="line805" /> 805         joined_scheme = self.scheme
-</span><span class="inferred0"><a name="line806" /> 806       end
-</span><span class="marked1"><a name="line807" /> 807       joined_fragment = uri.fragment
-</span><span class="inferred0"><a name="line808" /> 808
-</span><span class="marked1"><a name="line809" /> 809       return Addressable::URI.new(
-</span><span class="inferred0"><a name="line810" /> 810         joined_scheme,
-</span><span class="inferred1"><a name="line811" /> 811         joined_user,
-</span><span class="inferred0"><a name="line812" /> 812         joined_password,
-</span><span class="inferred1"><a name="line813" /> 813         joined_host,
-</span><span class="inferred0"><a name="line814" /> 814         joined_port,
-</span><span class="inferred1"><a name="line815" /> 815         joined_path,
-</span><span class="inferred0"><a name="line816" /> 816         joined_query,
-</span><span class="inferred1"><a name="line817" /> 817         joined_fragment
-</span><span class="marked0"><a name="line818" /> 818       )
-</span><span class="inferred1"><a name="line819" /> 819     end
-</span><span class="inferred0"><a name="line820" /> 820
-</span><span class="inferred1"><a name="line821" /> 821     # Merges two URIs together.
-</span><span class="marked0"><a name="line822" /> 822     def merge(uri)
-</span><span class="marked1"><a name="line823" /> 823       return self + uri
-</span><span class="marked0"><a name="line824" /> 824     end
-</span><span class="inferred1"><a name="line825" /> 825
-</span><span class="inferred0"><a name="line826" /> 826     # Destructive form of merge.
-</span><span class="marked1"><a name="line827" /> 827     def merge!(uri)
-</span><span class="marked0"><a name="line828" /> 828       replace_self(self.merge(uri))
-</span><span class="marked1"><a name="line829" /> 829     end
-</span><span class="inferred0"><a name="line830" /> 830
-</span><span class="inferred1"><a name="line831" /> 831     # Returns the shortest normalized relative form of this URI that uses the
-</span><span class="inferred0"><a name="line832" /> 832     # supplied URI as a base for resolution.  Returns an absolute URI if
-</span><span class="inferred1"><a name="line833" /> 833     # necessary.
-</span><span class="marked0"><a name="line834" /> 834     def route_from(uri)
-</span><span class="marked1"><a name="line835" /> 835       uri = uri.kind_of?(self.class) ? uri : self.class.parse(uri.to_s)
-</span><span class="marked0"><a name="line836" /> 836       uri = uri.normalize
-</span><span class="marked1"><a name="line837" /> 837       normalized_self = self.normalize
-</span><span class="marked0"><a name="line838" /> 838       if normalized_self.relative?
-</span><span class="marked1"><a name="line839" /> 839         raise ArgumentError, &quot;Expected absolute URI, got: #{self.to_s}&quot;
-</span><span class="inferred0"><a name="line840" /> 840       end
-</span><span class="marked1"><a name="line841" /> 841       if uri.relative?
-</span><span class="marked0"><a name="line842" /> 842         raise ArgumentError, &quot;Expected absolute URI, got: #{self.to_s}&quot;
-</span><span class="inferred1"><a name="line843" /> 843       end
-</span><span class="marked0"><a name="line844" /> 844       if normalized_self == uri
-</span><span class="marked1"><a name="line845" /> 845         return Addressable::URI.parse(&quot;##{normalized_self.fragment}&quot;)
-</span><span class="inferred0"><a name="line846" /> 846       end
-</span><span class="marked1"><a name="line847" /> 847       segments = normalized_self.to_h
-</span><span class="marked0"><a name="line848" /> 848       if normalized_self.scheme == uri.scheme
-</span><span class="marked1"><a name="line849" /> 849         segments[:scheme] = nil
-</span><span class="marked0"><a name="line850" /> 850         if normalized_self.authority == uri.authority
-</span><span class="marked1"><a name="line851" /> 851           segments[:user] = nil
-</span><span class="marked0"><a name="line852" /> 852           segments[:password] = nil
-</span><span class="marked1"><a name="line853" /> 853           segments[:host] = nil
-</span><span class="marked0"><a name="line854" /> 854           segments[:port] = nil
-</span><span class="marked1"><a name="line855" /> 855           if normalized_self.path == uri.path
-</span><span class="marked0"><a name="line856" /> 856             segments[:path] = nil
-</span><span class="marked1"><a name="line857" /> 857             if normalized_self.query == uri.query
-</span><span class="marked0"><a name="line858" /> 858               segments[:query] = nil
-</span><span class="inferred1"><a name="line859" /> 859             end
-</span><span class="inferred0"><a name="line860" /> 860           end
-</span><span class="inferred1"><a name="line861" /> 861         end
+</span><span class="inferred1"><a name="line283" /> 283         # Pattern failed to match URI.
+</span><span class="marked0"><a name="line284" /> 284         return nil
+</span><span class="inferred1"><a name="line285" /> 285       end
+</span><span class="inferred0"><a name="line286" /> 286     end
+</span><span class="inferred1"><a name="line287" /> 287
+</span><span class="inferred0"><a name="line288" /> 288     # Joins several uris together.
+</span><span class="marked1"><a name="line289" /> 289     def self.join(*uris)
+</span><span class="marked0"><a name="line290" /> 290       uri_objects = uris.collect do |uri|
+</span><span class="marked1"><a name="line291" /> 291         uri.kind_of?(self) ? uri : self.parse(uri.to_s)
+</span><span class="inferred0"><a name="line292" /> 292       end
+</span><span class="marked1"><a name="line293" /> 293       result = uri_objects.shift.dup
+</span><span class="marked0"><a name="line294" /> 294       for uri in uri_objects
+</span><span class="marked1"><a name="line295" /> 295         result.merge!(uri)
+</span><span class="inferred0"><a name="line296" /> 296       end
+</span><span class="marked1"><a name="line297" /> 297       return result
+</span><span class="inferred0"><a name="line298" /> 298     end
+</span><span class="inferred1"><a name="line299" /> 299
+</span><span class="inferred0"><a name="line300" /> 300     # Percent encodes a URI segment.  Returns a string.  Takes an optional
+</span><span class="inferred1"><a name="line301" /> 301     # character class parameter, which should be specified as a string
+</span><span class="inferred0"><a name="line302" /> 302     # containing a regular expression character class (not including the
+</span><span class="inferred1"><a name="line303" /> 303     # surrounding square brackets).  The character class parameter defaults
+</span><span class="inferred0"><a name="line304" /> 304     # to the reserved plus unreserved character classes specified in
+</span><span class="inferred1"><a name="line305" /> 305     # RFC 3986.  Usage of the constants within the CharacterClasses module is
+</span><span class="inferred0"><a name="line306" /> 306     # highly recommended when using this method.
+</span><span class="inferred1"><a name="line307" /> 307     #
+</span><span class="inferred0"><a name="line308" /> 308     # An example:
+</span><span class="inferred1"><a name="line309" /> 309     #
+</span><span class="inferred0"><a name="line310" /> 310     #  Addressable::URI.escape_segment(&quot;simple-example&quot;, &quot;b-zB-Z0-9&quot;)
+</span><span class="inferred1"><a name="line311" /> 311     #  =&gt; &quot;simple%2Dex%61mple&quot;
+</span><span class="marked0"><a name="line312" /> 312     def self.encode_segment(segment, character_class=
+</span><span class="inferred1"><a name="line313" /> 313         Addressable::URI::CharacterClasses::RESERVED +
+</span><span class="marked0"><a name="line314" /> 314         Addressable::URI::CharacterClasses::UNRESERVED)
+</span><span class="marked1"><a name="line315" /> 315       return nil if segment.nil?
+</span><span class="inferred0"><a name="line316" /> 316       return segment.gsub(
+</span><span class="inferred1"><a name="line317" /> 317         /[^#{character_class}]/
+</span><span class="inferred0"><a name="line318" /> 318       ) do |sequence|
+</span><span class="marked1"><a name="line319" /> 319         (&quot;%&quot; + sequence.unpack('C')[0].to_s(16).upcase)
+</span><span class="marked0"><a name="line320" /> 320       end
+</span><span class="inferred1"><a name="line321" /> 321     end
+</span><span class="inferred0"><a name="line322" /> 322
+</span><span class="inferred1"><a name="line323" /> 323     # Unencodes any percent encoded characters within a URI segment.
+</span><span class="inferred0"><a name="line324" /> 324     # Returns a string.
+</span><span class="marked1"><a name="line325" /> 325     def self.unencode_segment(segment)
+</span><span class="marked0"><a name="line326" /> 326       return nil if segment.nil?
+</span><span class="inferred1"><a name="line327" /> 327       return segment.to_s.gsub(/%[0-9a-f]{2}/i) do |sequence|
+</span><span class="marked0"><a name="line328" /> 328         sequence[1..3].to_i(16).chr
+</span><span class="marked1"><a name="line329" /> 329       end
+</span><span class="inferred0"><a name="line330" /> 330     end
+</span><span class="inferred1"><a name="line331" /> 331
+</span><span class="inferred0"><a name="line332" /> 332     # Percent encodes any special characters in the URI.  This method does
+</span><span class="inferred1"><a name="line333" /> 333     # not take IRIs or IDNs into account.
+</span><span class="marked0"><a name="line334" /> 334     def self.encode(uri)
+</span><span class="marked1"><a name="line335" /> 335       uri_object = uri.kind_of?(self) ? uri : self.parse(uri.to_s)
+</span><span class="marked0"><a name="line336" /> 336       return Addressable::URI.new(
+</span><span class="marked1"><a name="line337" /> 337         self.encode_segment(uri_object.scheme,
+</span><span class="inferred0"><a name="line338" /> 338           Addressable::URI::CharacterClasses::SCHEME),
+</span><span class="marked1"><a name="line339" /> 339         self.encode_segment(uri_object.user,
+</span><span class="inferred0"><a name="line340" /> 340           Addressable::URI::CharacterClasses::AUTHORITY),
+</span><span class="marked1"><a name="line341" /> 341         self.encode_segment(uri_object.password,
+</span><span class="inferred0"><a name="line342" /> 342           Addressable::URI::CharacterClasses::AUTHORITY),
+</span><span class="marked1"><a name="line343" /> 343         self.encode_segment(uri_object.host,
+</span><span class="inferred0"><a name="line344" /> 344           Addressable::URI::CharacterClasses::AUTHORITY),
+</span><span class="marked1"><a name="line345" /> 345         self.encode_segment(uri_object.specified_port,
+</span><span class="inferred0"><a name="line346" /> 346           Addressable::URI::CharacterClasses::AUTHORITY),
+</span><span class="marked1"><a name="line347" /> 347         self.encode_segment(uri_object.path,
+</span><span class="inferred0"><a name="line348" /> 348           Addressable::URI::CharacterClasses::PATH),
+</span><span class="marked1"><a name="line349" /> 349         self.encode_segment(uri_object.query,
+</span><span class="inferred0"><a name="line350" /> 350           Addressable::URI::CharacterClasses::QUERY),
+</span><span class="marked1"><a name="line351" /> 351         self.encode_segment(uri_object.fragment,
+</span><span class="inferred0"><a name="line352" /> 352           Addressable::URI::CharacterClasses::FRAGMENT)
+</span><span class="marked1"><a name="line353" /> 353       ).to_s
+</span><span class="inferred0"><a name="line354" /> 354     end
+</span><span class="inferred1"><a name="line355" /> 355
+</span><span class="marked0"><a name="line356" /> 356     class &lt;&lt; self
+</span><span class="marked1"><a name="line357" /> 357       alias_method :escape, :encode
+</span><span class="inferred0"><a name="line358" /> 358     end
+</span><span class="inferred1"><a name="line359" /> 359
+</span><span class="inferred0"><a name="line360" /> 360     # Normalizes the encoding of a URI.  Characters within a hostname are
+</span><span class="inferred1"><a name="line361" /> 361     # not percent encoded to allow for internationalized domain names.
+</span><span class="marked0"><a name="line362" /> 362     def self.normalized_encode(uri)
+</span><span class="marked1"><a name="line363" /> 363       uri_object = uri.kind_of?(self) ? uri : self.parse(uri.to_s)
+</span><span class="marked0"><a name="line364" /> 364       segments = {
+</span><span class="marked1"><a name="line365" /> 365         :scheme =&gt; self.unencode_segment(uri_object.scheme),
+</span><span class="marked0"><a name="line366" /> 366         :user =&gt; self.unencode_segment(uri_object.user),
+</span><span class="marked1"><a name="line367" /> 367         :password =&gt; self.unencode_segment(uri_object.password),
+</span><span class="marked0"><a name="line368" /> 368         :host =&gt; self.unencode_segment(uri_object.host),
+</span><span class="marked1"><a name="line369" /> 369         :port =&gt; self.unencode_segment(uri_object.specified_port),
+</span><span class="marked0"><a name="line370" /> 370         :path =&gt; self.unencode_segment(uri_object.path),
+</span><span class="marked1"><a name="line371" /> 371         :query =&gt; self.unencode_segment(uri_object.query),
+</span><span class="marked0"><a name="line372" /> 372         :fragment =&gt; self.unencode_segment(uri_object.fragment)
+</span><span class="inferred1"><a name="line373" /> 373       }
+</span><span class="marked0"><a name="line374" /> 374       if URI::IDNA.send(:use_libidn?)
+</span><span class="marked1"><a name="line375" /> 375         segments.each do |key, value|
+</span><span class="marked0"><a name="line376" /> 376           if value != nil
+</span><span class="marked1"><a name="line377" /> 377             segments[key] = IDN::Stringprep.nfkc_normalize(value.to_s)
+</span><span class="inferred0"><a name="line378" /> 378           end
+</span><span class="inferred1"><a name="line379" /> 379         end
+</span><span class="inferred0"><a name="line380" /> 380       end
+</span><span class="marked1"><a name="line381" /> 381       return Addressable::URI.new(
+</span><span class="marked0"><a name="line382" /> 382         self.encode_segment(segments[:scheme],
+</span><span class="inferred1"><a name="line383" /> 383           Addressable::URI::CharacterClasses::SCHEME),
+</span><span class="marked0"><a name="line384" /> 384         self.encode_segment(segments[:user],
+</span><span class="inferred1"><a name="line385" /> 385           Addressable::URI::CharacterClasses::AUTHORITY),
+</span><span class="marked0"><a name="line386" /> 386         self.encode_segment(segments[:password],
+</span><span class="inferred1"><a name="line387" /> 387           Addressable::URI::CharacterClasses::AUTHORITY),
+</span><span class="inferred0"><a name="line388" /> 388         segments[:host],
+</span><span class="inferred1"><a name="line389" /> 389         segments[:port],
+</span><span class="marked0"><a name="line390" /> 390         self.encode_segment(segments[:path],
+</span><span class="inferred1"><a name="line391" /> 391           Addressable::URI::CharacterClasses::PATH),
+</span><span class="marked0"><a name="line392" /> 392         self.encode_segment(segments[:query],
+</span><span class="inferred1"><a name="line393" /> 393           Addressable::URI::CharacterClasses::QUERY),
+</span><span class="marked0"><a name="line394" /> 394         self.encode_segment(segments[:fragment],
+</span><span class="inferred1"><a name="line395" /> 395           Addressable::URI::CharacterClasses::FRAGMENT)
+</span><span class="marked0"><a name="line396" /> 396       ).to_s
+</span><span class="inferred1"><a name="line397" /> 397     end
+</span><span class="inferred0"><a name="line398" /> 398
+</span><span class="inferred1"><a name="line399" /> 399     # Extracts uris from an arbitrary body of text.
+</span><span class="marked0"><a name="line400" /> 400     def self.extract(text, options={})
+</span><span class="marked1"><a name="line401" /> 401       defaults = {:base =&gt; nil, :parse =&gt; false}
+</span><span class="marked0"><a name="line402" /> 402       options = defaults.merge(options)
+</span><span class="marked1"><a name="line403" /> 403       raise InvalidOptionError unless (options.keys - defaults.keys).empty?
+</span><span class="inferred0"><a name="line404" /> 404       # This regular expression needs to be less forgiving or else it would
+</span><span class="inferred1"><a name="line405" /> 405       # match virtually all text.  Which isn't exactly what we're going for.
+</span><span class="marked0"><a name="line406" /> 406       extract_regex = /((([a-z\+]+):)[^ \n\&lt;\&gt;\&quot;\\]+[\w\/])/
+</span><span class="marked1"><a name="line407" /> 407       extracted_uris =
+</span><span class="marked0"><a name="line408" /> 408         text.scan(extract_regex).collect { |match| match[0] }
+</span><span class="marked1"><a name="line409" /> 409       sgml_extract_regex = /&lt;[^&gt;]+href=\&quot;([^\&quot;]+?)\&quot;[^&gt;]*&gt;/
+</span><span class="marked0"><a name="line410" /> 410       sgml_extracted_uris =
+</span><span class="inferred1"><a name="line411" /> 411         text.scan(sgml_extract_regex).collect { |match| match[0] }
+</span><span class="marked0"><a name="line412" /> 412       extracted_uris.concat(sgml_extracted_uris - extracted_uris)
+</span><span class="marked1"><a name="line413" /> 413       textile_extract_regex = /\&quot;.+?\&quot;:([^ ]+\/[^ ]+)[ \,\.\;\:\?\!\&lt;\&gt;\&quot;]/i
+</span><span class="marked0"><a name="line414" /> 414       textile_extracted_uris =
+</span><span class="inferred1"><a name="line415" /> 415         text.scan(textile_extract_regex).collect { |match| match[0] }
+</span><span class="marked0"><a name="line416" /> 416       extracted_uris.concat(textile_extracted_uris - extracted_uris)
+</span><span class="marked1"><a name="line417" /> 417       parsed_uris = []
+</span><span class="marked0"><a name="line418" /> 418       base_uri = nil
+</span><span class="marked1"><a name="line419" /> 419       if options[:base] != nil
+</span><span class="marked0"><a name="line420" /> 420         base_uri = options[:base] if options[:base].kind_of?(self)
+</span><span class="marked1"><a name="line421" /> 421         base_uri = self.parse(options[:base].to_s) if base_uri == nil
+</span><span class="inferred0"><a name="line422" /> 422       end
+</span><span class="marked1"><a name="line423" /> 423       for uri_string in extracted_uris
+</span><span class="marked0"><a name="line424" /> 424         begin
+</span><span class="marked1"><a name="line425" /> 425           if base_uri == nil
+</span><span class="marked0"><a name="line426" /> 426             parsed_uris &lt;&lt; self.parse(uri_string)
+</span><span class="inferred1"><a name="line427" /> 427           else
+</span><span class="marked0"><a name="line428" /> 428             parsed_uris &lt;&lt; (base_uri + self.parse(uri_string))
+</span><span class="inferred1"><a name="line429" /> 429           end
+</span><span class="inferred0"><a name="line430" /> 430         rescue Exception
+</span><span class="marked1"><a name="line431" /> 431           nil
+</span><span class="inferred0"><a name="line432" /> 432         end
+</span><span class="inferred1"><a name="line433" /> 433       end
+</span><span class="marked0"><a name="line434" /> 434       parsed_uris.reject! do |uri|
+</span><span class="marked1"><a name="line435" /> 435         (uri.scheme =~ /T\d+/ ||
+</span><span class="marked0"><a name="line436" /> 436          uri.scheme == &quot;xmlns&quot; ||
+</span><span class="marked1"><a name="line437" /> 437          uri.scheme == &quot;xml&quot; ||
+</span><span class="marked0"><a name="line438" /> 438          uri.scheme == &quot;thr&quot; ||
+</span><span class="marked1"><a name="line439" /> 439          uri.scheme == &quot;this&quot; ||
+</span><span class="marked0"><a name="line440" /> 440          uri.scheme == &quot;float&quot; ||
+</span><span class="marked1"><a name="line441" /> 441          uri.scheme == &quot;user&quot; ||
+</span><span class="marked0"><a name="line442" /> 442          uri.scheme == &quot;username&quot; ||
+</span><span class="marked1"><a name="line443" /> 443          uri.scheme == &quot;out&quot;)
+</span><span class="inferred0"><a name="line444" /> 444       end
+</span><span class="marked1"><a name="line445" /> 445       if options[:parse]
+</span><span class="marked0"><a name="line446" /> 446         return parsed_uris
+</span><span class="inferred1"><a name="line447" /> 447       else
+</span><span class="marked0"><a name="line448" /> 448         return parsed_uris.collect { |uri| uri.to_s }
+</span><span class="inferred1"><a name="line449" /> 449       end
+</span><span class="inferred0"><a name="line450" /> 450     end
+</span><span class="inferred1"><a name="line451" /> 451
+</span><span class="inferred0"><a name="line452" /> 452     # Creates a new uri object from component parts.  Passing nil for
+</span><span class="inferred1"><a name="line453" /> 453     # any of these parameters is acceptable.
+</span><span class="marked0"><a name="line454" /> 454     def initialize(scheme, user, password, host, port, path, query, fragment)
+</span><span class="marked1"><a name="line455" /> 455       @scheme = scheme
+</span><span class="marked0"><a name="line456" /> 456       @scheme = nil if @scheme.to_s.strip == &quot;&quot;
+</span><span class="marked1"><a name="line457" /> 457       @user = user
+</span><span class="marked0"><a name="line458" /> 458       @password = password
+</span><span class="marked1"><a name="line459" /> 459       @host = host
+</span><span class="marked0"><a name="line460" /> 460       @specified_port = port.to_s
+</span><span class="marked1"><a name="line461" /> 461       @port = port
+</span><span class="marked0"><a name="line462" /> 462       @port = @port.to_s if @port.kind_of?(Fixnum)
+</span><span class="marked1"><a name="line463" /> 463       if @port != nil &amp;&amp; !(@port =~ /^\d+$/)
+</span><span class="marked0"><a name="line464" /> 464         raise InvalidURIError,
+</span><span class="inferred1"><a name="line465" /> 465           &quot;Invalid port number: #{@port.inspect}&quot;
+</span><span class="inferred0"><a name="line466" /> 466       end
+</span><span class="marked1"><a name="line467" /> 467       @port = @port.to_i
+</span><span class="marked0"><a name="line468" /> 468       @port = nil if @port == 0
+</span><span class="marked1"><a name="line469" /> 469       @path = path
+</span><span class="marked0"><a name="line470" /> 470       @query = query
+</span><span class="marked1"><a name="line471" /> 471       @fragment = fragment
+</span><span class="inferred0"><a name="line472" /> 472
+</span><span class="marked1"><a name="line473" /> 473       validate()
+</span><span class="inferred0"><a name="line474" /> 474     end
+</span><span class="inferred1"><a name="line475" /> 475
+</span><span class="inferred0"><a name="line476" /> 476     # Returns the scheme (protocol) for this URI.
+</span><span class="marked1"><a name="line477" /> 477     def scheme
+</span><span class="marked0"><a name="line478" /> 478       return @scheme
+</span><span class="marked1"><a name="line479" /> 479     end
+</span><span class="inferred0"><a name="line480" /> 480
+</span><span class="inferred1"><a name="line481" /> 481     # Sets the scheme (protocol for this URI.)
+</span><span class="marked0"><a name="line482" /> 482     def scheme=(new_scheme)
+</span><span class="marked1"><a name="line483" /> 483       @scheme = new_scheme
+</span><span class="marked0"><a name="line484" /> 484     end
+</span><span class="inferred1"><a name="line485" /> 485
+</span><span class="inferred0"><a name="line486" /> 486     # Returns the user for this URI.
+</span><span class="marked1"><a name="line487" /> 487     def user
+</span><span class="marked0"><a name="line488" /> 488       return @user
+</span><span class="marked1"><a name="line489" /> 489     end
+</span><span class="inferred0"><a name="line490" /> 490
+</span><span class="inferred1"><a name="line491" /> 491     # Sets the user for this URI.
+</span><span class="marked0"><a name="line492" /> 492     def user=(new_user)
+</span><span class="marked1"><a name="line493" /> 493       @user = new_user
+</span><span class="inferred0"><a name="line494" /> 494
+</span><span class="inferred1"><a name="line495" /> 495       # You can't have a nil user with a non-nil password
+</span><span class="marked0"><a name="line496" /> 496       if @password != nil
+</span><span class="marked1"><a name="line497" /> 497         @user = &quot;&quot; if @user.nil?
+</span><span class="inferred0"><a name="line498" /> 498       end
+</span><span class="inferred1"><a name="line499" /> 499
+</span><span class="inferred0"><a name="line500" /> 500       # Reset dependant values
+</span><span class="marked1"><a name="line501" /> 501       @userinfo = nil
+</span><span class="marked0"><a name="line502" /> 502       @authority = nil
+</span><span class="inferred1"><a name="line503" /> 503
+</span><span class="inferred0"><a name="line504" /> 504       # Ensure we haven't created an invalid URI
+</span><span class="marked1"><a name="line505" /> 505       validate()
+</span><span class="inferred0"><a name="line506" /> 506     end
+</span><span class="inferred1"><a name="line507" /> 507
+</span><span class="inferred0"><a name="line508" /> 508     # Returns the password for this URI.
+</span><span class="marked1"><a name="line509" /> 509     def password
+</span><span class="marked0"><a name="line510" /> 510       return @password
+</span><span class="marked1"><a name="line511" /> 511     end
+</span><span class="inferred0"><a name="line512" /> 512
+</span><span class="inferred1"><a name="line513" /> 513     # Sets the password for this URI.
+</span><span class="marked0"><a name="line514" /> 514     def password=(new_password)
+</span><span class="marked1"><a name="line515" /> 515       @password = new_password
+</span><span class="inferred0"><a name="line516" /> 516
+</span><span class="inferred1"><a name="line517" /> 517       # You can't have a nil user with a non-nil password
+</span><span class="marked0"><a name="line518" /> 518       if @password != nil
+</span><span class="marked1"><a name="line519" /> 519         @user = &quot;&quot; if @user.nil?
+</span><span class="inferred0"><a name="line520" /> 520       end
+</span><span class="inferred1"><a name="line521" /> 521
+</span><span class="inferred0"><a name="line522" /> 522       # Reset dependant values
+</span><span class="marked1"><a name="line523" /> 523       @userinfo = nil
+</span><span class="marked0"><a name="line524" /> 524       @authority = nil
+</span><span class="inferred1"><a name="line525" /> 525
+</span><span class="inferred0"><a name="line526" /> 526       # Ensure we haven't created an invalid URI
+</span><span class="marked1"><a name="line527" /> 527       validate()
+</span><span class="inferred0"><a name="line528" /> 528     end
+</span><span class="inferred1"><a name="line529" /> 529
+</span><span class="inferred0"><a name="line530" /> 530     # Returns the username and password segment of this URI.
+</span><span class="marked1"><a name="line531" /> 531     def userinfo
+</span><span class="marked0"><a name="line532" /> 532       if !defined?(@userinfo) || @userinfo.nil?
+</span><span class="marked1"><a name="line533" /> 533         current_user = self.user
+</span><span class="marked0"><a name="line534" /> 534         current_password = self.password
+</span><span class="marked1"><a name="line535" /> 535         if current_user == nil &amp;&amp; current_password == nil
+</span><span class="marked0"><a name="line536" /> 536           @userinfo = nil
+</span><span class="marked1"><a name="line537" /> 537         elsif current_user != nil &amp;&amp; current_password == nil
+</span><span class="marked0"><a name="line538" /> 538           @userinfo = &quot;#{current_user}&quot;
+</span><span class="marked1"><a name="line539" /> 539         elsif current_user != nil &amp;&amp; current_password != nil
+</span><span class="marked0"><a name="line540" /> 540           @userinfo = &quot;#{current_user}:#{current_password}&quot;
+</span><span class="inferred1"><a name="line541" /> 541         end
+</span><span class="inferred0"><a name="line542" /> 542       end
+</span><span class="marked1"><a name="line543" /> 543       return @userinfo
+</span><span class="inferred0"><a name="line544" /> 544     end
+</span><span class="inferred1"><a name="line545" /> 545
+</span><span class="inferred0"><a name="line546" /> 546     # Sets the username and password segment of this URI.
+</span><span class="marked1"><a name="line547" /> 547     def userinfo=(new_userinfo)
+</span><span class="marked0"><a name="line548" /> 548       new_user = new_userinfo.to_s.strip.scan(/^(.*):/).flatten[0]
+</span><span class="marked1"><a name="line549" /> 549       new_password = new_userinfo.to_s.strip.scan(/:(.*)$/).flatten[0]
+</span><span class="inferred0"><a name="line550" /> 550
+</span><span class="inferred1"><a name="line551" /> 551       # Password assigned first to ensure validity in case of nil
+</span><span class="marked0"><a name="line552" /> 552       self.password = new_password
+</span><span class="marked1"><a name="line553" /> 553       self.user = new_user
+</span><span class="inferred0"><a name="line554" /> 554
+</span><span class="inferred1"><a name="line555" /> 555       # Reset dependant values
+</span><span class="marked0"><a name="line556" /> 556       @authority = nil
+</span><span class="inferred1"><a name="line557" /> 557
+</span><span class="inferred0"><a name="line558" /> 558       # Ensure we haven't created an invalid URI
+</span><span class="marked1"><a name="line559" /> 559       validate()
+</span><span class="inferred0"><a name="line560" /> 560     end
+</span><span class="inferred1"><a name="line561" /> 561
+</span><span class="inferred0"><a name="line562" /> 562     # Returns the host for this URI.
+</span><span class="marked1"><a name="line563" /> 563     def host
+</span><span class="marked0"><a name="line564" /> 564       return @host
+</span><span class="marked1"><a name="line565" /> 565     end
+</span><span class="inferred0"><a name="line566" /> 566
+</span><span class="inferred1"><a name="line567" /> 567     # Sets the host for this URI.
+</span><span class="marked0"><a name="line568" /> 568     def host=(new_host)
+</span><span class="marked1"><a name="line569" /> 569       @host = new_host
+</span><span class="inferred0"><a name="line570" /> 570
+</span><span class="inferred1"><a name="line571" /> 571       # Reset dependant values
+</span><span class="marked0"><a name="line572" /> 572       @authority = nil
+</span><span class="inferred1"><a name="line573" /> 573
+</span><span class="inferred0"><a name="line574" /> 574       # Ensure we haven't created an invalid URI
+</span><span class="marked1"><a name="line575" /> 575       validate()
+</span><span class="inferred0"><a name="line576" /> 576     end
+</span><span class="inferred1"><a name="line577" /> 577
+</span><span class="inferred0"><a name="line578" /> 578     # Returns the authority segment of this URI.
+</span><span class="marked1"><a name="line579" /> 579     def authority
+</span><span class="marked0"><a name="line580" /> 580       if !defined?(@authority) || @authority.nil?
+</span><span class="marked1"><a name="line581" /> 581         return nil if self.host.nil?
+</span><span class="marked0"><a name="line582" /> 582         @authority = &quot;&quot;
+</span><span class="marked1"><a name="line583" /> 583         if self.userinfo != nil
+</span><span class="marked0"><a name="line584" /> 584           @authority &lt;&lt; &quot;#{self.userinfo}@&quot;
+</span><span class="inferred1"><a name="line585" /> 585         end
+</span><span class="marked0"><a name="line586" /> 586         @authority &lt;&lt; self.host
+</span><span class="marked1"><a name="line587" /> 587         if self.specified_port != nil
+</span><span class="marked0"><a name="line588" /> 588           @authority &lt;&lt; &quot;:#{self.specified_port}&quot;
+</span><span class="inferred1"><a name="line589" /> 589         end
+</span><span class="inferred0"><a name="line590" /> 590       end
+</span><span class="marked1"><a name="line591" /> 591       return @authority
+</span><span class="inferred0"><a name="line592" /> 592     end
+</span><span class="inferred1"><a name="line593" /> 593
+</span><span class="inferred0"><a name="line594" /> 594     # Sets the authority segment of this URI.
+</span><span class="marked1"><a name="line595" /> 595     def authority=(new_authority)
+</span><span class="marked0"><a name="line596" /> 596       if new_authority != nil
+</span><span class="marked1"><a name="line597" /> 597         new_userinfo = new_authority.scan(/^([^\[\]]*)@/).flatten[0]
+</span><span class="marked0"><a name="line598" /> 598         if new_userinfo != nil
+</span><span class="marked1"><a name="line599" /> 599           new_user = new_userinfo.strip.scan(/^([^:]*):?/).flatten[0]
+</span><span class="marked0"><a name="line600" /> 600           new_password = new_userinfo.strip.scan(/:(.*)$/).flatten[0]
+</span><span class="inferred1"><a name="line601" /> 601         end
+</span><span class="marked0"><a name="line602" /> 602         new_host =
+</span><span class="inferred1"><a name="line603" /> 603           new_authority.gsub(/^([^\[\]]*)@/, &quot;&quot;).gsub(/:([^:@\[\]]*?)$/, &quot;&quot;)
+</span><span class="marked0"><a name="line604" /> 604         new_port =
+</span><span class="inferred1"><a name="line605" /> 605           new_authority.scan(/:([^:@\[\]]*?)$/).flatten[0]
+</span><span class="inferred0"><a name="line606" /> 606       end
+</span><span class="marked1"><a name="line607" /> 607       new_port = nil if new_port == &quot;&quot;
+</span><span class="inferred0"><a name="line608" /> 608
+</span><span class="inferred1"><a name="line609" /> 609       # Password assigned first to ensure validity in case of nil
+</span><span class="marked0"><a name="line610" /> 610       self.password = new_password
+</span><span class="marked1"><a name="line611" /> 611       self.user = new_user
+</span><span class="marked0"><a name="line612" /> 612       self.host = new_host
+</span><span class="inferred1"><a name="line613" /> 613
+</span><span class="inferred0"><a name="line614" /> 614       # Port reset to allow port normalization
+</span><span class="marked1"><a name="line615" /> 615       @port = nil
+</span><span class="marked0"><a name="line616" /> 616       @specified_port = new_port
+</span><span class="inferred1"><a name="line617" /> 617
+</span><span class="inferred0"><a name="line618" /> 618       # Ensure we haven't created an invalid URI
+</span><span class="marked1"><a name="line619" /> 619       validate()
+</span><span class="inferred0"><a name="line620" /> 620     end
+</span><span class="inferred1"><a name="line621" /> 621
+</span><span class="inferred0"><a name="line622" /> 622     # Returns an array of known ip-based schemes.  These schemes typically
+</span><span class="inferred1"><a name="line623" /> 623     # use a similar URI form:
+</span><span class="inferred0"><a name="line624" /> 624     # //&lt;user&gt;:&lt;password&gt;@&lt;host&gt;:&lt;port&gt;/&lt;url-path&gt;
+</span><span class="marked1"><a name="line625" /> 625     def self.ip_based_schemes
+</span><span class="marked0"><a name="line626" /> 626       return self.scheme_mapping.keys
+</span><span class="marked1"><a name="line627" /> 627     end
+</span><span class="inferred0"><a name="line628" /> 628
+</span><span class="inferred1"><a name="line629" /> 629     # Returns a hash of common IP-based schemes and their default port
+</span><span class="inferred0"><a name="line630" /> 630     # numbers.  Adding new schemes to this hash, as necessary, will allow
+</span><span class="inferred1"><a name="line631" /> 631     # for better URI normalization.
+</span><span class="marked0"><a name="line632" /> 632     def self.scheme_mapping
+</span><span class="marked1"><a name="line633" /> 633       if !defined?(@protocol_mapping) || @protocol_mapping.nil?
+</span><span class="marked0"><a name="line634" /> 634         @protocol_mapping = {
+</span><span class="inferred1"><a name="line635" /> 635           &quot;http&quot; =&gt; 80,
+</span><span class="inferred0"><a name="line636" /> 636           &quot;https&quot; =&gt; 443,
+</span><span class="inferred1"><a name="line637" /> 637           &quot;ftp&quot; =&gt; 21,
+</span><span class="inferred0"><a name="line638" /> 638           &quot;tftp&quot; =&gt; 69,
+</span><span class="inferred1"><a name="line639" /> 639           &quot;ssh&quot; =&gt; 22,
+</span><span class="inferred0"><a name="line640" /> 640           &quot;svn+ssh&quot; =&gt; 22,
+</span><span class="inferred1"><a name="line641" /> 641           &quot;telnet&quot; =&gt; 23,
+</span><span class="inferred0"><a name="line642" /> 642           &quot;nntp&quot; =&gt; 119,
+</span><span class="inferred1"><a name="line643" /> 643           &quot;gopher&quot; =&gt; 70,
+</span><span class="inferred0"><a name="line644" /> 644           &quot;wais&quot; =&gt; 210,
+</span><span class="inferred1"><a name="line645" /> 645           &quot;ldap&quot; =&gt; 389,
+</span><span class="inferred0"><a name="line646" /> 646           &quot;prospero&quot; =&gt; 1525
+</span><span class="inferred1"><a name="line647" /> 647         }
+</span><span class="inferred0"><a name="line648" /> 648       end
+</span><span class="marked1"><a name="line649" /> 649       return @protocol_mapping
+</span><span class="inferred0"><a name="line650" /> 650     end
+</span><span class="inferred1"><a name="line651" /> 651
+</span><span class="inferred0"><a name="line652" /> 652     # Returns the port number for this URI.  This method will normalize to the
+</span><span class="inferred1"><a name="line653" /> 653     # default port for the URI's scheme if the port isn't explicitly specified
+</span><span class="inferred0"><a name="line654" /> 654     # in the URI.
+</span><span class="marked1"><a name="line655" /> 655     def port
+</span><span class="marked0"><a name="line656" /> 656       if @port.to_i == 0
+</span><span class="marked1"><a name="line657" /> 657         if self.scheme.nil?
+</span><span class="marked0"><a name="line658" /> 658           @port = nil
+</span><span class="inferred1"><a name="line659" /> 659         else
+</span><span class="marked0"><a name="line660" /> 660           @port = self.class.scheme_mapping[self.scheme.strip.downcase]
+</span><span class="inferred1"><a name="line661" /> 661         end
+</span><span class="marked0"><a name="line662" /> 662         return @port
+</span><span class="inferred1"><a name="line663" /> 663       else
+</span><span class="marked0"><a name="line664" /> 664         @port = @port.to_i
+</span><span class="marked1"><a name="line665" /> 665         return @port
+</span><span class="inferred0"><a name="line666" /> 666       end
+</span><span class="marked1"><a name="line667" /> 667     end
+</span><span class="inferred0"><a name="line668" /> 668
+</span><span class="inferred1"><a name="line669" /> 669     # Sets the port for this URI.
+</span><span class="marked0"><a name="line670" /> 670     def port=(new_port)
+</span><span class="marked1"><a name="line671" /> 671       @port = new_port.to_s.to_i
+</span><span class="marked0"><a name="line672" /> 672       @specified_port = @port
+</span><span class="marked1"><a name="line673" /> 673       @authority = nil
+</span><span class="inferred0"><a name="line674" /> 674     end
+</span><span class="inferred1"><a name="line675" /> 675
+</span><span class="inferred0"><a name="line676" /> 676     # Returns the port number that was actually specified in the URI string.
+</span><span class="marked1"><a name="line677" /> 677     def specified_port
+</span><span class="marked0"><a name="line678" /> 678       port = @specified_port.to_s.to_i
+</span><span class="marked1"><a name="line679" /> 679       if port == 0
+</span><span class="marked0"><a name="line680" /> 680         return nil
+</span><span class="inferred1"><a name="line681" /> 681       else
+</span><span class="marked0"><a name="line682" /> 682         return port
+</span><span class="inferred1"><a name="line683" /> 683       end
+</span><span class="inferred0"><a name="line684" /> 684     end
+</span><span class="inferred1"><a name="line685" /> 685
+</span><span class="inferred0"><a name="line686" /> 686     # Returns the path for this URI.
+</span><span class="marked1"><a name="line687" /> 687     def path
+</span><span class="marked0"><a name="line688" /> 688       return @path
+</span><span class="marked1"><a name="line689" /> 689     end
+</span><span class="inferred0"><a name="line690" /> 690
+</span><span class="inferred1"><a name="line691" /> 691     # Sets the path for this URI.
+</span><span class="marked0"><a name="line692" /> 692     def path=(new_path)
+</span><span class="marked1"><a name="line693" /> 693       @path = new_path
+</span><span class="marked0"><a name="line694" /> 694     end
+</span><span class="inferred1"><a name="line695" /> 695
+</span><span class="inferred0"><a name="line696" /> 696     # Returns the basename, if any, of the file at the path being referenced.
+</span><span class="inferred1"><a name="line697" /> 697     # Returns nil if there is no path component.
+</span><span class="marked0"><a name="line698" /> 698     def basename
+</span><span class="marked1"><a name="line699" /> 699       return nil if self.path == nil
+</span><span class="marked0"><a name="line700" /> 700       return File.basename(self.path).gsub(/;[^\/]*$/, &quot;&quot;)
+</span><span class="inferred1"><a name="line701" /> 701     end
+</span><span class="inferred0"><a name="line702" /> 702
+</span><span class="inferred1"><a name="line703" /> 703     # Returns the extension, if any, of the file at the path being referenced.
+</span><span class="inferred0"><a name="line704" /> 704     # Returns &quot;&quot; if there is no extension or nil if there is no path
+</span><span class="inferred1"><a name="line705" /> 705     # component.
+</span><span class="marked0"><a name="line706" /> 706     def extname
+</span><span class="marked1"><a name="line707" /> 707       return nil if self.path == nil
+</span><span class="marked0"><a name="line708" /> 708       return File.extname(self.basename.gsub(/;[^\/]*$/, &quot;&quot;))
+</span><span class="inferred1"><a name="line709" /> 709     end
+</span><span class="inferred0"><a name="line710" /> 710
+</span><span class="inferred1"><a name="line711" /> 711     # Returns the query string for this URI.
+</span><span class="marked0"><a name="line712" /> 712     def query
+</span><span class="marked1"><a name="line713" /> 713       return @query
+</span><span class="marked0"><a name="line714" /> 714     end
+</span><span class="inferred1"><a name="line715" /> 715
+</span><span class="inferred0"><a name="line716" /> 716     # Sets the query string for this URI.
+</span><span class="marked1"><a name="line717" /> 717     def query=(new_query)
+</span><span class="marked0"><a name="line718" /> 718       @query = new_query
+</span><span class="marked1"><a name="line719" /> 719     end
+</span><span class="inferred0"><a name="line720" /> 720
+</span><span class="inferred1"><a name="line721" /> 721     # Returns the fragment for this URI.
+</span><span class="marked0"><a name="line722" /> 722     def fragment
+</span><span class="marked1"><a name="line723" /> 723       return @fragment
+</span><span class="marked0"><a name="line724" /> 724     end
+</span><span class="inferred1"><a name="line725" /> 725
+</span><span class="inferred0"><a name="line726" /> 726     # Sets the fragment for this URI.
+</span><span class="marked1"><a name="line727" /> 727     def fragment=(new_fragment)
+</span><span class="marked0"><a name="line728" /> 728       @fragment = new_fragment
+</span><span class="marked1"><a name="line729" /> 729     end
+</span><span class="inferred0"><a name="line730" /> 730
+</span><span class="inferred1"><a name="line731" /> 731     # Returns true if the URI uses an IP-based protocol.
+</span><span class="marked0"><a name="line732" /> 732     def ip_based?
+</span><span class="marked1"><a name="line733" /> 733       return false if self.scheme.nil?
+</span><span class="marked0"><a name="line734" /> 734       return self.class.ip_based_schemes.include?(self.scheme.strip.downcase)
+</span><span class="inferred1"><a name="line735" /> 735     end
+</span><span class="inferred0"><a name="line736" /> 736
+</span><span class="inferred1"><a name="line737" /> 737     # Returns true if this URI is known to be relative.
+</span><span class="marked0"><a name="line738" /> 738     def relative?
+</span><span class="marked1"><a name="line739" /> 739       return self.scheme.nil?
+</span><span class="marked0"><a name="line740" /> 740     end
+</span><span class="inferred1"><a name="line741" /> 741
+</span><span class="inferred0"><a name="line742" /> 742     # Returns true if this URI is known to be absolute.
+</span><span class="marked1"><a name="line743" /> 743     def absolute?
+</span><span class="marked0"><a name="line744" /> 744       return !relative?
+</span><span class="marked1"><a name="line745" /> 745     end
+</span><span class="inferred0"><a name="line746" /> 746
+</span><span class="inferred1"><a name="line747" /> 747     # Joins two URIs together.
+</span><span class="marked0"><a name="line748" /> 748     def +(uri)
+</span><span class="marked1"><a name="line749" /> 749       if !uri.kind_of?(self.class)
+</span><span class="marked0"><a name="line750" /> 750         uri = URI.parse(uri.to_s)
+</span><span class="inferred1"><a name="line751" /> 751       end
+</span><span class="marked0"><a name="line752" /> 752       if uri.to_s == &quot;&quot;
+</span><span class="marked1"><a name="line753" /> 753         return self.dup
+</span><span class="inferred0"><a name="line754" /> 754       end
+</span><span class="inferred1"><a name="line755" /> 755
+</span><span class="marked0"><a name="line756" /> 756       joined_scheme = nil
+</span><span class="marked1"><a name="line757" /> 757       joined_user = nil
+</span><span class="marked0"><a name="line758" /> 758       joined_password = nil
+</span><span class="marked1"><a name="line759" /> 759       joined_host = nil
+</span><span class="marked0"><a name="line760" /> 760       joined_port = nil
+</span><span class="marked1"><a name="line761" /> 761       joined_path = nil
+</span><span class="marked0"><a name="line762" /> 762       joined_query = nil
+</span><span class="marked1"><a name="line763" /> 763       joined_fragment = nil
+</span><span class="inferred0"><a name="line764" /> 764
+</span><span class="inferred1"><a name="line765" /> 765       # Section 5.2.2 of RFC 3986
+</span><span class="marked0"><a name="line766" /> 766       if uri.scheme != nil
+</span><span class="marked1"><a name="line767" /> 767         joined_scheme = uri.scheme
+</span><span class="marked0"><a name="line768" /> 768         joined_user = uri.user
+</span><span class="marked1"><a name="line769" /> 769         joined_password = uri.password
+</span><span class="marked0"><a name="line770" /> 770         joined_host = uri.host
+</span><span class="marked1"><a name="line771" /> 771         joined_port = uri.specified_port
+</span><span class="marked0"><a name="line772" /> 772         joined_path = self.class.normalize_path(uri.path)
+</span><span class="marked1"><a name="line773" /> 773         joined_query = uri.query
+</span><span class="inferred0"><a name="line774" /> 774       else
+</span><span class="marked1"><a name="line775" /> 775         if uri.authority != nil
+</span><span class="marked0"><a name="line776" /> 776           joined_user = uri.user
+</span><span class="marked1"><a name="line777" /> 777           joined_password = uri.password
+</span><span class="marked0"><a name="line778" /> 778           joined_host = uri.host
+</span><span class="marked1"><a name="line779" /> 779           joined_port = uri.specified_port
+</span><span class="marked0"><a name="line780" /> 780           joined_path = self.class.normalize_path(uri.path)
+</span><span class="marked1"><a name="line781" /> 781           joined_query = uri.query
+</span><span class="inferred0"><a name="line782" /> 782         else
+</span><span class="marked1"><a name="line783" /> 783           if uri.path == nil || uri.path == &quot;&quot;
+</span><span class="marked0"><a name="line784" /> 784             joined_path = self.path
+</span><span class="marked1"><a name="line785" /> 785             if uri.query != nil
+</span><span class="marked0"><a name="line786" /> 786               joined_query = uri.query
+</span><span class="inferred1"><a name="line787" /> 787             else
+</span><span class="marked0"><a name="line788" /> 788               joined_query = self.query
+</span><span class="inferred1"><a name="line789" /> 789             end
+</span><span class="inferred0"><a name="line790" /> 790           else
+</span><span class="marked1"><a name="line791" /> 791             if uri.path[0..0] == &quot;/&quot;
+</span><span class="marked0"><a name="line792" /> 792               joined_path = self.class.normalize_path(uri.path)
+</span><span class="inferred1"><a name="line793" /> 793             else
+</span><span class="marked0"><a name="line794" /> 794               base_path = self.path.dup
+</span><span class="marked1"><a name="line795" /> 795               base_path = &quot;&quot; if base_path == nil
+</span><span class="marked0"><a name="line796" /> 796               base_path = self.class.normalize_path(base_path)
+</span><span class="inferred1"><a name="line797" /> 797
+</span><span class="inferred0"><a name="line798" /> 798               # Section 5.2.3 of RFC 3986
+</span><span class="inferred1"><a name="line799" /> 799               #
+</span><span class="inferred0"><a name="line800" /> 800               # Removes the right-most path segment from the base path.
+</span><span class="marked1"><a name="line801" /> 801               if base_path =~ /\//
+</span><span class="marked0"><a name="line802" /> 802                 base_path.gsub!(/\/[^\/]+$/, &quot;/&quot;)
+</span><span class="inferred1"><a name="line803" /> 803               else
+</span><span class="marked0"><a name="line804" /> 804                 base_path = &quot;&quot;
+</span><span class="inferred1"><a name="line805" /> 805               end
+</span><span class="inferred0"><a name="line806" /> 806
+</span><span class="inferred1"><a name="line807" /> 807               # If the base path is empty and an authority segment has been
+</span><span class="inferred0"><a name="line808" /> 808               # defined, use a base path of &quot;/&quot;
+</span><span class="marked1"><a name="line809" /> 809               if base_path == &quot;&quot; &amp;&amp; self.authority != nil
+</span><span class="marked0"><a name="line810" /> 810                 base_path = &quot;/&quot;
+</span><span class="inferred1"><a name="line811" /> 811               end
+</span><span class="inferred0"><a name="line812" /> 812
+</span><span class="marked1"><a name="line813" /> 813               joined_path = self.class.normalize_path(base_path + uri.path)
+</span><span class="inferred0"><a name="line814" /> 814             end
+</span><span class="marked1"><a name="line815" /> 815             joined_query = uri.query
+</span><span class="inferred0"><a name="line816" /> 816           end
+</span><span class="marked1"><a name="line817" /> 817           joined_user = self.user
+</span><span class="marked0"><a name="line818" /> 818           joined_password = self.password
+</span><span class="marked1"><a name="line819" /> 819           joined_host = self.host
+</span><span class="marked0"><a name="line820" /> 820           joined_port = self.specified_port
+</span><span class="inferred1"><a name="line821" /> 821         end
+</span><span class="marked0"><a name="line822" /> 822         joined_scheme = self.scheme
+</span><span class="inferred1"><a name="line823" /> 823       end
+</span><span class="marked0"><a name="line824" /> 824       joined_fragment = uri.fragment
+</span><span class="inferred1"><a name="line825" /> 825
+</span><span class="marked0"><a name="line826" /> 826       return Addressable::URI.new(
+</span><span class="inferred1"><a name="line827" /> 827         joined_scheme,
+</span><span class="inferred0"><a name="line828" /> 828         joined_user,
+</span><span class="inferred1"><a name="line829" /> 829         joined_password,
+</span><span class="inferred0"><a name="line830" /> 830         joined_host,
+</span><span class="inferred1"><a name="line831" /> 831         joined_port,
+</span><span class="inferred0"><a name="line832" /> 832         joined_path,
+</span><span class="inferred1"><a name="line833" /> 833         joined_query,
+</span><span class="inferred0"><a name="line834" /> 834         joined_fragment
+</span><span class="marked1"><a name="line835" /> 835       )
+</span><span class="inferred0"><a name="line836" /> 836     end
+</span><span class="inferred1"><a name="line837" /> 837
+</span><span class="inferred0"><a name="line838" /> 838     # Merges two URIs together.
+</span><span class="marked1"><a name="line839" /> 839     def merge(uri)
+</span><span class="marked0"><a name="line840" /> 840       return self + uri
+</span><span class="marked1"><a name="line841" /> 841     end
+</span><span class="marked0"><a name="line842" /> 842     alias_method :join, :merge
+</span><span class="inferred1"><a name="line843" /> 843
+</span><span class="inferred0"><a name="line844" /> 844     # Destructive form of merge.
+</span><span class="marked1"><a name="line845" /> 845     def merge!(uri)
+</span><span class="marked0"><a name="line846" /> 846       replace_self(self.merge(uri))
+</span><span class="marked1"><a name="line847" /> 847     end
+</span><span class="marked0"><a name="line848" /> 848     alias_method :join!, :merge!
+</span><span class="inferred1"><a name="line849" /> 849
+</span><span class="inferred0"><a name="line850" /> 850     # Returns the shortest normalized relative form of this URI that uses the
+</span><span class="inferred1"><a name="line851" /> 851     # supplied URI as a base for resolution.  Returns an absolute URI if
+</span><span class="inferred0"><a name="line852" /> 852     # necessary.
+</span><span class="marked1"><a name="line853" /> 853     def route_from(uri)
+</span><span class="marked0"><a name="line854" /> 854       uri = uri.kind_of?(self.class) ? uri : self.class.parse(uri.to_s)
+</span><span class="marked1"><a name="line855" /> 855       uri = uri.normalize
+</span><span class="marked0"><a name="line856" /> 856       normalized_self = self.normalize
+</span><span class="marked1"><a name="line857" /> 857       if normalized_self.relative?
+</span><span class="marked0"><a name="line858" /> 858         raise ArgumentError, &quot;Expected absolute URI, got: #{self.to_s}&quot;
+</span><span class="inferred1"><a name="line859" /> 859       end
+</span><span class="marked0"><a name="line860" /> 860       if uri.relative?
+</span><span class="marked1"><a name="line861" /> 861         raise ArgumentError, &quot;Expected absolute URI, got: #{self.to_s}&quot;
 </span><span class="inferred0"><a name="line862" /> 862       end
-</span><span class="inferred1"><a name="line863" /> 863       # Avoid network-path references.
-</span><span class="marked0"><a name="line864" /> 864       if segments[:scheme] == nil &amp;&amp; segments[:host] != nil
-</span><span class="marked1"><a name="line865" /> 865         segments[:scheme] = normalized_self.scheme
-</span><span class="inferred0"><a name="line866" /> 866       end
-</span><span class="marked1"><a name="line867" /> 867       return Addressable::URI.new(
-</span><span class="inferred0"><a name="line868" /> 868         segments[:scheme],
-</span><span class="inferred1"><a name="line869" /> 869         segments[:user],
-</span><span class="inferred0"><a name="line870" /> 870         segments[:password],
-</span><span class="inferred1"><a name="line871" /> 871         segments[:host],
-</span><span class="inferred0"><a name="line872" /> 872         segments[:port],
-</span><span class="inferred1"><a name="line873" /> 873         segments[:path],
-</span><span class="inferred0"><a name="line874" /> 874         segments[:query],
-</span><span class="inferred1"><a name="line875" /> 875         segments[:fragment]
-</span><span class="marked0"><a name="line876" /> 876       )
-</span><span class="inferred1"><a name="line877" /> 877     end
-</span><span class="inferred0"><a name="line878" /> 878
-</span><span class="inferred1"><a name="line879" /> 879     # Returns the shortest normalized relative form of the supplied URI that
-</span><span class="inferred0"><a name="line880" /> 880     # uses this URI as a base for resolution.  Returns an absolute URI if
-</span><span class="inferred1"><a name="line881" /> 881     # necessary.
-</span><span class="marked0"><a name="line882" /> 882     def route_to(uri)
-</span><span class="marked1"><a name="line883" /> 883       uri = uri.kind_of?(self.class) ? uri : self.class.parse(uri.to_s)
-</span><span class="marked0"><a name="line884" /> 884       return uri.route_from(self)
-</span><span class="inferred1"><a name="line885" /> 885     end
-</span><span class="inferred0"><a name="line886" /> 886
-</span><span class="inferred1"><a name="line887" /> 887     # Returns a normalized URI object.
-</span><span class="inferred0"><a name="line888" /> 888     #
-</span><span class="inferred1"><a name="line889" /> 889     # NOTE: This method does not attempt to fully conform to specifications.
-</span><span class="inferred0"><a name="line890" /> 890     # It exists largely to correct other people's failures to read the
-</span><span class="inferred1"><a name="line891" /> 891     # specifications, and also to deal with caching issues since several
-</span><span class="inferred0"><a name="line892" /> 892     # different URIs may represent the same resource and should not be
-</span><span class="inferred1"><a name="line893" /> 893     # cached multiple times.
-</span><span class="marked0"><a name="line894" /> 894     def normalize
-</span><span class="marked1"><a name="line895" /> 895       normalized_scheme = nil
-</span><span class="marked0"><a name="line896" /> 896       normalized_scheme = self.scheme.strip.downcase if self.scheme != nil
-</span><span class="marked1"><a name="line897" /> 897       normalized_scheme = &quot;svn+ssh&quot; if normalized_scheme == &quot;ssh+svn&quot;
-</span><span class="marked0"><a name="line898" /> 898       if normalized_scheme == &quot;feed&quot;
-</span><span class="marked1"><a name="line899" /> 899         if self.to_s =~ /^feed:\/*http:\/*/
-</span><span class="marked0"><a name="line900" /> 900           return self.class.parse(
-</span><span class="marked1"><a name="line901" /> 901             self.to_s.scan(/^feed:\/*(http:\/*.*)/).flatten[0]).normalize
-</span><span class="inferred0"><a name="line902" /> 902         end
-</span><span class="inferred1"><a name="line903" /> 903       end
-</span><span class="marked0"><a name="line904" /> 904       normalized_user = nil
-</span><span class="marked1"><a name="line905" /> 905       normalized_user = self.user.strip if self.user != nil
-</span><span class="marked0"><a name="line906" /> 906       normalized_password = nil
-</span><span class="marked1"><a name="line907" /> 907       normalized_password = self.password.strip if self.password != nil
-</span><span class="marked0"><a name="line908" /> 908       normalized_host = nil
-</span><span class="marked1"><a name="line909" /> 909       normalized_host = self.host.strip.downcase if self.host != nil
-</span><span class="marked0"><a name="line910" /> 910       if normalized_host != nil
-</span><span class="marked1"><a name="line911" /> 911         begin
-</span><span class="marked0"><a name="line912" /> 912           normalized_host = URI::IDNA.to_ascii(normalized_host)
-</span><span class="inferred1"><a name="line913" /> 913         rescue Exception
-</span><span class="marked0"><a name="line914" /> 914           nil
-</span><span class="inferred1"><a name="line915" /> 915         end
-</span><span class="inferred0"><a name="line916" /> 916       end
-</span><span class="inferred1"><a name="line917" /> 917
-</span><span class="marked0"><a name="line918" /> 918       normalized_port = self.port
-</span><span class="marked1"><a name="line919" /> 919       if self.class.scheme_mapping[normalized_scheme] == normalized_port
-</span><span class="marked0"><a name="line920" /> 920         normalized_port = nil
-</span><span class="inferred1"><a name="line921" /> 921       end
-</span><span class="marked0"><a name="line922" /> 922       normalized_path = nil
-</span><span class="marked1"><a name="line923" /> 923       normalized_path = self.path.strip if self.path != nil
-</span><span class="inferred0"><a name="line924" /> 924       if normalized_path == nil &amp;&amp;
-</span><span class="marked1"><a name="line925" /> 925           normalized_scheme != nil &amp;&amp;
-</span><span class="inferred0"><a name="line926" /> 926           normalized_host != nil
-</span><span class="marked1"><a name="line927" /> 927         normalized_path = &quot;/&quot;
-</span><span class="inferred0"><a name="line928" /> 928       end
-</span><span class="marked1"><a name="line929" /> 929       if normalized_path != nil
-</span><span class="marked0"><a name="line930" /> 930         normalized_path = self.class.normalize_path(normalized_path)
-</span><span class="inferred1"><a name="line931" /> 931       end
-</span><span class="marked0"><a name="line932" /> 932       if normalized_path == &quot;&quot;
-</span><span class="marked1"><a name="line933" /> 933         if [&quot;http&quot;, &quot;https&quot;, &quot;ftp&quot;, &quot;tftp&quot;].include?(normalized_scheme)
-</span><span class="marked0"><a name="line934" /> 934           normalized_path = &quot;/&quot;
-</span><span class="inferred1"><a name="line935" /> 935         end
-</span><span class="inferred0"><a name="line936" /> 936       end
-</span><span class="inferred1"><a name="line937" /> 937
-</span><span class="marked0"><a name="line938" /> 938       normalized_query = nil
-</span><span class="marked1"><a name="line939" /> 939       normalized_query = self.query.strip if self.query != nil
-</span><span class="inferred0"><a name="line940" /> 940
-</span><span class="marked1"><a name="line941" /> 941       normalized_fragment = nil
-</span><span class="marked0"><a name="line942" /> 942       normalized_fragment = self.fragment.strip if self.fragment != nil
-</span><span class="marked1"><a name="line943" /> 943       return Addressable::URI.parse(
-</span><span class="marked0"><a name="line944" /> 944         Addressable::URI.normalized_encode(Addressable::URI.new(
-</span><span class="inferred1"><a name="line945" /> 945           normalized_scheme,
-</span><span class="inferred0"><a name="line946" /> 946           normalized_user,
-</span><span class="inferred1"><a name="line947" /> 947           normalized_password,
-</span><span class="inferred0"><a name="line948" /> 948           normalized_host,
-</span><span class="inferred1"><a name="line949" /> 949           normalized_port,
-</span><span class="inferred0"><a name="line950" /> 950           normalized_path,
-</span><span class="inferred1"><a name="line951" /> 951           normalized_query,
-</span><span class="inferred0"><a name="line952" /> 952           normalized_fragment
-</span><span class="marked1"><a name="line953" /> 953         )))
-</span><span class="inferred0"><a name="line954" /> 954     end
-</span><span class="inferred1"><a name="line955" /> 955
-</span><span class="inferred0"><a name="line956" /> 956     # Destructively normalizes this URI object.
-</span><span class="marked1"><a name="line957" /> 957     def normalize!
-</span><span class="marked0"><a name="line958" /> 958       replace_self(self.normalize)
-</span><span class="marked1"><a name="line959" /> 959     end
-</span><span class="inferred0"><a name="line960" /> 960
-</span><span class="inferred1"><a name="line961" /> 961     # Creates a URI suitable for display to users.  If semantic attacks are
-</span><span class="inferred0"><a name="line962" /> 962     # likely, the application should try to detect these and warn the user.
-</span><span class="inferred1"><a name="line963" /> 963     # See RFC 3986 section 7.6 for more information.
-</span><span class="marked0"><a name="line964" /> 964     def display_uri
-</span><span class="marked1"><a name="line965" /> 965       display_uri = self.normalize
-</span><span class="marked0"><a name="line966" /> 966       begin
-</span><span class="marked1"><a name="line967" /> 967         display_uri.instance_variable_set(&quot;@host&quot;,
-</span><span class="marked0"><a name="line968" /> 968           URI::IDNA.to_unicode(display_uri.host))
-</span><span class="inferred1"><a name="line969" /> 969       rescue Exception
-</span><span class="marked0"><a name="line970" /> 970         nil
-</span><span class="inferred1"><a name="line971" /> 971       end
-</span><span class="marked0"><a name="line972" /> 972       return display_uri
-</span><span class="inferred1"><a name="line973" /> 973     end
-</span><span class="inferred0"><a name="line974" /> 974
-</span><span class="inferred1"><a name="line975" /> 975     # Returns true if the URI objects are equal.  This method normalizes
-</span><span class="inferred0"><a name="line976" /> 976     # both URIs before doing the comparison, and allows comparison against
-</span><span class="inferred1"><a name="line977" /> 977     # strings.
-</span><span class="marked0"><a name="line978" /> 978     def ===(uri)
-</span><span class="marked1"><a name="line979" /> 979       uri_string = nil
-</span><span class="marked0"><a name="line980" /> 980       if uri.respond_to?(:normalize)
-</span><span class="marked1"><a name="line981" /> 981         uri_string = uri.normalize.to_s
-</span><span class="inferred0"><a name="line982" /> 982       else
-</span><span class="marked1"><a name="line983" /> 983         begin
-</span><span class="marked0"><a name="line984" /> 984           uri_string = URI.parse(uri.to_s).normalize.to_s
-</span><span class="inferred1"><a name="line985" /> 985         rescue Exception
-</span><span class="marked0"><a name="line986" /> 986           return false
-</span><span class="inferred1"><a name="line987" /> 987         end
-</span><span class="inferred0"><a name="line988" /> 988       end
-</span><span class="marked1"><a name="line989" /> 989       return self.normalize.to_s == uri_string
-</span><span class="inferred0"><a name="line990" /> 990     end
-</span><span class="inferred1"><a name="line991" /> 991
-</span><span class="inferred0"><a name="line992" /> 992     # Returns true if the URI objects are equal.  This method normalizes
-</span><span class="inferred1"><a name="line993" /> 993     # both URIs before doing the comparison.
-</span><span class="marked0"><a name="line994" /> 994     def ==(uri)
-</span><span class="marked1"><a name="line995" /> 995       return false unless uri.kind_of?(self.class)
-</span><span class="marked0"><a name="line996" /> 996       return self.normalize.to_s == uri.normalize.to_s
-</span><span class="inferred1"><a name="line997" /> 997     end
-</span><span class="inferred0"><a name="line998" /> 998
-</span><span class="inferred1"><a name="line999" /> 999     # Returns true if the URI objects are equal.  This method does NOT
-</span><span class="inferred0"><a name="line1000" />1000     # normalize either URI before doing the comparison.
-</span><span class="marked1"><a name="line1001" />1001     def eql?(uri)
-</span><span class="marked0"><a name="line1002" />1002       return false unless uri.kind_of?(self.class)
-</span><span class="marked1"><a name="line1003" />1003       return self.to_s == uri.to_s
-</span><span class="inferred0"><a name="line1004" />1004     end
-</span><span class="inferred1"><a name="line1005" />1005
-</span><span class="inferred0"><a name="line1006" />1006     # Clones the URI object.
-</span><span class="marked1"><a name="line1007" />1007     def dup
-</span><span class="marked0"><a name="line1008" />1008       duplicated_scheme = nil
-</span><span class="marked1"><a name="line1009" />1009       duplicated_scheme = self.scheme.dup if self.scheme != nil
-</span><span class="marked0"><a name="line1010" />1010       duplicated_user = nil
-</span><span class="marked1"><a name="line1011" />1011       duplicated_user = self.user.dup if self.user != nil
-</span><span class="marked0"><a name="line1012" />1012       duplicated_password = nil
-</span><span class="marked1"><a name="line1013" />1013       duplicated_password = self.password.dup if self.password != nil
-</span><span class="marked0"><a name="line1014" />1014       duplicated_host = nil
-</span><span class="marked1"><a name="line1015" />1015       duplicated_host = self.host.dup if self.host != nil
-</span><span class="marked0"><a name="line1016" />1016       duplicated_port = self.port
-</span><span class="marked1"><a name="line1017" />1017       duplicated_path = nil
-</span><span class="marked0"><a name="line1018" />1018       duplicated_path = self.path.dup if self.path != nil
-</span><span class="marked1"><a name="line1019" />1019       duplicated_query = nil
-</span><span class="marked0"><a name="line1020" />1020       duplicated_query = self.query.dup if self.query != nil
-</span><span class="marked1"><a name="line1021" />1021       duplicated_fragment = nil
-</span><span class="marked0"><a name="line1022" />1022       duplicated_fragment = self.fragment.dup if self.fragment != nil
-</span><span class="marked1"><a name="line1023" />1023       duplicated_uri = Addressable::URI.new(
-</span><span class="inferred0"><a name="line1024" />1024         duplicated_scheme,
-</span><span class="inferred1"><a name="line1025" />1025         duplicated_user,
-</span><span class="inferred0"><a name="line1026" />1026         duplicated_password,
-</span><span class="inferred1"><a name="line1027" />1027         duplicated_host,
-</span><span class="inferred0"><a name="line1028" />1028         duplicated_port,
-</span><span class="inferred1"><a name="line1029" />1029         duplicated_path,
-</span><span class="inferred0"><a name="line1030" />1030         duplicated_query,
-</span><span class="inferred1"><a name="line1031" />1031         duplicated_fragment
-</span><span class="inferred0"><a name="line1032" />1032       )
-</span><span class="marked1"><a name="line1033" />1033       @specified_port = nil if !defined?(@specified_port)
-</span><span class="marked0"><a name="line1034" />1034       duplicated_uri.instance_variable_set(&quot;@specified_port&quot;, @specified_port)
-</span><span class="marked1"><a name="line1035" />1035       return duplicated_uri
-</span><span class="inferred0"><a name="line1036" />1036     end
-</span><span class="inferred1"><a name="line1037" />1037
-</span><span class="inferred0"><a name="line1038" />1038     # Returns the assembled URI as a string.
-</span><span class="marked1"><a name="line1039" />1039     def to_s
-</span><span class="marked0"><a name="line1040" />1040       uri_string = &quot;&quot;
-</span><span class="marked1"><a name="line1041" />1041       uri_string &lt;&lt; &quot;#{self.scheme}:&quot; if self.scheme != nil
-</span><span class="marked0"><a name="line1042" />1042       uri_string &lt;&lt; &quot;//#{self.authority}&quot; if self.authority != nil
-</span><span class="marked1"><a name="line1043" />1043       uri_string &lt;&lt; self.path.to_s
-</span><span class="marked0"><a name="line1044" />1044       uri_string &lt;&lt; &quot;?#{self.query}&quot; if self.query != nil
-</span><span class="marked1"><a name="line1045" />1045       uri_string &lt;&lt; &quot;##{self.fragment}&quot; if self.fragment != nil
-</span><span class="marked0"><a name="line1046" />1046       return uri_string
-</span><span class="inferred1"><a name="line1047" />1047     end
-</span><span class="inferred0"><a name="line1048" />1048
-</span><span class="inferred1"><a name="line1049" />1049     # Returns a Hash of the URI segments.
-</span><span class="marked0"><a name="line1050" />1050     def to_h
-</span><span class="inferred1"><a name="line1051" />1051       return {
-</span><span class="marked0"><a name="line1052" />1052         :scheme =&gt; self.scheme,
-</span><span class="marked1"><a name="line1053" />1053         :user =&gt; self.user,
-</span><span class="marked0"><a name="line1054" />1054         :password =&gt; self.password,
-</span><span class="marked1"><a name="line1055" />1055         :host =&gt; self.host,
-</span><span class="marked0"><a name="line1056" />1056         :port =&gt; self.specified_port,
-</span><span class="marked1"><a name="line1057" />1057         :path =&gt; self.path,
-</span><span class="marked0"><a name="line1058" />1058         :query =&gt; self.query,
-</span><span class="marked1"><a name="line1059" />1059         :fragment =&gt; self.fragment
-</span><span class="marked0"><a name="line1060" />1060       }
-</span><span class="marked1"><a name="line1061" />1061     end
-</span><span class="inferred0"><a name="line1062" />1062
-</span><span class="inferred1"><a name="line1063" />1063     # Returns a string representation of the URI object's state.
-</span><span class="marked0"><a name="line1064" />1064     def inspect
-</span><span class="marked1"><a name="line1065" />1065       sprintf(&quot;#&lt;%s:%#0x URI:%s&gt;&quot;, self.class.to_s, self.object_id, self.to_s)
-</span><span class="marked0"><a name="line1066" />1066     end
-</span><span class="inferred1"><a name="line1067" />1067
-</span><span class="inferred0"><a name="line1068" />1068     # This module handles internationalized domain names.  When Ruby has an
-</span><span class="inferred1"><a name="line1069" />1069     # implementation of nameprep, stringprep, punycode, etc, this
-</span><span class="inferred0"><a name="line1070" />1070     # module should contain an actual implementation of IDNA instead of
-</span><span class="inferred1"><a name="line1071" />1071     # returning nil if libidn can't be used.
-</span><span class="marked0"><a name="line1072" />1072     module IDNA
-</span><span class="inferred1"><a name="line1073" />1073       # Returns the ascii representation of the label.
-</span><span class="marked0"><a name="line1074" />1074       def self.to_ascii(label)
-</span><span class="marked1"><a name="line1075" />1075         return nil if label.nil?
-</span><span class="marked0"><a name="line1076" />1076         if self.use_libidn?
-</span><span class="marked1"><a name="line1077" />1077           return IDN::Idna.toASCII(label)
-</span><span class="inferred0"><a name="line1078" />1078         else
-</span><span class="marked1"><a name="line1079" />1079           raise NotImplementedError,
-</span><span class="inferred0"><a name="line1080" />1080             &quot;There is no available pure-ruby implementation.  &quot; +
-</span><span class="inferred1"><a name="line1081" />1081             &quot;Install libidn bindings.&quot;
-</span><span class="inferred0"><a name="line1082" />1082         end
-</span><span class="inferred1"><a name="line1083" />1083       end
-</span><span class="inferred0"><a name="line1084" />1084
-</span><span class="inferred1"><a name="line1085" />1085       # Returns the unicode representation of the label.
-</span><span class="marked0"><a name="line1086" />1086       def self.to_unicode(label)
-</span><span class="marked1"><a name="line1087" />1087         return nil if label.nil?
-</span><span class="marked0"><a name="line1088" />1088         if self.use_libidn?
-</span><span class="marked1"><a name="line1089" />1089           return IDN::Idna.toUnicode(label)
-</span><span class="inferred0"><a name="line1090" />1090         else
-</span><span class="marked1"><a name="line1091" />1091           raise NotImplementedError,
-</span><span class="inferred0"><a name="line1092" />1092             &quot;There is no available pure-ruby implementation.  &quot; +
-</span><span class="inferred1"><a name="line1093" />1093             &quot;Install libidn bindings.&quot;
-</span><span class="inferred0"><a name="line1094" />1094         end
-</span><span class="inferred1"><a name="line1095" />1095       end
-</span><span class="inferred0"><a name="line1096" />1096
-</span><span class="marked1"><a name="line1097" />1097     private
-</span><span class="inferred0"><a name="line1098" />1098       # Determines if the libidn bindings are available and able to be used.
-</span><span class="marked1"><a name="line1099" />1099       def self.use_libidn?
-</span><span class="marked0"><a name="line1100" />1100         if !defined?(@use_libidn) || @use_libidn.nil?
-</span><span class="marked1"><a name="line1101" />1101           begin
-</span><span class="marked0"><a name="line1102" />1102             require 'rubygems'
-</span><span class="inferred1"><a name="line1103" />1103           rescue LoadError
-</span><span class="marked0"><a name="line1104" />1104             nil
-</span><span class="inferred1"><a name="line1105" />1105           end
-</span><span class="marked0"><a name="line1106" />1106           begin
-</span><span class="marked1"><a name="line1107" />1107             require 'idn'
-</span><span class="inferred0"><a name="line1108" />1108           rescue LoadError
-</span><span class="marked1"><a name="line1109" />1109             nil
-</span><span class="inferred0"><a name="line1110" />1110           end
-</span><span class="marked1"><a name="line1111" />1111           @use_libidn = !!(defined?(IDN::Idna))
-</span><span class="inferred0"><a name="line1112" />1112         end
-</span><span class="marked1"><a name="line1113" />1113         return @use_libidn
-</span><span class="inferred0"><a name="line1114" />1114       end
-</span><span class="inferred1"><a name="line1115" />1115     end
-</span><span class="inferred0"><a name="line1116" />1116
-</span><span class="marked1"><a name="line1117" />1117   private
-</span><span class="inferred0"><a name="line1118" />1118     # Resolves paths to their simplest form.
-</span><span class="marked1"><a name="line1119" />1119     def self.normalize_path(path)
-</span><span class="marked0"><a name="line1120" />1120       return nil if path.nil?
-</span><span class="marked1"><a name="line1121" />1121       normalized_path = path.dup
-</span><span class="marked0"><a name="line1122" />1122       previous_state = normalized_path.dup
-</span><span class="inferred1"><a name="line1123" />1123       begin
-</span><span class="marked0"><a name="line1124" />1124         previous_state = normalized_path.dup
-</span><span class="marked1"><a name="line1125" />1125         normalized_path.gsub!(/\/\.\//, &quot;/&quot;)
-</span><span class="marked0"><a name="line1126" />1126         normalized_path.gsub!(/\/\.$/, &quot;/&quot;)
-</span><span class="marked1"><a name="line1127" />1127         parent = normalized_path.scan(/\/([^\/]+)\/\.\.\//).flatten[0]
-</span><span class="marked0"><a name="line1128" />1128         if parent != &quot;.&quot; &amp;&amp; parent != &quot;..&quot;
-</span><span class="marked1"><a name="line1129" />1129           normalized_path.gsub!(/\/#{parent}\/\.\.\//, &quot;/&quot;)
-</span><span class="inferred0"><a name="line1130" />1130         end
-</span><span class="marked1"><a name="line1131" />1131         parent = normalized_path.scan(/\/([^\/]+)\/\.\.$/).flatten[0]
-</span><span class="marked0"><a name="line1132" />1132         if parent != &quot;.&quot; &amp;&amp; parent != &quot;..&quot;
-</span><span class="marked1"><a name="line1133" />1133           normalized_path.gsub!(/\/#{parent}\/\.\.$/, &quot;/&quot;)
-</span><span class="inferred0"><a name="line1134" />1134         end
-</span><span class="marked1"><a name="line1135" />1135         normalized_path.gsub!(/^\.\.?\/?/, &quot;&quot;)
-</span><span class="marked0"><a name="line1136" />1136         normalized_path.gsub!(/^\/\.\.?\//, &quot;/&quot;)
-</span><span class="marked1"><a name="line1137" />1137       end until previous_state == normalized_path
-</span><span class="marked0"><a name="line1138" />1138       return normalized_path
-</span><span class="inferred1"><a name="line1139" />1139     end
-</span><span class="inferred0"><a name="line1140" />1140
-</span><span class="inferred1"><a name="line1141" />1141     # Ensures that the URI is valid.
-</span><span class="marked0"><a name="line1142" />1142     def validate
-</span><span class="marked1"><a name="line1143" />1143       if self.scheme == nil &amp;&amp; self.user == nil &amp;&amp; self.password == nil &amp;&amp;
-</span><span class="marked0"><a name="line1144" />1144           self.host == nil &amp;&amp; self.port == nil &amp;&amp; self.path == nil &amp;&amp;
-</span><span class="marked1"><a name="line1145" />1145           self.query == nil &amp;&amp; self.fragment == nil
-</span><span class="marked0"><a name="line1146" />1146         raise InvalidURIError, &quot;All segments were nil.&quot;
-</span><span class="inferred1"><a name="line1147" />1147       end
-</span><span class="marked0"><a name="line1148" />1148       if self.scheme != nil &amp;&amp;
-</span><span class="marked1"><a name="line1149" />1149           (self.host == nil || self.host == &quot;&quot;) &amp;&amp;
-</span><span class="marked0"><a name="line1150" />1150           (self.path == nil || self.path == &quot;&quot;)
-</span><span class="marked1"><a name="line1151" />1151         raise InvalidURIError,
-</span><span class="inferred0"><a name="line1152" />1152           &quot;Absolute URI missing hierarchical segment.&quot;
-</span><span class="inferred1"><a name="line1153" />1153       end
-</span><span class="inferred0"><a name="line1154" />1154     end
-</span><span class="inferred1"><a name="line1155" />1155
-</span><span class="inferred0"><a name="line1156" />1156     # Replaces the internal state of self with the specified URI's state.
-</span><span class="inferred1"><a name="line1157" />1157     # Used in destructive operations to avoid massive code repetition.
-</span><span class="marked0"><a name="line1158" />1158     def replace_self(uri)
-</span><span class="inferred1"><a name="line1159" />1159       # Reset dependant values
-</span><span class="marked0"><a name="line1160" />1160       @userinfo = nil
-</span><span class="marked1"><a name="line1161" />1161       @authority = nil
-</span><span class="inferred0"><a name="line1162" />1162
-</span><span class="marked1"><a name="line1163" />1163       @scheme = uri.scheme
-</span><span class="marked0"><a name="line1164" />1164       @user = uri.user
-</span><span class="marked1"><a name="line1165" />1165       @password = uri.password
-</span><span class="marked0"><a name="line1166" />1166       @host = uri.host
-</span><span class="marked1"><a name="line1167" />1167       @specified_port = uri.instance_variable_get(&quot;@specified_port&quot;)
-</span><span class="marked0"><a name="line1168" />1168       @port = @specified_port.to_s.to_i
-</span><span class="marked1"><a name="line1169" />1169       @path = uri.path
-</span><span class="marked0"><a name="line1170" />1170       @query = uri.query
-</span><span class="marked1"><a name="line1171" />1171       @fragment = uri.fragment
-</span><span class="marked0"><a name="line1172" />1172       return self
-</span><span class="inferred1"><a name="line1173" />1173     end
-</span><span class="inferred0"><a name="line1174" />1174   end
-</span><span class="inferred1"><a name="line1175" />1175 end
+</span><span class="marked1"><a name="line863" /> 863       if normalized_self == uri
+</span><span class="marked0"><a name="line864" /> 864         return Addressable::URI.parse(&quot;##{normalized_self.fragment}&quot;)
+</span><span class="inferred1"><a name="line865" /> 865       end
+</span><span class="marked0"><a name="line866" /> 866       segments = normalized_self.to_h
+</span><span class="marked1"><a name="line867" /> 867       if normalized_self.scheme == uri.scheme
+</span><span class="marked0"><a name="line868" /> 868         segments[:scheme] = nil
+</span><span class="marked1"><a name="line869" /> 869         if normalized_self.authority == uri.authority
+</span><span class="marked0"><a name="line870" /> 870           segments[:user] = nil
+</span><span class="marked1"><a name="line871" /> 871           segments[:password] = nil
+</span><span class="marked0"><a name="line872" /> 872           segments[:host] = nil
+</span><span class="marked1"><a name="line873" /> 873           segments[:port] = nil
+</span><span class="marked0"><a name="line874" /> 874           if normalized_self.path == uri.path
+</span><span class="marked1"><a name="line875" /> 875             segments[:path] = nil
+</span><span class="marked0"><a name="line876" /> 876             if normalized_self.query == uri.query
+</span><span class="marked1"><a name="line877" /> 877               segments[:query] = nil
+</span><span class="inferred0"><a name="line878" /> 878             end
+</span><span class="inferred1"><a name="line879" /> 879           end
+</span><span class="inferred0"><a name="line880" /> 880         end
+</span><span class="inferred1"><a name="line881" /> 881       end
+</span><span class="inferred0"><a name="line882" /> 882       # Avoid network-path references.
+</span><span class="marked1"><a name="line883" /> 883       if segments[:scheme] == nil &amp;&amp; segments[:host] != nil
+</span><span class="marked0"><a name="line884" /> 884         segments[:scheme] = normalized_self.scheme
+</span><span class="inferred1"><a name="line885" /> 885       end
+</span><span class="marked0"><a name="line886" /> 886       return Addressable::URI.new(
+</span><span class="inferred1"><a name="line887" /> 887         segments[:scheme],
+</span><span class="inferred0"><a name="line888" /> 888         segments[:user],
+</span><span class="inferred1"><a name="line889" /> 889         segments[:password],
+</span><span class="inferred0"><a name="line890" /> 890         segments[:host],
+</span><span class="inferred1"><a name="line891" /> 891         segments[:port],
+</span><span class="inferred0"><a name="line892" /> 892         segments[:path],
+</span><span class="inferred1"><a name="line893" /> 893         segments[:query],
+</span><span class="inferred0"><a name="line894" /> 894         segments[:fragment]
+</span><span class="marked1"><a name="line895" /> 895       )
+</span><span class="inferred0"><a name="line896" /> 896     end
+</span><span class="inferred1"><a name="line897" /> 897
+</span><span class="inferred0"><a name="line898" /> 898     # Returns the shortest normalized relative form of the supplied URI that
+</span><span class="inferred1"><a name="line899" /> 899     # uses this URI as a base for resolution.  Returns an absolute URI if
+</span><span class="inferred0"><a name="line900" /> 900     # necessary.
+</span><span class="marked1"><a name="line901" /> 901     def route_to(uri)
+</span><span class="marked0"><a name="line902" /> 902       uri = uri.kind_of?(self.class) ? uri : self.class.parse(uri.to_s)
+</span><span class="marked1"><a name="line903" /> 903       return uri.route_from(self)
+</span><span class="inferred0"><a name="line904" /> 904     end
+</span><span class="inferred1"><a name="line905" /> 905
+</span><span class="inferred0"><a name="line906" /> 906     # Returns a normalized URI object.
+</span><span class="inferred1"><a name="line907" /> 907     #
+</span><span class="inferred0"><a name="line908" /> 908     # NOTE: This method does not attempt to fully conform to specifications.
+</span><span class="inferred1"><a name="line909" /> 909     # It exists largely to correct other people's failures to read the
+</span><span class="inferred0"><a name="line910" /> 910     # specifications, and also to deal with caching issues since several
+</span><span class="inferred1"><a name="line911" /> 911     # different URIs may represent the same resource and should not be
+</span><span class="inferred0"><a name="line912" /> 912     # cached multiple times.
+</span><span class="marked1"><a name="line913" /> 913     def normalize
+</span><span class="marked0"><a name="line914" /> 914       normalized_scheme = nil
+</span><span class="marked1"><a name="line915" /> 915       normalized_scheme = self.scheme.strip.downcase if self.scheme != nil
+</span><span class="marked0"><a name="line916" /> 916       normalized_scheme = &quot;svn+ssh&quot; if normalized_scheme == &quot;ssh+svn&quot;
+</span><span class="marked1"><a name="line917" /> 917       if normalized_scheme == &quot;feed&quot;
+</span><span class="marked0"><a name="line918" /> 918         if self.to_s =~ /^feed:\/*http:\/*/
+</span><span class="marked1"><a name="line919" /> 919           return self.class.parse(
+</span><span class="marked0"><a name="line920" /> 920             self.to_s.scan(/^feed:\/*(http:\/*.*)/).flatten[0]).normalize
+</span><span class="inferred1"><a name="line921" /> 921         end
+</span><span class="inferred0"><a name="line922" /> 922       end
+</span><span class="marked1"><a name="line923" /> 923       normalized_user = nil
+</span><span class="marked0"><a name="line924" /> 924       normalized_user = self.user.strip if self.user != nil
+</span><span class="marked1"><a name="line925" /> 925       normalized_password = nil
+</span><span class="marked0"><a name="line926" /> 926       normalized_password = self.password.strip if self.password != nil
+</span><span class="inferred1"><a name="line927" /> 927
+</span><span class="marked0"><a name="line928" /> 928       if normalized_scheme =~ /https?/ &amp;&amp; normalized_user == &quot;&quot; &amp;&amp;
+</span><span class="marked1"><a name="line929" /> 929           (normalized_password == nil || normalized_password == &quot;&quot;)
+</span><span class="marked0"><a name="line930" /> 930         normalized_user = nil
+</span><span class="marked1"><a name="line931" /> 931         normalized_password = nil
+</span><span class="inferred0"><a name="line932" /> 932       end
+</span><span class="inferred1"><a name="line933" /> 933
+</span><span class="marked0"><a name="line934" /> 934       normalized_host = nil
+</span><span class="marked1"><a name="line935" /> 935       normalized_host = self.host.strip.downcase if self.host != nil
+</span><span class="marked0"><a name="line936" /> 936       if normalized_host != nil
+</span><span class="marked1"><a name="line937" /> 937         begin
+</span><span class="marked0"><a name="line938" /> 938           normalized_host = URI::IDNA.to_ascii(normalized_host)
+</span><span class="inferred1"><a name="line939" /> 939         rescue Exception
+</span><span class="marked0"><a name="line940" /> 940           nil
+</span><span class="inferred1"><a name="line941" /> 941         end
+</span><span class="marked0"><a name="line942" /> 942         if normalized_host[-1..-1] == &quot;.&quot;
+</span><span class="marked1"><a name="line943" /> 943           normalized_host = normalized_host[0...-1]
+</span><span class="inferred0"><a name="line944" /> 944         end
+</span><span class="inferred1"><a name="line945" /> 945       end
+</span><span class="inferred0"><a name="line946" /> 946
+</span><span class="marked1"><a name="line947" /> 947       normalized_port = self.port
+</span><span class="marked0"><a name="line948" /> 948       if self.class.scheme_mapping[normalized_scheme] == normalized_port
+</span><span class="marked1"><a name="line949" /> 949         normalized_port = nil
+</span><span class="inferred0"><a name="line950" /> 950       end
+</span><span class="marked1"><a name="line951" /> 951       normalized_path = nil
+</span><span class="marked0"><a name="line952" /> 952       normalized_path = self.path.strip if self.path != nil
+</span><span class="inferred1"><a name="line953" /> 953       if normalized_path == nil &amp;&amp;
+</span><span class="marked0"><a name="line954" /> 954           normalized_scheme != nil &amp;&amp;
+</span><span class="inferred1"><a name="line955" /> 955           normalized_host != nil
+</span><span class="marked0"><a name="line956" /> 956         normalized_path = &quot;/&quot;
+</span><span class="inferred1"><a name="line957" /> 957       end
+</span><span class="marked0"><a name="line958" /> 958       if normalized_path != nil
+</span><span class="marked1"><a name="line959" /> 959         normalized_path = self.class.normalize_path(normalized_path)
+</span><span class="inferred0"><a name="line960" /> 960       end
+</span><span class="marked1"><a name="line961" /> 961       if normalized_path == &quot;&quot;
+</span><span class="marked0"><a name="line962" /> 962         if [&quot;http&quot;, &quot;https&quot;, &quot;ftp&quot;, &quot;tftp&quot;].include?(normalized_scheme)
+</span><span class="marked1"><a name="line963" /> 963           normalized_path = &quot;/&quot;
+</span><span class="inferred0"><a name="line964" /> 964         end
+</span><span class="inferred1"><a name="line965" /> 965       end
+</span><span class="inferred0"><a name="line966" /> 966
+</span><span class="marked1"><a name="line967" /> 967       normalized_query = nil
+</span><span class="marked0"><a name="line968" /> 968       normalized_query = self.query.strip if self.query != nil
+</span><span class="inferred1"><a name="line969" /> 969
+</span><span class="marked0"><a name="line970" /> 970       normalized_fragment = nil
+</span><span class="marked1"><a name="line971" /> 971       normalized_fragment = self.fragment.strip if self.fragment != nil
+</span><span class="marked0"><a name="line972" /> 972       return Addressable::URI.parse(
+</span><span class="marked1"><a name="line973" /> 973         Addressable::URI.normalized_encode(Addressable::URI.new(
+</span><span class="inferred0"><a name="line974" /> 974           normalized_scheme,
+</span><span class="inferred1"><a name="line975" /> 975           normalized_user,
+</span><span class="inferred0"><a name="line976" /> 976           normalized_password,
+</span><span class="inferred1"><a name="line977" /> 977           normalized_host,
+</span><span class="inferred0"><a name="line978" /> 978           normalized_port,
+</span><span class="inferred1"><a name="line979" /> 979           normalized_path,
+</span><span class="inferred0"><a name="line980" /> 980           normalized_query,
+</span><span class="inferred1"><a name="line981" /> 981           normalized_fragment
+</span><span class="marked0"><a name="line982" /> 982         )))
+</span><span class="inferred1"><a name="line983" /> 983     end
+</span><span class="inferred0"><a name="line984" /> 984
+</span><span class="inferred1"><a name="line985" /> 985     # Destructively normalizes this URI object.
+</span><span class="marked0"><a name="line986" /> 986     def normalize!
+</span><span class="marked1"><a name="line987" /> 987       replace_self(self.normalize)
+</span><span class="marked0"><a name="line988" /> 988     end
+</span><span class="inferred1"><a name="line989" /> 989
+</span><span class="inferred0"><a name="line990" /> 990     # Creates a URI suitable for display to users.  If semantic attacks are
+</span><span class="inferred1"><a name="line991" /> 991     # likely, the application should try to detect these and warn the user.
+</span><span class="inferred0"><a name="line992" /> 992     # See RFC 3986 section 7.6 for more information.
+</span><span class="marked1"><a name="line993" /> 993     def display_uri
+</span><span class="marked0"><a name="line994" /> 994       display_uri = self.normalize
+</span><span class="marked1"><a name="line995" /> 995       begin
+</span><span class="marked0"><a name="line996" /> 996         display_uri.instance_variable_set(&quot;@host&quot;,
+</span><span class="marked1"><a name="line997" /> 997           URI::IDNA.to_unicode(display_uri.host))
+</span><span class="inferred0"><a name="line998" /> 998       rescue Exception
+</span><span class="marked1"><a name="line999" /> 999         nil
+</span><span class="inferred0"><a name="line1000" />1000       end
+</span><span class="marked1"><a name="line1001" />1001       return display_uri
+</span><span class="inferred0"><a name="line1002" />1002     end
+</span><span class="inferred1"><a name="line1003" />1003
+</span><span class="inferred0"><a name="line1004" />1004     # Returns true if the URI objects are equal.  This method normalizes
+</span><span class="inferred1"><a name="line1005" />1005     # both URIs before doing the comparison, and allows comparison against
+</span><span class="inferred0"><a name="line1006" />1006     # strings.
+</span><span class="marked1"><a name="line1007" />1007     def ===(uri)
+</span><span class="marked0"><a name="line1008" />1008       uri_string = nil
+</span><span class="marked1"><a name="line1009" />1009       if uri.respond_to?(:normalize)
+</span><span class="marked0"><a name="line1010" />1010         uri_string = uri.normalize.to_s
+</span><span class="inferred1"><a name="line1011" />1011       else
+</span><span class="marked0"><a name="line1012" />1012         begin
+</span><span class="marked1"><a name="line1013" />1013           uri_string = URI.parse(uri.to_s).normalize.to_s
+</span><span class="inferred0"><a name="line1014" />1014         rescue Exception
+</span><span class="marked1"><a name="line1015" />1015           return false
+</span><span class="inferred0"><a name="line1016" />1016         end
+</span><span class="inferred1"><a name="line1017" />1017       end
+</span><span class="marked0"><a name="line1018" />1018       return self.normalize.to_s == uri_string
+</span><span class="inferred1"><a name="line1019" />1019     end
+</span><span class="inferred0"><a name="line1020" />1020
+</span><span class="inferred1"><a name="line1021" />1021     # Returns true if the URI objects are equal.  This method normalizes
+</span><span class="inferred0"><a name="line1022" />1022     # both URIs before doing the comparison.
+</span><span class="marked1"><a name="line1023" />1023     def ==(uri)
+</span><span class="marked0"><a name="line1024" />1024       return false unless uri.kind_of?(self.class)
+</span><span class="marked1"><a name="line1025" />1025       return self.normalize.to_s == uri.normalize.to_s
+</span><span class="inferred0"><a name="line1026" />1026     end
+</span><span class="inferred1"><a name="line1027" />1027
+</span><span class="inferred0"><a name="line1028" />1028     # Returns true if the URI objects are equal.  This method does NOT
+</span><span class="inferred1"><a name="line1029" />1029     # normalize either URI before doing the comparison.
+</span><span class="marked0"><a name="line1030" />1030     def eql?(uri)
+</span><span class="marked1"><a name="line1031" />1031       return false unless uri.kind_of?(self.class)
+</span><span class="marked0"><a name="line1032" />1032       return self.to_s == uri.to_s
+</span><span class="inferred1"><a name="line1033" />1033     end
+</span><span class="inferred0"><a name="line1034" />1034
+</span><span class="inferred1"><a name="line1035" />1035     # Clones the URI object.
+</span><span class="marked0"><a name="line1036" />1036     def dup
+</span><span class="marked1"><a name="line1037" />1037       duplicated_scheme = nil
+</span><span class="marked0"><a name="line1038" />1038       duplicated_scheme = self.scheme.dup if self.scheme != nil
+</span><span class="marked1"><a name="line1039" />1039       duplicated_user = nil
+</span><span class="marked0"><a name="line1040" />1040       duplicated_user = self.user.dup if self.user != nil
+</span><span class="marked1"><a name="line1041" />1041       duplicated_password = nil
+</span><span class="marked0"><a name="line1042" />1042       duplicated_password = self.password.dup if self.password != nil
+</span><span class="marked1"><a name="line1043" />1043       duplicated_host = nil
+</span><span class="marked0"><a name="line1044" />1044       duplicated_host = self.host.dup if self.host != nil
+</span><span class="marked1"><a name="line1045" />1045       duplicated_port = self.port
+</span><span class="marked0"><a name="line1046" />1046       duplicated_path = nil
+</span><span class="marked1"><a name="line1047" />1047       duplicated_path = self.path.dup if self.path != nil
+</span><span class="marked0"><a name="line1048" />1048       duplicated_query = nil
+</span><span class="marked1"><a name="line1049" />1049       duplicated_query = self.query.dup if self.query != nil
+</span><span class="marked0"><a name="line1050" />1050       duplicated_fragment = nil
+</span><span class="marked1"><a name="line1051" />1051       duplicated_fragment = self.fragment.dup if self.fragment != nil
+</span><span class="marked0"><a name="line1052" />1052       duplicated_uri = Addressable::URI.new(
+</span><span class="inferred1"><a name="line1053" />1053         duplicated_scheme,
+</span><span class="inferred0"><a name="line1054" />1054         duplicated_user,
+</span><span class="inferred1"><a name="line1055" />1055         duplicated_password,
+</span><span class="inferred0"><a name="line1056" />1056         duplicated_host,
+</span><span class="inferred1"><a name="line1057" />1057         duplicated_port,
+</span><span class="inferred0"><a name="line1058" />1058         duplicated_path,
+</span><span class="inferred1"><a name="line1059" />1059         duplicated_query,
+</span><span class="inferred0"><a name="line1060" />1060         duplicated_fragment
+</span><span class="inferred1"><a name="line1061" />1061       )
+</span><span class="marked0"><a name="line1062" />1062       @specified_port = nil if !defined?(@specified_port)
+</span><span class="marked1"><a name="line1063" />1063       duplicated_uri.instance_variable_set(&quot;@specified_port&quot;, @specified_port)
+</span><span class="marked0"><a name="line1064" />1064       return duplicated_uri
+</span><span class="inferred1"><a name="line1065" />1065     end
+</span><span class="inferred0"><a name="line1066" />1066
+</span><span class="inferred1"><a name="line1067" />1067     # Returns the assembled URI as a string.
+</span><span class="marked0"><a name="line1068" />1068     def to_s
+</span><span class="marked1"><a name="line1069" />1069       uri_string = &quot;&quot;
+</span><span class="marked0"><a name="line1070" />1070       uri_string &lt;&lt; &quot;#{self.scheme}:&quot; if self.scheme != nil
+</span><span class="marked1"><a name="line1071" />1071       uri_string &lt;&lt; &quot;//#{self.authority}&quot; if self.authority != nil
+</span><span class="marked0"><a name="line1072" />1072       uri_string &lt;&lt; self.path.to_s
+</span><span class="marked1"><a name="line1073" />1073       uri_string &lt;&lt; &quot;?#{self.query}&quot; if self.query != nil
+</span><span class="marked0"><a name="line1074" />1074       uri_string &lt;&lt; &quot;##{self.fragment}&quot; if self.fragment != nil
+</span><span class="marked1"><a name="line1075" />1075       return uri_string
+</span><span class="inferred0"><a name="line1076" />1076     end
+</span><span class="inferred1"><a name="line1077" />1077
+</span><span class="inferred0"><a name="line1078" />1078     # Returns a Hash of the URI segments.
+</span><span class="marked1"><a name="line1079" />1079     def to_h
+</span><span class="inferred0"><a name="line1080" />1080       return {
+</span><span class="marked1"><a name="line1081" />1081         :scheme =&gt; self.scheme,
+</span><span class="marked0"><a name="line1082" />1082         :user =&gt; self.user,
+</span><span class="marked1"><a name="line1083" />1083         :password =&gt; self.password,
+</span><span class="marked0"><a name="line1084" />1084         :host =&gt; self.host,
+</span><span class="marked1"><a name="line1085" />1085         :port =&gt; self.specified_port,
+</span><span class="marked0"><a name="line1086" />1086         :path =&gt; self.path,
+</span><span class="marked1"><a name="line1087" />1087         :query =&gt; self.query,
+</span><span class="marked0"><a name="line1088" />1088         :fragment =&gt; self.fragment
+</span><span class="marked1"><a name="line1089" />1089       }
+</span><span class="marked0"><a name="line1090" />1090     end
+</span><span class="inferred1"><a name="line1091" />1091
+</span><span class="inferred0"><a name="line1092" />1092     # Returns a string representation of the URI object's state.
+</span><span class="marked1"><a name="line1093" />1093     def inspect
+</span><span class="marked0"><a name="line1094" />1094       sprintf(&quot;#&lt;%s:%#0x URI:%s&gt;&quot;, self.class.to_s, self.object_id, self.to_s)
+</span><span class="marked1"><a name="line1095" />1095     end
+</span><span class="inferred0"><a name="line1096" />1096
+</span><span class="inferred1"><a name="line1097" />1097     # This module handles internationalized domain names.  When Ruby has an
+</span><span class="inferred0"><a name="line1098" />1098     # implementation of nameprep, stringprep, punycode, etc, this
+</span><span class="inferred1"><a name="line1099" />1099     # module should contain an actual implementation of IDNA instead of
+</span><span class="inferred0"><a name="line1100" />1100     # returning nil if libidn can't be used.
+</span><span class="marked1"><a name="line1101" />1101     module IDNA
+</span><span class="inferred0"><a name="line1102" />1102       # Returns the ascii representation of the label.
+</span><span class="marked1"><a name="line1103" />1103       def self.to_ascii(label)
+</span><span class="marked0"><a name="line1104" />1104         return nil if label.nil?
+</span><span class="marked1"><a name="line1105" />1105         if self.use_libidn?
+</span><span class="marked0"><a name="line1106" />1106           return IDN::Idna.toASCII(label)
+</span><span class="inferred1"><a name="line1107" />1107         else
+</span><span class="marked0"><a name="line1108" />1108           raise NotImplementedError,
+</span><span class="inferred1"><a name="line1109" />1109             &quot;There is no available pure-ruby implementation.  &quot; +
+</span><span class="inferred0"><a name="line1110" />1110             &quot;Install libidn bindings.&quot;
+</span><span class="inferred1"><a name="line1111" />1111         end
+</span><span class="inferred0"><a name="line1112" />1112       end
+</span><span class="inferred1"><a name="line1113" />1113
+</span><span class="inferred0"><a name="line1114" />1114       # Returns the unicode representation of the label.
+</span><span class="marked1"><a name="line1115" />1115       def self.to_unicode(label)
+</span><span class="marked0"><a name="line1116" />1116         return nil if label.nil?
+</span><span class="marked1"><a name="line1117" />1117         if self.use_libidn?
+</span><span class="marked0"><a name="line1118" />1118           return IDN::Idna.toUnicode(label)
+</span><span class="inferred1"><a name="line1119" />1119         else
+</span><span class="marked0"><a name="line1120" />1120           raise NotImplementedError,
+</span><span class="inferred1"><a name="line1121" />1121             &quot;There is no available pure-ruby implementation.  &quot; +
+</span><span class="inferred0"><a name="line1122" />1122             &quot;Install libidn bindings.&quot;
+</span><span class="inferred1"><a name="line1123" />1123         end
+</span><span class="inferred0"><a name="line1124" />1124       end
+</span><span class="inferred1"><a name="line1125" />1125
+</span><span class="marked0"><a name="line1126" />1126     private
+</span><span class="inferred1"><a name="line1127" />1127       # Determines if the libidn bindings are available and able to be used.
+</span><span class="marked0"><a name="line1128" />1128       def self.use_libidn?
+</span><span class="marked1"><a name="line1129" />1129         if !defined?(@use_libidn) || @use_libidn.nil?
+</span><span class="marked0"><a name="line1130" />1130           begin
+</span><span class="marked1"><a name="line1131" />1131             require 'rubygems'
+</span><span class="inferred0"><a name="line1132" />1132           rescue LoadError
+</span><span class="marked1"><a name="line1133" />1133             nil
+</span><span class="inferred0"><a name="line1134" />1134           end
+</span><span class="marked1"><a name="line1135" />1135           begin
+</span><span class="marked0"><a name="line1136" />1136             require 'idn'
+</span><span class="inferred1"><a name="line1137" />1137           rescue LoadError
+</span><span class="marked0"><a name="line1138" />1138             nil
+</span><span class="inferred1"><a name="line1139" />1139           end
+</span><span class="marked0"><a name="line1140" />1140           @use_libidn = !!(defined?(IDN::Idna))
+</span><span class="inferred1"><a name="line1141" />1141         end
+</span><span class="marked0"><a name="line1142" />1142         return @use_libidn
+</span><span class="inferred1"><a name="line1143" />1143       end
+</span><span class="inferred0"><a name="line1144" />1144     end
+</span><span class="inferred1"><a name="line1145" />1145
+</span><span class="marked0"><a name="line1146" />1146   private
+</span><span class="inferred1"><a name="line1147" />1147     # Resolves paths to their simplest form.
+</span><span class="marked0"><a name="line1148" />1148     def self.normalize_path(path)
+</span><span class="inferred1"><a name="line1149" />1149       # Section 5.2.4 of RFC 3986
+</span><span class="inferred0"><a name="line1150" />1150
+</span><span class="marked1"><a name="line1151" />1151       return nil if path.nil?
+</span><span class="marked0"><a name="line1152" />1152       normalized_path = path.dup
+</span><span class="marked1"><a name="line1153" />1153       previous_state = normalized_path.dup
+</span><span class="inferred0"><a name="line1154" />1154       begin
+</span><span class="marked1"><a name="line1155" />1155         previous_state = normalized_path.dup
+</span><span class="marked0"><a name="line1156" />1156         normalized_path.gsub!(/\/\.\//, &quot;/&quot;)
+</span><span class="marked1"><a name="line1157" />1157         normalized_path.gsub!(/\/\.$/, &quot;/&quot;)
+</span><span class="marked0"><a name="line1158" />1158         parent = normalized_path.scan(/\/([^\/]+)\/\.\.\//).flatten[0]
+</span><span class="marked1"><a name="line1159" />1159         if parent != &quot;.&quot; &amp;&amp; parent != &quot;..&quot;
+</span><span class="marked0"><a name="line1160" />1160           normalized_path.gsub!(/\/#{parent}\/\.\.\//, &quot;/&quot;)
+</span><span class="inferred1"><a name="line1161" />1161         end
+</span><span class="marked0"><a name="line1162" />1162         parent = normalized_path.scan(/\/([^\/]+)\/\.\.$/).flatten[0]
+</span><span class="marked1"><a name="line1163" />1163         if parent != &quot;.&quot; &amp;&amp; parent != &quot;..&quot;
+</span><span class="marked0"><a name="line1164" />1164           normalized_path.gsub!(/\/#{parent}\/\.\.$/, &quot;/&quot;)
+</span><span class="inferred1"><a name="line1165" />1165         end
+</span><span class="marked0"><a name="line1166" />1166         normalized_path.gsub!(/^\.\.?\/?/, &quot;&quot;)
+</span><span class="marked1"><a name="line1167" />1167         normalized_path.gsub!(/^\/\.\.?\//, &quot;/&quot;)
+</span><span class="marked0"><a name="line1168" />1168       end until previous_state == normalized_path
+</span><span class="marked1"><a name="line1169" />1169       return normalized_path
+</span><span class="inferred0"><a name="line1170" />1170     end
+</span><span class="inferred1"><a name="line1171" />1171
+</span><span class="inferred0"><a name="line1172" />1172     # Ensures that the URI is valid.
+</span><span class="marked1"><a name="line1173" />1173     def validate
+</span><span class="marked0"><a name="line1174" />1174       if self.scheme == nil &amp;&amp; self.user == nil &amp;&amp; self.password == nil &amp;&amp;
+</span><span class="marked1"><a name="line1175" />1175           self.host == nil &amp;&amp; self.port == nil &amp;&amp; self.path == nil &amp;&amp;
+</span><span class="marked0"><a name="line1176" />1176           self.query == nil &amp;&amp; self.fragment == nil
+</span><span class="marked1"><a name="line1177" />1177         raise InvalidURIError, &quot;All segments were nil.&quot;
+</span><span class="inferred0"><a name="line1178" />1178       end
+</span><span class="marked1"><a name="line1179" />1179       if self.scheme != nil &amp;&amp;
+</span><span class="marked0"><a name="line1180" />1180           (self.host == nil || self.host == &quot;&quot;) &amp;&amp;
+</span><span class="marked1"><a name="line1181" />1181           (self.path == nil || self.path == &quot;&quot;)
+</span><span class="marked0"><a name="line1182" />1182         raise InvalidURIError,
+</span><span class="inferred1"><a name="line1183" />1183           &quot;Absolute URI missing hierarchical segment.&quot;
+</span><span class="inferred0"><a name="line1184" />1184       end
+</span><span class="inferred1"><a name="line1185" />1185     end
+</span><span class="inferred0"><a name="line1186" />1186
+</span><span class="inferred1"><a name="line1187" />1187     # Replaces the internal state of self with the specified URI's state.
+</span><span class="inferred0"><a name="line1188" />1188     # Used in destructive operations to avoid massive code repetition.
+</span><span class="marked1"><a name="line1189" />1189     def replace_self(uri)
+</span><span class="inferred0"><a name="line1190" />1190       # Reset dependant values
+</span><span class="marked1"><a name="line1191" />1191       @userinfo = nil
+</span><span class="marked0"><a name="line1192" />1192       @authority = nil
+</span><span class="inferred1"><a name="line1193" />1193
+</span><span class="marked0"><a name="line1194" />1194       @scheme = uri.scheme
+</span><span class="marked1"><a name="line1195" />1195       @user = uri.user
+</span><span class="marked0"><a name="line1196" />1196       @password = uri.password
+</span><span class="marked1"><a name="line1197" />1197       @host = uri.host
+</span><span class="marked0"><a name="line1198" />1198       @specified_port = uri.instance_variable_get(&quot;@specified_port&quot;)
+</span><span class="marked1"><a name="line1199" />1199       @port = @specified_port.to_s.to_i
+</span><span class="marked0"><a name="line1200" />1200       @path = uri.path
+</span><span class="marked1"><a name="line1201" />1201       @query = uri.query
+</span><span class="marked0"><a name="line1202" />1202       @fragment = uri.fragment
+</span><span class="marked1"><a name="line1203" />1203       return self
+</span><span class="inferred0"><a name="line1204" />1204     end
+</span><span class="inferred1"><a name="line1205" />1205   end
+</span><span class="inferred0"><a name="line1206" />1206 end
 </span></pre><hr />    <p>Generated using the <a href='http://eigenclass.org/hiki.rb?rcov'>rcov code coverage analysis tool for Ruby</a> version 0.8.0.</p><p>
           <a href='http://validator.w3.org/check/referer'>
             <img src='http://www.w3.org/Icons/valid-xhtml10' height='31' alt='Valid XHTML 1.0!' width='88' />