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

addressable 0.1.1 → 0.1.2

Files changed (27) hide show

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

data/doc/classes/Addressable/URI/CharacterClasses.html CHANGED

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>Module: Addressable::URI::CharacterClasses</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
   <script type="text/javascript">

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>Module: Addressable::URI::IDNA</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
   <script type="text/javascript">
@@ -89,8 +89,8 @@ returning nil if libidn can&#8216;t be used.
       <h3 class="section-bar">Methods</h3>
       <div class="name-list">
-      <a href="#M000055">to_ascii</a>&nbsp;&nbsp;
-      <a href="#M000056">to_unicode</a>&nbsp;&nbsp;
+      <a href="#M000057">to_ascii</a>&nbsp;&nbsp;
+      <a href="#M000058">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-M000055" class="method-detail">
-        <a name="M000055"></a>
+      <div id="method-M000057" class="method-detail">
+        <a name="M000057"></a>
         <div class="method-heading">
-          <a href="#M000055" class="method-signature">
+          <a href="#M000057" 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('M000055-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000055-source">
+            onclick="toggleCode('M000057-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000057-source">
 <pre>
-      <span class="ruby-comment cmt"># File lib/addressable/uri.rb, line 1074</span>
-1074:       <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>)
-1075:         <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>
-1076:         <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">use_libidn?</span>
-1077:           <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>)
-1078:         <span class="ruby-keyword kw">else</span>
-1079:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">NotImplementedError</span>,
-1080:             <span class="ruby-value str">&quot;There is no available pure-ruby implementation.  &quot;</span> <span class="ruby-operator">+</span>
-1081:             <span class="ruby-value str">&quot;Install libidn bindings.&quot;</span>
-1082:         <span class="ruby-keyword kw">end</span>
-1083:       <span class="ruby-keyword kw">end</span>
+      <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>
 </pre>
           </div>
         </div>
       </div>
-      <div id="method-M000056" class="method-detail">
-        <a name="M000056"></a>
+      <div id="method-M000058" class="method-detail">
+        <a name="M000058"></a>
         <div class="method-heading">
-          <a href="#M000056" class="method-signature">
+          <a href="#M000058" 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('M000056-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000056-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 1086</span>
-1086:       <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>)
-1087:         <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>
-1088:         <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">use_libidn?</span>
-1089:           <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>)
-1090:         <span class="ruby-keyword kw">else</span>
-1091:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">NotImplementedError</span>,
-1092:             <span class="ruby-value str">&quot;There is no available pure-ruby implementation.  &quot;</span> <span class="ruby-operator">+</span>
-1093:             <span class="ruby-value str">&quot;Install libidn bindings.&quot;</span>
-1094:         <span class="ruby-keyword kw">end</span>
-1095:       <span class="ruby-keyword kw">end</span>
+      <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>
 </pre>
           </div>
         </div>

data/doc/classes/Addressable/URI/InvalidOptionError.html CHANGED

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>Class: Addressable::URI::InvalidOptionError</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
   <script type="text/javascript">

data/doc/classes/Addressable/URI/InvalidTemplateValue.html CHANGED

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>Class: Addressable::URI::InvalidTemplateValue</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
   <script type="text/javascript">

data/doc/classes/Addressable/URI/InvalidURIError.html CHANGED

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>Class: Addressable::URI::InvalidURIError</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
   <script type="text/javascript">

data/doc/created.rid CHANGED

	@@ -1 +1 @@
1	- ~~Wed~~ ~~Sep~~ 05 16:05:51 -0400 2007
1	+ Sun Oct 28 17:23:21 -0400 2007

data/doc/files/CHANGELOG.html CHANGED

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>File: CHANGELOG</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
   <script type="text/javascript">
@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Sep 05 13:34:16 -0400 2007</td>
+      <td>Sun Oct 28 15:46:06 -0400 2007</td>
     </tr>
     </table>
   </div>
@@ -69,7 +69,13 @@
   <div id="contextContent">
     <div id="description">
-      <h3><a href="../classes/Addressable.html">Addressable</a> 0.1.1</h3>
+      <h3><a href="../classes/Addressable.html">Addressable</a> 0.1.2</h3>
+<pre>
+  * improved normalization
+  * fixed bug in joining algorithm
+  * updated specifications
+</pre>
+<h3><a href="../classes/Addressable.html">Addressable</a> 0.1.1</h3>
 <pre>
   * updated documentation
   * added URI Template variable extraction

data/doc/files/LICENSE.html CHANGED

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>File: LICENSE</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
   <script type="text/javascript">

data/doc/files/README.html CHANGED

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>File: README</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
   <script type="text/javascript">

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>File: uri.rb</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
   <script type="text/javascript">
@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Sep 05 16:01:22 -0400 2007</td>
+      <td>Sun Oct 28 17:15:18 -0400 2007</td>
     </tr>
     </table>
   </div>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>File: version.rb</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
   <script type="text/javascript">
