addressable 1.0.4 → 2.0.0

data/lib/addressable/version.rb

@@ -21,12 +21,15 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-module Addressable
-  module ADDRESSABLE_VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 0
-    TINY  = 4
+# Used to prevent the class/module from being loaded more than once
+if !defined?(Addressable::VERSION)
+  module Addressable
+    module VERSION #:nodoc:
+      MAJOR = 2
+      MINOR = 0
+      TINY  = 0
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+      STRING = [MAJOR, MINOR, TINY].join('.')
+    end
   end
 end

data/spec/addressable/idna_spec.rb

@@ -0,0 +1,196 @@
+# coding:utf-8
+#--
+# Addressable, Copyright (c) 2006-2007 Bob Aman
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../lib'))
+$:.uniq!
+
+require "addressable/idna"
+
+describe Addressable::IDNA, "when converting from unicode to ASCII" do
+  it "should convert 'www.google.com' correctly" do
+    Addressable::IDNA.to_ascii("www.google.com").should == "www.google.com"
+  end
+
+  it "should convert 'www.詹姆斯.com' correctly" do
+    Addressable::IDNA.to_ascii(
+      "www.詹姆斯.com"
+    ).should == "www.xn--8ws00zhy3a.com"
+  end
+
+  it "should convert 'www.Iñtërnâtiônàlizætiøn.com' correctly" do
+    Addressable::IDNA.to_ascii(
+      "www.I\303\261t\303\253rn\303\242ti\303\264" +
+      "n\303\240liz\303\246ti\303\270n.com"
+    ).should == "www.xn--itrntinliztin-vdb0a5exd8ewcye.com"
+  end
+
+  it "should convert 'www.Iñtërnâtiônàlizætiøn.com' correctly" do
+    Addressable::IDNA.to_ascii(
+      "www.In\314\203te\314\210rna\314\202tio\314\202n" +
+      "a\314\200liz\303\246ti\303\270n.com"
+    ).should == "www.xn--itrntinliztin-vdb0a5exd8ewcye.com"
+  end
+
+  it "should convert " +
+      "'www.ほんとうにながいわけのわからないどめいんめいのらべるまだながくしないとたりない.w3.mag.keio.ac.jp' " +
+      "correctly" do
+    Addressable::IDNA.to_ascii(
+      "www.\343\201\273\343\202\223\343\201\250\343\201\206\343\201\253\343" +
+      "\201\252\343\201\214\343\201\204\343\202\217\343\201\221\343\201\256" +
+      "\343\202\217\343\201\213\343\202\211\343\201\252\343\201\204\343\201" +
+      "\251\343\202\201\343\201\204\343\202\223\343\202\201\343\201\204\343" +
+      "\201\256\343\202\211\343\201\271\343\202\213\343\201\276\343\201\240" +
+      "\343\201\252\343\201\214\343\201\217\343\201\227\343\201\252\343\201" +
+      "\204\343\201\250\343\201\237\343\202\212\343\201\252\343\201\204." +
+      "w3.mag.keio.ac.jp"
+    ).should ==
+      "www.xn--n8jaaaaai5bhf7as8fsfk3jnknefdde3" +
+      "fg11amb5gzdb4wi9bya3kc6lra.w3.mag.keio.ac.jp"
+  end
+
+  it "should convert " +
+      "'www.ほんとうにながいわけのわからないどめいんめいのらべるまだながくしないとたりない.w3.mag.keio.ac.jp' " +
+      "correctly" do
+    Addressable::IDNA.to_ascii(
+      "www.\343\201\273\343\202\223\343\201\250\343\201\206\343\201\253\343" +
+      "\201\252\343\201\213\343\202\231\343\201\204\343\202\217\343\201\221" +
+      "\343\201\256\343\202\217\343\201\213\343\202\211\343\201\252\343\201" +
+      "\204\343\201\250\343\202\231\343\202\201\343\201\204\343\202\223\343" +
+      "\202\201\343\201\204\343\201\256\343\202\211\343\201\270\343\202\231" +
+      "\343\202\213\343\201\276\343\201\237\343\202\231\343\201\252\343\201" +
+      "\213\343\202\231\343\201\217\343\201\227\343\201\252\343\201\204\343" +
+      "\201\250\343\201\237\343\202\212\343\201\252\343\201\204." +
+      "w3.mag.keio.ac.jp"
+    ).should ==
+      "www.xn--n8jaaaaai5bhf7as8fsfk3jnknefdde3" +
+      "fg11amb5gzdb4wi9bya3kc6lra.w3.mag.keio.ac.jp"
+  end
+
+  it "should convert '点心和烤鸭.w3.mag.keio.ac.jp' correctly" do
+    Addressable::IDNA.to_ascii(
+      "点心和烤鸭.w3.mag.keio.ac.jp"
+    ).should == "xn--0trv4xfvn8el34t.w3.mag.keio.ac.jp"
+  end
+
+  it "should convert '가각갂갃간갅갆갇갈갉힢힣.com' correctly" do
+    Addressable::IDNA.to_ascii(
+      "가각갂갃간갅갆갇갈갉힢힣.com"
+    ).should == "xn--o39acdefghijk5883jma.com"
+  end
+
+  it "should convert " +
+      "'\347\242\274\346\250\231\346\272\226\350" +
+      "\220\254\345\234\213\347\242\274.com' correctly" do
+    Addressable::IDNA.to_ascii(
+      "\347\242\274\346\250\231\346\272\226\350" +
+      "\220\254\345\234\213\347\242\274.com"
+    ).should == "xn--9cs565brid46mda086o.com"
+  end
+
+  it "should convert 'ﾘ宠퐱〹.com' correctly" do
+    Addressable::IDNA.to_ascii(
+      "\357\276\230\345\256\240\355\220\261\343\200\271.com"
+    ).should == "xn--eek174hoxfpr4k.com"
+  end
+
+  it "should convert 'リ宠퐱卄.com' correctly" do
+    Addressable::IDNA.to_ascii(
+      "\343\203\252\345\256\240\355\220\261\345\215\204.com"
+    ).should == "xn--eek174hoxfpr4k.com"
+  end
+
+  it "should convert 'ᆵ' correctly" do
+    Addressable::IDNA.to_ascii(
+      "\341\206\265"
+    ).should == "xn--4ud"
+  end
+
+  it "should convert 'ﾯ' correctly" do
+    Addressable::IDNA.to_ascii(
+      "\357\276\257"
+    ).should == "xn--4ud"
+  end
+end
+
+describe Addressable::IDNA, "when converting from ASCII to unicode" do
+  it "should convert 'www.google.com' correctly" do
+    Addressable::IDNA.to_unicode("www.google.com").should == "www.google.com"
+  end
+
+  it "should convert 'www.詹姆斯.com' correctly" do
+    Addressable::IDNA.to_unicode(
+      "www.xn--8ws00zhy3a.com"
+    ).should == "www.詹姆斯.com"
+  end
+
+  it "should convert 'www.iñtërnâtiônàlizætiøn.com' correctly" do
+    Addressable::IDNA.to_unicode(
+      "www.xn--itrntinliztin-vdb0a5exd8ewcye.com"
+    ).should == "www.iñtërnâtiônàlizætiøn.com"
+  end
+
+  it "should convert " +
+      "'www.ほんとうにながいわけのわからないどめいんめいのらべるまだながくしないとたりない.w3.mag.keio.ac.jp' " +
+      "correctly" do
+    Addressable::IDNA.to_unicode(
+      "www.xn--n8jaaaaai5bhf7as8fsfk3jnknefdde3" +
+      "fg11amb5gzdb4wi9bya3kc6lra.w3.mag.keio.ac.jp"
+    ).should ==
+      "www.ほんとうにながいわけのわからないどめいんめいのらべるまだながくしないとたりない.w3.mag.keio.ac.jp"
+  end
+
+  it "should convert '点心和烤鸭.w3.mag.keio.ac.jp' correctly" do
+    Addressable::IDNA.to_unicode(
+      "xn--0trv4xfvn8el34t.w3.mag.keio.ac.jp"
+    ).should == "点心和烤鸭.w3.mag.keio.ac.jp"
+  end
+
+  it "should convert '가각갂갃간갅갆갇갈갉힢힣.com' correctly" do
+    Addressable::IDNA.to_unicode(
+      "xn--o39acdefghijk5883jma.com"
+    ).should == "가각갂갃간갅갆갇갈갉힢힣.com"
+  end
+
+  it "should convert " +
+      "'\347\242\274\346\250\231\346\272\226\350" +
+      "\220\254\345\234\213\347\242\274.com' correctly" do
+    Addressable::IDNA.to_unicode(
+      "xn--9cs565brid46mda086o.com"
+    ).should ==
+      "\347\242\274\346\250\231\346\272\226\350" +
+      "\220\254\345\234\213\347\242\274.com"
+  end
+
+  it "should convert 'リ宠퐱卄.com' correctly" do
+    Addressable::IDNA.to_unicode(
+      "xn--eek174hoxfpr4k.com"
+    ).should == "\343\203\252\345\256\240\355\220\261\345\215\204.com"
+  end
+
+  it "should convert 'ﾯ' correctly" do
+    Addressable::IDNA.to_unicode(
+      "xn--4ud"
+    ).should == "\341\206\265"
+  end
+end

data/spec/addressable/uri_spec.rb

@@ -1,3 +1,4 @@
+# coding:utf-8
 #--
 # Addressable, Copyright (c) 2006-2007 Bob Aman
 #
@@ -24,24 +25,38 @@
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../lib'))
 $:.uniq!
 
-require 'addressable/uri'
+require "addressable/uri"
+
+if !"".respond_to?("force_encoding")
+  class String
+    def force_encoding(encoding)
+      # Do nothing, just make sure this gets called.
+    end
+  end
+
+  class Encoding
+    UTF_8 = Encoding.new
+    ASCII_8BIT = Encoding.new
+  end
+end
 
 class ExampleProcessor
   def self.validate(name, value)
     return !!(value =~ /^[\w ]+$/) if name == "query"
     return true
   end
-  
+
   def self.transform(name, value)
     return value.gsub(/ /, "+") if name == "query"
     return value
   end
-  
+
   def self.restore(name, value)
     return value.gsub(/\+/, " ") if name == "query"
+    return value.tr("A-Za-z", "N-ZA-Mn-za-m") if name == "rot13"
     return value
   end
- 
+
   def self.match(name)
     return ".*?" if name == "first"
     return ".*"
@@ -57,7 +72,7 @@ end
 describe Addressable::URI, "when created with a non-numeric port number" do
   it "should raise an error" do
     (lambda do
-      Addressable::URI.new(nil, nil, nil, nil, "bogus", nil, nil, nil)
+      Addressable::URI.new(:port => "bogus")
     end).should raise_error(Addressable::URI::InvalidURIError)
   end
 end
@@ -73,9 +88,9 @@ end
 
 describe Addressable::URI, "when created from nil components" do
   before do
-    @uri = Addressable::URI.new(nil, nil, nil, nil, nil, nil, nil, nil)
+    @uri = Addressable::URI.new
   end
-  
+
   it "should have an empty path" do
     @uri.path.should == ""
   end
@@ -88,28 +103,65 @@ end
 describe Addressable::URI, "when created from string components" do
   before do
     @uri = Addressable::URI.new(
-      "http", nil, nil, "example.com", nil, nil, nil, nil)
+      :scheme => "http", :host => "example.com"
+    )
   end
 
   it "should be equal to the equivalent parsed URI" do
     @uri.should == Addressable::URI.parse("http://example.com")
   end
+
+  it "should raise an error if invalid components omitted" do
+    (lambda do
+      @uri.omit(:bogus)
+    end).should raise_error(ArgumentError)
+    (lambda do
+      @uri.omit(:scheme, :bogus, :path)
+    end).should raise_error(ArgumentError)
+  end
 end
 
 describe Addressable::URI, "when created with a nil host but " +
     "non-nil authority components" do
   it "should raise an error" do
     (lambda do
-      Addressable::URI.new(nil, "user", "pass", nil, 80, nil, nil, nil)
+      Addressable::URI.new(:user => "user", :password => "pass", :port => 80)
     end).should raise_error(Addressable::URI::InvalidURIError)
   end
 end
 
