addressable 0.1.2 → 1.0.0

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

@@ -89,8 +89,8 @@ returning nil if libidn can‘t be used.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000057">to_ascii</a>&nbsp;&nbsp;
-      <a href="#M000058">to_unicode</a>&nbsp;&nbsp;
+      <a href="#M000058">to_ascii</a>&nbsp;&nbsp;
+      <a href="#M000059">to_unicode</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -112,11 +112,11 @@ returning nil if libidn can&#8216;t be used.
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000057" class="method-detail">
-        <a name="M000057"></a>
+      <div id="method-M000058" class="method-detail">
+        <a name="M000058"></a>
 
         <div class="method-heading">
-          <a href="#M000057" class="method-signature">
+          <a href="#M000058" class="method-signature">
           <span class="method-name">to_ascii</span><span class="method-args">(label)</span>
           </a>
         </div>
@@ -126,30 +126,30 @@ returning nil if libidn can&#8216;t be used.
 Returns the ascii representation of the label.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000057-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000057-source">
+            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 1103</span>
-1103:       <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>)
-1104:         <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>
-1105:         <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">use_libidn?</span>
-1106:           <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>)
-1107:         <span class="ruby-keyword kw">else</span>
-1108:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">NotImplementedError</span>,
-1109:             <span class="ruby-value str">&quot;There is no available pure-ruby implementation.  &quot;</span> <span class="ruby-operator">+</span>
-1110:             <span class="ruby-value str">&quot;Install libidn bindings.&quot;</span>
-1111:         <span class="ruby-keyword kw">end</span>
-1112:       <span class="ruby-keyword kw">end</span>
+      <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>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000058" class="method-detail">
-        <a name="M000058"></a>
+      <div id="method-M000059" class="method-detail">
+        <a name="M000059"></a>
 
         <div class="method-heading">
-          <a href="#M000058" class="method-signature">
+          <a href="#M000059" class="method-signature">
           <span class="method-name">to_unicode</span><span class="method-args">(label)</span>
           </a>
         </div>
@@ -159,20 +159,20 @@ Returns the ascii representation of the label.
 Returns the unicode representation of the label.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000058-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000058-source">
+            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 1115</span>
-1115:       <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>)
-1116:         <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>
-1117:         <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">use_libidn?</span>
-1118:           <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>)
-1119:         <span class="ruby-keyword kw">else</span>
-1120:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">NotImplementedError</span>,
-1121:             <span class="ruby-value str">&quot;There is no available pure-ruby implementation.  &quot;</span> <span class="ruby-operator">+</span>
-1122:             <span class="ruby-value str">&quot;Install libidn bindings.&quot;</span>
-1123:         <span class="ruby-keyword kw">end</span>
-1124:       <span class="ruby-keyword kw">end</span>
+      <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>
 </pre>
           </div>
         </div>

data/doc/created.rid

@@ -1 +1 @@
-Sun Oct 28 17:23:21 -0400 2007
+Sat Nov 03 22:20:27 -0400 2007

data/doc/files/CHANGELOG.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sun Oct 28 15:46:06 -0400 2007</td>
+      <td>Sat Nov 03 19:31:11 -0400 2007</td>
     </tr>
     </table>
   </div>
@@ -69,7 +69,17 @@
   <div id="contextContent">
 
     <div id="description">
-      <h3><a href="../classes/Addressable.html">Addressable</a> 0.1.2</h3>
+      <h3><a href="../classes/Addressable.html">Addressable</a> 1.0.0</h3>
+<pre>
+  * heuristic parse method added
+  * parsing is slightly more strict
+  * replaced to_h with to_hash
+  * fixed routing methods
+  * improved specifications
+  * improved heckle rake task
+  * no surviving heckle mutations
+</pre>
+<h3><a href="../classes/Addressable.html">Addressable</a> 0.1.2</h3>
 <pre>
   * improved normalization
   * fixed bug in joining algorithm

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>Sun Oct 28 17:15:18 -0400 2007</td>
+      <td>Sat Nov 03 20:48:16 -0400 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>Wed Sep 05 19:02:53 -0400 2007</td>
+      <td>Fri Nov 02 10:59:09 -0400 2007</td>
     </tr>
     </table>
   </div>