@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Sep 05 14:18:58 -0400 2007</td>
+      <td>Wed Sep 05 19:02:53 -0400 2007</td>
     </tr>
     </table>
   </div>

data/doc/fr_class_index.html CHANGED

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -12,7 +12,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>Classes</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <link rel="stylesheet" href="rdoc-style.css" type="text/css" />
   <base target="docwin" />
 </head>

data/doc/fr_file_index.html CHANGED

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -12,7 +12,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>Files</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <link rel="stylesheet" href="rdoc-style.css" type="text/css" />
   <base target="docwin" />
 </head>

data/doc/fr_method_index.html CHANGED

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -12,7 +12,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>Methods</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <link rel="stylesheet" href="rdoc-style.css" type="text/css" />
   <base target="docwin" />
 </head>
@@ -21,18 +21,18 @@
   <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#M000049">== (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000048">=== (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#M000047">display_uri (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000051">dup (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#M000050">eql? (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 />
@@ -41,15 +41,17 @@
     <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#M000054">inspect (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#M000042">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#M000045">normalize (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000046">normalize! (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#M000001">parse (Addressable::URI)</a><br />
     <a href="classes/Addressable/URI.html#M000016">password (Addressable::URI)</a><br />
@@ -61,16 +63,16 @@
     <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#M000043">route_from (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000044">route_to (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#M000055">to_ascii (Addressable::URI::IDNA)</a><br />
-    <a href="classes/Addressable/URI.html#M000053">to_h (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI.html#M000052">to_s (Addressable::URI)</a><br />
-    <a href="classes/Addressable/URI/IDNA.html#M000056">to_unicode (Addressable::URI::IDNA)</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 />

data/doc/index.html CHANGED

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -11,7 +11,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <title>Addressable -- URI Implementation</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 </head>
 <frameset rows="20%, 80%">
     <frameset cols="25%,35%,45%">

data/lib/addressable/uri.rb CHANGED

@@ -27,7 +27,7 @@ $:.uniq!
 require 'addressable/version'
 module Addressable
-  # This is an implementation of a URI parser based on RFC 3986.
+  # This is an implementation of a URI parser based on RFC 3986, 3987.
   class URI
     # Raised if something other than a uri is supplied.
     class InvalidURIError < StandardError
@@ -280,6 +280,7 @@ module Addressable
         end
         return mapping
       else
+        # Pattern failed to match URI.
         return nil
       end
     end
@@ -790,9 +791,25 @@ module Addressable
             if uri.path[0..0] == "/"
               joined_path = self.class.normalize_path(uri.path)
             else
-              base_path = self.path.nil? ? "" : self.path.dup
+              base_path = self.path.dup
+              base_path = "" if base_path == nil
               base_path = self.class.normalize_path(base_path)
-              base_path.gsub!(/\/[^\/]+$/, "/")
+              # Section 5.2.3 of RFC 3986
+              #
+              # Removes the right-most path segment from the base path.
+              if base_path =~ /\//
+                base_path.gsub!(/\/[^\/]+$/, "/")
+              else
+                base_path = ""
+              end
+              # If the base path is empty and an authority segment has been
+              # defined, use a base path of "/"
+              if base_path == "" && self.authority != nil
+                base_path = "/"
+              end
               joined_path = self.class.normalize_path(base_path + uri.path)
             end
             joined_query = uri.query
@@ -822,11 +839,13 @@ module Addressable
     def merge(uri)
       return self + uri
     end
+    alias_method :join, :merge
     # Destructive form of merge.
     def merge!(uri)
       replace_self(self.merge(uri))
     end
+    alias_method :join!, :merge!
     # Returns the shortest normalized relative form of this URI that uses the
     # supplied URI as a base for resolution.  Returns an absolute URI if
@@ -905,6 +924,13 @@ module Addressable
       normalized_user = self.user.strip if self.user != nil
       normalized_password = nil
       normalized_password = self.password.strip if self.password != nil
+      if normalized_scheme =~ /https?/ && normalized_user == "" &&
+          (normalized_password == nil || normalized_password == "")
+        normalized_user = nil
+        normalized_password = nil
+      end
       normalized_host = nil
       normalized_host = self.host.strip.downcase if self.host != nil
       if normalized_host != nil
@@ -913,8 +939,11 @@ module Addressable
         rescue Exception
           nil
         end
+        if normalized_host[-1..-1] == "."
+          normalized_host = normalized_host[0...-1]
+        end
       end
       normalized_port = self.port
       if self.class.scheme_mapping[normalized_scheme] == normalized_port
         normalized_port = nil
@@ -1117,6 +1146,8 @@ module Addressable
   private
     # Resolves paths to their simplest form.
     def self.normalize_path(path)
+      # Section 5.2.4 of RFC 3986
       return nil if path.nil?
       normalized_path = path.dup
       previous_state = normalized_path.dup