+describe Addressable::URI, "when created with both an authority and a user" do
+  it "should raise an error" do
+    (lambda do
+      Addressable::URI.new(:user => "user", :authority => "user@example.com:80")
+    end).should raise_error(ArgumentError)
+  end
+end
+
+describe Addressable::URI, "when created with an authority and no port" do
+  before do
+    @uri = Addressable::URI.new(:authority => "user@example.com")
+  end
+
+  it "should not infer a port" do
+    @uri.port.should == nil
+    @uri.inferred_port.should == nil
+  end
+end
+
+describe Addressable::URI, "when created with both a userinfo and a user" do
+  it "should raise an error" do
+    (lambda do
+      Addressable::URI.new(:user => "user", :userinfo => "user:pass")
+    end).should raise_error(ArgumentError)
+  end
+end
+
 describe Addressable::URI, "when created with a path that hasn't been " +
     "prefixed with a '/' but a host specified" do
   it "should prefix a '/' to the path" do
     Addressable::URI.new(
-      "http", nil, nil, "example.com", nil, "path", nil, nil
+      :scheme => "http", :host => "example.com", :path => "path"
     ).should == Addressable::URI.parse("http://example.com/path")
   end
 end
@@ -118,7 +170,7 @@ describe Addressable::URI, "when created with a path that hasn't been " +
     "prefixed with a '/' but no host specified" do
   it "should prefix a '/' to the path" do
     Addressable::URI.new(
-      "http", nil, nil, nil, nil, "path", nil, nil
+      :scheme => "http", :path => "path"
     ).should == Addressable::URI.parse("http:path")
   end
 end
@@ -177,6 +229,16 @@ describe Addressable::URI, " when parsed from " +
   it "should be considered to be in normal form" do
     @uri.normalize.should be_eql(@uri)
   end
+
+  it "should correctly omit components" do
+    @uri.omit(:scheme).to_s.should == "//www.ietf.org/rfc/rfc2396.txt"
+    @uri.omit(:path).to_s.should == "http://www.ietf.org"
+  end
+
+  it "should correctly omit components destructively" do
+    @uri.omit!(:scheme)
+    @uri.to_s.should == "//www.ietf.org/rfc/rfc2396.txt"
+  end
 end
 
 # Section 1.1.2 of RFC 3986
@@ -209,6 +271,16 @@ describe Addressable::URI, "when parsed from " +
   it "should be considered to be in normal form" do
     @uri.normalize.should be_eql(@uri)
   end
+
+  it "should correctly omit components" do
+    @uri.omit(:scheme, :authority).to_s.should == "/c=GB?objectClass?one"
+    @uri.omit(:path).to_s.should == "ldap://[2001:db8::7]?objectClass?one"
+  end
+
+  it "should correctly omit components destructively" do
+    @uri.omit!(:scheme, :authority)
+    @uri.to_s.should == "/c=GB?objectClass?one"
+  end
 end
 
 # Section 1.1.2 of RFC 3986
@@ -386,13 +458,13 @@ describe Addressable::URI, " when parsed from " +
   it "should have no password" do
     @uri.password.should == nil
   end
-  
+
   it "should use port 80" do
-    @uri.port.should == 80
+    @uri.inferred_port.should == 80
   end
-  
+
   it "should not have a specified port" do
-    @uri.specified_port.should == nil
+    @uri.port.should == nil
   end
 
   it "should have an empty path" do
@@ -401,6 +473,7 @@ describe Addressable::URI, " when parsed from " +
 
   it "should have no query string" do
     @uri.query.should == nil
+    @uri.query_values.should == nil
   end
 
   it "should have no fragment" do
@@ -422,7 +495,7 @@ describe Addressable::URI, " when parsed from " +
   it "should not be equal to 42" do
     (@uri == 42).should == false
   end
-  
+
   it "should not be roughly equal to 42" do
     (@uri === 42).should == false
   end
@@ -446,9 +519,9 @@ describe Addressable::URI, " when parsed from " +
     end).should_not raise_error
   end
 
-  it "should result in itself when merged with itself" do
-    @uri.merge(@uri).to_s.should == "http://example.com"
-    @uri.merge!(@uri).to_s.should == "http://example.com"
+  it "should result in itself when joined with itself" do
+    @uri.join(@uri).to_s.should == "http://example.com"
+    @uri.join!(@uri).to_s.should == "http://example.com"
   end
 
   # Section 6.2.3 of RFC 3986
@@ -470,22 +543,22 @@ describe Addressable::URI, " when parsed from " +
   it "should be equivalent to http://EXAMPLE.COM/" do
     @uri.should == Addressable::URI.parse("http://EXAMPLE.COM/")
   end
-  
+
   it "should have a route of '/path/' to 'http://example.com/path/'" do
     @uri.route_to("http://example.com/path/").should ==
       Addressable::URI.parse("/path/")
   end
-  
+
   it "should have a route of '/' from 'http://example.com/path/'" do
     @uri.route_from("http://example.com/path/").should ==
       Addressable::URI.parse("/")
   end
-  
+
   it "should have a route of '#' to 'http://example.com/'" do
     @uri.route_to("http://example.com/").should ==
       Addressable::URI.parse("#")
   end
-  
+
   it "should have a route of 'http://elsewhere.com/' to " +
       "'http://elsewhere.com/'" do
     @uri.route_to("http://elsewhere.com/").should ==
@@ -498,6 +571,12 @@ describe Addressable::URI, " when parsed from " +
       Addressable::URI.parse("http://example.com/relative/path")
   end
 
+  it "when joined with a bogus object a TypeError should be raised" do
+    (lambda do
+      @uri.join(42)
+    end).should raise_error(TypeError)
+  end
+
   it "should have the correct username after assignment" do
     @uri.user = "newuser"
     @uri.user.should == "newuser"
@@ -511,7 +590,7 @@ describe Addressable::URI, " when parsed from " +
     @uri.user.should == ""
     @uri.to_s.should == "http://:newpass@example.com"
   end
-  
+
   it "should have the correct user/pass after repeated assignment" do
     @uri.user = nil
     @uri.user.should == nil
@@ -537,7 +616,7 @@ describe Addressable::URI, " when parsed from " +
     @uri.user.should == ""
     @uri.to_s.should == "http://:newpass@example.com"
   end
-  
+
   it "should have the correct user/pass after userinfo assignment" do
     @uri.user = "newuser"
     @uri.user.should == "newuser"
@@ -548,7 +627,7 @@ describe Addressable::URI, " when parsed from " +
     @uri.user.should == nil
     @uri.password.should == nil
   end
