addressable 1.0.0 → 1.0.1

data/doc/classes/Addressable/URI/IDNA.html

@@ -129,17 +129,17 @@ Returns the ascii representation of the label.
             onclick="toggleCode('M000058-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000058-source">
 <pre>
-      <span class="ruby-comment cmt"># File lib/addressable/uri.rb, line 1114</span>
-1114:       <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">to_ascii</span>(<span class="ruby-identifier">label</span>)
-1115:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">label</span>.<span class="ruby-identifier">nil?</span>
-1116:         <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">use_libidn?</span>
-1117:           <span class="ruby-keyword kw">return</span> <span class="ruby-constant">IDN</span><span class="ruby-operator">::</span><span class="ruby-constant">Idna</span>.<span class="ruby-identifier">toASCII</span>(<span class="ruby-identifier">label</span>)
-1118:         <span class="ruby-keyword kw">else</span>
-1119:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">NotImplementedError</span>,
-1120:             <span class="ruby-value str">&quot;There is no available pure-ruby implementation.  &quot;</span> <span class="ruby-operator">+</span>
-1121:             <span class="ruby-value str">&quot;Install libidn bindings.&quot;</span>
-1122:         <span class="ruby-keyword kw">end</span>
-1123:       <span class="ruby-keyword kw">end</span>
+      <span class="ruby-comment cmt"># File lib/addressable/uri.rb, line 1117</span>
+1117:       <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">to_ascii</span>(<span class="ruby-identifier">label</span>)
+1118:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">label</span>.<span class="ruby-identifier">nil?</span>
+1119:         <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">use_libidn?</span>
+1120:           <span class="ruby-keyword kw">return</span> <span class="ruby-constant">IDN</span><span class="ruby-operator">::</span><span class="ruby-constant">Idna</span>.<span class="ruby-identifier">toASCII</span>(<span class="ruby-identifier">label</span>)
+1121:         <span class="ruby-keyword kw">else</span>
+1122:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">NotImplementedError</span>,
+1123:             <span class="ruby-value str">&quot;There is no available pure-ruby implementation.  &quot;</span> <span class="ruby-operator">+</span>
+1124:             <span class="ruby-value str">&quot;Install libidn bindings.&quot;</span>
+1125:         <span class="ruby-keyword kw">end</span>
+1126:       <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -162,17 +162,17 @@ Returns the unicode representation of the label.
             onclick="toggleCode('M000059-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000059-source">
 <pre>
-      <span class="ruby-comment cmt"># File lib/addressable/uri.rb, line 1126</span>
-1126:       <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">to_unicode</span>(<span class="ruby-identifier">label</span>)
-1127:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">label</span>.<span class="ruby-identifier">nil?</span>
-1128:         <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">use_libidn?</span>
-1129:           <span class="ruby-keyword kw">return</span> <span class="ruby-constant">IDN</span><span class="ruby-operator">::</span><span class="ruby-constant">Idna</span>.<span class="ruby-identifier">toUnicode</span>(<span class="ruby-identifier">label</span>)
-1130:         <span class="ruby-keyword kw">else</span>
-1131:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">NotImplementedError</span>,
-1132:             <span class="ruby-value str">&quot;There is no available pure-ruby implementation.  &quot;</span> <span class="ruby-operator">+</span>
-1133:             <span class="ruby-value str">&quot;Install libidn bindings.&quot;</span>
-1134:         <span class="ruby-keyword kw">end</span>
-1135:       <span class="ruby-keyword kw">end</span>
+      <span class="ruby-comment cmt"># File lib/addressable/uri.rb, line 1129</span>
+1129:       <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">to_unicode</span>(<span class="ruby-identifier">label</span>)
+1130:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">label</span>.<span class="ruby-identifier">nil?</span>
+1131:         <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">use_libidn?</span>
+1132:           <span class="ruby-keyword kw">return</span> <span class="ruby-constant">IDN</span><span class="ruby-operator">::</span><span class="ruby-constant">Idna</span>.<span class="ruby-identifier">toUnicode</span>(<span class="ruby-identifier">label</span>)
+1133:         <span class="ruby-keyword kw">else</span>
+1134:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">NotImplementedError</span>,
+1135:             <span class="ruby-value str">&quot;There is no available pure-ruby implementation.  &quot;</span> <span class="ruby-operator">+</span>
+1136:             <span class="ruby-value str">&quot;Install libidn bindings.&quot;</span>
+1137:         <span class="ruby-keyword kw">end</span>
+1138:       <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

data/doc/created.rid

@@ -1 +1 @@
-Sat Nov 03 22:20:27 -0400 2007
+Sun, 09 Dec 2007 23:57:35 -0500

data/doc/files/CHANGELOG.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Nov 03 19:31:11 -0400 2007</td>
+      <td>Sun Dec 09 23:54:57 -0500 2007</td>
     </tr>
     </table>
   </div>
@@ -69,7 +69,11 @@
   <div id="contextContent">
 
     <div id="description">
-      <h3><a href="../classes/Addressable.html">Addressable</a> 1.0.0</h3>
+      <h3><a href="../classes/Addressable.html">Addressable</a> 1.0.1</h3>
+<pre>
+  * fixed minor bug with the extract_mapping method
+</pre>
+<h3><a href="../classes/Addressable.html">Addressable</a> 1.0.0</h3>
 <pre>
   * heuristic parse method added
   * parsing is slightly more strict

data/doc/files/lib/addressable/uri_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Nov 03 20:48:16 -0400 2007</td>
+      <td>Sun Dec 09 23:47:23 -0500 2007</td>
     </tr>
     </table>
   </div>

data/doc/files/lib/addressable/version_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Nov 02 10:59:09 -0400 2007</td>
+      <td>Sun Dec 09 23:57:29 -0500 2007</td>
     </tr>
     </table>
   </div>

data/lib/addressable/uri.rb

@@ -285,7 +285,8 @@ module Addressable
         capture_group
       end)
       values = self.to_s.scan(regexp).flatten
-      if variables.size == values.size
+      
+      if variables.size == values.size && variables.size > 0
         for i in 0...variables.size
           name = variables[i]
           value = values[i]
@@ -299,6 +300,8 @@ module Addressable
           mapping[name] = value
         end
         return mapping
+      elsif self.to_s == pattern
+        return {}
       else
         # Pattern failed to match URI.
         return nil

data/lib/addressable/version.rb

@@ -25,7 +25,7 @@ module Addressable
   module ADDRESSABLE_VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/addressable/uri_spec.rb

@@ -2818,6 +2818,33 @@ describe Addressable::URI, "when given a mapping that contains values " +
   end
 end
 
+describe Addressable::URI, " when parsed from " +
+    "'/'" do
+  before do
+    @uri = Addressable::URI.parse("/")
+  end
+  
+  it "should have the correct mapping when extracting values " +
+      "using the pattern '/'" do
+    @uri.extract_mapping("/").should == {}
+  end
+end
+
+describe Addressable::URI, " when parsed from '/one/'" do
+  before do
+    @uri = Addressable::URI.parse("/one/")
+  end
+  
+  it "should not match the pattern '/two/'" do
+    @uri.extract_mapping("/two/").should == nil
+  end
+  
+  it "should have the correct mapping when extracting values " +
+      "using the pattern '/{number}/'" do
+    @uri.extract_mapping("/{number}/").should == {"number" => "one"}
+  end
+end
+
 describe Addressable::URI, " when parsed from " +
     "'http://example.com/search/an+example+search+query/'" do
   before do

data/specdoc/index.html