data/doc/fr_method_index.html

@@ -20,64 +20,65 @@
 <div id="index">
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
-    <a href="classes/Addressable/URI.html#M000040">+ (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000051">== (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000050">=== (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000039">absolute? (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000022">authority (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000023">authority= (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000031">basename (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000002">convert_path (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000049">display_uri (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000053">dup (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000008">encode (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000006">encode_segment (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000052">eql? (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000003">expand_template (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000032">extname (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000010">extract (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000004">extract_mapping (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000035">fragment (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000036">fragment= (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000020">host (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000021">host= (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000056">inspect (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000037">ip_based? (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000024">ip_based_schemes (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000005">join (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000042">join (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000044">join! (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000041">merge (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000043">merge! (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000011">new (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000047">normalize (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000048">normalize! (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000009">normalized_encode (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000041">+ (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000052">== (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000051">=== (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000040">absolute? (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000023">authority (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000024">authority= (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000032">basename (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000003">convert_path (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000050">display_uri (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000054">dup (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000009">encode (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000007">encode_segment (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000053">eql? (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000004">expand_template (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000033">extname (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000011">extract (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000005">extract_mapping (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000036">fragment (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000037">fragment= (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000002">heuristic_parse (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000021">host (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000022">host= (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000057">inspect (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000038">ip_based? (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000025">ip_based_schemes (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000043">join (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000006">join (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000045">join! (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000042">merge (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000044">merge! (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000012">new (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000048">normalize (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000049">normalize! (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000010">normalized_encode (Addressable::URI)</a><br />
     <a href="classes/Addressable/URI.html#M000001">parse (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000016">password (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000017">password= (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000029">path (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000030">path= (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000026">port (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000027">port= (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000033">query (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000034">query= (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000038">relative? (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000045">route_from (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000046">route_to (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000012">scheme (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000013">scheme= (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000025">scheme_mapping (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000028">specified_port (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI/IDNA.html#M000057">to_ascii (Addressable::URI::IDNA)</a><br />
-    <a href="classes/Addressable/URI.html#M000055">to_h (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000054">to_s (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI/IDNA.html#M000058">to_unicode (Addressable::URI::IDNA)</a><br />
-    <a href="classes/Addressable/URI.html#M000007">unencode_segment (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000014">user (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000015">user= (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000018">userinfo (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000019">userinfo= (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000017">password (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000018">password= (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000030">path (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000031">path= (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000027">port (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000028">port= (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000034">query (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000035">query= (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000039">relative? (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000046">route_from (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000047">route_to (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000013">scheme (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000014">scheme= (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000026">scheme_mapping (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000029">specified_port (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI/IDNA.html#M000058">to_ascii (Addressable::URI::IDNA)</a><br />
+    <a href="classes/Addressable/URI.html#M000056">to_hash (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000055">to_s (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI/IDNA.html#M000059">to_unicode (Addressable::URI::IDNA)</a><br />
+    <a href="classes/Addressable/URI.html#M000008">unencode_segment (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000015">user (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000016">user= (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000019">userinfo (Addressable::URI)</a><br />
+    <a href="classes/Addressable/URI.html#M000020">userinfo= (Addressable::URI)</a><br />
   </div>
 </div>
 </body>

data/lib/addressable/uri.rb

@@ -93,31 +93,51 @@ module Addressable
         host = authority.gsub(/^([^\[\]]*)@/, "").gsub(/:([^:@\[\]]*?)$/, "")
         port = authority.scan(/:([^:@\[\]]*?)$/).flatten[0]
       end
-      if port.nil? || port == ""
+      if port == nil || port == ""
         port = nil
       end
       
-      # WARNING: Not standards-compliant, but follows the theme
-      # of Postel's law:
-      #
-      # Special exception for dealing with the retarded idea of the
-      # feed pseudo-protocol.  Without this exception, the parser will read
-      # the URI as having a blank port number, instead of as having a second
-      # URI embedded within.  This exception translates these broken URIs
-      # and instead treats the inner URI as opaque.
-      if scheme == "feed" && host == "http"
-        userinfo = nil
-        user = nil
-        password = nil
-        host = nil
-        port = nil
-        path = authority + path
-      end
-      
       return Addressable::URI.new(
         scheme, user, password, host, port, path, query, fragment)
     end
     
+    # Converts an input to a URI.  The input does not have to be a valid
+    # URI -- the method will use heuristics to guess what URI was intended.
+    # This is not standards compliant, merely user-friendly.
+    def self.heuristic_parse(input, hints={})
+      input = input.dup
+      hints = {
+        :scheme => "http"
+      }.merge(hints)
+      case input
+      when /^http:\/+/
+        input.gsub!(/^http:\/+/, "http://")
+      when /^feed:\/+http:\/+/
+        input.gsub!(/^feed:\/+http:\/+/, "feed:http://")
+      when /^feed:\/+/
+        input.gsub!(/^feed:\/+/, "feed://")
+      when /^file:\/+/
+        input.gsub!(/^file:\/+/, "file:///")
+      end
+      parsed = self.parse(input)
+      if parsed.scheme =~ /^[^\/?#\.]+\.[^\/?#]+$/
+        parsed = self.parse(hints[:scheme] + "://" + input)
+      end
+      if parsed.authority == nil
+        if parsed.path =~ /^[^\/]+\./
+          new_host = parsed.path.scan(/^([^\/]+\.[^\/]*)/).flatten[0]
+          if new_host
+            new_path = parsed.path.gsub(
+              Regexp.new("^" + Regexp.escape(new_host)), "")
+            parsed.host = new_host
+            parsed.path = new_path
+            parsed.scheme = hints[:scheme]
+          end
+        end
+      end
+      return parsed
+    end
+    
     # Converts a path to a file protocol URI.  If the path supplied is
     # relative, it will be returned as a relative URI.  If the path supplied
     # is actually a URI, it will return the parsed URI.
@@ -458,15 +478,14 @@ module Addressable
       @password = password
       @host = host
       @specified_port = port.to_s
-      @port = port
-      @port = @port.to_s if @port.kind_of?(Fixnum)
+      @port = port.kind_of?(Fixnum) ? port.to_s : port
       if @port != nil && !(@port =~ /^\d+$/)
         raise InvalidURIError,
           "Invalid port number: #{@port.inspect}"
       end
       @port = @port.to_i
       @port = nil if @port == 0
-      @path = path
+      @path = (path || "")
       @query = query
       @fragment = fragment
 
@@ -529,15 +548,15 @@ module Addressable
     
     # Returns the username and password segment of this URI.
     def userinfo
-      if !defined?(@userinfo) || @userinfo.nil?
+      if !defined?(@userinfo) || @userinfo == nil
         current_user = self.user
         current_password = self.password
-        if current_user == nil && current_password == nil
+        if !current_user && !current_password
           @userinfo = nil
-        elsif current_user != nil && current_password == nil
-          @userinfo = "#{current_user}"
-        elsif current_user != nil && current_password != nil
+        elsif current_user && current_password
           @userinfo = "#{current_user}:#{current_password}"
+        elsif current_user && !current_password
+          @userinfo = "#{current_user}"
         end
       end
       return @userinfo
@@ -593,9 +612,9 @@ module Addressable
     
     # Sets the authority segment of this URI.
     def authority=(new_authority)
-      if new_authority != nil
+      if new_authority
         new_userinfo = new_authority.scan(/^([^\[\]]*)@/).flatten[0]
-        if new_userinfo != nil
+        if new_userinfo
           new_user = new_userinfo.strip.scan(/^([^:]*):?/).flatten[0]
           new_password = new_userinfo.strip.scan(/:(.*)$/).flatten[0]
         end
@@ -604,7 +623,6 @@ module Addressable
         new_port =
           new_authority.scan(/:([^:@\[\]]*?)$/).flatten[0]
       end
-      new_port = nil if new_port == ""
       
       # Password assigned first to ensure validity in case of nil
       self.password = new_password
@@ -654,10 +672,10 @@ module Addressable
     # in the URI.
     def port
       if @port.to_i == 0
-        if self.scheme.nil?
-          @port = nil
-        else
+        if self.scheme
           @port = self.class.scheme_mapping[self.scheme.strip.downcase]
+        else
+          @port = nil
         end
         return @port
       else
@@ -690,13 +708,13 @@ module Addressable
     
     # Sets the path for this URI.
     def path=(new_path)
-      @path = new_path
+      @path = (new_path || "")
     end
 
     # Returns the basename, if any, of the file at the path being referenced.
     # Returns nil if there is no path component.
     def basename
-      return nil if self.path == nil
+      # Path cannot be nil
       return File.basename(self.path).gsub(/;[^\/]*$/, "")
     end
         
@@ -704,8 +722,8 @@ module Addressable
     # Returns "" if there is no extension or nil if there is no path
     # component.
     def extname
-      return nil if self.path == nil
-      return File.extname(self.basename.gsub(/;[^\/]*$/, ""))
+      return nil unless self.path
+      return File.extname(self.basename)
     end
     
     # Returns the query string for this URI.
@@ -730,8 +748,11 @@ module Addressable
     
     # Returns true if the URI uses an IP-based protocol.
     def ip_based?
-      return false if self.scheme.nil?
-      return self.class.ip_based_schemes.include?(self.scheme.strip.downcase)
+      if self.scheme
+        return self.class.ip_based_schemes.include?(
+          self.scheme.strip.downcase)
+      end
+      return false
     end
     
     # Returns true if this URI is known to be relative.
@@ -851,19 +872,18 @@ module Addressable
     # supplied URI as a base for resolution.  Returns an absolute URI if
     # necessary.
     def route_from(uri)
-      uri = uri.kind_of?(self.class) ? uri : self.class.parse(uri.to_s)
-      uri = uri.normalize
+      uri = self.class.parse(uri).normalize
       normalized_self = self.normalize
       if normalized_self.relative?
         raise ArgumentError, "Expected absolute URI, got: #{self.to_s}"
       end
       if uri.relative?
-        raise ArgumentError, "Expected absolute URI, got: #{self.to_s}"
+        raise ArgumentError, "Expected absolute URI, got: #{uri.to_s}"
       end
       if normalized_self == uri
         return Addressable::URI.parse("##{normalized_self.fragment}")
       end
-      segments = normalized_self.to_h
+      segments = normalized_self.to_hash
       if normalized_self.scheme == uri.scheme
         segments[:scheme] = nil
         if normalized_self.authority == uri.authority
@@ -876,11 +896,16 @@ module Addressable
             if normalized_self.query == uri.query
               segments[:query] = nil
             end
+          else
+            if uri.path != "/"
+              segments[:path].gsub!(
+                Regexp.new("^" + Regexp.escape(uri.path)), "")
+            end
           end
         end
       end
       # Avoid network-path references.
-      if segments[:scheme] == nil && segments[:host] != nil
+      if segments[:host] != nil
         segments[:scheme] = normalized_self.scheme
       end
       return Addressable::URI.new(
@@ -899,8 +924,7 @@ module Addressable
     # uses this URI as a base for resolution.  Returns an absolute URI if
     # necessary.
     def route_to(uri)
-      uri = uri.kind_of?(self.class) ? uri : self.class.parse(uri.to_s)
-      return uri.route_from(self)
+      return self.class.parse(uri).route_from(self)
     end
     
     # Returns a normalized URI object.
@@ -925,8 +949,10 @@ module Addressable
       normalized_password = nil
       normalized_password = self.password.strip if self.password != nil
       
+      # If we are using http or https and user/password are blank,
+      # then we remove them
       if normalized_scheme =~ /https?/ && normalized_user == "" &&
-          (normalized_password == nil || normalized_password == "")
+          (!normalized_password || normalized_password == "")
         normalized_user = nil
         normalized_password = nil
       end
@@ -943,18 +969,13 @@ module Addressable
           normalized_host = normalized_host[0...-1]
         end
       end
-            
+      
       normalized_port = self.port
       if self.class.scheme_mapping[normalized_scheme] == normalized_port
         normalized_port = nil
       end
       normalized_path = nil
       normalized_path = self.path.strip if self.path != nil
-      if normalized_path == nil &&
-          normalized_scheme != nil &&
-          normalized_host != nil
-        normalized_path = "/"
-      end
       if normalized_path != nil
         normalized_path = self.class.normalize_path(normalized_path)
       end
@@ -1005,13 +1026,12 @@ module Addressable
     # both URIs before doing the comparison, and allows comparison against
     # strings.
     def ===(uri)
-      uri_string = nil
       if uri.respond_to?(:normalize)
         uri_string = uri.normalize.to_s
       else
         begin
           uri_string = URI.parse(uri.to_s).normalize.to_s
-        rescue Exception
+        rescue InvalidURIError
           return false
         end
       end
@@ -1034,21 +1054,14 @@ module Addressable
     
     # Clones the URI object.
     def dup
-      duplicated_scheme = nil
-      duplicated_scheme = self.scheme.dup if self.scheme != nil
-      duplicated_user = nil
-      duplicated_user = self.user.dup if self.user != nil
-      duplicated_password = nil
-      duplicated_password = self.password.dup if self.password != nil
-      duplicated_host = nil
-      duplicated_host = self.host.dup if self.host != nil
-      duplicated_port = self.port
-      duplicated_path = nil
-      duplicated_path = self.path.dup if self.path != nil
-      duplicated_query = nil
-      duplicated_query = self.query.dup if self.query != nil
-      duplicated_fragment = nil
-      duplicated_fragment = self.fragment.dup if self.fragment != nil
+      duplicated_scheme = self.scheme ? self.scheme.dup : nil
+      duplicated_user = self.user ? self.user.dup : nil
+      duplicated_password = self.password ? self.password.dup : nil
+      duplicated_host = self.host ? self.host.dup : nil
+      duplicated_port = self.specified_port
+      duplicated_path = self.path ? self.path.dup : nil
+      duplicated_query = self.query ? self.query.dup : nil
+      duplicated_fragment = self.fragment ? self.fragment.dup : nil
       duplicated_uri = Addressable::URI.new(
         duplicated_scheme,
         duplicated_user,
@@ -1059,8 +1072,6 @@ module Addressable
         duplicated_query,
         duplicated_fragment
       )
-      @specified_port = nil if !defined?(@specified_port)
-      duplicated_uri.instance_variable_set("@specified_port", @specified_port)
       return duplicated_uri
     end
     
@@ -1076,7 +1087,7 @@ module Addressable
     end
     
     # Returns a Hash of the URI segments.
-    def to_h
+    def to_hash
       return {
         :scheme => self.scheme,
         :user => self.user,
@@ -1171,17 +1182,19 @@ module Addressable
 
     # Ensures that the URI is valid.
     def validate
-      if self.scheme == nil && self.user == nil && self.password == nil &&
-          self.host == nil && self.port == nil && self.path == nil &&
-          self.query == nil && self.fragment == nil
-        raise InvalidURIError, "All segments were nil."
-      end
       if self.scheme != nil &&
           (self.host == nil || self.host == "") &&
           (self.path == nil || self.path == "")
         raise InvalidURIError,
           "Absolute URI missing hierarchical segment."
       end
+      if self.host == nil
+        if self.specified_port != nil ||
+            self.user != nil ||
+            self.password != nil
+          raise InvalidURIError, "Hostname not supplied."
+        end
+      end
     end
     
     # Replaces the internal state of self with the specified URI's state.