-  
+
   it "should correctly convert to a hash" do
     @uri.to_hash.should == {
       :scheme => "http",
@@ -572,7 +651,7 @@ describe Addressable::URI, " when parsed from " +
   before do
     @uri = Addressable::URI.parse("http://example.com/")
   end
-  
+
   # Based on http://intertwingly.net/blog/2004/07/31/URI-Equivalence
   it "should be equivalent to http://example.com" do
     @uri.should == Addressable::URI.parse("http://example.com")
@@ -611,7 +690,7 @@ describe Addressable::URI, " when parsed from " +
     @uri.user.should == nil
     @uri.to_s.should == "http://example.com/"
   end
-  
+
   it "should correctly convert to a hash" do
     @uri.to_hash.should == {
       :scheme => "http",
@@ -647,11 +726,11 @@ describe Addressable::URI, " when parsed from " +
   before do
     @uri = Addressable::URI.parse("http://@example.com/")
   end
-  
+
   it "should be equivalent to http://example.com" do
     @uri.should == Addressable::URI.parse("http://example.com")
   end
-  
+
   it "should correctly convert to a hash" do
     @uri.to_hash.should == {
       :scheme => "http",
@@ -675,7 +754,7 @@ describe Addressable::URI, " when parsed from " +
   before do
     @uri = Addressable::URI.parse("http://example.com./")
   end
-  
+
   it "should be equivalent to http://example.com" do
     @uri.should == Addressable::URI.parse("http://example.com")
   end
@@ -694,11 +773,11 @@ describe Addressable::URI, " when parsed from " +
   before do
     @uri = Addressable::URI.parse("http://:@example.com/")
   end
-  
+
   it "should be equivalent to http://example.com" do
     @uri.should == Addressable::URI.parse("http://example.com")
   end
-  
+
   it "should correctly convert to a hash" do
     @uri.to_hash.should == {
       :scheme => "http",
@@ -746,23 +825,36 @@ describe Addressable::URI, " when parsed from " +
 
   # Based on http://intertwingly.net/blog/2004/07/31/URI-Equivalence
   it "should be equivalent to 'http://example.com/C%CC%A7'" do
-    if Addressable::URI::IDNA.send(:use_libidn?)
-      @uri.should == Addressable::URI.parse("http://example.com/C%CC%A7")
-    else
-      pending("Skipping IDN specification because GNU libidn is unavailable.")
-    end
+    @uri.should == Addressable::URI.parse("http://example.com/C%CC%A7")
   end
-  
+
   it "should not change if encoded with the normalizing algorithm" do
-    Addressable::URI.normalized_encode(@uri).to_s.should == 
+    Addressable::URI.normalized_encode(@uri).to_s.should ==
       "http://example.com/%C3%87"
   end
-  
+
+  it "should raise an error if encoding with an unexpected return type" do
+    (lambda do
+      Addressable::URI.normalized_encode(@uri, Integer)
+    end).should raise_error(TypeError)
+  end
+
   it "if percent encoded should be 'http://example.com/C%25CC%25A7'" do
     Addressable::URI.encode(@uri).to_s.should ==
       "http://example.com/%25C3%2587"
   end
 
+  it "if percent encoded should be 'http://example.com/C%25CC%25A7'" do
+    Addressable::URI.encode(@uri, Addressable::URI).should ==
+      Addressable::URI.parse("http://example.com/%25C3%2587")
+  end
+
+  it "should raise an error if encoding with an unexpected return type" do
+    (lambda do
+      Addressable::URI.encode(@uri, Integer)
+    end).should raise_error(TypeError)
+  end
+
   it "should be identical to its duplicate" do
     @uri.should == @uri.dup
   end
@@ -793,9 +885,9 @@ describe Addressable::URI, " when parsed from " +
   it "should have no password" do
     @uri.password.should == nil
   end
-  
+
   it "should use port 80" do
-    @uri.port.should == 80
+    @uri.inferred_port.should == 80
   end
 
   it "should have a path of '/'" do
@@ -817,7 +909,7 @@ describe Addressable::URI, " when parsed from " +
   it "should not be considered relative" do
     @uri.should_not be_relative
   end
-  
+
   it "should be considered to be in normal form" do
     @uri.normalize.should be_eql(@uri)
   end
@@ -852,7 +944,7 @@ describe Addressable::URI, " when parsed from " +
   it "should have no password" do
     @uri.password.should == nil
   end
-  
+
   it "should use port 80" do
     @uri.port.should == 80
   end
@@ -920,7 +1012,7 @@ describe Addressable::URI, " when parsed from " +
   it "should be equal to http://EXAMPLE.COM/" do
     @uri.should == Addressable::URI.parse("http://EXAMPLE.COM/")
   end
-  
+
   it "should correctly convert to a hash" do
     @uri.to_hash.should == {
       :scheme => "http",
@@ -964,7 +1056,7 @@ describe Addressable::URI, " when parsed from " +
   it "should have no password" do
     @uri.password.should == nil
   end
-  
+
   it "should use port 8080" do
     @uri.port.should == 8080
   end
@@ -993,25 +1085,25 @@ describe Addressable::URI, " when parsed from " +
     @uri.eql?(Addressable::URI.parse(
       "http://example.com:8080/")).should == true
   end
-  
+
   it "should have a route of 'http://example.com:8080/' from " +
       "'http://example.com/path/to/'" do
     @uri.route_from("http://example.com/path/to/").should ==
       Addressable::URI.parse("http://example.com:8080/")
   end
-  
+
   it "should have a route of 'http://example.com:8080/' from " +
       "'http://example.com:80/path/to/'" do
     @uri.route_from("http://example.com:80/path/to/").should ==
       Addressable::URI.parse("http://example.com:8080/")
   end
-  
+
   it "should have a route of '/' from " +
       "'http://example.com:8080/path/to/'" do
     @uri.route_from("http://example.com:8080/path/to/").should ==
       Addressable::URI.parse("/")
   end
-  
+
   it "should have a route of 'http://example.com:8080/' from " +
       "'http://user:pass@example.com/path/to/'" do
     @uri.route_from("http://user:pass@example.com/path/to/").should ==
@@ -1061,9 +1153,9 @@ describe Addressable::URI, " when parsed from " +
   it "should have no password" do
     @uri.password.should == nil
   end
-  
+
   it "should use port 80" do
-    @uri.port.should == 80
+    @uri.inferred_port.should == 80
   end
 
   it "should have a path of '/path/to/resource/'" do
@@ -1090,31 +1182,31 @@ describe Addressable::URI, " when parsed from " +
     @uri.eql?(Addressable::URI.parse(
       "http://example.com/path/to/resource/")).should == true
   end
-  
+
   it "should have a route of 'resource/' from " +
       "'http://example.com/path/to/'" do
     @uri.route_from("http://example.com/path/to/").should ==
       Addressable::URI.parse("resource/")
   end
-  
+
   it "should have a route of 'resource/' from " +
       "'http://example.com:80/path/to/'" do
     @uri.route_from("http://example.com:80/path/to/").should ==
       Addressable::URI.parse("resource/")
   end
-  
+
   it "should have a route of 'http://example.com/path/to/' from " +
       "'http://example.com:8080/path/to/'" do
     @uri.route_from("http://example.com:8080/path/to/").should ==
       Addressable::URI.parse("http://example.com/path/to/resource/")
   end
-  
+
   it "should have a route of 'http://example.com/path/to/' from " +
       "'http://user:pass@example.com/path/to/'" do
     @uri.route_from("http://user:pass@example.com/path/to/").should ==
       Addressable::URI.parse("http://example.com/path/to/resource/")
   end
-  
+
   it "should have a route of '/path/to/resource/' from " +
       "'http://example.com/to/resource/'" do
     @uri.route_from("http://example.com/to/resource/").should ==
@@ -1168,7 +1260,7 @@ describe Addressable::URI, "when parsed from " +
   it "should have no password" do
     @uri.password.should == nil
   end
-  
+
   it "should not have a port" do
     @uri.port.should == nil
   end
@@ -1201,11 +1293,11 @@ describe Addressable::URI, "when parsed from " +
       @uri.route_from("http://example.com/")
     end).should raise_error(ArgumentError, /relative\/path\/to\/resource/)
   end
-  
+
   it "when joined with 'another/relative/path' should be " +
       "'relative/path/to/another/relative/path'" do
     @uri.join('another/relative/path').should ==
-      Addressable::URI.parse("relative/path/to/another/relative/path")    
+      Addressable::URI.parse("relative/path/to/another/relative/path")
   end
 
   it "should be identical to its duplicate" do
@@ -1242,7 +1334,7 @@ describe Addressable::URI, "when parsed from " +
   it "should have no password" do
     @uri.password.should == nil
   end
-  
+
   it "should not have a port" do
     @uri.port.should == nil
   end
@@ -1270,7 +1362,7 @@ describe Addressable::URI, "when parsed from " +
   it "when joined with 'another_relative_path' should be " +
       "'another_relative_path'" do
     @uri.join('another_relative_path').should ==
-      Addressable::URI.parse("another_relative_path")    
+      Addressable::URI.parse("another_relative_path")
   end
 end
 
@@ -1283,7 +1375,7 @@ describe Addressable::URI, " when parsed from " +
   it "should have a scheme of 'http'" do
     @uri.scheme.should == "http"
   end
-  
+
   it "should have an authority segment of 'example.com'" do
     @uri.authority.should == "example.com"
   end
@@ -1299,9 +1391,9 @@ describe Addressable::URI, " when parsed from " +
   it "should have no password" do
     @uri.password.should == nil
   end
-  
+
   it "should use port 80" do
-    @uri.port.should == 80
+    @uri.inferred_port.should == 80
   end
 
   it "should have a path of '/file.txt'" do
@@ -1334,7 +1426,7 @@ describe Addressable::URI, " when parsed from " +
   it "should have a scheme of 'http'" do
     @uri.scheme.should == "http"
   end
-  
+
   it "should have an authority segment of 'example.com'" do
     @uri.authority.should == "example.com"
   end
@@ -1350,9 +1442,9 @@ describe Addressable::URI, " when parsed from " +
   it "should have no password" do
     @uri.password.should == nil
   end
-  
+
   it "should use port 80" do
-    @uri.port.should == 80
+    @uri.inferred_port.should == 80
   end
 
   it "should have a path of '/file.txt;parameter'" do
@@ -1389,7 +1481,7 @@ describe Addressable::URI, " when parsed from " +
   it "should have a scheme of 'http'" do
     @uri.scheme.should == "http"
   end
-  
+
   it "should have an authority segment of 'example.com'" do
     @uri.authority.should == "example.com"
   end
@@ -1405,9 +1497,9 @@ describe Addressable::URI, " when parsed from " +
   it "should have no password" do
     @uri.password.should == nil
   end
-  
+
   it "should use port 80" do
-    @uri.port.should == 80
+    @uri.inferred_port.should == 80
   end
 
   it "should have a path of '/file.txt;x=y'" do
@@ -1425,12 +1517,82 @@ describe Addressable::URI, " when parsed from " +
   it "should have no fragment" do
     @uri.fragment.should == nil
   end
-  
+
+  it "should be considered to be in normal form" do
+    @uri.normalize.should be_eql(@uri)
+  end
+end
+
+describe Addressable::URI, " when parsed from " +
+    "'svn+ssh://developername@rubyforge.org/var/svn/project'" do
+  before do
+    @uri = Addressable::URI.parse(
+      "svn+ssh://developername@rubyforge.org/var/svn/project"
+    )
+  end
+
+  it "should have a scheme of 'svn+ssh'" do
+    @uri.scheme.should == "svn+ssh"
+  end
+
+  it "should be considered to be ip-based" do
+    @uri.should be_ip_based
+  end
+
+  it "should have a path of '/var/svn/project'" do
+    @uri.path.should == "/var/svn/project"
+  end
+
+  it "should have a username of 'developername'" do
+    @uri.user.should == "developername"
+  end
+
+  it "should have no password" do
+    @uri.password.should == nil
+  end
+
   it "should be considered to be in normal form" do
     @uri.normalize.should be_eql(@uri)
   end
 end
 
+describe Addressable::URI, " when parsed from " +
+    "'ssh+svn://developername@rubyforge.org/var/svn/project'" do
+  before do
+    @uri = Addressable::URI.parse(
+      "ssh+svn://developername@rubyforge.org/var/svn/project"
+    )
+  end
+
+  it "should have a scheme of 'ssh+svn'" do
+    @uri.scheme.should == "ssh+svn"
+  end
+
+  it "should have a normalized scheme of 'svn+ssh'" do
+    @uri.normalized_scheme.should == "svn+ssh"
+  end
+
+  it "should not be considered to be ip-based" do
+    @uri.should_not be_ip_based
+  end
+
+  it "should have a path of '/var/svn/project'" do
+    @uri.path.should == "/var/svn/project"
+  end
+
+  it "should have a username of 'developername'" do
+    @uri.user.should == "developername"
+  end
+
+  it "should have no password" do
+    @uri.password.should == nil
+  end
+
+  it "should not be considered to be in normal form" do
+    @uri.normalize.should_not be_eql(@uri)
+  end
+end
+
 describe Addressable::URI, " when parsed from " +
     "'mailto:user@example.com'" do
   before do
@@ -1452,7 +1614,7 @@ describe Addressable::URI, " when parsed from " +
   it "should have no user" do
     @uri.user.should == nil
   end
-  
+
   it "should be considered to be in normal form" do
     @uri.normalize.should be_eql(@uri)
   end
@@ -1481,7 +1643,7 @@ describe Addressable::URI, " when parsed from " +
   it "should have no user" do
     @uri.user.should == nil
   end
-  
+
   it "should be considered to be in normal form" do
     @uri.normalize.should be_eql(@uri)
   end
@@ -1492,7 +1654,7 @@ describe Addressable::URI, " when parsed from " +
   before do
     @uri = Addressable::URI.parse("http://example.com/x;y/")
   end
-  
+
   it "should be considered to be in normal form" do
     @uri.normalize.should be_eql(@uri)
   end
@@ -1503,7 +1665,7 @@ describe Addressable::URI, " when parsed from " +
   before do
     @uri = Addressable::URI.parse("http://example.com/?x=1&y=2")
   end
-  
+
   it "should be considered to be in normal form" do
     @uri.normalize.should be_eql(@uri)
   end
@@ -1522,7 +1684,7 @@ describe Addressable::URI, " when parsed from " +
   it "should have a path of 'http://example.com/'" do
     @uri.path.should == "http://example.com/"
   end
-  
+
   it "should be considered to be in normal form" do
     @uri.normalize.should be_eql(@uri)
   end
@@ -1538,7 +1700,7 @@ describe Addressable::URI, " when parsed from " +
   it "should use the 'http' scheme" do
     @uri.scheme.should == "http"
   end
-  
+
   it "should have an authority segment of 'user:pass@example.com'" do
     @uri.authority.should == "user:pass@example.com"
   end
@@ -1550,13 +1712,13 @@ describe Addressable::URI, " when parsed from " +
   it "should have a password of 'pass'" do
     @uri.password.should == "pass"
   end
-  
+
   it "should have a host of 'example.com'" do
     @uri.host.should == "example.com"
   end
 
   it "should use port 80" do
-    @uri.port.should == 80
+    @uri.inferred_port.should == 80
   end
 
   it "should have a path of '/path/to/resource'" do
@@ -1570,7 +1732,7 @@ describe Addressable::URI, " when parsed from " +
   it "should have a fragment of 'fragment'" do
     @uri.fragment.should == "fragment"
   end
-  
+
   it "should be considered to be in normal form" do
     @uri.normalize.should be_eql(@uri)
   end
@@ -1580,33 +1742,33 @@ describe Addressable::URI, " when parsed from " +
     @uri.route_to("http://user:pass@example.com/path/").should ==
       Addressable::URI.parse("/path/")
   end
-  
+
   it "should have a route of '/path/to/resource?query=x#fragment' " +
       "from 'http://user:pass@example.com/path/'" do
     @uri.route_from("http://user:pass@example.com/path/").should ==
       Addressable::URI.parse("to/resource?query=x#fragment")
   end
-  
+
   it "should have a route of '?query=x#fragment' " +
       "from 'http://user:pass@example.com/path/to/resource'" do
     @uri.route_from("http://user:pass@example.com/path/to/resource").should ==
       Addressable::URI.parse("?query=x#fragment")
   end
-  
+
   it "should have a route of '#fragment' " +
       "from 'http://user:pass@example.com/path/to/resource?query=x'" do
     @uri.route_from(
       "http://user:pass@example.com/path/to/resource?query=x").should ==
         Addressable::URI.parse("#fragment")
   end
-  
+
   it "should have a route of '#fragment' from " +
       "'http://user:pass@example.com/path/to/resource?query=x#fragment'" do
     @uri.route_from(
       "http://user:pass@example.com/path/to/resource?query=x#fragment"
     ).should == Addressable::URI.parse("#fragment")
   end
-  
+
   it "should have a route of 'http://elsewhere.com/' to " +
       "'http://elsewhere.com/'" do
     @uri.route_to("http://elsewhere.com/").should ==
@@ -1627,16 +1789,18 @@ describe Addressable::URI, " when parsed from " +
     @uri.to_s.should ==
       "ftp://user:pass@example.com/path/to/resource?query=x#fragment"
   end
-  
+
   it "should have the correct authority segment after assignment" do
     @uri.authority = "newuser:newpass@example.com:80"
     @uri.authority.should == "newuser:newpass@example.com:80"
     @uri.user.should == "newuser"
     @uri.password.should == "newpass"
+    @uri.userinfo.should == "newuser:newpass"
+    @uri.normalized_userinfo.should == "newuser:newpass"
     @uri.host.should == "example.com"
     @uri.port.should == 80
-    @uri.specified_port.should == 80
-    @uri.to_s.should == 
+    @uri.inferred_port.should == 80
+    @uri.to_s.should ==
       "http://newuser:newpass@example.com:80" +
       "/path/to/resource?query=x#fragment"
   end
@@ -1648,8 +1812,8 @@ describe Addressable::URI, " when parsed from " +
     @uri.user.should == "newuser"
     @uri.password.should == "newpass"
     @uri.host.should == "example.com"
-    @uri.port.should == 80
-    @uri.specified_port.should == nil
+    @uri.port.should == nil
+    @uri.inferred_port.should == 80
     @uri.to_s.should ==
       "http://newuser:newpass@example.com" +
       "/path/to/resource?query=x#fragment"
@@ -1696,15 +1860,110 @@ describe Addressable::URI, " when parsed from " +
   it "should have the correct query string after assignment" do
     @uri.query = "newquery=x"
     @uri.query.should == "newquery=x"
-    @uri.to_s.should == 
+    @uri.to_s.should ==
       "http://user:pass@example.com/path/to/resource?newquery=x#fragment"
   end
 
+  it "should have the correct query string after hash assignment" do
+    @uri.query_values = {"?uestion mark"=>"=sign", "hello"=>"günther"}
+    @uri.query.split("&").should include("%3Fuestion%20mark=%3Dsign")
+    @uri.query.split("&").should include("hello=g%C3%BCnther")
+    @uri.query_values.should == {"?uestion mark"=>"=sign", "hello"=>"günther"}
+  end
+
+  it "should have the correct query string after flag hash assignment" do
+    @uri.query_values = {'flag?1' => true, 'fl=ag2' => true, 'flag3' => true}
+    @uri.query.split("&").should include("flag%3F1")
+    @uri.query.split("&").should include("fl%3Dag2")
+    @uri.query.split("&").should include("flag3")
+    @uri.query_values.should == {
+      'flag?1' => true, 'fl=ag2' => true, 'flag3' => true
+    }
+  end
+
   it "should have the correct fragment after assignment" do
     @uri.fragment = "newfragment"
     @uri.fragment.should == "newfragment"
     @uri.to_s.should ==
       "http://user:pass@example.com/path/to/resource?query=x#newfragment"
+
+    @uri.fragment = nil
+    @uri.fragment.should == nil
+    @uri.to_s.should ==
+      "http://user:pass@example.com/path/to/resource?query=x"
+  end
+
+  it "should have the correct values after a merge" do
+    @uri.merge(:fragment => "newfragment").to_s.should ==
+      "http://user:pass@example.com/path/to/resource?query=x#newfragment"
+  end
+
+  it "should have the correct values after a merge" do
+    @uri.merge(:fragment => nil).to_s.should ==
+      "http://user:pass@example.com/path/to/resource?query=x"
+  end
+
+  it "should have the correct values after a merge" do
+    @uri.merge(:userinfo => "newuser:newpass").to_s.should ==
+      "http://newuser:newpass@example.com/path/to/resource?query=x#fragment"
+  end
+
+  it "should have the correct values after a merge" do
+    @uri.merge(:userinfo => nil).to_s.should ==
+      "http://example.com/path/to/resource?query=x#fragment"
+  end
+
+  it "should have the correct values after a merge" do
+    @uri.merge(:path => "newpath").to_s.should ==
+      "http://user:pass@example.com/newpath?query=x#fragment"
+  end
+
+  it "should have the correct values after a merge" do
+    @uri.merge(:port => "42", :path => "newpath", :query => "").to_s.should ==
+      "http://user:pass@example.com:42/newpath?#fragment"
+  end
+
+  it "should have the correct values after a merge" do
+    @uri.merge(:authority => "foo:bar@baz:42").to_s.should ==
+      "http://foo:bar@baz:42/path/to/resource?query=x#fragment"
+    @uri.to_s.should ==
+      "http://user:pass@example.com/path/to/resource?query=x#fragment"
+  end
+
+  it "should have the correct values after a destructive merge" do
+    @uri.merge!(:authority => "foo:bar@baz:42")
+    @uri.to_s.should ==
+      "http://foo:bar@baz:42/path/to/resource?query=x#fragment"
+  end
+
+  it "should fail to merge with bogus values" do
+    (lambda do
+      @uri.merge(:port => "bogus")
+    end).should raise_error(Addressable::URI::InvalidURIError)
+  end
+
+  it "should fail to merge with bogus parameters" do
+    (lambda do
+      @uri.merge(42)
+    end).should raise_error(TypeError)
+  end
+
+  it "should fail to merge with bogus parameters" do
+    (lambda do
+      @uri.merge("http://example.com/")
+    end).should raise_error(TypeError)
+  end
+
+  it "should fail to merge with both authority and subcomponents" do
+    (lambda do
+      @uri.merge(:authority => "foo:bar@baz:42", :port => "42")
+    end).should raise_error(ArgumentError)
+  end
+
+  it "should fail to merge with both userinfo and subcomponents" do
+    (lambda do
+      @uri.merge(:userinfo => "foo:bar", :user => "foo")
+    end).should raise_error(ArgumentError)
   end
 
   it "should be identical to its duplicate" do
@@ -1729,15 +1988,23 @@ describe Addressable::URI, " when parsed from " +
   it "should have no password" do
     @uri.password.should == nil
   end
-  
+
+  it "should have a userinfo of 'user'" do
+    @uri.userinfo.should == "user"
+  end
+
+  it "should have a normalized userinfo of 'user'" do
+    @uri.normalized_userinfo.should == "user"
+  end
+
   it "should have a host of 'example.com'" do
     @uri.host.should == "example.com"
   end
 
   it "should use port 80" do
-    @uri.port.should == 80
+    @uri.inferred_port.should == 80
   end
-  
+
   it "should have the correct username after assignment" do
     @uri.user = "newuser"
     @uri.user.should == "newuser"
@@ -1757,8 +2024,8 @@ describe Addressable::URI, " when parsed from " +
     @uri.user.should == "newuser"
     @uri.password.should == "newpass"
     @uri.host.should == "example.com"
-    @uri.port.should == 80
-    @uri.specified_port.should == nil
+    @uri.port.should == nil
+    @uri.inferred_port.should == 80
     @uri.to_s.should == "http://newuser:newpass@example.com"
   end
 
@@ -1768,22 +2035,22 @@ describe Addressable::URI, " when parsed from " +
     @uri.user.should == nil
     @uri.password.should == nil
     @uri.host.should == "example.com"
-    @uri.port.should == 80
-    @uri.specified_port.should == nil
+    @uri.port.should == nil
+    @uri.inferred_port.should == 80
     @uri.to_s.should == "http://example.com"
   end
-  
+
   it "should have the correct authority segment after assignment" do
     @uri.authority = "newuser@example.com"
     @uri.authority.should == "newuser@example.com"
     @uri.user.should == "newuser"
     @uri.password.should == nil
     @uri.host.should == "example.com"
-    @uri.port.should == 80
-    @uri.specified_port.should == nil
+    @uri.port.should == nil
+    @uri.inferred_port.should == 80
     @uri.to_s.should == "http://newuser@example.com"
   end
-  
+
   it "should raise an error after nil assignment of authority segment" do
     (lambda do
       # This would create an invalid URI
@@ -1809,13 +2076,17 @@ describe Addressable::URI, " when parsed from " +
   it "should have a password of ''" do
     @uri.password.should == ""
   end
-  
+
+  it "should have a normalized userinfo of 'user:'" do
+    @uri.normalized_userinfo.should == "user:"
+  end
+
   it "should have a host of 'example.com'" do
     @uri.host.should == "example.com"
   end
 
   it "should use port 80" do
-    @uri.port.should == 80
+    @uri.inferred_port.should == 80
   end
 
   it "should have the correct username after assignment" do
@@ -1837,8 +2108,8 @@ describe Addressable::URI, " when parsed from " +
     @uri.user.should == "newuser"
     @uri.password.should == ""
     @uri.host.should == "example.com"
-    @uri.port.should == 80
-    @uri.specified_port.should == nil
+    @uri.port.should == nil
+    @uri.inferred_port.should == 80
     @uri.to_s.should == "http://newuser:@example.com"
   end
 end
@@ -1864,13 +2135,17 @@ describe Addressable::URI, " when parsed from " +
   it "should have a userinfo of ':pass'" do
     @uri.userinfo.should == ":pass"
   end
-  
+
+  it "should have a normalized userinfo of ':pass'" do
+    @uri.normalized_userinfo.should == ":pass"
+  end
+
   it "should have a host of 'example.com'" do
     @uri.host.should == "example.com"
   end
 
   it "should use port 80" do
-    @uri.port.should == 80
+    @uri.inferred_port.should == 80
   end
 
   it "should have the correct username after assignment" do
@@ -1893,8 +2168,8 @@ describe Addressable::URI, " when parsed from " +
     @uri.user.should == ""
     @uri.password.should == "newpass"
     @uri.host.should == "example.com"
-    @uri.port.should == 80
-    @uri.specified_port.should == nil
+    @uri.port.should == nil
+    @uri.inferred_port.should == 80
     @uri.to_s.should == "http://:newpass@example.com"
   end
 end
@@ -1916,13 +2191,17 @@ describe Addressable::URI, " when parsed from " +
   it "should have a password of ''" do
     @uri.password.should == ""
   end
-  
+
+  it "should have a normalized userinfo of nil" do
+    @uri.normalized_userinfo.should == nil
+  end
+
   it "should have a host of 'example.com'" do
     @uri.host.should == "example.com"
   end
 
   it "should use port 80" do
-    @uri.port.should == 80
+    @uri.inferred_port.should == 80
   end
 
   it "should have the correct username after assignment" do
@@ -1945,8 +2224,8 @@ describe Addressable::URI, " when parsed from " +
     @uri.user.should == ""
     @uri.password.should == ""
     @uri.host.should == "newexample.com"
-    @uri.port.should == 80
-    @uri.specified_port.should == nil
+    @uri.port.should == nil
+    @uri.inferred_port.should == 80
     @uri.to_s.should == "http://:@newexample.com"
   end
 end
@@ -1995,14 +2274,14 @@ describe Addressable::URI, " when parsed from " +
   it "should have a path of '/'" do
     @uri.path.should == "/"
   end
-  
+
   it "should raise an error if routing is attempted" do
     (lambda do
       @uri.route_to("http://example.com/")
     end).should raise_error(ArgumentError, /\/\/example.com\//)
     (lambda do
       @uri.route_from("http://example.com/")
-    end).should raise_error(ArgumentError, /\/\/example.com\//)    
+    end).should raise_error(ArgumentError, /\/\/example.com\//)
   end
 end
 
@@ -2066,7 +2345,7 @@ describe Addressable::URI, " when parsed from " +
   end
 
   it "should use port 80" do
-    @uri.port.should == 80
+    @uri.inferred_port.should == 80
   end
 
   it "should have a path of '/indirect/path/./to/../resource/'" do
@@ -2119,19 +2398,126 @@ describe Addressable::URI, "when parsed from " +
   end
 end
 
-describe Addressable::URI, " when parsed from " +
+describe Addressable::URI, " when parsed from '?one=1&two=2&three=3'" do
+  before do
+    @uri = Addressable::URI.parse("?one=1&two=2&three=3")
+  end
+
+  it "should have the correct query values" do
+    @uri.query_values.should == {"one" => "1", "two" => "2", "three" => "3"}
+  end
+
+  it "should raise an error for invalid query value notations" do
+    (lambda do
+      @uri.query_values(:notation => :bogus)
+    end).should raise_error(ArgumentError)
+  end
+end
+
+describe Addressable::URI, " when parsed from '?one[two][three]=four'" do
+  before do
+    @uri = Addressable::URI.parse("?one[two][three]=four")
+  end
+
+  it "should have the correct query values" do
+    @uri.query_values.should == {"one" => {"two" => {"three" => "four"}}}
+  end
+
+  it "should have the correct flat notation query values" do
+    @uri.query_values(:notation => :flat).should == {
+      "one[two][three]" => "four"
+    }
+  end
+end
+
+describe Addressable::URI, " when parsed from '?one.two.three=four'" do
+  before do
+    @uri = Addressable::URI.parse("?one.two.three=four")
+  end
+
+  it "should have the correct dot notation query values" do
+    @uri.query_values(:notation => :dot).should == {
+      "one" => {"two" => {"three" => "four"}}
+    }
+  end
+
+  it "should have the correct flat notation query values" do
+    @uri.query_values(:notation => :flat).should == {
+      "one.two.three" => "four"
+    }
+  end
+end
+
+describe Addressable::URI, " when parsed from " +
+    "'?one[two][three]=four&one[two][five]=six'" do
+  before do
+    @uri = Addressable::URI.parse("?one[two][three]=four&one[two][five]=six")
+  end
+
+  it "should have the correct dot notation query values" do
+    @uri.query_values(:notation => :subscript).should == {
+      "one" => {"two" => {"three" => "four", "five" => "six"}}
+    }
+  end
+
+  it "should have the correct flat notation query values" do
+    @uri.query_values(:notation => :flat).should == {
+      "one[two][three]" => "four",
+      "one[two][five]" => "six"
+    }
+  end
+end
+
+describe Addressable::URI, " when parsed from " +
+    "'?one.two.three=four&one.two.five=six'" do
+  before do
+    @uri = Addressable::URI.parse("?one.two.three=four&one.two.five=six")
+  end
+
+  it "should have the correct dot notation query values" do
+    @uri.query_values(:notation => :dot).should == {
+      "one" => {"two" => {"three" => "four", "five" => "six"}}
+    }
+  end
+
+  it "should have the correct flat notation query values" do
+    @uri.query_values(:notation => :flat).should == {
+      "one.two.three" => "four",
+      "one.two.five" => "six"
+    }
+  end
+end
+
+describe Addressable::URI, " when parsed from " +
+    "'?one[two][three][]=four&one[two][three][]=five'" do
+  before do
+    @uri = Addressable::URI.parse(
+      "?one[two][three][]=four&one[two][three][]=five"
+    )
+  end
+
+  it "should have the correct dot notation query values" do
+    @uri.query_values(:notation => :subscript).should == {
+      "one" => {"two" => {"three" => ["four", "five"]}}
+    }
+  end
+
+  it "should raise an error if a key is repeated in the flat notation" do
+    (lambda do
+      @uri.query_values(:notation => :flat)
+    end).should raise_error(ArgumentError)
+  end
+end
+
+describe Addressable::URI, " when parsed from " +
     "'http://www.詹姆斯.com/'" do
   before do
     @uri = Addressable::URI.parse("http://www.詹姆斯.com/")
   end
 
   it "should be equivalent to 'http://www.xn--8ws00zhy3a.com/'" do
-    if Addressable::URI::IDNA.send(:use_libidn?)
-      @uri.should ==
-        Addressable::URI.parse("http://www.xn--8ws00zhy3a.com/")
-    else
-      pending("Skipping IDN specification because GNU libidn is unavailable.")
-    end
+    @uri.should ==
+      Addressable::URI.parse("http://www.xn--8ws00zhy3a.com/")
   end
 
   it "should not have domain name encoded during normalization" do
@@ -2148,13 +2534,9 @@ describe Addressable::URI, " when parsed from " +
 
   it "should be equivalent to " +
       "'http://www.xn--8ws00zhy3a.com/%20some%20spaces%20/'" do
-    if Addressable::URI::IDNA.send(:use_libidn?)
-      @uri.should ==
-        Addressable::URI.parse(
-          "http://www.xn--8ws00zhy3a.com/%20some%20spaces%20/")
-    else
-      pending("Skipping IDN specification because GNU libidn is unavailable.")
-    end
+    @uri.should ==
+      Addressable::URI.parse(
+        "http://www.xn--8ws00zhy3a.com/%20some%20spaces%20/")
   end
 
   it "should not have domain name encoded during normalization" do
@@ -2170,11 +2552,7 @@ describe Addressable::URI, " when parsed from " +
   end
 
   it "should be displayed as http://www.詹姆斯.com/" do
-    if Addressable::URI::IDNA.send(:use_libidn?)
-      @uri.display_uri.to_s.should == "http://www.詹姆斯.com/"
-    else
-      pending("Skipping IDN specification because GNU libidn is unavailable.")
-    end
+    @uri.display_uri.to_s.should == "http://www.詹姆斯.com/"
   end
 end
 
@@ -2186,14 +2564,32 @@ describe Addressable::URI, " when parsed from " +
 
   it "should normalize to " +
       "http://www.xn--8ws00zhy3a.com/atomtests/iri/%E8%A9%B9.html" do
-    if Addressable::URI::IDNA.send(:use_libidn?)
-      @uri.normalize.to_s.should ==
-        "http://www.xn--8ws00zhy3a.com/atomtests/iri/%E8%A9%B9.html"
-      @uri.normalize!.to_s.should ==
-        "http://www.xn--8ws00zhy3a.com/atomtests/iri/%E8%A9%B9.html"
-    else
-      pending("Skipping IDN specification because GNU libidn is unavailable.")
-    end
+    @uri.normalize.to_s.should ==
+      "http://www.xn--8ws00zhy3a.com/atomtests/iri/%E8%A9%B9.html"
+    @uri.normalize!.to_s.should ==
+      "http://www.xn--8ws00zhy3a.com/atomtests/iri/%E8%A9%B9.html"
+  end
+end
+
+describe Addressable::URI, " when parsed from a percent-encoded IRI" do
+  before do
+    @uri = Addressable::URI.parse(
+      "http://www.%E3%81%BB%E3%82%93%E3%81%A8%E3%81%86%E3%81%AB%E3%81%AA" +
+      "%E3%81%8C%E3%81%84%E3%82%8F%E3%81%91%E3%81%AE%E3%82%8F%E3%81%8B%E3" +
+      "%82%89%E3%81%AA%E3%81%84%E3%81%A9%E3%82%81%E3%81%84%E3%82%93%E3%82" +
+      "%81%E3%81%84%E3%81%AE%E3%82%89%E3%81%B9%E3%82%8B%E3%81%BE%E3%81%A0" +
+      "%E3%81%AA%E3%81%8C%E3%81%8F%E3%81%97%E3%81%AA%E3%81%84%E3%81%A8%E3" +
+      "%81%9F%E3%82%8A%E3%81%AA%E3%81%84.w3.mag.keio.ac.jp"
+    )
+  end
+
+  it "should normalize to something sane" do
+    @uri.normalize.to_s.should ==
+      "http://www.xn--n8jaaaaai5bhf7as8fsfk3jnknefdde3f" +
+      "g11amb5gzdb4wi9bya3kc6lra.w3.mag.keio.ac.jp/"
+    @uri.normalize!.to_s.should ==
+      "http://www.xn--n8jaaaaai5bhf7as8fsfk3jnknefdde3f" +
+      "g11amb5gzdb4wi9bya3kc6lra.w3.mag.keio.ac.jp/"
   end
 end
 
@@ -2237,19 +2633,19 @@ describe Addressable::URI, "with a base uri of 'http://a/b/c/d;p?q'" do
     (@uri + "//g").to_s.should == "http://g"
     Addressable::URI.join(@uri.to_s, "//g").to_s.should == "http://g"
   end
-  
+
   # Section 5.4.1 of RFC 3986
   it "when joined with '?y' should resolve to http://a/b/c/d;p?y" do
     (@uri + "?y").to_s.should == "http://a/b/c/d;p?y"
     Addressable::URI.join(@uri.to_s, "?y").to_s.should == "http://a/b/c/d;p?y"
   end
-  
+
   # Section 5.4.1 of RFC 3986
   it "when joined with 'g?y' should resolve to http://a/b/c/g?y" do
     (@uri + "g?y").to_s.should == "http://a/b/c/g?y"
     Addressable::URI.join(@uri.to_s, "g?y").to_s.should == "http://a/b/c/g?y"
   end
-  
+
   # Section 5.4.1 of RFC 3986
   it "when joined with '#s' should resolve to http://a/b/c/d;p?q#s" do
     (@uri + "#s").to_s.should == "http://a/b/c/d;p?q#s"
@@ -2480,88 +2876,11 @@ describe Addressable::URI, "with a base uri of 'http://a/b/c/d;p?q'" do
     Addressable::URI.join(
       @uri.to_s, "//example.com/").to_s.should == "http://example.com/"
   end
-end
-
-describe Addressable::URI::IDNA, "without libidn bindings" do
-  before do
-    Addressable::URI::IDNA.instance_variable_set("@use_libidn", false)
-  end
-  
-  it "should raise an exception when an operation is attempted" do
-    (lambda do
-      Addressable::URI::IDNA.to_ascii("www.詹姆斯.com")
-    end).should raise_error
-    (lambda do
-      Addressable::URI::IDNA.to_unicode("www.xn--8ws00zhy3a.com")
-    end).should raise_error
-  end
-
-  it "should not cause normalization routines to error out" do
-    (lambda do
-      uri = Addressable::URI.parse(
-        "http://www.詹姆斯.com/atomtests/iri/詹.html")
-      uri.normalize
-    end).should_not raise_error
-  end
-
-  it "should not cause display uri routines to error out" do
-    (lambda do
-      uri = Addressable::URI.parse(
-        "http://www.xn--8ws00zhy3a.com/atomtests/iri/%E8%A9%B9.html")
-      uri.display_uri
-    end).should_not raise_error
-  end
-  
-  after do
-    Addressable::URI::IDNA.instance_variable_set("@use_libidn", nil)
-    Addressable::URI::IDNA.send(:use_libidn?)
-  end
-end
-
-describe Addressable::URI::IDNA, "with rubygems and idn missing" do
-  before do
-    module Kernel
-      alias_method :saved_require, :require
-      def require(path)
-        raise LoadError,
-          "Libraries cannot be loaded during this test."
-      end
-    end
-    Addressable::URI::IDNA.instance_variable_set("@use_libidn", nil)
-  end
-  
-  it "should not raise an exception while checking " +
-      "if libidn is available" do
-    (lambda do
-      Addressable::URI::IDNA.send(:use_libidn?)
-    end).should_not raise_error
-  end
-
-  it "should not cause normalization routines to error out" do
-    (lambda do
-      uri = Addressable::URI.parse(
-        "http://www.詹姆斯.com/atomtests/iri/詹.html")
-      uri.normalize
-    end).should_not raise_error
-  end
 
-  it "should not cause display uri routines to error out" do
+  it "when joined with a bogus object a TypeError should be raised" do
     (lambda do
-      uri = Addressable::URI.parse(
-        "http://www.xn--8ws00zhy3a.com/atomtests/iri/%E8%A9%B9.html")
-      uri.display_uri
-    end).should_not raise_error
-  end
-  
-  after do
-    module Kernel
-      def require(path)
-        saved_require(path)
-      end
-      alias_method :require, :saved_require
-    end
-    Addressable::URI::IDNA.instance_variable_set("@use_libidn", nil)
-    Addressable::URI::IDNA.send(:use_libidn?)
+      Addressable::URI.join(@uri, 42)
+    end).should raise_error(TypeError)
   end
 end
 
@@ -2617,6 +2936,21 @@ describe Addressable::URI, "when converting the path " +
     @uri = Addressable::URI.convert_path(@path)
     @uri.to_s.should == "relative/path/to/something"
   end
+
+  it "should join with an absolute file path correctly" do
+    @base = Addressable::URI.convert_path("/absolute/path/")
+    @uri = Addressable::URI.convert_path(@path)
+    (@base + @uri).to_s.should ==
+      "file:///absolute/path/relative/path/to/something"
+  end
+end
+
+describe Addressable::URI, "when converting a bogus path" do
+  it "should raise a TypeError" do
+    (lambda do
+      Addressable::URI.convert_path(42)
+    end).should raise_error(TypeError)
+  end
 end
 
 describe Addressable::URI, "when given the root directory" do
@@ -2679,6 +3013,32 @@ describe Addressable::URI, " when given the path " +
   end
 end
 
+describe Addressable::URI, " when given the path " +
+    "'file:c:\\windows\\My Documents 100%20\\foo.txt'" do
+  before do
+    @path = "file:c:\\windows\\My Documents 100%20\\foo.txt"
+  end
+
+  it "should convert to " +
+      "\'file:///c:/windows/My%20Documents%20100%20/foo.txt\'" do
+    @uri = Addressable::URI.convert_path(@path)
+    @uri.to_s.should == "file:///c:/windows/My%20Documents%20100%20/foo.txt"
+  end
+end
+
+describe Addressable::URI, " when given the path " +
+    "'file:/c:\\windows\\My Documents 100%20\\foo.txt'" do
+  before do
+    @path = "file:/c:\\windows\\My Documents 100%20\\foo.txt"
+  end
+
+  it "should convert to " +
+      "\'file:///c:/windows/My%20Documents%20100%20/foo.txt\'" do
+    @uri = Addressable::URI.convert_path(@path)
+    @uri.to_s.should == "file:///c:/windows/My%20Documents%20100%20/foo.txt"
+  end
+end
+
 describe Addressable::URI, " when given the path " +
     "'file:///c|/windows/My%20Documents%20100%20/foo.txt'" do
   before do
@@ -2731,9 +3091,9 @@ describe Addressable::URI, " when given the template pattern " +
   end
 end
 
-# Section 3.3.1 of the URI Template draft
+# Section 3.3.1 of the URI Template draft v 01
 describe Addressable::URI, " when given the mapping supplied in " +
-    "Section 3.3.1 of the URI Template draft" do
+    "Section 3.3.1 of the URI Template draft v 01" do
   before do
     @mapping = {
       "a" => "fred",
@@ -2748,80 +3108,206 @@ describe Addressable::URI, " when given the mapping supplied in " +
       "q" => "hullo#world"
     }
   end
-  
+
   it "should result in 'http://example.org/page1#fred' " +
       "when used to expand 'http://example.org/page1\#{a}'" do
     Addressable::URI.expand_template(
       "http://example.org/page1\#{a}",
-      @mapping).to_s.should == "http://example.org/page1#fred"
+      @mapping
+    ).to_s.should == "http://example.org/page1#fred"
   end
-  
+
   it "should result in 'http://example.org/fred/barney/' " +
       "when used to expand 'http://example.org/{a}/{b}/'" do
     Addressable::URI.expand_template(
       "http://example.org/{a}/{b}/",
-      @mapping).to_s.should == "http://example.org/fred/barney/"
+      @mapping
+    ).to_s.should == "http://example.org/fred/barney/"
   end
-  
+
   it "should result in 'http://example.org/fredbarney/' " +
       "when used to expand 'http://example.org/{a}{b}/'" do
     Addressable::URI.expand_template(
       "http://example.org/{a}{b}/",
-      @mapping).to_s.should == "http://example.org/fredbarney/"
+      @mapping
+    ).to_s.should == "http://example.org/fredbarney/"
   end
-  
+
   it "should result in " +
       "'http://example.com/order/cheeseburger/cheeseburger/cheeseburger/' " +
       "when used to expand 'http://example.com/order/{c}/{c}/{c}/'" do
     Addressable::URI.expand_template(
       "http://example.com/order/{c}/{c}/{c}/",
-      @mapping).to_s.should ==
+      @mapping
+    ).to_s.should ==
         "http://example.com/order/cheeseburger/cheeseburger/cheeseburger/"
   end
-  
+
   it "should result in 'http://example.org/one%20two%20three' " +
       "when used to expand 'http://example.org/{d}'" do
     Addressable::URI.expand_template(
       "http://example.org/{d}",
-      @mapping).to_s.should == "http://example.org/one%20two%20three"
+      @mapping
+    ).to_s.should == "http://example.org/one%20two%20three"
   end
-  
+
   it "should result in 'http://example.org/20%25%20tricky' " +
       "when used to expand 'http://example.org/{e}'" do
     Addressable::URI.expand_template(
       "http://example.org/{e}",
-      @mapping).to_s.should == "http://example.org/20%25%20tricky"
+      @mapping
+    ).to_s.should == "http://example.org/20%25%20tricky"
   end