@@ -179,23 +179,25 @@ a {
 <div class="results">
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_1">Addressable::URI when created from nil components</dt>
+  <dt id="behaviour_1">Addressable::URI when created with a non-numeric port number</dt>
     <script type="text/javascript">moveProgressBar('0.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should raise an error</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_2">Addressable::URI when created with a non-numeric port number</dt>
-    <script type="text/javascript">moveProgressBar('0.5');</script>
+  <dt id="behaviour_2">Addressable::URI when created with a scheme but no hierarchical segment</dt>
+    <script type="text/javascript">moveProgressBar('0.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should raise an error</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_3">Addressable::URI when created with a scheme but no hierarchical segment</dt>
-    <script type="text/javascript">moveProgressBar('0.8');</script>
-    <dd class="spec passed"><span class="passed_spec_name">should raise an error</span></dd>
+  <dt id="behaviour_3">Addressable::URI when created from nil components</dt>
+    <script type="text/javascript">moveProgressBar('0.6');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have an empty path</span></dd>
+    <script type="text/javascript">moveProgressBar('0.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be an empty uri</span></dd>
   </dl>
 </div>
 <div class="behaviour">
@@ -207,846 +209,1000 @@ a {
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_5">Addressable::URI when parsed from 'ftp://ftp.is.co.za/rfc/rfc1808.txt'</dt>
+  <dt id="behaviour_5">Addressable::URI when created with a nil host but non-nil authority components</dt>
     <script type="text/javascript">moveProgressBar('1.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should raise an error</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_6">Addressable::URI when parsed from 'ftp://ftp.is.co.za/rfc/rfc1808.txt'</dt>
+    <script type="text/javascript">moveProgressBar('1.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'ftp' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('1.6');</script>
+    <script type="text/javascript">moveProgressBar('1.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('1.9');</script>
+    <script type="text/javascript">moveProgressBar('2.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'ftp.is.co.za'</span></dd>
     <script type="text/javascript">moveProgressBar('2.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of '/rfc/rfc1808.txt'</span></dd>
-    <script type="text/javascript">moveProgressBar('2.4');</script>
+    <script type="text/javascript">moveProgressBar('2.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_6">Addressable::URI when parsed from 'http://www.ietf.org/rfc/rfc2396.txt'</dt>
+  <dt id="behaviour_7">Addressable::URI when parsed from 'http://www.ietf.org/rfc/rfc2396.txt'</dt>
     <script type="text/javascript">moveProgressBar('2.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'http' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('3.0');</script>
+    <script type="text/javascript">moveProgressBar('2.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('3.3');</script>
+    <script type="text/javascript">moveProgressBar('3.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'www.ietf.org'</span></dd>
-    <script type="text/javascript">moveProgressBar('3.5');</script>
+    <script type="text/javascript">moveProgressBar('3.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of '/rfc/rfc2396.txt'</span></dd>
-    <script type="text/javascript">moveProgressBar('3.8');</script>
+    <script type="text/javascript">moveProgressBar('3.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_7">Addressable::URI when parsed from 'ldap://[2001:db8::7]/c=GB?objectClass?one'</dt>
-    <script type="text/javascript">moveProgressBar('4.1');</script>
+  <dt id="behaviour_8">Addressable::URI when parsed from 'ldap://[2001:db8::7]/c=GB?objectClass?one'</dt>
+    <script type="text/javascript">moveProgressBar('3.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'ldap' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('4.4');</script>
+    <script type="text/javascript">moveProgressBar('4.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('4.6');</script>
+    <script type="text/javascript">moveProgressBar('4.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of '[2001:db8::7]'</span></dd>
-    <script type="text/javascript">moveProgressBar('4.9');</script>
+    <script type="text/javascript">moveProgressBar('4.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of '/c=GB'</span></dd>
-    <script type="text/javascript">moveProgressBar('5.2');</script>
+    <script type="text/javascript">moveProgressBar('4.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a query of 'objectClass?one'</span></dd>
-    <script type="text/javascript">moveProgressBar('5.5');</script>
+    <script type="text/javascript">moveProgressBar('5.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_8">Addressable::URI when parsed from 'mailto:John.Doe@example.com'</dt>
-    <script type="text/javascript">moveProgressBar('5.8');</script>
+  <dt id="behaviour_9">Addressable::URI when parsed from 'mailto:John.Doe@example.com'</dt>
+    <script type="text/javascript">moveProgressBar('5.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'mailto' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('6.0');</script>
+    <script type="text/javascript">moveProgressBar('5.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be considered to be ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('6.3');</script>
+    <script type="text/javascript">moveProgressBar('5.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of 'John.Doe@example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('6.6');</script>
+    <script type="text/javascript">moveProgressBar('5.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_9">Addressable::URI when parsed from 'news:comp.infosystems.www.servers.unix'</dt>
-    <script type="text/javascript">moveProgressBar('6.9');</script>
+  <dt id="behaviour_10">Addressable::URI when parsed from 'news:comp.infosystems.www.servers.unix'</dt>
+    <script type="text/javascript">moveProgressBar('6.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'news' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('7.1');</script>
+    <script type="text/javascript">moveProgressBar('6.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be considered to be ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('7.4');</script>
+    <script type="text/javascript">moveProgressBar('6.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of 'comp.infosystems.www.servers.unix'</span></dd>
-    <script type="text/javascript">moveProgressBar('7.7');</script>
+    <script type="text/javascript">moveProgressBar('6.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_10">Addressable::URI when parsed from 'tel:+1-816-555-1212'</dt>
-    <script type="text/javascript">moveProgressBar('8.0');</script>
+  <dt id="behaviour_11">Addressable::URI when parsed from 'tel:+1-816-555-1212'</dt>
+    <script type="text/javascript">moveProgressBar('7.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'tel' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('8.2');</script>
+    <script type="text/javascript">moveProgressBar('7.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be considered to be ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('8.5');</script>
+    <script type="text/javascript">moveProgressBar('7.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of '+1-816-555-1212'</span></dd>
-    <script type="text/javascript">moveProgressBar('8.8');</script>
+    <script type="text/javascript">moveProgressBar('7.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_11">Addressable::URI when parsed from 'telnet://192.0.2.16:80/'</dt>
-    <script type="text/javascript">moveProgressBar('9.1');</script>
+  <dt id="behaviour_12">Addressable::URI when parsed from 'telnet://192.0.2.16:80/'</dt>
+    <script type="text/javascript">moveProgressBar('7.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'telnet' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('9.3');</script>
+    <script type="text/javascript">moveProgressBar('8.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of '192.0.2.16'</span></dd>
-    <script type="text/javascript">moveProgressBar('9.6');</script>
+    <script type="text/javascript">moveProgressBar('8.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a port of '80'</span></dd>
-    <script type="text/javascript">moveProgressBar('9.9');</script>
+    <script type="text/javascript">moveProgressBar('8.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('10.2');</script>
+    <script type="text/javascript">moveProgressBar('8.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of '/'</span></dd>
-    <script type="text/javascript">moveProgressBar('10.4');</script>
+    <script type="text/javascript">moveProgressBar('9.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_12">Addressable::URI when parsed from 'urn:oasis:names:specification:docbook:dtd:xml:4.1.2'</dt>
-    <script type="text/javascript">moveProgressBar('10.7');</script>
+  <dt id="behaviour_13">Addressable::URI when parsed from 'urn:oasis:names:specification:docbook:dtd:xml:4.1.2'</dt>
+    <script type="text/javascript">moveProgressBar('9.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'urn' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('11.0');</script>
+    <script type="text/javascript">moveProgressBar('9.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be considered to be ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('11.3');</script>
+    <script type="text/javascript">moveProgressBar('9.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of 'oasis:names:specification:docbook:dtd:xml:4.1.2'</span></dd>
-    <script type="text/javascript">moveProgressBar('11.6');</script>
+    <script type="text/javascript">moveProgressBar('10.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_13">Addressable::URI when parsed from 'http://example.com'</dt>
-    <script type="text/javascript">moveProgressBar('11.8');</script>
+  <dt id="behaviour_14">Addressable::URI when parsed from 'http://example.com'</dt>
+    <script type="text/javascript">moveProgressBar('10.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">when inspected, should have the correct URI</span></dd>
-    <script type="text/javascript">moveProgressBar('12.1');</script>
+    <script type="text/javascript">moveProgressBar('10.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">when inspected, should have the correct class name</span></dd>
+    <script type="text/javascript">moveProgressBar('10.6');</script>
+    <dd class="spec passed"><span class="passed_spec_name">when inspected, should have the correct object id</span></dd>
+    <script type="text/javascript">moveProgressBar('10.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'http' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('12.4');</script>
+    <script type="text/javascript">moveProgressBar('11.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('12.7');</script>
+    <script type="text/javascript">moveProgressBar('11.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have an authority segment of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('12.9');</script>
+    <script type="text/javascript">moveProgressBar('11.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('13.2');</script>
+    <script type="text/javascript">moveProgressBar('11.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('13.5');</script>
+    <script type="text/javascript">moveProgressBar('12.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no username</span></dd>
-    <script type="text/javascript">moveProgressBar('13.8');</script>
+    <script type="text/javascript">moveProgressBar('12.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no password</span></dd>
-    <script type="text/javascript">moveProgressBar('14.0');</script>
+    <script type="text/javascript">moveProgressBar('12.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use port 80</span></dd>
-    <script type="text/javascript">moveProgressBar('14.3');</script>
+    <script type="text/javascript">moveProgressBar('12.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not have a specified port</span></dd>
-    <script type="text/javascript">moveProgressBar('14.6');</script>
+    <script type="text/javascript">moveProgressBar('12.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have an empty path</span></dd>
-    <script type="text/javascript">moveProgressBar('14.9');</script>
+    <script type="text/javascript">moveProgressBar('13.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no query string</span></dd>
-    <script type="text/javascript">moveProgressBar('15.1');</script>
+    <script type="text/javascript">moveProgressBar('13.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no fragment</span></dd>
-    <script type="text/javascript">moveProgressBar('15.4');</script>
+    <script type="text/javascript">moveProgressBar('13.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered absolute</span></dd>
-    <script type="text/javascript">moveProgressBar('15.7');</script>
+    <script type="text/javascript">moveProgressBar('13.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be considered relative</span></dd>
-    <script type="text/javascript">moveProgressBar('16.0');</script>
+    <script type="text/javascript">moveProgressBar('14.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be exactly equal to 42</span></dd>
-    <script type="text/javascript">moveProgressBar('16.2');</script>
+    <script type="text/javascript">moveProgressBar('14.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be equal to 42</span></dd>
-    <script type="text/javascript">moveProgressBar('16.5');</script>
+    <script type="text/javascript">moveProgressBar('14.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be roughly equal to 42</span></dd>
-    <script type="text/javascript">moveProgressBar('16.8');</script>
+    <script type="text/javascript">moveProgressBar('14.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be exactly equal to http://example.com</span></dd>
-    <script type="text/javascript">moveProgressBar('17.1');</script>
+    <script type="text/javascript">moveProgressBar('15.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be roughly equal to http://example.com/</span></dd>
-    <script type="text/javascript">moveProgressBar('17.4');</script>
+    <script type="text/javascript">moveProgressBar('15.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be roughly equal to the string 'http://example.com/'</span></dd>
-    <script type="text/javascript">moveProgressBar('17.6');</script>
+    <script type="text/javascript">moveProgressBar('15.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be roughly equal to the string 'http://example.com:bogus/'</span></dd>
-    <script type="text/javascript">moveProgressBar('17.9');</script>
+    <script type="text/javascript">moveProgressBar('15.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should result in itself when merged with itself</span></dd>
-    <script type="text/javascript">moveProgressBar('18.2');</script>
+    <script type="text/javascript">moveProgressBar('15.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to http://example.com/</span></dd>
-    <script type="text/javascript">moveProgressBar('18.5');</script>
+    <script type="text/javascript">moveProgressBar('16.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to http://example.com:/</span></dd>
-    <script type="text/javascript">moveProgressBar('18.7');</script>
+    <script type="text/javascript">moveProgressBar('16.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to http://example.com:80/</span></dd>
-    <script type="text/javascript">moveProgressBar('19.0');</script>
+    <script type="text/javascript">moveProgressBar('16.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to http://EXAMPLE.COM/</span></dd>
-    <script type="text/javascript">moveProgressBar('19.3');</script>
+    <script type="text/javascript">moveProgressBar('16.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a route of '/path/' to 'http://example.com/path/'</span></dd>
-    <script type="text/javascript">moveProgressBar('19.6');</script>
+    <script type="text/javascript">moveProgressBar('17.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a route of '/' from 'http://example.com/path/'</span></dd>
-    <script type="text/javascript">moveProgressBar('19.8');</script>
+    <script type="text/javascript">moveProgressBar('17.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a route of '#' to 'http://example.com/'</span></dd>
-    <script type="text/javascript">moveProgressBar('20.1');</script>
+    <script type="text/javascript">moveProgressBar('17.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a route of 'http://elsewhere.com/' to 'http://elsewhere.com/'</span></dd>
-    <script type="text/javascript">moveProgressBar('20.4');</script>
+    <script type="text/javascript">moveProgressBar('17.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'relative/path' should be 'http://example.com/relative/path'</span></dd>
-    <script type="text/javascript">moveProgressBar('20.7');</script>
+    <script type="text/javascript">moveProgressBar('17.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct username after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('20.9');</script>
+    <script type="text/javascript">moveProgressBar('18.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct password after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('21.2');</script>
+    <script type="text/javascript">moveProgressBar('18.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct user/pass after repeated assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('21.5');</script>
+    <script type="text/javascript">moveProgressBar('18.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct user/pass after userinfo assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('21.8');</script>
+    <script type="text/javascript">moveProgressBar('18.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should correctly convert to a hash</span></dd>
+    <script type="text/javascript">moveProgressBar('19.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be identical to its duplicate</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_14">Addressable::URI when parsed from 'http://example.com/'</dt>
-    <script type="text/javascript">moveProgressBar('22.0');</script>
+  <dt id="behaviour_15">Addressable::URI when parsed from 'http://example.com/'</dt>
+    <script type="text/javascript">moveProgressBar('19.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to http://example.com</span></dd>
-    <script type="text/javascript">moveProgressBar('22.3');</script>
+    <script type="text/javascript">moveProgressBar('19.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to HTTP://example.com/</span></dd>
-    <script type="text/javascript">moveProgressBar('22.6');</script>
+    <script type="text/javascript">moveProgressBar('19.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to http://example.com:/</span></dd>
-    <script type="text/javascript">moveProgressBar('22.9');</script>
+    <script type="text/javascript">moveProgressBar('20.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to http://example.com:80/</span></dd>
-    <script type="text/javascript">moveProgressBar('23.2');</script>
+    <script type="text/javascript">moveProgressBar('20.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to http://Example.com/</span></dd>
-    <script type="text/javascript">moveProgressBar('23.4');</script>
+    <script type="text/javascript">moveProgressBar('20.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct username after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('23.7');</script>
+    <script type="text/javascript">moveProgressBar('20.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct password after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('24.0');</script>
+    <script type="text/javascript">moveProgressBar('20.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should correctly convert to a hash</span></dd>
+    <script type="text/javascript">moveProgressBar('21.1');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be identical to its duplicate</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_15">Addressable::URI when parsed from 'http://@example.com/'</dt>
-    <script type="text/javascript">moveProgressBar('24.3');</script>
+  <dt id="behaviour_16">Addressable::URI when parsed from 'http://@example.com/'</dt>
+    <script type="text/javascript">moveProgressBar('21.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to http://example.com</span></dd>
-    <script type="text/javascript">moveProgressBar('24.5');</script>
+    <script type="text/javascript">moveProgressBar('21.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should correctly convert to a hash</span></dd>
+    <script type="text/javascript">moveProgressBar('21.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be identical to its duplicate</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_16">Addressable::URI when parsed from 'http://example.com./'</dt>
-    <script type="text/javascript">moveProgressBar('24.8');</script>
+  <dt id="behaviour_17">Addressable::URI when parsed from 'http://example.com./'</dt>
+    <script type="text/javascript">moveProgressBar('22.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to http://example.com</span></dd>
-    <script type="text/javascript">moveProgressBar('25.1');</script>
+    <script type="text/javascript">moveProgressBar('22.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be considered to be in normal form</span></dd>
+    <script type="text/javascript">moveProgressBar('22.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be identical to its duplicate</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_17">Addressable::URI when parsed from 'http://:@example.com/'</dt>
-    <script type="text/javascript">moveProgressBar('25.4');</script>
+  <dt id="behaviour_18">Addressable::URI when parsed from 'http://:@example.com/'</dt>
+    <script type="text/javascript">moveProgressBar('22.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to http://example.com</span></dd>
-    <script type="text/javascript">moveProgressBar('25.6');</script>
+    <script type="text/javascript">moveProgressBar('22.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should correctly convert to a hash</span></dd>
+    <script type="text/javascript">moveProgressBar('23.1');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be identical to its duplicate</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_18">Addressable::URI when parsed from 'http://example.com/~smith/'</dt>
-    <script type="text/javascript">moveProgressBar('25.9');</script>
+  <dt id="behaviour_19">Addressable::URI when parsed from 'http://example.com/~smith/'</dt>
+    <script type="text/javascript">moveProgressBar('23.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to http://example.com/%7Esmith/</span></dd>
-    <script type="text/javascript">moveProgressBar('26.2');</script>
+    <script type="text/javascript">moveProgressBar('23.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to http://example.com/%7esmith/</span></dd>
+    <script type="text/javascript">moveProgressBar('23.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be identical to its duplicate</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_19">Addressable::URI when parsed from 'http://example.com/%C3%87'</dt>
-    <script type="text/javascript">moveProgressBar('26.5');</script>
+  <dt id="behaviour_20">Addressable::URI when parsed from 'http://example.com/%C3%87'</dt>
+    <script type="text/javascript">moveProgressBar('24.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to 'http://example.com/C%CC%A7'</span></dd>
-    <script type="text/javascript">moveProgressBar('26.7');</script>
+    <script type="text/javascript">moveProgressBar('24.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not change if encoded with the normalizing algorithm</span></dd>
-    <script type="text/javascript">moveProgressBar('27.0');</script>
+    <script type="text/javascript">moveProgressBar('24.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">if percent encoded should be 'http://example.com/C%25CC%25A7'</span></dd>
+    <script type="text/javascript">moveProgressBar('24.7');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be identical to its duplicate</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_20">Addressable::URI when parsed from 'http://example.com/?q=string'</dt>
-    <script type="text/javascript">moveProgressBar('27.3');</script>
+  <dt id="behaviour_21">Addressable::URI when parsed from 'http://example.com/?q=string'</dt>
+    <script type="text/javascript">moveProgressBar('25.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'http' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('27.6');</script>
+    <script type="text/javascript">moveProgressBar('25.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have an authority segment of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('27.9');</script>
+    <script type="text/javascript">moveProgressBar('25.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('28.1');</script>
+    <script type="text/javascript">moveProgressBar('25.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no username</span></dd>
-    <script type="text/javascript">moveProgressBar('28.4');</script>
+    <script type="text/javascript">moveProgressBar('25.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no password</span></dd>
-    <script type="text/javascript">moveProgressBar('28.7');</script>
+    <script type="text/javascript">moveProgressBar('26.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use port 80</span></dd>
-    <script type="text/javascript">moveProgressBar('29.0');</script>
+    <script type="text/javascript">moveProgressBar('26.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of '/'</span></dd>
-    <script type="text/javascript">moveProgressBar('29.2');</script>
+    <script type="text/javascript">moveProgressBar('26.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a query string of 'q=string'</span></dd>
-    <script type="text/javascript">moveProgressBar('29.5');</script>
+    <script type="text/javascript">moveProgressBar('26.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no fragment</span></dd>
-    <script type="text/javascript">moveProgressBar('29.8');</script>
+    <script type="text/javascript">moveProgressBar('27.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered absolute</span></dd>
-    <script type="text/javascript">moveProgressBar('30.1');</script>
+    <script type="text/javascript">moveProgressBar('27.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be considered relative</span></dd>
-    <script type="text/javascript">moveProgressBar('30.3');</script>
+    <script type="text/javascript">moveProgressBar('27.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
+    <script type="text/javascript">moveProgressBar('27.7');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be identical to its duplicate</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_21">Addressable::URI when parsed from 'http://example.com:80/'</dt>
-    <script type="text/javascript">moveProgressBar('30.6');</script>
+  <dt id="behaviour_22">Addressable::URI when parsed from 'http://example.com:80/'</dt>
+    <script type="text/javascript">moveProgressBar('27.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'http' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('30.9');</script>
+    <script type="text/javascript">moveProgressBar('28.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have an authority segment of 'example.com:80'</span></dd>
-    <script type="text/javascript">moveProgressBar('31.2');</script>
+    <script type="text/javascript">moveProgressBar('28.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('31.4');</script>
+    <script type="text/javascript">moveProgressBar('28.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no username</span></dd>
-    <script type="text/javascript">moveProgressBar('31.7');</script>
+    <script type="text/javascript">moveProgressBar('28.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no password</span></dd>
-    <script type="text/javascript">moveProgressBar('32.0');</script>
+    <script type="text/javascript">moveProgressBar('29.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use port 80</span></dd>
-    <script type="text/javascript">moveProgressBar('32.3');</script>
+    <script type="text/javascript">moveProgressBar('29.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of '/'</span></dd>
-    <script type="text/javascript">moveProgressBar('32.5');</script>
+    <script type="text/javascript">moveProgressBar('29.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no query string</span></dd>
-    <script type="text/javascript">moveProgressBar('32.8');</script>
+    <script type="text/javascript">moveProgressBar('29.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no fragment</span></dd>
-    <script type="text/javascript">moveProgressBar('33.1');</script>
+    <script type="text/javascript">moveProgressBar('30.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered absolute</span></dd>
-    <script type="text/javascript">moveProgressBar('33.4');</script>
+    <script type="text/javascript">moveProgressBar('30.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be considered relative</span></dd>
-    <script type="text/javascript">moveProgressBar('33.7');</script>
+    <script type="text/javascript">moveProgressBar('30.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be exactly equal to http://example.com:80/</span></dd>
-    <script type="text/javascript">moveProgressBar('33.9');</script>
+    <script type="text/javascript">moveProgressBar('30.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be roughly equal to http://example.com/</span></dd>
-    <script type="text/javascript">moveProgressBar('34.2');</script>
+    <script type="text/javascript">moveProgressBar('30.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be roughly equal to the string 'http://example.com/'</span></dd>
-    <script type="text/javascript">moveProgressBar('34.5');</script>
+    <script type="text/javascript">moveProgressBar('31.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be roughly equal to the string 'http://example.com:bogus/'</span></dd>
-    <script type="text/javascript">moveProgressBar('34.8');</script>
-    <dd class="spec passed"><span class="passed_spec_name">should result in itself when merged with itself</span></dd>
-    <script type="text/javascript">moveProgressBar('35.0');</script>
+    <script type="text/javascript">moveProgressBar('31.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should result in itself when joined with itself</span></dd>
+    <script type="text/javascript">moveProgressBar('31.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equal to http://example.com/</span></dd>
-    <script type="text/javascript">moveProgressBar('35.3');</script>
+    <script type="text/javascript">moveProgressBar('31.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equal to http://example.com:/</span></dd>
-    <script type="text/javascript">moveProgressBar('35.6');</script>
+    <script type="text/javascript">moveProgressBar('32.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equal to http://example.com:80/</span></dd>
-    <script type="text/javascript">moveProgressBar('35.9');</script>
+    <script type="text/javascript">moveProgressBar('32.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equal to http://EXAMPLE.COM/</span></dd>
+    <script type="text/javascript">moveProgressBar('32.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should correctly convert to a hash</span></dd>
+    <script type="text/javascript">moveProgressBar('32.7');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be identical to its duplicate</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_22">Addressable::URI when parsed from 'relative/path/to/resource'</dt>
+  <dt id="behaviour_23">Addressable::URI when parsed from 'http://example.com:8080/'</dt>
+    <script type="text/javascript">moveProgressBar('32.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should use the 'http' scheme</span></dd>
+    <script type="text/javascript">moveProgressBar('33.1');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have an authority segment of 'example.com:8080'</span></dd>
+    <script type="text/javascript">moveProgressBar('33.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
+    <script type="text/javascript">moveProgressBar('33.6');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have no username</span></dd>
+    <script type="text/javascript">moveProgressBar('33.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have no password</span></dd>
+    <script type="text/javascript">moveProgressBar('34.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should use port 8080</span></dd>
+    <script type="text/javascript">moveProgressBar('34.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a path of '/'</span></dd>
+    <script type="text/javascript">moveProgressBar('34.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have no query string</span></dd>
+    <script type="text/javascript">moveProgressBar('34.7');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have no fragment</span></dd>
+    <script type="text/javascript">moveProgressBar('35.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be considered absolute</span></dd>
+    <script type="text/javascript">moveProgressBar('35.2');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should not be considered relative</span></dd>
+    <script type="text/javascript">moveProgressBar('35.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be exactly equal to http://example.com:8080/</span></dd>
+    <script type="text/javascript">moveProgressBar('35.6');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a route of 'http://example.com:8080/' from 'http://example.com/path/to/'</span></dd>
+    <script type="text/javascript">moveProgressBar('35.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a route of 'http://example.com:8080/' from 'http://example.com:80/path/to/'</span></dd>
     <script type="text/javascript">moveProgressBar('36.1');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a route of '/' from 'http://example.com:8080/path/to/'</span></dd>
+    <script type="text/javascript">moveProgressBar('36.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a route of 'http://example.com:8080/' from 'http://user:pass@example.com/path/to/'</span></dd>
+    <script type="text/javascript">moveProgressBar('36.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should correctly convert to a hash</span></dd>
+    <script type="text/javascript">moveProgressBar('36.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be identical to its duplicate</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_24">Addressable::URI when parsed from 'http://example.com/path/to/resource/'</dt>
+    <script type="text/javascript">moveProgressBar('37.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should use the 'http' scheme</span></dd>
+    <script type="text/javascript">moveProgressBar('37.2');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have an authority segment of 'example.com'</span></dd>
+    <script type="text/javascript">moveProgressBar('37.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
+    <script type="text/javascript">moveProgressBar('37.7');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have no username</span></dd>
+    <script type="text/javascript">moveProgressBar('37.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have no password</span></dd>
+    <script type="text/javascript">moveProgressBar('38.1');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should use port 80</span></dd>
+    <script type="text/javascript">moveProgressBar('38.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a path of '/path/to/resource/'</span></dd>
+    <script type="text/javascript">moveProgressBar('38.6');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have no query string</span></dd>
+    <script type="text/javascript">moveProgressBar('38.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have no fragment</span></dd>
+    <script type="text/javascript">moveProgressBar('39.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be considered absolute</span></dd>
+    <script type="text/javascript">moveProgressBar('39.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should not be considered relative</span></dd>
+    <script type="text/javascript">moveProgressBar('39.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be exactly equal to http://example.com:8080/</span></dd>
+    <script type="text/javascript">moveProgressBar('39.7');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a route of 'resource/' from 'http://example.com/path/to/'</span></dd>
+    <script type="text/javascript">moveProgressBar('40.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a route of 'resource/' from 'http://example.com:80/path/to/'</span></dd>
+    <script type="text/javascript">moveProgressBar('40.2');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a route of 'http://example.com/path/to/' from 'http://example.com:8080/path/to/'</span></dd>
+    <script type="text/javascript">moveProgressBar('40.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a route of 'http://example.com/path/to/' from 'http://user:pass@example.com/path/to/'</span></dd>
+    <script type="text/javascript">moveProgressBar('40.6');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a route of '/path/to/resource/' from 'http://example.com/to/resource/'</span></dd>
+    <script type="text/javascript">moveProgressBar('40.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should correctly convert to a hash</span></dd>
+    <script type="text/javascript">moveProgressBar('41.1');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be identical to its duplicate</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_25">Addressable::URI when parsed from 'relative/path/to/resource'</dt>
+    <script type="text/javascript">moveProgressBar('41.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not have a scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('36.4');</script>
+    <script type="text/javascript">moveProgressBar('41.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be considered ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('36.7');</script>
+    <script type="text/javascript">moveProgressBar('41.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not have an authority segment</span></dd>
-    <script type="text/javascript">moveProgressBar('37.0');</script>
+    <script type="text/javascript">moveProgressBar('42.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not have a host</span></dd>
-    <script type="text/javascript">moveProgressBar('37.2');</script>
+    <script type="text/javascript">moveProgressBar('42.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no username</span></dd>
-    <script type="text/javascript">moveProgressBar('37.5');</script>
+    <script type="text/javascript">moveProgressBar('42.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no password</span></dd>
-    <script type="text/javascript">moveProgressBar('37.8');</script>
+    <script type="text/javascript">moveProgressBar('42.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not have a port</span></dd>
-    <script type="text/javascript">moveProgressBar('38.1');</script>
+    <script type="text/javascript">moveProgressBar('42.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of 'relative/path/to/resource'</span></dd>
-    <script type="text/javascript">moveProgressBar('38.3');</script>
+    <script type="text/javascript">moveProgressBar('43.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no query string</span></dd>
-    <script type="text/javascript">moveProgressBar('38.6');</script>
+    <script type="text/javascript">moveProgressBar('43.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no fragment</span></dd>
-    <script type="text/javascript">moveProgressBar('38.9');</script>
+    <script type="text/javascript">moveProgressBar('43.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be considered absolute</span></dd>
-    <script type="text/javascript">moveProgressBar('39.2');</script>
+    <script type="text/javascript">moveProgressBar('43.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered relative</span></dd>
-    <script type="text/javascript">moveProgressBar('39.5');</script>
+    <script type="text/javascript">moveProgressBar('44.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should raise an error if routing is attempted</span></dd>
-    <script type="text/javascript">moveProgressBar('39.7');</script>
+    <script type="text/javascript">moveProgressBar('44.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'another/relative/path' should be 'relative/path/to/another/relative/path'</span></dd>
+    <script type="text/javascript">moveProgressBar('44.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be identical to its duplicate</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_23">Addressable::URI when parsed from 'relative_path_with_no_slashes'</dt>
-    <script type="text/javascript">moveProgressBar('40.0');</script>
+  <dt id="behaviour_26">Addressable::URI when parsed from 'relative_path_with_no_slashes'</dt>
+    <script type="text/javascript">moveProgressBar('44.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not have a scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('40.3');</script>
+    <script type="text/javascript">moveProgressBar('45.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be considered ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('40.6');</script>
+    <script type="text/javascript">moveProgressBar('45.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not have an authority segment</span></dd>
-    <script type="text/javascript">moveProgressBar('40.8');</script>
+    <script type="text/javascript">moveProgressBar('45.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not have a host</span></dd>
-    <script type="text/javascript">moveProgressBar('41.1');</script>
+    <script type="text/javascript">moveProgressBar('45.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no username</span></dd>
-    <script type="text/javascript">moveProgressBar('41.4');</script>
+    <script type="text/javascript">moveProgressBar('45.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no password</span></dd>
-    <script type="text/javascript">moveProgressBar('41.7');</script>
+    <script type="text/javascript">moveProgressBar('46.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not have a port</span></dd>
-    <script type="text/javascript">moveProgressBar('41.9');</script>
+    <script type="text/javascript">moveProgressBar('46.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of 'relative_path_with_no_slashes'</span></dd>
-    <script type="text/javascript">moveProgressBar('42.2');</script>
+    <script type="text/javascript">moveProgressBar('46.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no query string</span></dd>
-    <script type="text/javascript">moveProgressBar('42.5');</script>
+    <script type="text/javascript">moveProgressBar('46.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no fragment</span></dd>
-    <script type="text/javascript">moveProgressBar('42.8');</script>
+    <script type="text/javascript">moveProgressBar('47.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be considered absolute</span></dd>
-    <script type="text/javascript">moveProgressBar('43.0');</script>
+    <script type="text/javascript">moveProgressBar('47.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered relative</span></dd>
-    <script type="text/javascript">moveProgressBar('43.3');</script>
+    <script type="text/javascript">moveProgressBar('47.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'another_relative_path' should be 'another_relative_path'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_24">Addressable::URI when parsed from 'http://example.com/file.txt'</dt>
-    <script type="text/javascript">moveProgressBar('43.6');</script>
+  <dt id="behaviour_27">Addressable::URI when parsed from 'http://example.com/file.txt'</dt>
+    <script type="text/javascript">moveProgressBar('47.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a scheme of 'http'</span></dd>
-    <script type="text/javascript">moveProgressBar('43.9');</script>
+    <script type="text/javascript">moveProgressBar('47.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have an authority segment of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('44.1');</script>
+    <script type="text/javascript">moveProgressBar('48.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('44.4');</script>
+    <script type="text/javascript">moveProgressBar('48.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no username</span></dd>
-    <script type="text/javascript">moveProgressBar('44.7');</script>
+    <script type="text/javascript">moveProgressBar('48.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no password</span></dd>
-    <script type="text/javascript">moveProgressBar('45.0');</script>
+    <script type="text/javascript">moveProgressBar('48.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use port 80</span></dd>
-    <script type="text/javascript">moveProgressBar('45.3');</script>
+    <script type="text/javascript">moveProgressBar('49.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of '/file.txt'</span></dd>
-    <script type="text/javascript">moveProgressBar('45.5');</script>
+    <script type="text/javascript">moveProgressBar('49.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a basename of 'file.txt'</span></dd>
+    <script type="text/javascript">moveProgressBar('49.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have an extname of '.txt'</span></dd>
-    <script type="text/javascript">moveProgressBar('45.8');</script>
+    <script type="text/javascript">moveProgressBar('49.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no query string</span></dd>
-    <script type="text/javascript">moveProgressBar('46.1');</script>
+    <script type="text/javascript">moveProgressBar('50.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have no fragment</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_28">Addressable::URI when parsed from 'http://example.com/file.txt;parameter'</dt>
+    <script type="text/javascript">moveProgressBar('50.2');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a scheme of 'http'</span></dd>
+    <script type="text/javascript">moveProgressBar('50.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have an authority segment of 'example.com'</span></dd>
+    <script type="text/javascript">moveProgressBar('50.6');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
+    <script type="text/javascript">moveProgressBar('50.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have no username</span></dd>
+    <script type="text/javascript">moveProgressBar('51.1');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have no password</span></dd>
+    <script type="text/javascript">moveProgressBar('51.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should use port 80</span></dd>
+    <script type="text/javascript">moveProgressBar('51.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a path of '/file.txt;parameter'</span></dd>
+    <script type="text/javascript">moveProgressBar('51.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a basename of 'file.txt'</span></dd>
+    <script type="text/javascript">moveProgressBar('52.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have an extname of '.txt'</span></dd>
+    <script type="text/javascript">moveProgressBar('52.2');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have no query string</span></dd>
+    <script type="text/javascript">moveProgressBar('52.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no fragment</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_25">Addressable::URI when parsed from 'http://example.com/file.txt;x=y'</dt>
-    <script type="text/javascript">moveProgressBar('46.4');</script>
+  <dt id="behaviour_29">Addressable::URI when parsed from 'http://example.com/file.txt;x=y'</dt>
+    <script type="text/javascript">moveProgressBar('52.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a scheme of 'http'</span></dd>
-    <script type="text/javascript">moveProgressBar('46.6');</script>
+    <script type="text/javascript">moveProgressBar('52.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a scheme of 'http'</span></dd>
-    <script type="text/javascript">moveProgressBar('46.9');</script>
+    <script type="text/javascript">moveProgressBar('53.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have an authority segment of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('47.2');</script>
+    <script type="text/javascript">moveProgressBar('53.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('47.5');</script>
+    <script type="text/javascript">moveProgressBar('53.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no username</span></dd>
-    <script type="text/javascript">moveProgressBar('47.7');</script>
+    <script type="text/javascript">moveProgressBar('53.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no password</span></dd>
-    <script type="text/javascript">moveProgressBar('48.0');</script>
+    <script type="text/javascript">moveProgressBar('54.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use port 80</span></dd>
-    <script type="text/javascript">moveProgressBar('48.3');</script>
+    <script type="text/javascript">moveProgressBar('54.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of '/file.txt;x=y'</span></dd>
-    <script type="text/javascript">moveProgressBar('48.6');</script>
+    <script type="text/javascript">moveProgressBar('54.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have an extname of '.txt'</span></dd>
-    <script type="text/javascript">moveProgressBar('48.8');</script>
+    <script type="text/javascript">moveProgressBar('54.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no query string</span></dd>
-    <script type="text/javascript">moveProgressBar('49.1');</script>
+    <script type="text/javascript">moveProgressBar('55.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no fragment</span></dd>
-    <script type="text/javascript">moveProgressBar('49.4');</script>
+    <script type="text/javascript">moveProgressBar('55.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_26">Addressable::URI when parsed from 'mailto:user@example.com'</dt>
-    <script type="text/javascript">moveProgressBar('49.7');</script>
+  <dt id="behaviour_30">Addressable::URI when parsed from 'mailto:user@example.com'</dt>
+    <script type="text/javascript">moveProgressBar('55.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a scheme of 'mailto'</span></dd>
-    <script type="text/javascript">moveProgressBar('50.0');</script>
+    <script type="text/javascript">moveProgressBar('55.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be considered to be ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('50.2');</script>
+    <script type="text/javascript">moveProgressBar('55.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of 'user@example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('50.5');</script>
+    <script type="text/javascript">moveProgressBar('56.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no user</span></dd>
-    <script type="text/javascript">moveProgressBar('50.8');</script>
+    <script type="text/javascript">moveProgressBar('56.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_27">Addressable::URI when parsed from 'tag:example.com,2006-08-18:/path/to/something'</dt>
-    <script type="text/javascript">moveProgressBar('51.1');</script>
+  <dt id="behaviour_31">Addressable::URI when parsed from 'tag:example.com,2006-08-18:/path/to/something'</dt>
+    <script type="text/javascript">moveProgressBar('56.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a scheme of 'tag'</span></dd>
-    <script type="text/javascript">moveProgressBar('51.3');</script>
+    <script type="text/javascript">moveProgressBar('56.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be ip-based</span></dd>
-    <script type="text/javascript">moveProgressBar('51.6');</script>
+    <script type="text/javascript">moveProgressBar('57.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of 'example.com,2006-08-18:/path/to/something'</span></dd>
-    <script type="text/javascript">moveProgressBar('51.9');</script>
+    <script type="text/javascript">moveProgressBar('57.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no user</span></dd>
-    <script type="text/javascript">moveProgressBar('52.2');</script>
+    <script type="text/javascript">moveProgressBar('57.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_28">Addressable::URI when parsed from 'http://example.com/x;y/'</dt>
-    <script type="text/javascript">moveProgressBar('52.4');</script>
+  <dt id="behaviour_32">Addressable::URI when parsed from 'http://example.com/x;y/'</dt>
+    <script type="text/javascript">moveProgressBar('57.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_29">Addressable::URI when parsed from 'http://example.com/?x=1&amp;y=2'</dt>
-    <script type="text/javascript">moveProgressBar('52.7');</script>
+  <dt id="behaviour_33">Addressable::URI when parsed from 'http://example.com/?x=1&amp;y=2'</dt>
+    <script type="text/javascript">moveProgressBar('57.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_30">Addressable::URI when parsed from 'view-source:http://example.com/'</dt>
-    <script type="text/javascript">moveProgressBar('53.0');</script>
+  <dt id="behaviour_34">Addressable::URI when parsed from 'view-source:http://example.com/'</dt>
+    <script type="text/javascript">moveProgressBar('58.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a scheme of 'view-source'</span></dd>
-    <script type="text/javascript">moveProgressBar('53.3');</script>
+    <script type="text/javascript">moveProgressBar('58.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of 'http://example.com/'</span></dd>
-    <script type="text/javascript">moveProgressBar('53.5');</script>
+    <script type="text/javascript">moveProgressBar('58.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_31">Addressable::URI when parsed from 'http://user:pass@example.com/path/to/resource?query=x#fragment'</dt>
-    <script type="text/javascript">moveProgressBar('53.8');</script>
+  <dt id="behaviour_35">Addressable::URI when parsed from 'http://user:pass@example.com/path/to/resource?query=x#fragment'</dt>
+    <script type="text/javascript">moveProgressBar('58.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'http' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('54.1');</script>
+    <script type="text/javascript">moveProgressBar('59.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have an authority segment of 'user:pass@example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('54.4');</script>
+    <script type="text/javascript">moveProgressBar('59.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a username of 'user'</span></dd>
-    <script type="text/javascript">moveProgressBar('54.6');</script>
+    <script type="text/javascript">moveProgressBar('59.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a password of 'pass'</span></dd>
-    <script type="text/javascript">moveProgressBar('54.9');</script>
+    <script type="text/javascript">moveProgressBar('59.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('55.2');</script>
+    <script type="text/javascript">moveProgressBar('60.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use port 80</span></dd>
-    <script type="text/javascript">moveProgressBar('55.5');</script>
+    <script type="text/javascript">moveProgressBar('60.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of '/path/to/resource'</span></dd>
-    <script type="text/javascript">moveProgressBar('55.8');</script>
+    <script type="text/javascript">moveProgressBar('60.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a query string of 'query=x'</span></dd>
-    <script type="text/javascript">moveProgressBar('56.0');</script>
+    <script type="text/javascript">moveProgressBar('60.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a fragment of 'fragment'</span></dd>
-    <script type="text/javascript">moveProgressBar('56.3');</script>
+    <script type="text/javascript">moveProgressBar('60.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered to be in normal form</span></dd>
-    <script type="text/javascript">moveProgressBar('56.6');</script>
+    <script type="text/javascript">moveProgressBar('61.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a route of '/path/' to 'http://user:pass@example.com/path/'</span></dd>
-    <script type="text/javascript">moveProgressBar('56.9');</script>
+    <script type="text/javascript">moveProgressBar('61.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a route of '/path/to/resource?query=x#fragment' from 'http://user:pass@example.com/path/'</span></dd>
-    <script type="text/javascript">moveProgressBar('57.1');</script>
+    <script type="text/javascript">moveProgressBar('61.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a route of '?query=x#fragment' from 'http://user:pass@example.com/path/to/resource'</span></dd>
-    <script type="text/javascript">moveProgressBar('57.4');</script>
+    <script type="text/javascript">moveProgressBar('61.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a route of '#fragment' from 'http://user:pass@example.com/path/to/resource?query=x'</span></dd>
-    <script type="text/javascript">moveProgressBar('57.7');</script>
+    <script type="text/javascript">moveProgressBar('62.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a route of '#fragment' from 'http://user:pass@example.com/path/to/resource?query=x#fragment'</span></dd>
-    <script type="text/javascript">moveProgressBar('58.0');</script>
+    <script type="text/javascript">moveProgressBar('62.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a route of 'http://elsewhere.com/' to 'http://elsewhere.com/'</span></dd>
-    <script type="text/javascript">moveProgressBar('58.2');</script>
+    <script type="text/javascript">moveProgressBar('62.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a route of 'http://user:pass@example.com/path/to/resource?query=x#fragment' from 'http://example.com/path/to/'</span></dd>
+    <script type="text/javascript">moveProgressBar('62.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct scheme after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('58.5');</script>
+    <script type="text/javascript">moveProgressBar('62.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct authority segment after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('58.8');</script>
+    <script type="text/javascript">moveProgressBar('63.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct userinfo segment after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('59.1');</script>
+    <script type="text/javascript">moveProgressBar('63.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct username after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('59.3');</script>
+    <script type="text/javascript">moveProgressBar('63.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct password after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('59.6');</script>
+    <script type="text/javascript">moveProgressBar('63.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct host after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('59.9');</script>
+    <script type="text/javascript">moveProgressBar('64.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct port after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('60.2');</script>
+    <script type="text/javascript">moveProgressBar('64.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct path after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('60.4');</script>
+    <script type="text/javascript">moveProgressBar('64.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have the correct path after nil assignment</span></dd>
+    <script type="text/javascript">moveProgressBar('64.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct query string after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('60.7');</script>
+    <script type="text/javascript">moveProgressBar('65.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct fragment after assignment</span></dd>
+    <script type="text/javascript">moveProgressBar('65.2');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be identical to its duplicate</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_32">Addressable::URI when parsed from 'http://user@example.com'</dt>
-    <script type="text/javascript">moveProgressBar('61.0');</script>
+  <dt id="behaviour_36">Addressable::URI when parsed from 'http://user@example.com'</dt>
+    <script type="text/javascript">moveProgressBar('65.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'http' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('61.3');</script>
+    <script type="text/javascript">moveProgressBar('65.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a username of 'user'</span></dd>
-    <script type="text/javascript">moveProgressBar('61.6');</script>
+    <script type="text/javascript">moveProgressBar('65.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no password</span></dd>
-    <script type="text/javascript">moveProgressBar('61.8');</script>
+    <script type="text/javascript">moveProgressBar('66.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('62.1');</script>
+    <script type="text/javascript">moveProgressBar('66.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use port 80</span></dd>
-    <script type="text/javascript">moveProgressBar('62.4');</script>
+    <script type="text/javascript">moveProgressBar('66.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct username after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('62.7');</script>
+    <script type="text/javascript">moveProgressBar('66.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct password after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('62.9');</script>
+    <script type="text/javascript">moveProgressBar('67.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct userinfo segment after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('63.2');</script>
+    <script type="text/javascript">moveProgressBar('67.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct userinfo segment after nil assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('63.5');</script>
+    <script type="text/javascript">moveProgressBar('67.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct authority segment after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('63.8');</script>
+    <script type="text/javascript">moveProgressBar('67.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should raise an error after nil assignment of authority segment</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_33">Addressable::URI when parsed from 'http://user:@example.com'</dt>
-    <script type="text/javascript">moveProgressBar('64.0');</script>
+  <dt id="behaviour_37">Addressable::URI when parsed from 'http://user:@example.com'</dt>
+    <script type="text/javascript">moveProgressBar('67.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'http' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('64.3');</script>
+    <script type="text/javascript">moveProgressBar('68.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a username of 'user'</span></dd>
-    <script type="text/javascript">moveProgressBar('64.6');</script>
+    <script type="text/javascript">moveProgressBar('68.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a password of ''</span></dd>
-    <script type="text/javascript">moveProgressBar('64.9');</script>
+    <script type="text/javascript">moveProgressBar('68.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('65.1');</script>
+    <script type="text/javascript">moveProgressBar('68.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use port 80</span></dd>
-    <script type="text/javascript">moveProgressBar('65.4');</script>
+    <script type="text/javascript">moveProgressBar('69.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct username after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('65.7');</script>
+    <script type="text/javascript">moveProgressBar('69.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct password after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('66.0');</script>
+    <script type="text/javascript">moveProgressBar('69.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct authority segment after assignment</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_34">Addressable::URI when parsed from 'http://:pass@example.com'</dt>
-    <script type="text/javascript">moveProgressBar('66.2');</script>
+  <dt id="behaviour_38">Addressable::URI when parsed from 'http://:pass@example.com'</dt>
+    <script type="text/javascript">moveProgressBar('69.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'http' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('66.5');</script>
+    <script type="text/javascript">moveProgressBar('70.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a username of ''</span></dd>
-    <script type="text/javascript">moveProgressBar('66.8');</script>
+    <script type="text/javascript">moveProgressBar('70.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a password of 'pass'</span></dd>
-    <script type="text/javascript">moveProgressBar('67.1');</script>
+    <script type="text/javascript">moveProgressBar('70.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a userinfo of ':pass'</span></dd>
-    <script type="text/javascript">moveProgressBar('67.4');</script>
+    <script type="text/javascript">moveProgressBar('70.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('67.6');</script>
+    <script type="text/javascript">moveProgressBar('70.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use port 80</span></dd>
-    <script type="text/javascript">moveProgressBar('67.9');</script>
+    <script type="text/javascript">moveProgressBar('71.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct username after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('68.2');</script>
+    <script type="text/javascript">moveProgressBar('71.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct password after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('68.5');</script>
+    <script type="text/javascript">moveProgressBar('71.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct authority segment after assignment</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_35">Addressable::URI when parsed from 'http://:@example.com'</dt>
-    <script type="text/javascript">moveProgressBar('68.7');</script>
+  <dt id="behaviour_39">Addressable::URI when parsed from 'http://:@example.com'</dt>
+    <script type="text/javascript">moveProgressBar('71.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'http' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('69.0');</script>
+    <script type="text/javascript">moveProgressBar('72.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a username of ''</span></dd>
-    <script type="text/javascript">moveProgressBar('69.3');</script>
+    <script type="text/javascript">moveProgressBar('72.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a password of ''</span></dd>
-    <script type="text/javascript">moveProgressBar('69.6');</script>
+    <script type="text/javascript">moveProgressBar('72.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('69.8');</script>
+    <script type="text/javascript">moveProgressBar('72.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use port 80</span></dd>
-    <script type="text/javascript">moveProgressBar('70.1');</script>
+    <script type="text/javascript">moveProgressBar('72.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct username after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('70.4');</script>
+    <script type="text/javascript">moveProgressBar('73.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct password after assignment</span></dd>
-    <script type="text/javascript">moveProgressBar('70.7');</script>
+    <script type="text/javascript">moveProgressBar('73.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct authority segment after assignment</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_36">Addressable::URI when parsed from '#example'</dt>
-    <script type="text/javascript">moveProgressBar('70.9');</script>
+  <dt id="behaviour_40">Addressable::URI when parsed from '#example'</dt>
+    <script type="text/javascript">moveProgressBar('73.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered relative</span></dd>
-    <script type="text/javascript">moveProgressBar('71.2');</script>
+    <script type="text/javascript">moveProgressBar('73.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of nil</span></dd>
-    <script type="text/javascript">moveProgressBar('71.5');</script>
+    <script type="text/javascript">moveProgressBar('74.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of ''</span></dd>
-    <script type="text/javascript">moveProgressBar('71.8');</script>
+    <script type="text/javascript">moveProgressBar('74.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a query string of nil</span></dd>
-    <script type="text/javascript">moveProgressBar('72.0');</script>
+    <script type="text/javascript">moveProgressBar('74.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a fragment of 'example'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_37">Addressable::URI when parsed from the network-path reference '//example.com/'</dt>
-    <script type="text/javascript">moveProgressBar('72.3');</script>
+  <dt id="behaviour_41">Addressable::URI when parsed from the network-path reference '//example.com/'</dt>
+    <script type="text/javascript">moveProgressBar('74.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered relative</span></dd>
-    <script type="text/javascript">moveProgressBar('72.6');</script>
+    <script type="text/javascript">moveProgressBar('75.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('72.9');</script>
+    <script type="text/javascript">moveProgressBar('75.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of '/'</span></dd>
+    <script type="text/javascript">moveProgressBar('75.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should raise an error if routing is attempted</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_38">Addressable::URI when parsed from 'feed://http://example.com/'</dt>
-    <script type="text/javascript">moveProgressBar('73.2');</script>
-    <dd class="spec passed"><span class="passed_spec_name">should have a path of 'http://example.com/'</span></dd>
-    <script type="text/javascript">moveProgressBar('73.4');</script>
-    <dd class="spec passed"><span class="passed_spec_name">should normalize to 'http://example.com/'</span></dd>
+  <dt id="behaviour_42">Addressable::URI when parsed from 'feed://http://example.com/'</dt>
+    <script type="text/javascript">moveProgressBar('75.6');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a host of 'http'</span></dd>
+    <script type="text/javascript">moveProgressBar('75.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should have a path of '//example.com/'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_39">Addressable::URI when parsed from 'feed:http://example.com/'</dt>
-    <script type="text/javascript">moveProgressBar('73.7');</script>
+  <dt id="behaviour_43">Addressable::URI when parsed from 'feed:http://example.com/'</dt>
+    <script type="text/javascript">moveProgressBar('76.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of 'http://example.com/'</span></dd>
-    <script type="text/javascript">moveProgressBar('74.0');</script>
+    <script type="text/javascript">moveProgressBar('76.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should normalize to 'http://example.com/'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_40">Addressable::URI when parsed from 'example://a/b/c/%7Bfoo%7D'</dt>
-    <script type="text/javascript">moveProgressBar('74.3');</script>
+  <dt id="behaviour_44">Addressable::URI when parsed from 'example://a/b/c/%7Bfoo%7D'</dt>
+    <script type="text/javascript">moveProgressBar('76.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to eXAMPLE://a/./b/../b/%63/%7bfoo%7d</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_41">Addressable::URI when parsed from 'http://example.com/indirect/path/./to/../resource/'</dt>
-    <script type="text/javascript">moveProgressBar('74.5');</script>
+  <dt id="behaviour_45">Addressable::URI when parsed from 'http://example.com/indirect/path/./to/../resource/'</dt>
+    <script type="text/javascript">moveProgressBar('76.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use the 'http' scheme</span></dd>
-    <script type="text/javascript">moveProgressBar('74.8');</script>
+    <script type="text/javascript">moveProgressBar('77.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a host of 'example.com'</span></dd>
-    <script type="text/javascript">moveProgressBar('75.1');</script>
+    <script type="text/javascript">moveProgressBar('77.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should use port 80</span></dd>
-    <script type="text/javascript">moveProgressBar('75.4');</script>
+    <script type="text/javascript">moveProgressBar('77.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a path of '/indirect/path/./to/../resource/'</span></dd>
-    <script type="text/javascript">moveProgressBar('75.6');</script>
+    <script type="text/javascript">moveProgressBar('77.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a normalized path of '/indirect/path/resource/'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_42">Addressable::URI when parsed from 'http://under_score.example.com/'</dt>
-    <script type="text/javascript">moveProgressBar('75.9');</script>
+  <dt id="behaviour_46">Addressable::URI when parsed from 'http://under_score.example.com/'</dt>
+    <script type="text/javascript">moveProgressBar('77.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not cause an error</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_43">Addressable::URI when parsed from './this:that'</dt>
-    <script type="text/javascript">moveProgressBar('76.2');</script>
+  <dt id="behaviour_47">Addressable::URI when parsed from './this:that'</dt>
+    <script type="text/javascript">moveProgressBar('78.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered relative</span></dd>
-    <script type="text/javascript">moveProgressBar('76.5');</script>
+    <script type="text/javascript">moveProgressBar('78.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have no scheme</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_44">Addressable::URI when parsed from 'this:that'</dt>
-    <script type="text/javascript">moveProgressBar('76.7');</script>
+  <dt id="behaviour_48">Addressable::URI when parsed from 'this:that'</dt>
+    <script type="text/javascript">moveProgressBar('78.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be considered absolute</span></dd>
-    <script type="text/javascript">moveProgressBar('77.0');</script>
+    <script type="text/javascript">moveProgressBar('78.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have a scheme of 'this'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_45">Addressable::URI when parsed from 'http://www.詹姆斯.com/'</dt>
-    <script type="text/javascript">moveProgressBar('77.3');</script>
+  <dt id="behaviour_49">Addressable::URI when parsed from 'http://www.詹姆斯.com/'</dt>
+    <script type="text/javascript">moveProgressBar('79.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to 'http://www.xn--8ws00zhy3a.com/'</span></dd>
-    <script type="text/javascript">moveProgressBar('77.6');</script>
+    <script type="text/javascript">moveProgressBar('79.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not have domain name encoded during normalization</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_46">Addressable::URI when parsed from 'http://www.詹姆斯.com/ some spaces /'</dt>
-    <script type="text/javascript">moveProgressBar('77.9');</script>
+  <dt id="behaviour_50">Addressable::URI when parsed from 'http://www.詹姆斯.com/ some spaces /'</dt>
+    <script type="text/javascript">moveProgressBar('79.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be equivalent to 'http://www.xn--8ws00zhy3a.com/%20some%20spaces%20/'</span></dd>
-    <script type="text/javascript">moveProgressBar('78.1');</script>
+    <script type="text/javascript">moveProgressBar('79.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not have domain name encoded during normalization</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_47">Addressable::URI when parsed from 'http://www.xn--8ws00zhy3a.com/'</dt>
-    <script type="text/javascript">moveProgressBar('78.4');</script>
+  <dt id="behaviour_51">Addressable::URI when parsed from 'http://www.xn--8ws00zhy3a.com/'</dt>
+    <script type="text/javascript">moveProgressBar('80.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be displayed as http://www.詹姆斯.com/</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_48">Addressable::URI when parsed from 'http://www.詹姆斯.com/atomtests/iri/詹.html'</dt>
-    <script type="text/javascript">moveProgressBar('78.7');</script>
+  <dt id="behaviour_52">Addressable::URI when parsed from 'http://www.詹姆斯.com/atomtests/iri/詹.html'</dt>
+    <script type="text/javascript">moveProgressBar('80.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should normalize to http://www.xn--8ws00zhy3a.com/atomtests/iri/%E8%A9%B9.html</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_49">Addressable::URI with a base uri of 'http://a/b/c/d;p?q'</dt>
-    <script type="text/javascript">moveProgressBar('79.0');</script>
+  <dt id="behaviour_53">Addressable::URI with a base uri of 'http://a/b/c/d;p?q'</dt>
+    <script type="text/javascript">moveProgressBar('80.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g:h' should resolve to g:h</span></dd>
-    <script type="text/javascript">moveProgressBar('79.2');</script>
+    <script type="text/javascript">moveProgressBar('80.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g' should resolve to http://a/b/c/g</span></dd>
-    <script type="text/javascript">moveProgressBar('79.5');</script>
+    <script type="text/javascript">moveProgressBar('80.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with './g' should resolve to http://a/b/c/g</span></dd>
-    <script type="text/javascript">moveProgressBar('79.8');</script>
+    <script type="text/javascript">moveProgressBar('81.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g/' should resolve to http://a/b/c/g/</span></dd>
-    <script type="text/javascript">moveProgressBar('80.1');</script>
+    <script type="text/javascript">moveProgressBar('81.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '/g' should resolve to http://a/g</span></dd>
-    <script type="text/javascript">moveProgressBar('80.3');</script>
+    <script type="text/javascript">moveProgressBar('81.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '//g' should resolve to http://g</span></dd>
-    <script type="text/javascript">moveProgressBar('80.6');</script>
+    <script type="text/javascript">moveProgressBar('81.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '?y' should resolve to http://a/b/c/d;p?y</span></dd>
-    <script type="text/javascript">moveProgressBar('80.9');</script>
+    <script type="text/javascript">moveProgressBar('82.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g?y' should resolve to http://a/b/c/g?y</span></dd>
-    <script type="text/javascript">moveProgressBar('81.2');</script>
+    <script type="text/javascript">moveProgressBar('82.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '#s' should resolve to http://a/b/c/d;p?q#s</span></dd>
-    <script type="text/javascript">moveProgressBar('81.4');</script>
+    <script type="text/javascript">moveProgressBar('82.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g#s' should resolve to http://a/b/c/g#s</span></dd>
-    <script type="text/javascript">moveProgressBar('81.7');</script>
+    <script type="text/javascript">moveProgressBar('82.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g?y#s' should resolve to http://a/b/c/g?y#s</span></dd>
-    <script type="text/javascript">moveProgressBar('82.0');</script>
+    <script type="text/javascript">moveProgressBar('82.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with ';x' should resolve to http://a/b/c/;x</span></dd>
-    <script type="text/javascript">moveProgressBar('82.3');</script>
+    <script type="text/javascript">moveProgressBar('83.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g;x' should resolve to http://a/b/c/g;x</span></dd>
-    <script type="text/javascript">moveProgressBar('82.5');</script>
+    <script type="text/javascript">moveProgressBar('83.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g;x?y#s' should resolve to http://a/b/c/g;x?y#s</span></dd>
-    <script type="text/javascript">moveProgressBar('82.8');</script>
+    <script type="text/javascript">moveProgressBar('83.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '' should resolve to http://a/b/c/d;p?q</span></dd>
-    <script type="text/javascript">moveProgressBar('83.1');</script>
+    <script type="text/javascript">moveProgressBar('83.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '.' should resolve to http://a/b/c/</span></dd>
-    <script type="text/javascript">moveProgressBar('83.4');</script>
+    <script type="text/javascript">moveProgressBar('84.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with './' should resolve to http://a/b/c/</span></dd>
-    <script type="text/javascript">moveProgressBar('83.7');</script>
+    <script type="text/javascript">moveProgressBar('84.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '..' should resolve to http://a/b/</span></dd>
-    <script type="text/javascript">moveProgressBar('83.9');</script>
+    <script type="text/javascript">moveProgressBar('84.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '../' should resolve to http://a/b/</span></dd>
-    <script type="text/javascript">moveProgressBar('84.2');</script>
+    <script type="text/javascript">moveProgressBar('84.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '../g' should resolve to http://a/b/g</span></dd>
-    <script type="text/javascript">moveProgressBar('84.5');</script>
+    <script type="text/javascript">moveProgressBar('85.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '../..' should resolve to http://a/</span></dd>
-    <script type="text/javascript">moveProgressBar('84.8');</script>
+    <script type="text/javascript">moveProgressBar('85.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '../../' should resolve to http://a/</span></dd>
-    <script type="text/javascript">moveProgressBar('85.0');</script>
+    <script type="text/javascript">moveProgressBar('85.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '../../g' should resolve to http://a/g</span></dd>
-    <script type="text/javascript">moveProgressBar('85.3');</script>
-    <dd class="spec passed"><span class="passed_spec_name">when joined with '../../../g' should resolve to http://a/g</span></dd>
     <script type="text/javascript">moveProgressBar('85.6');</script>
-    <dd class="spec passed"><span class="passed_spec_name">when joined with '../.././../g' should resolve to http://a/g</span></dd>
+    <dd class="spec passed"><span class="passed_spec_name">when joined with '../../../g' should resolve to http://a/g</span></dd>
     <script type="text/javascript">moveProgressBar('85.9');</script>
-    <dd class="spec passed"><span class="passed_spec_name">when joined with '../../../../g' should resolve to http://a/g</span></dd>
+    <dd class="spec passed"><span class="passed_spec_name">when joined with '../.././../g' should resolve to http://a/g</span></dd>
     <script type="text/javascript">moveProgressBar('86.1');</script>
+    <dd class="spec passed"><span class="passed_spec_name">when joined with '../../../../g' should resolve to http://a/g</span></dd>
+    <script type="text/javascript">moveProgressBar('86.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '/./g' should resolve to http://a/g</span></dd>
-    <script type="text/javascript">moveProgressBar('86.4');</script>
+    <script type="text/javascript">moveProgressBar('86.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '/../g' should resolve to http://a/g</span></dd>
-    <script type="text/javascript">moveProgressBar('86.7');</script>
+    <script type="text/javascript">moveProgressBar('86.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g.' should resolve to http://a/b/c/g.</span></dd>
     <script type="text/javascript">moveProgressBar('87.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '.g' should resolve to http://a/b/c/.g</span></dd>
@@ -1054,190 +1210,260 @@ a {
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g..' should resolve to http://a/b/c/g..</span></dd>
     <script type="text/javascript">moveProgressBar('87.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '..g' should resolve to http://a/b/c/..g</span></dd>
-    <script type="text/javascript">moveProgressBar('87.8');</script>
+    <script type="text/javascript">moveProgressBar('87.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with './../g' should resolve to http://a/b/g</span></dd>
-    <script type="text/javascript">moveProgressBar('88.1');</script>
+    <script type="text/javascript">moveProgressBar('87.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with './g/.' should resolve to http://a/b/c/g/</span></dd>
-    <script type="text/javascript">moveProgressBar('88.3');</script>
+    <script type="text/javascript">moveProgressBar('88.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g/./h' should resolve to http://a/b/c/g/h</span></dd>
-    <script type="text/javascript">moveProgressBar('88.6');</script>
+    <script type="text/javascript">moveProgressBar('88.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g/../h' should resolve to http://a/b/c/h</span></dd>
-    <script type="text/javascript">moveProgressBar('88.9');</script>
+    <script type="text/javascript">moveProgressBar('88.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g;x=1/./y' should resolve to http://a/b/c/g;x=1/y</span></dd>
-    <script type="text/javascript">moveProgressBar('89.2');</script>
+    <script type="text/javascript">moveProgressBar('88.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g;x=1/../y' should resolve to http://a/b/c/y</span></dd>
-    <script type="text/javascript">moveProgressBar('89.5');</script>
+    <script type="text/javascript">moveProgressBar('89.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g?y/./x' should resolve to http://a/b/c/g?y/./x</span></dd>
-    <script type="text/javascript">moveProgressBar('89.7');</script>
+    <script type="text/javascript">moveProgressBar('89.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g?y/../x' should resolve to http://a/b/c/g?y/../x</span></dd>
-    <script type="text/javascript">moveProgressBar('90.0');</script>
+    <script type="text/javascript">moveProgressBar('89.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g#s/./x' should resolve to http://a/b/c/g#s/./x</span></dd>
-    <script type="text/javascript">moveProgressBar('90.3');</script>
+    <script type="text/javascript">moveProgressBar('89.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'g#s/../x' should resolve to http://a/b/c/g#s/../x</span></dd>
-    <script type="text/javascript">moveProgressBar('90.6');</script>
+    <script type="text/javascript">moveProgressBar('90.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with 'http:g' should resolve to http:g</span></dd>
-    <script type="text/javascript">moveProgressBar('90.8');</script>
+    <script type="text/javascript">moveProgressBar('90.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">when joined with '//example.com/' should resolve to http://example.com/</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_50">Addressable::URI::IDNA without libidn bindings</dt>
-    <script type="text/javascript">moveProgressBar('91.1');</script>
+  <dt id="behaviour_54">Addressable::URI::IDNA without libidn bindings</dt>
+    <script type="text/javascript">moveProgressBar('90.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should raise an exception when an operation is attempted</span></dd>
-    <script type="text/javascript">moveProgressBar('91.4');</script>
+    <script type="text/javascript">moveProgressBar('90.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not cause normalization routines to error out</span></dd>
-    <script type="text/javascript">moveProgressBar('91.7');</script>
+    <script type="text/javascript">moveProgressBar('90.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not cause display uri routines to error out</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_51">Addressable::URI::IDNA with rubygems and idn missing</dt>
-    <script type="text/javascript">moveProgressBar('91.9');</script>
+  <dt id="behaviour_55">Addressable::URI::IDNA with rubygems and idn missing</dt>
+    <script type="text/javascript">moveProgressBar('91.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not raise an exception while checking if libidn is available</span></dd>
-    <script type="text/javascript">moveProgressBar('92.2');</script>
+    <script type="text/javascript">moveProgressBar('91.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not cause normalization routines to error out</span></dd>
-    <script type="text/javascript">moveProgressBar('92.5');</script>
+    <script type="text/javascript">moveProgressBar('91.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not cause display uri routines to error out</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_52">Addressable::URI when extracting from an arbitrary text</dt>
-    <script type="text/javascript">moveProgressBar('92.8');</script>
+  <dt id="behaviour_56">Addressable::URI when extracting from an arbitrary text</dt>
+    <script type="text/javascript">moveProgressBar('91.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have all obvious URIs extractable from it</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_53">Addressable::URI when extracting from an arbitrary text containing invalid URIs</dt>
-    <script type="text/javascript">moveProgressBar('93.0');</script>
+  <dt id="behaviour_57">Addressable::URI when extracting from an arbitrary text containing invalid URIs</dt>
+    <script type="text/javascript">moveProgressBar('92.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should ignore invalid URIs when extracting</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_54">Addressable::URI when converting the path 'relative/path/to/something'</dt>
-    <script type="text/javascript">moveProgressBar('93.3');</script>
+  <dt id="behaviour_58">Addressable::URI when converting the path 'relative/path/to/something'</dt>
+    <script type="text/javascript">moveProgressBar('92.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should convert to 'relative/path/to/something'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_55">Addressable::URI when given the root directory</dt>
-    <script type="text/javascript">moveProgressBar('93.6');</script>
+  <dt id="behaviour_59">Addressable::URI when given the root directory</dt>
+    <script type="text/javascript">moveProgressBar('92.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should convert to 'file:///'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_56">Addressable::URI when given the path '/home/user/'</dt>
-    <script type="text/javascript">moveProgressBar('93.9');</script>
+  <dt id="behaviour_60">Addressable::URI when given the path '/home/user/'</dt>
+    <script type="text/javascript">moveProgressBar('92.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should convert to 'file:///home/user/'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_57">Addressable::URI when given the path 'c:\windows\My Documents 100%20\foo.txt'</dt>
-    <script type="text/javascript">moveProgressBar('94.1');</script>
+  <dt id="behaviour_61">Addressable::URI when given the path 'c:\windows\My Documents 100%20\foo.txt'</dt>
+    <script type="text/javascript">moveProgressBar('92.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should convert to 'file:///c:/windows/My%20Documents%20100%20/foo.txt'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_58">Addressable::URI when given the path 'file://c:\windows\My Documents 100%20\foo.txt'</dt>
-    <script type="text/javascript">moveProgressBar('94.4');</script>
+  <dt id="behaviour_62">Addressable::URI when given the path 'file://c:\windows\My Documents 100%20\foo.txt'</dt>
+    <script type="text/javascript">moveProgressBar('93.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should convert to 'file:///c:/windows/My%20Documents%20100%20/foo.txt'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_59">Addressable::URI when given the path 'file:///c|/windows/My%20Documents%20100%20/foo.txt'</dt>
-    <script type="text/javascript">moveProgressBar('94.7');</script>
+  <dt id="behaviour_63">Addressable::URI when given the path 'file:///c|/windows/My%20Documents%20100%20/foo.txt'</dt>
+    <script type="text/javascript">moveProgressBar('93.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should convert to 'file:///c:/windows/My%20Documents%20100%20/foo.txt'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_60">Addressable::URI when given an http protocol URI</dt>
-    <script type="text/javascript">moveProgressBar('95.0');</script>
+  <dt id="behaviour_64">Addressable::URI when given an http protocol URI</dt>
+    <script type="text/javascript">moveProgressBar('93.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not do any conversion at all</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_61">Addressable::URI when given the template pattern 'http://example.com/search/{query}/' to be processed with the ExampleProcessor</dt>
-    <script type="text/javascript">moveProgressBar('95.3');</script>
+  <dt id="behaviour_65">Addressable::URI when given the template pattern 'http://example.com/search/{query}/' to be processed with the ExampleProcessor</dt>
+    <script type="text/javascript">moveProgressBar('93.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should expand to 'http://example.com/search/an+example+search+query/' with a mapping of {&quot;query&quot; =&gt; &quot;an example search query&quot;} </span></dd>
-    <script type="text/javascript">moveProgressBar('95.5');</script>
+    <script type="text/javascript">moveProgressBar('94.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should raise an error with a mapping of {&quot;query&quot; =&gt; &quot;invalid!&quot;}</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_62">Addressable::URI when given the mapping supplied in Section 3.3.1 of the URI Template draft</dt>
-    <script type="text/javascript">moveProgressBar('95.8');</script>
+  <dt id="behaviour_66">Addressable::URI when given the mapping supplied in Section 3.3.1 of the URI Template draft</dt>
+    <script type="text/javascript">moveProgressBar('94.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should result in 'http://example.org/page1#fred' when used to expand 'http://example.org/page1#{a}'</span></dd>
-    <script type="text/javascript">moveProgressBar('96.1');</script>
+    <script type="text/javascript">moveProgressBar('94.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should result in 'http://example.org/fred/barney/' when used to expand 'http://example.org/{a}/{b}/'</span></dd>
-    <script type="text/javascript">moveProgressBar('96.4');</script>
+    <script type="text/javascript">moveProgressBar('94.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should result in 'http://example.org/fredbarney/' when used to expand 'http://example.org/{a}{b}/'</span></dd>
-    <script type="text/javascript">moveProgressBar('96.6');</script>
+    <script type="text/javascript">moveProgressBar('95.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should result in 'http://example.com/order/cheeseburger/cheeseburger/cheeseburger/' when used to expand 'http://example.com/order/{c}/{c}/{c}/'</span></dd>
-    <script type="text/javascript">moveProgressBar('96.9');</script>
+    <script type="text/javascript">moveProgressBar('95.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should result in 'http://example.org/one%20two%20three' when used to expand 'http://example.org/{d}'</span></dd>
-    <script type="text/javascript">moveProgressBar('97.2');</script>
+    <script type="text/javascript">moveProgressBar('95.4');</script>
     <dd class="spec passed"><span class="passed_spec_name">should result in 'http://example.org/20%25%20tricky' when used to expand 'http://example.org/{e}'</span></dd>
-    <script type="text/javascript">moveProgressBar('97.5');</script>
+    <script type="text/javascript">moveProgressBar('95.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should result in 'http://example.com//' when used to expand 'http://example.com/{f}/'</span></dd>
-    <script type="text/javascript">moveProgressBar('97.7');</script>
+    <script type="text/javascript">moveProgressBar('95.9');</script>
     <dd class="spec passed"><span class="passed_spec_name">should result in 'https://this-is-spinal-tap.example.org?date=&amp;option=fred' when used to expand '{scheme}://{20}.example.org?date={wilma}&amp;option={a}'</span></dd>
-    <script type="text/javascript">moveProgressBar('98.0');</script>
+    <script type="text/javascript">moveProgressBar('96.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should result in 'http://example.org?quote=to+be+or+not+to+be' when used to expand 'http://example.org?{p}'</span></dd>
-    <script type="text/javascript">moveProgressBar('98.3');</script>
+    <script type="text/javascript">moveProgressBar('96.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should result in 'http://example.com/hullo#world' when used to expand 'http://example.com/{q}'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_63">Addressable::URI when given a mapping that contains a template-var within a value</dt>
-    <script type="text/javascript">moveProgressBar('98.6');</script>
+  <dt id="behaviour_67">Addressable::URI when given a mapping that contains a template-var within a value</dt>
+    <script type="text/javascript">moveProgressBar('96.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should result in 'http://example.com/%7Bb%7D/barney/' when used to expand 'http://example.com/{a}/{b}/'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_64">Addressable::URI when given a mapping that contains values that are already percent-encoded</dt>
-    <script type="text/javascript">moveProgressBar('98.8');</script>
+  <dt id="behaviour_68">Addressable::URI when given a mapping that contains values that are already percent-encoded</dt>
+    <script type="text/javascript">moveProgressBar('96.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should result in 'http://example.com/%257Bb%257D/' when used to expand 'http://example.com/{a}/'</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_65">Addressable::URI when parsed from 'http://example.com/search/an+example+search+query/'</dt>
-    <script type="text/javascript">moveProgressBar('99.1');</script>
+  <dt id="behaviour_69">Addressable::URI when parsed from 'http://example.com/search/an+example+search+query/'</dt>
+    <script type="text/javascript">moveProgressBar('97.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct mapping when extracting values using the pattern 'http://example.com/search/{query}/' with the ExampleProcessor</span></dd>
-    <script type="text/javascript">moveProgressBar('99.4');</script>
+    <script type="text/javascript">moveProgressBar('97.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should return nil when extracting values using a non-matching pattern</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_66">Addressable::URI when parsed from 'http://example.com/a/b/c/'</dt>
-    <script type="text/javascript">moveProgressBar('99.7');</script>
+  <dt id="behaviour_70">Addressable::URI when parsed from 'http://example.com/a/b/c/'</dt>
+    <script type="text/javascript">moveProgressBar('97.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct mapping when extracting values using the pattern 'http://example.com/{first}/{second}/' with the ExampleProcessor</span></dd>
   </dl>
 </div>
 <div class="behaviour">
   <dl>
-  <dt id="behaviour_67">Addressable::URI when parsed from 'http://example.com/one/spacer/two/'</dt>
-    <script type="text/javascript">moveProgressBar('100.0');</script>
+  <dt id="behaviour_71">Addressable::URI when parsed from 'http://example.com/one/spacer/two/'</dt>
+    <script type="text/javascript">moveProgressBar('97.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should have the correct mapping when extracting values using the pattern 'http://example.com/{first}/spacer/{second}/'</span></dd>
   </dl>
 </div>
-<script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>1.976435 seconds</strong>";</script>
-<script type="text/javascript">document.getElementById('totals').innerHTML = "362 examples, 0 failures";</script>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_72">Addressable::URI when given the input '/path/to/resource'</dt>
+    <script type="text/javascript">moveProgressBar('97.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should heuristically parse to '/path/to/resource'</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_73">Addressable::URI when given the input 'relative/path/to/resource'</dt>
+    <script type="text/javascript">moveProgressBar('98.1');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should heuristically parse to 'relative/path/to/resource'</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_74">Addressable::URI when given the input 'example.com'</dt>
+    <script type="text/javascript">moveProgressBar('98.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should heuristically parse to 'http://example.com'</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_75">Addressable::URI when given the input 'example.com' and a scheme hint of 'ftp'</dt>
+    <script type="text/javascript">moveProgressBar('98.6');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should heuristically parse to 'http://example.com'</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_76">Addressable::URI when given the input 'example.com:21' and a scheme hint of 'ftp'</dt>
+    <script type="text/javascript">moveProgressBar('98.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should heuristically parse to 'http://example.com:21'</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_77">Addressable::URI when given the input 'example.com/path/to/resource'</dt>
+    <script type="text/javascript">moveProgressBar('99.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should heuristically parse to 'http://example.com/path/to/resource'</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_78">Addressable::URI when given the input 'http:///example.com'</dt>
+    <script type="text/javascript">moveProgressBar('99.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should heuristically parse to 'http://example.com'</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_79">Addressable::URI when given the input 'feed:///example.com'</dt>
+    <script type="text/javascript">moveProgressBar('99.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should heuristically parse to 'feed://example.com'</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_80">Addressable::URI when given the input 'file://path/to/resource/'</dt>
+    <script type="text/javascript">moveProgressBar('99.7');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should heuristically parse to 'file:///path/to/resource/'</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_81">Addressable::URI when given the input 'feed://http://example.com'</dt>
+    <script type="text/javascript">moveProgressBar('100.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should heuristically parse to 'feed:http://example.com'</span></dd>
+  </dl>
+</div>
+<script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>3.537794 seconds</strong>";</script>
+<script type="text/javascript">document.getElementById('totals').innerHTML = "440 examples, 0 failures";</script>
 </div>
 </div>
 </body>