-  
+
   it "should result in 'http://example.com//' " +
       "when used to expand 'http://example.com/{f}/'" do
     Addressable::URI.expand_template(
       "http://example.com/{f}/",
-      @mapping).to_s.should == "http://example.com//"
+      @mapping
+    ).to_s.should == "http://example.com//"
   end
-  
+
   it "should result in " +
       "'https://this-is-spinal-tap.example.org?date=&option=fred' " +
       "when used to expand " +
       "'{scheme}://{20}.example.org?date={wilma}&option={a}'" do
     Addressable::URI.expand_template(
       "{scheme}://{20}.example.org?date={wilma}&option={a}",
-      @mapping).to_s.should ==
+      @mapping
+    ).to_s.should ==
         "https://this-is-spinal-tap.example.org?date=&option=fred"
   end
-  
-  it "should result in 'http://example.org?quote=to+be+or+not+to+be' " +
+
+  # The v 01 draft conflicts with the v 03 draft here.
+  # The Addressable implementation uses v 03.
+  it "should result in " +
+      "'http://example.org?quote%3Dto%2Bbe%2Bor%2Bnot%2Bto%2Bbe' " +
       "when used to expand 'http://example.org?{p}'" do
     Addressable::URI.expand_template(
       "http://example.org?{p}",
-      @mapping).to_s.should == "http://example.org?quote=to+be+or+not+to+be"
+      @mapping
+    ).to_s.should == "http://example.org?quote%3Dto%2Bbe%2Bor%2Bnot%2Bto%2Bbe"
   end
-  
-  it "should result in 'http://example.com/hullo#world' " +
+
+  # The v 01 draft conflicts with the v 03 draft here.
+  # The Addressable implementation uses v 03.
+  it "should result in 'http://example.com/hullo%23world' " +
       "when used to expand 'http://example.com/{q}'" do
     Addressable::URI.expand_template(
       "http://example.com/{q}",
-      @mapping).to_s.should == "http://example.com/hullo#world"
+      @mapping
+    ).to_s.should == "http://example.com/hullo%23world"
+  end
+end
+
+# Section 4.5 of the URI Template draft v 03
+describe Addressable::URI, " when given the mapping supplied in " +
+    "Section 4.5 of the URI Template draft v 03" do
+  before do
+    @mapping = {
+      "foo" => "ϓ",
+      "bar" => "fred",
+      "baz" => "10,20,30",
+      "qux" => ["10","20","30"],
+      "corge" => [],
+      "grault" => "",
+      "garply" => "a/b/c",
+      "waldo" => "ben & jerrys",
+      "fred" => ["fred", "", "wilma"],
+      "plugh" => ["ẛ", "ṡ"],
+      "1-a_b.c" => "200"
+    }
+  end
+
+  it "should result in 'http://example.org/?q=fred' " +
+      "when used to expand 'http://example.org/?q={bar}'" do
+    Addressable::URI.expand_template(
+      "http://example.org/?q={bar}",
+      @mapping
+    ).to_s.should == "http://example.org/?q=fred"
+  end
+
+  it "should result in '/' " +
+      "when used to expand '/{xyzzy}'" do
+    Addressable::URI.expand_template(
+      "/{xyzzy}",
+      @mapping
+    ).to_s.should == "/"
+  end
+
+  it "should result in " +
+      "'http://example.org/?foo=%CE%8E&bar=fred&baz=10%2C20%2C30' " +
+      "when used to expand " +
+      "'http://example.org/?{-join|&|foo,bar,xyzzy,baz}'" do
+    Addressable::URI.expand_template(
+      "http://example.org/?{-join|&|foo,bar,xyzzy,baz}",
+      @mapping
+    ).to_s.should ==
+      "http://example.org/?foo=%CE%8E&bar=fred&baz=10%2C20%2C30"
+  end
+
+  it "should result in 'http://example.org/?d=10,20,30' " +
+      "when used to expand 'http://example.org/?d={-list|,|qux}'" do
+    Addressable::URI.expand_template(
+      "http://example.org/?d={-list|,|qux}",
+      @mapping
+    ).to_s.should == "http://example.org/?d=10,20,30"
+  end
+
+  it "should result in 'http://example.org/?d=10&d=20&d=30' " +
+      "when used to expand 'http://example.org/?d={-list|&d=|qux}'" do
+    Addressable::URI.expand_template(
+      "http://example.org/?d={-list|&d=|qux}",
+      @mapping
+    ).to_s.should == "http://example.org/?d=10&d=20&d=30"
+  end
+
+  it "should result in 'http://example.org/fredfred/a%2Fb%2Fc' " +
+      "when used to expand 'http://example.org/{bar}{bar}/{garply}'" do
+    Addressable::URI.expand_template(
+      "http://example.org/{bar}{bar}/{garply}",
+      @mapping
+    ).to_s.should == "http://example.org/fredfred/a%2Fb%2Fc"
+  end
+
+  it "should result in 'http://example.org/fred/fred//wilma' " +
+      "when used to expand 'http://example.org/{bar}{-prefix|/|fred}'" do
+    Addressable::URI.expand_template(
+      "http://example.org/{bar}{-prefix|/|fred}",
+      @mapping
+    ).to_s.should == "http://example.org/fred/fred//wilma"
+  end
+
+  it "should result in ':%E1%B9%A1:%E1%B9%A1:' " +
+      "when used to expand '{-neg|:|corge}{-suffix|:|plugh}'" do
+    Addressable::URI.expand_template(
+      "{-neg|:|corge}{-suffix|:|plugh}",
+      @mapping
+    ).to_s.should == ":%E1%B9%A1:%E1%B9%A1:"
+  end
+
+  it "should result in '../ben%20%26%20jerrys/' " +
+      "when used to expand '../{waldo}/'" do
+    Addressable::URI.expand_template(
+      "../{waldo}/",
+      @mapping
+    ).to_s.should == "../ben%20%26%20jerrys/"
+  end
+
+  it "should result in 'telnet:192.0.2.16:80' " +
+      "when used to expand 'telnet:192.0.2.16{-opt|:80|grault}'" do
+    Addressable::URI.expand_template(
+      "telnet:192.0.2.16{-opt|:80|grault}",
+      @mapping
+    ).to_s.should == "telnet:192.0.2.16:80"
+  end
+
+  it "should result in ':200:' " +
+      "when used to expand ':{1-a_b.c}:'" do
+    Addressable::URI.expand_template(
+      ":{1-a_b.c}:",
+      @mapping
+    ).to_s.should == ":200:"
   end
 end
 
@@ -2833,75 +3319,356 @@ describe Addressable::URI, "when given a mapping that contains a " +
       "b" => "barney",
     }
   end
-  
+
   it "should result in 'http://example.com/%7Bb%7D/barney/' " +
       "when used to expand 'http://example.com/{a}/{b}/'" do
     Addressable::URI.expand_template(
       "http://example.com/{a}/{b}/",
       @mapping).to_s.should == "http://example.com/%7Bb%7D/barney/"
   end
+
+  it "should result in 'http://example.com//%7Bb%7D/' " +
+      "when used to expand 'http://example.com/{-opt|foo|foo}/{a}/'" do
+    Addressable::URI.expand_template(
+      "http://example.com/{-opt|foo|foo}/{a}/",
+      @mapping).to_s.should == "http://example.com//%7Bb%7D/"
+  end
+
+  it "should result in 'http://example.com//%7Bb%7D/' " +
+      "when used to expand 'http://example.com/{-neg|foo|b}/{a}/'" do
+    Addressable::URI.expand_template(
+      "http://example.com/{-neg|foo|b}/{a}/",
+      @mapping).to_s.should == "http://example.com//%7Bb%7D/"
+  end
+
+  it "should result in 'http://example.com//barney/%7Bb%7D/' " +
+      "when used to expand 'http://example.com/{-prefix|/|b}/{a}/'" do
+    Addressable::URI.expand_template(
+      "http://example.com/{-prefix|/|b}/{a}/",
+      @mapping).to_s.should == "http://example.com//barney/%7Bb%7D/"
+  end
+
+  it "should result in 'http://example.com/barney//%7Bb%7D/' " +
+      "when used to expand 'http://example.com/{-suffix|/|b}/{a}/'" do
+    Addressable::URI.expand_template(
+      "http://example.com/{-suffix|/|b}/{a}/",
+      @mapping).to_s.should == "http://example.com/barney//%7Bb%7D/"
+  end
+
+  it "should result in 'http://example.com/%7Bb%7D/?b=barney&c=42' " +
+      "when used to expand 'http://example.com/{a}/?{-join|&|b,c=42}'" do
+    Addressable::URI.expand_template(
+      "http://example.com/{a}/?{-join|&|b,c=42}",
+      @mapping).to_s.should == "http://example.com/%7Bb%7D/?b=barney&c=42"
+  end
+
+  it "should result in 'http://example.com/42/?b=barney' " +
+      "when used to expand 'http://example.com/{c=42}/?{-join|&|b}'" do
+    Addressable::URI.expand_template(
+      "http://example.com/{c=42}/?{-join|&|b}",
+      @mapping).to_s.should == "http://example.com/42/?b=barney"
+  end
 end
 
-describe Addressable::URI, "when given a mapping that contains values " +
-    "that are already percent-encoded" do
+describe Addressable::URI, "when given a single variable mapping" do
   before do
     @mapping = {
-      "a" => "%7Bb%7D"
+      "foo" => "fred"
     }
   end
-  
-  it "should result in 'http://example.com/%257Bb%257D/' " +
-      "when used to expand 'http://example.com/{a}/'" do
+
+  it "should result in 'fred' when used to expand '{foo}'" do
     Addressable::URI.expand_template(
-      "http://example.com/{a}/",
-      @mapping).to_s.should == "http://example.com/%257Bb%257D/"
+      "{foo}",
+      @mapping
+    ).to_s.should == "fred"
   end
-end
 
-describe Addressable::URI, " when parsed from " +
-    "'/'" do
-  before do
-    @uri = Addressable::URI.parse("/")
+  it "should result in 'wilma' when used to expand '{bar=wilma}'" do
+    Addressable::URI.expand_template(
+      "{bar=wilma}",
+      @mapping
+    ).to_s.should == "wilma"
   end
-  
-  it "should have the correct mapping when extracting values " +
-      "using the pattern '/'" do
-    @uri.extract_mapping("/").should == {}
+
+  it "should result in '' when used to expand '{baz}'" do
+    Addressable::URI.expand_template(
+      "{baz}",
+      @mapping
+    ).to_s.should == ""
   end
 end
 
-describe Addressable::URI, " when parsed from '/one/'" do
+describe Addressable::URI, "when given a simple mapping" do
   before do
-    @uri = Addressable::URI.parse("/one/")
+    @mapping = {
+      "foo" => "fred",
+      "bar" => "barney",
+      "baz" => ""
+    }
   end
-  
-  it "should not match the pattern '/two/'" do
-    @uri.extract_mapping("/two/").should == nil
+
+  it "should result in 'foo=fred&bar=barney&baz=' when used to expand " +
+      "'{-join|&|foo,bar,baz,qux}'" do
+    Addressable::URI.expand_template(
+      "{-join|&|foo,bar,baz,qux}",
+      @mapping
+    ).to_s.should == "foo=fred&bar=barney&baz="
   end
-  
-  it "should have the correct mapping when extracting values " +
-      "using the pattern '/{number}/'" do
-    @uri.extract_mapping("/{number}/").should == {"number" => "one"}
+
+  it "should result in 'bar=barney' when used to expand " +
+      "'{-join|&|bar}'" do
+    Addressable::URI.expand_template(
+      "{-join|&|bar}",
+      @mapping
+    ).to_s.should == "bar=barney"
+  end
+
+  it "should result in '' when used to expand " +
+      "'{-join|&|qux}'" do
+    Addressable::URI.expand_template(
+      "{-join|&|qux}",
+      @mapping
+    ).to_s.should == ""
   end
 end
 
-describe Addressable::URI, " when parsed from '/one/two/'" do
+describe Addressable::URI, "when given a mapping containing values " +
+    "that are already percent-encoded" do
   before do
-    @uri = Addressable::URI.parse("/one/two/")
-  end
-  
+    @mapping = {
+      "a" => "%7Bb%7D"
+    }
+  end
+
+  it "should result in 'http://example.com/%257Bb%257D/' " +
+      "when used to expand 'http://example.com/{a}/'" do
+    Addressable::URI.expand_template(
+      "http://example.com/{a}/",
+      @mapping).to_s.should == "http://example.com/%257Bb%257D/"
+  end
+end
+
+describe Addressable::URI, "when given a mapping containing bogus values" do
+  it "should raise a TypeError" do
+    (lambda do
+      Addressable::URI.expand_template(
+        "http://example.com/{bogus}/", {
+          "bogus" => 42
+        }
+      )
+    end).should raise_error(TypeError)
+  end
+end
+
+describe Addressable::URI, "when given a pattern with bogus operators" do
+  it "should raise an InvalidTemplateOperatorError" do
+    (lambda do
+      Addressable::URI.expand_template(
+        "http://example.com/{-bogus|/|a,b,c}/", {
+          "a" => "a", "b" => "b", "c" => "c"
+        }
+      )
+    end).should raise_error(Addressable::URI::InvalidTemplateOperatorError)
+  end
+
+  it "should raise an InvalidTemplateOperatorError" do
+    (lambda do
+      Addressable::URI.expand_template(
+        "http://example.com/{-prefix|/|a,b,c}/", {
+          "a" => "a", "b" => "b", "c" => "c"
+        }
+      )
+    end).should raise_error(Addressable::URI::InvalidTemplateOperatorError)
+  end
+
+  it "should raise an InvalidTemplateOperatorError" do
+    (lambda do
+      Addressable::URI.expand_template(
+        "http://example.com/{-suffix|/|a,b,c}/", {
+          "a" => "a", "b" => "b", "c" => "c"
+        }
+      )
+    end).should raise_error(Addressable::URI::InvalidTemplateOperatorError)
+  end
+
+  it "should raise an InvalidTemplateOperatorError" do
+    (lambda do
+      Addressable::URI.expand_template(
+        "http://example.com/{-join|/|a,b,c}/", {
+          "a" => ["a"], "b" => ["b"], "c" => "c"
+        }
+      )
+    end).should raise_error(Addressable::URI::InvalidTemplateOperatorError)
+  end
+
+  it "should raise an InvalidTemplateOperatorError" do
+    (lambda do
+      Addressable::URI.expand_template(
+        "http://example.com/{-list|/|a,b,c}/", {
+          "a" => ["a"], "b" => ["b"], "c" => "c"
+        }
+      )
+    end).should raise_error(Addressable::URI::InvalidTemplateOperatorError)
+  end
+end
+
+describe Addressable::URI, "when given a mapping that contains an Array" do
+  before do
+    @mapping = {"query" => "an example search query".split(" ")}
+  end
+
+  it "should result in 'http://example.com/search/an+example+search+query/'" +
+      " when used to expand 'http://example.com/search/{-list|+|query}/'" do
+    Addressable::URI.expand_template(
+      "http://example.com/search/{-list|+|query}/",
+      @mapping).to_s.should ==
+        "http://example.com/search/an+example+search+query/"
+  end
+end
+
+class SuperString
+  def initialize(string)
+    @string = string.to_s
+  end
+
+  def to_str
+    return @string
+  end
+end
+
+describe Addressable::URI, " when parsing a non-String object" do
+  it "should correctly parse anything with a 'to_str' method" do
+    Addressable::URI.parse(SuperString.new(42))
+  end
+
+  it "should raise a TypeError for objects than cannot be converted" do
+    (lambda do
+      Addressable::URI.parse(42)
+    end).should raise_error(TypeError)
+  end
+
+  it "should correctly parse heuristically anything with a 'to_str' method" do
+    Addressable::URI.heuristic_parse(SuperString.new(42))
+  end
+
+  it "should raise a TypeError for objects than cannot be converted" do
+    (lambda do
+      Addressable::URI.heuristic_parse(42)
+    end).should raise_error(TypeError)
+  end
+end
+
+describe Addressable::URI, "when encoding a multibyte string" do
+  it "should result in correct percent encoded sequence" do
+    Addressable::URI.encode_component("günther").should == "g%C3%BCnther"
+  end
+
+  it "should result in correct percent encoded sequence" do
+    Addressable::URI.encode_component(
+      "günther", /[^a-zA-Z0-9\:\/\?\#\[\]\@\!\$\&\'\(\)\*\+\,\;\=\-\.\_\~]/
+    ).should == "g%C3%BCnther"
+  end
+end
+
+describe Addressable::URI, "when unencoding a multibyte string" do
+  it "should result in correct percent encoded sequence" do
+    Addressable::URI.unencode_component("g%C3%BCnther").should == "günther"
+  end
+
+  it "should result in correct percent encoded sequence as a URI" do
+    Addressable::URI.unencode(
+      "/path?g%C3%BCnther", ::Addressable::URI
+    ).should == Addressable::URI.new(
+      :path => "/path", :query => "günther"
+    )
+  end
+end
+
+describe Addressable::URI, "when unencoding a bogus object" do
+  it "should raise a TypeError" do
+    (lambda do
+      Addressable::URI.unencode_component(42)
+    end).should raise_error(TypeError)
+  end
+
+  it "should raise a TypeError" do
+    (lambda do
+      Addressable::URI.unencode("/path?g%C3%BCnther", Integer)
+    end).should raise_error(TypeError)
+  end
+end
+
+describe Addressable::URI, "when encoding a bogus object" do
+  it "should raise a TypeError" do
+    (lambda do
+      Addressable::URI.encode(42)
+    end).should raise_error(TypeError)
+  end
+
+  it "should raise a TypeError" do
+    (lambda do
+      Addressable::URI.normalized_encode(42)
+    end).should raise_error(TypeError)
+  end
+
+  it "should raise a TypeError" do
+    (lambda do
+      Addressable::URI.encode_component("günther", 42)
+    end).should raise_error(TypeError)
+  end
+
+  it "should raise a TypeError" do
+    (lambda do
+      Addressable::URI.encode_component(42)
+    end).should raise_error(TypeError)
+  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 '/one/two/'" do
+  before do
+    @uri = Addressable::URI.parse("/one/two/")
+  end
+
   it "should not match the pattern '/{number}/' " +
       "with the SlashlessProcessor" do
     @uri.extract_mapping("/{number}/", SlashlessProcessor).should == nil
   end
-  
+
   it "should have the correct mapping when extracting values " +
       "using the pattern '/{number}/' without a processor" do
     @uri.extract_mapping("/{number}/").should == {
       "number" => "one/two"
     }
   end
-  
+
   it "should have the correct mapping when extracting values " +
       "using the pattern '/{first}/{second}/' with the SlashlessProcessor" do
     @uri.extract_mapping("/{first}/{second}/", SlashlessProcessor).should == {
@@ -2917,7 +3684,7 @@ describe Addressable::URI, " when parsed from " +
     @uri = Addressable::URI.parse(
       "http://example.com/search/an+example+search+query/")
   end
-  
+
   it "should have the correct mapping when extracting values using " +
       "the pattern 'http://example.com/search/{query}/' with the " +
       "ExampleProcessor" do
@@ -2927,7 +3694,17 @@ describe Addressable::URI, " when parsed from " +
       "query" => "an example search query"
     }
   end
-  
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com/search/{-list|+|query}/'" do
+    @uri.extract_mapping(
+      "http://example.com/search/{-list|+|query}/"
+    ).should == {
+      "query" => ["an", "example", "search", "query"]
+    }
+  end
+
   it "should return nil when extracting values using " +
       "a non-matching pattern" do
     @uri.extract_mapping(
@@ -2942,7 +3719,7 @@ describe Addressable::URI, " when parsed from " +
     @uri = Addressable::URI.parse(
       "http://example.com/a/b/c/")
   end
-  
+
   it "should have the correct mapping when extracting values " +
       "using the pattern " +
       "'http://example.com/{first}/{second}/' with the ExampleProcessor" do
@@ -2953,6 +3730,85 @@ describe Addressable::URI, " when parsed from " +
       "second" => "b/c"
     }
   end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com/{first}/{-list|/|second}/'" do
+    @uri.extract_mapping(
+      "http://example.com/{first}/{-list|/|second}/"
+    ).should == {
+      "first" => "a",
+      "second" => ["b", "c"]
+    }
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com/{first}/{-list|/|rot13}/' " +
+      "with the ExampleProcessor" do
+    @uri.extract_mapping(
+      "http://example.com/{first}/{-list|/|rot13}/",
+      ExampleProcessor
+    ).should == {
+      "first" => "a",
+      "rot13" => ["o", "p"]
+    }
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com/{-list|/|rot13}/' " +
+      "with the ExampleProcessor" do
+    @uri.extract_mapping(
+      "http://example.com/{-list|/|rot13}/",
+      ExampleProcessor
+    ).should == {
+      "rot13" => ["n", "o", "p"]
+    }
+  end
+
+  it "should not map to anything when extracting values " +
+      "using the pattern " +
+      "'http://example.com/{-list|/|rot13}/'" do
+    @uri.extract_mapping("http://example.com/{-join|/|a,b,c}/").should == nil
+  end
+end
+
+describe Addressable::URI, " when parsed from " +
+    "'http://example.com/?a=one&b=two&c=three'" do
+  before do
+    @uri = Addressable::URI.parse("http://example.com/?a=one&b=two&c=three")
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com/?{-join|&|a,b,c}'" do
+    @uri.extract_mapping(
+      "http://example.com/?{-join|&|a,b,c}"
+    ).should == {
+      "a" => "one",
+      "b" => "two",
+      "c" => "three"
+    }
+  end
+end
+
+describe Addressable::URI, " when parsed from " +
+    "'http://example.com/?rot13=frperg'" do
+  before do
+    @uri = Addressable::URI.parse("http://example.com/?rot13=frperg")
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com/?{-join|&|rot13}' with the ExampleProcessor" do
+    @uri.extract_mapping(
+      "http://example.com/?{-join|&|rot13}",
+      ExampleProcessor
+    ).should == {
+      "rot13" => "secret"
+    }
+  end
 end
 
 describe Addressable::URI, " when parsed from " +
@@ -2960,15 +3816,319 @@ describe Addressable::URI, " when parsed from " +
   before do
     @uri = Addressable::URI.parse("http://example.com/one/spacer/two/")
   end
-  
+
   it "should have the correct mapping when extracting values " +
       "using the pattern " +
       "'http://example.com/{first}/spacer/{second}/'" do
     @uri.extract_mapping(
-      "http://example.com/{first}/spacer/{second}/").should == {
-        "first" => "one",
-        "second" => "two"
-      }
+      "http://example.com/{first}/spacer/{second}/"
+    ).should == {
+      "first" => "one",
+      "second" => "two"
+    }
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com{-prefix|/|stuff}/'" do
+    @uri.extract_mapping(
+      "http://example.com{-prefix|/|stuff}/"
+    ).should == {
+      "stuff" => ["one", "spacer", "two"]
+    }
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com/o{-prefix|/|stuff}/'" do
+    @uri.extract_mapping(
+      "http://example.com/o{-prefix|/|stuff}/"
+    ).should == nil
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com/{first}/spacer{-prefix|/|stuff}/'" do
+    @uri.extract_mapping(
+      "http://example.com/{first}/spacer{-prefix|/|stuff}/"
+    ).should == {
+      "first" => "one",
+      "stuff" => ["two"]
+    }
+  end
+
+  it "should not match anything when extracting values " +
+      "using the incorrect suffix pattern " +
+      "'http://example.com/{-prefix|/|stuff}/'" do
+    @uri.extract_mapping(
+      "http://example.com/{-prefix|/|stuff}/"
+    ).should == nil
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com{-prefix|/|rot13}/' with the ExampleProcessor" do
+    @uri.extract_mapping(
+      "http://example.com{-prefix|/|rot13}/",
+      ExampleProcessor
+    ).should == {
+      "rot13" => ["bar", "fcnpre", "gjb"]
+    }
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com{-prefix|/|rot13}' with the ExampleProcessor" do
+    @uri.extract_mapping(
+      "http://example.com{-prefix|/|rot13}",
+      ExampleProcessor
+    ).should == {
+      "rot13" => ["bar", "fcnpre", "gjb", ""]
+    }
+  end
+
+  it "should not match anything when extracting values " +
+      "using the incorrect suffix pattern " +
+      "'http://example.com/{-prefix|/|rot13}' with the ExampleProcessor" do
+    @uri.extract_mapping(
+      "http://example.com/{-prefix|/|rot13}",
+      ExampleProcessor
+    ).should == nil
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com/{-suffix|/|stuff}'" do
+    @uri.extract_mapping(
+      "http://example.com/{-suffix|/|stuff}"
+    ).should == {
+      "stuff" => ["one", "spacer", "two"]
+    }
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com/{-suffix|/|stuff}o'" do
+    @uri.extract_mapping(
+      "http://example.com/{-suffix|/|stuff}o"
+    ).should == nil
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com/o{-suffix|/|stuff}'" do
+    @uri.extract_mapping(
+      "http://example.com/o{-suffix|/|stuff}"
+    ).should == {"stuff"=>["ne", "spacer", "two"]}
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com/{first}/spacer/{-suffix|/|stuff}'" do
+    @uri.extract_mapping(
+      "http://example.com/{first}/spacer/{-suffix|/|stuff}"
+    ).should == {
+      "first" => "one",
+      "stuff" => ["two"]
+    }
+  end
+
+  it "should not match anything when extracting values " +
+      "using the incorrect suffix pattern " +
+      "'http://example.com/{-suffix|/|stuff}/'" do
+    @uri.extract_mapping(
+      "http://example.com/{-suffix|/|stuff}/"
+    ).should == nil
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com/{-suffix|/|rot13}' with the ExampleProcessor" do
+    @uri.extract_mapping(
+      "http://example.com/{-suffix|/|rot13}",
+      ExampleProcessor
+    ).should == {
+      "rot13" => ["bar", "fcnpre", "gjb"]
+    }
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://example.com{-suffix|/|rot13}' with the ExampleProcessor" do
+    @uri.extract_mapping(
+      "http://example.com{-suffix|/|rot13}",
+      ExampleProcessor
+    ).should == {
+      "rot13" => ["", "bar", "fcnpre", "gjb"]
+    }
+  end
+
+  it "should not match anything when extracting values " +
+      "using the incorrect suffix pattern " +
+      "'http://example.com/{-suffix|/|rot13}/' with the ExampleProcessor" do
+    @uri.extract_mapping(
+      "http://example.com/{-suffix|/|rot13}/",
+      ExampleProcessor
+    ).should == nil
+  end
+end
+
+describe Addressable::URI, " when parsed from " +
+    "'http://example.com/?email=bob@sporkmonger.com'" do
+  before do
+    @uri = Addressable::URI.parse(
+      "http://example.com/?email=bob@sporkmonger.com"
+    )
+  end
+
+  it "should not match anything when extracting values " +
+      "using the incorrect opt pattern " +
+      "'http://example.com/?email={-opt|bogus@bogus.com|test}'" do
+    @uri.extract_mapping(
+      "http://example.com/?email={-opt|bogus@bogus.com|test}"
+    ).should == nil
+  end
+
+  it "should not match anything when extracting values " +
+      "using the incorrect neg pattern " +
+      "'http://example.com/?email={-neg|bogus@bogus.com|test}'" do
+    @uri.extract_mapping(
+      "http://example.com/?email={-neg|bogus@bogus.com|test}"
+    ).should == nil
+  end
+
+  it "should indicate a match when extracting values " +
+      "using the opt pattern " +
+      "'http://example.com/?email={-opt|bob@sporkmonger.com|test}'" do
+    @uri.extract_mapping(
+      "http://example.com/?email={-opt|bob@sporkmonger.com|test}"
+    ).should == {}
+  end
+
+  it "should indicate a match when extracting values " +
+      "using the neg pattern " +
+      "'http://example.com/?email={-neg|bob@sporkmonger.com|test}'" do
+    @uri.extract_mapping(
+      "http://example.com/?email={-neg|bob@sporkmonger.com|test}"
+    ).should == {}
+  end
+end
+
+describe Addressable::URI, " when parsed from " +
+    "'http://example.com/?email='" do
+  before do
+    @uri = Addressable::URI.parse(
+      "http://example.com/?email="
+    )
+  end
+
+  it "should indicate a match when extracting values " +
+      "using the opt pattern " +
+      "'http://example.com/?email={-opt|bob@sporkmonger.com|test}'" do
+    @uri.extract_mapping(
+      "http://example.com/?email={-opt|bob@sporkmonger.com|test}"
+    ).should == {}
+  end
+
+  it "should indicate a match when extracting values " +
+      "using the neg pattern " +
+      "'http://example.com/?email={-neg|bob@sporkmonger.com|test}'" do
+    @uri.extract_mapping(
+      "http://example.com/?email={-neg|bob@sporkmonger.com|test}"
+    ).should == {}
+  end
+end
+
+describe Addressable::URI, " when parsed from " +
+    "'http://example.com/a/b/c/?one=1&two=2#foo'" do
+  before do
+    @uri = Addressable::URI.parse(
+      "http://example.com/a/b/c/?one=1&two=2#foo"
+    )
+  end
+
+  it "should have the correct mapping when extracting values " +
+      "using the pattern " +
+      "'http://{host}/{-suffix|/|segments}?{-join|&|one,two}\#{fragment}'" do
+    @uri.extract_mapping(
+      "http://{host}/{-suffix|/|segments}?{-join|&|one,two}\#{fragment}"
+    ).should == {
+      "host" => "example.com",
+      "segments" => ["a", "b", "c"],
+      "one" => "1",
+      "two" => "2",
+      "fragment" => "foo"
+    }
+  end
+
+  it "should not match when extracting values " +
+      "using the pattern " +
+      "'http://{host}/{-suffix|/|segments}?{-join|&|one}\#{fragment}'" do
+    @uri.extract_mapping(
+      "http://{host}/{-suffix|/|segments}?{-join|&|one}\#{fragment}"
+    ).should == nil
+  end
+
+  it "should not match when extracting values " +
+      "using the pattern " +
+      "'http://{host}/{-suffix|/|segments}?{-join|&|bogus}\#{fragment}'" do
+    @uri.extract_mapping(
+      "http://{host}/{-suffix|/|segments}?{-join|&|bogus}\#{fragment}"
+    ).should == nil
+  end
+
+  it "should not match when extracting values " +
+      "using the pattern " +
+      "'http://{host}/{-suffix|/|segments}?" +
+      "{-join|&|one,bogus}\#{fragment}'" do
+    @uri.extract_mapping(
+      "http://{host}/{-suffix|/|segments}?{-join|&|one,bogus}\#{fragment}"
+    ).should == nil
+  end
+
+  it "should not match when extracting values " +
+      "using the pattern " +
+      "'http://{host}/{-suffix|/|segments}?" +
+      "{-join|&|one,two,bogus}\#{fragment}'" do
+    @uri.extract_mapping(
+      "http://{host}/{-suffix|/|segments}?{-join|&|one,two,bogus}\#{fragment}"
+    ).should == {
+      "host" => "example.com",
+      "segments" => ["a", "b", "c"],
+      "one" => "1",
+      "two" => "2",
+      "fragment" => "foo"
+    }
+  end
+end
+
+describe Addressable::URI, "when given a pattern with bogus operators" do
+  before do
+    @uri = Addressable::URI.parse("http://example.com/a/b/c/")
+  end
+
+  it "should raise an InvalidTemplateOperatorError" do
+    (lambda do
+      @uri.extract_mapping("http://example.com/{-bogus|/|a,b,c}/")
+    end).should raise_error(Addressable::URI::InvalidTemplateOperatorError)
+  end
+
+  it "should raise an InvalidTemplateOperatorError" do
+    (lambda do
+      @uri.extract_mapping("http://example.com/{-prefix|/|a,b,c}/")
+    end).should raise_error(Addressable::URI::InvalidTemplateOperatorError)
+  end
+
+  it "should raise an InvalidTemplateOperatorError" do
+    (lambda do
+      @uri.extract_mapping("http://example.com/{-suffix|/|a,b,c}/")
+    end).should raise_error(Addressable::URI::InvalidTemplateOperatorError)
+  end
+
+  it "should raise an InvalidTemplateOperatorError" do
+    (lambda do
+      @uri.extract_mapping("http://example.com/{-list|/|a,b,c}/")
+    end).should raise_error(Addressable::URI::InvalidTemplateOperatorError)
   end
 end