addressable 2.2.3 → 2.7.0

data/spec/addressable/security_spec.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+# coding: utf-8
+# Copyright (C) Bob Aman
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+
+require "spec_helper"
+
+require "addressable/uri"
+
+describe Addressable::URI, "when created with a URI known to cause crashes " +
+    "in certain browsers" do
+  it "should parse correctly" do
+    uri = Addressable::URI.parse('%%30%30')
+    expect(uri.path).to eq('%%30%30')
+    expect(uri.normalize.path).to eq('%2500')
+  end
+
+  it "should parse correctly as a full URI" do
+    uri = Addressable::URI.parse('http://www.example.com/%%30%30')
+    expect(uri.path).to eq('/%%30%30')
+    expect(uri.normalize.path).to eq('/%2500')
+  end
+end
+
+describe Addressable::URI, "when created with a URI known to cause crashes " +
+    "in certain browsers" do
+  it "should parse correctly" do
+    uri = Addressable::URI.parse('لُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ 冗')
+    expect(uri.path).to eq('لُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ 冗')
+    expect(uri.normalize.path).to eq(
+      '%D9%84%D9%8F%D8%B5%D9%91%D8%A8%D9%8F%D9%84%D9%8F%D9%84%D8%B5%D9%91' +
+      '%D8%A8%D9%8F%D8%B1%D8%B1%D9%8B%20%E0%A5%A3%20%E0%A5%A3h%20%E0%A5' +
+      '%A3%20%E0%A5%A3%20%E5%86%97'
+    )
+  end
+
+  it "should parse correctly as a full URI" do
+    uri = Addressable::URI.parse('http://www.example.com/لُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ 冗')
+    expect(uri.path).to eq('/لُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ 冗')
+    expect(uri.normalize.path).to eq(
+      '/%D9%84%D9%8F%D8%B5%D9%91%D8%A8%D9%8F%D9%84%D9%8F%D9%84%D8%B5%D9%91' +
+      '%D8%A8%D9%8F%D8%B1%D8%B1%D9%8B%20%E0%A5%A3%20%E0%A5%A3h%20%E0%A5' +
+      '%A3%20%E0%A5%A3%20%E5%86%97'
+    )
+  end
+end

data/spec/addressable/template_spec.rb

@@ -1,2152 +1,1451 @@
-# encoding:utf-8
-#--
-# Addressable, Copyright (c) 2006-2007 Bob Aman
+# frozen_string_literal: true
+
+# coding: utf-8
+# Copyright (C) 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:
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
 #
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+#        http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-#++
-
-require "addressable/template"
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
 
-if !"".respond_to?("force_encoding")
-  class String
-    def force_encoding(encoding)
-      @encoding = encoding
-    end
 
-    def encoding
-      @encoding ||= Encoding::ASCII_8BIT
-    end
-  end
+require "spec_helper"
 
-  class Encoding
-    def initialize(name)
-      @name = name
-    end
+require "bigdecimal"
+require "addressable/template"
 
-    def to_s
-      return @name
+shared_examples_for 'expands' do |tests|
+  tests.each do |template, expansion|
+    exp = expansion.is_a?(Array) ? expansion.first : expansion
+    it "#{template} to #{exp}" do
+      tmpl = Addressable::Template.new(template).expand(subject)
+      if expansion.is_a?(Array)
+        expect(expansion.any?{|i| i == tmpl.to_str}).to be true
+      else
+        expect(tmpl.to_str).to eq(expansion)
+      end
     end
-
-    UTF_8 = Encoding.new("UTF-8")
-    ASCII_8BIT = Encoding.new("US-ASCII")
-  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 ".*"
-  end
-end
-
-class SlashlessProcessor
-  def self.match(name)
-    return "[^/\\n]*"
-  end
-end
-
-class NoOpProcessor
-  def self.transform(name, value)
-    value
-  end
-end
-
-describe Addressable::Template do
-  it "should raise a TypeError for invalid patterns" do
-    (lambda do
-      Addressable::Template.new(42)
-    end).should raise_error(TypeError, "Can't convert Fixnum into String.")
   end
 end
 
-describe Addressable::Template, "created with the pattern '/'" do
-  before do
-    @template = Addressable::Template.new("/")
+describe "eql?" do
+  let(:template) { Addressable::Template.new('https://www.example.com/{foo}') }
+  it 'is equal when the pattern matches' do
+    other_template = Addressable::Template.new('https://www.example.com/{foo}')
+    expect(template).to be_eql(other_template)
+    expect(other_template).to be_eql(template)
   end
-
-  it "should have no variables" do
-    @template.variables.should be_empty
+  it 'is not equal when the pattern differs' do
+    other_template = Addressable::Template.new('https://www.example.com/{bar}')
+    expect(template).to_not be_eql(other_template)
+    expect(other_template).to_not be_eql(template)
   end
-
-  it "should have the correct mapping when extracting from '/'" do
-    @template.extract("/").should == {}
+  it 'is not equal to non-templates' do
+    uri = 'https://www.example.com/foo/bar'
+    addressable_template = Addressable::Template.new uri
+    addressable_uri = Addressable::URI.parse uri
+    expect(addressable_template).to_not be_eql(addressable_uri)
+    expect(addressable_uri).to_not be_eql(addressable_template)
   end
 end
 
-describe Addressable::URI, "when parsed from '/one/'" do
-  before do
-    @uri = Addressable::URI.parse("/one/")
+describe "==" do
+  let(:template) { Addressable::Template.new('https://www.example.com/{foo}') }
+  it 'is equal when the pattern matches' do
+    other_template = Addressable::Template.new('https://www.example.com/{foo}')
+    expect(template).to eq other_template
+    expect(other_template).to eq template
   end
-
-  it "should not match the pattern '/two/'" do
-    Addressable::Template.new("/two/").extract(@uri).should == nil
+  it 'is not equal when the pattern differs' do
+    other_template = Addressable::Template.new('https://www.example.com/{bar}')
+    expect(template).not_to eq other_template
+    expect(other_template).not_to eq template
   end
-
-  it "should have the correct mapping when extracting values " +
-      "using the pattern '/{number}/'" do
-    Addressable::Template.new(
-      "/{number}/"
-    ).extract(@uri).should == {"number" => "one"}
+  it 'is not equal to non-templates' do
+    uri = 'https://www.example.com/foo/bar'
+    addressable_template = Addressable::Template.new uri
+    addressable_uri = Addressable::URI.parse uri
+    expect(addressable_template).not_to eq addressable_uri
+    expect(addressable_uri).not_to eq addressable_template
   end
 end
 
-describe Addressable::Template, "created with the pattern '/{number}/'" do
-  before do
-    @template = Addressable::Template.new("/{number}/")
-  end
-
-  it "should have the variables ['number']" do
-    @template.variables.should == ["number"]
-  end
-
-  it "should not match the pattern '/'" do
-    @template.match("/").should == nil
+describe "Type conversion" do
+  subject {
+    {
+      :var => true,
+      :hello => 1234,
+      :nothing => nil,
+      :sym => :symbolic,
+      :decimal => BigDecimal('1')
+    }
+  }
+
+  it_behaves_like 'expands', {
+    '{var}' => 'true',
+    '{hello}' => '1234',
+    '{nothing}' => '',
+    '{sym}' => 'symbolic',
+    '{decimal}' => RUBY_VERSION < '2.4.0' ? '0.1E1' : '0.1e1'
+  }
+end
+
+describe "Level 1:" do
+  subject {
+    {:var => "value", :hello => "Hello World!"}
+  }
+  it_behaves_like 'expands', {
+    '{var}' => 'value',
+    '{hello}' => 'Hello%20World%21'
+  }
+end
+
+describe "Level 2" do
+  subject {
+    {
+      :var => "value",
+      :hello => "Hello World!",
+      :path => "/foo/bar"
+    }
+  }
+  context "Operator +:" do
+    it_behaves_like 'expands', {
+      '{+var}' => 'value',
+      '{+hello}' => 'Hello%20World!',
+      '{+path}/here' => '/foo/bar/here',
+      'here?ref={+path}' => 'here?ref=/foo/bar'
+    }
   end
-
-  it "should match the pattern '/two/'" do
-    @template.match("/two/").mapping.should == {"number" => "two"}
+  context "Operator #:" do
+    it_behaves_like 'expands', {
+      'X{#var}' => 'X#value',
+      'X{#hello}' => 'X#Hello%20World!'
+    }
   end
 end
 
-describe Addressable::Template,
-    "created with the pattern '/{number}/{number}/'" do
-  before do
-    @template = Addressable::Template.new("/{number}/{number}/")
+describe "Level 3" do
+  subject {
+    {
+      :var => "value",
+      :hello => "Hello World!",
+      :empty => "",
+      :path => "/foo/bar",
+      :x => "1024",
+      :y => "768"
+    }
+  }
+  context "Operator nil (multiple vars):" do
+    it_behaves_like 'expands', {
+      'map?{x,y}' => 'map?1024,768',
+      '{x,hello,y}' => '1024,Hello%20World%21,768'
+    }
   end
-
-  it "should have one variable" do
-    @template.variables.should == ["number"]
+  context "Operator + (multiple vars):" do
+    it_behaves_like 'expands', {
+      '{+x,hello,y}' => '1024,Hello%20World!,768',
+      '{+path,x}/here' => '/foo/bar,1024/here'
+    }
   end
-
-  it "should have the correct mapping when extracting from '/1/1/'" do
-    @template.extract("/1/1/").should == {"number" => "1"}
+  context "Operator # (multiple vars):" do
+    it_behaves_like 'expands', {
+      '{#x,hello,y}' => '#1024,Hello%20World!,768',
+      '{#path,x}/here' => '#/foo/bar,1024/here'
+    }
   end
-
-  it "should not match '/1/2/'" do
-    @template.match("/1/2/").should == nil
+  context "Operator ." do
+    it_behaves_like 'expands', {
+      'X{.var}' => 'X.value',
+      'X{.x,y}' => 'X.1024.768'
+    }
   end
-
-  it "should not match '/2/1/'" do
-    @template.match("/2/1/").should == nil
+  context "Operator /" do
+    it_behaves_like 'expands', {
+      '{/var}' => '/value',
+      '{/var,x}/here' => '/value/1024/here'
+    }
   end
-
-  it "should not match '/1/'" do
-    @template.match("/1/").should == nil
+  context "Operator ;" do
+    it_behaves_like 'expands', {
+      '{;x,y}' => ';x=1024;y=768',
+      '{;x,y,empty}' => ';x=1024;y=768;empty'
+    }
   end
-
-  it "should not match '/1/1/1/'" do
-    @template.match("/1/1/1/").should == nil
+  context "Operator ?" do
+    it_behaves_like 'expands', {
+      '{?x,y}' => '?x=1024&y=768',
+      '{?x,y,empty}' => '?x=1024&y=768&empty='
+    }
   end
-
-  it "should not match '/1/2/3/'" do
-    @template.match("/1/2/3/").should == nil
+  context "Operator &" do
+    it_behaves_like 'expands', {
+      '?fixed=yes{&x}' => '?fixed=yes&x=1024',
+      '{&x,y,empty}' => '&x=1024&y=768&empty='
+    }
   end
 end
 
-describe Addressable::Template,
-    "created with the pattern '/{number}{-prefix|.|number}'" do
-  before do
-    @template = Addressable::Template.new("/{number}{-prefix|.|number}")
-  end
-
-  it "should have one variable" do
-    @template.variables.should == ["number"]
+describe "Level 4" do
+  subject {
+    {
+      :var => "value",
+      :hello => "Hello World!",
+      :path => "/foo/bar",
+      :semi => ";",
+      :list => %w(red green blue),
+      :keys => {"semi" => ';', "dot" => '.', "comma" => ','}
+    }
+  }
+  context "Expansion with value modifiers" do
+    it_behaves_like 'expands', {
+      '{var:3}' => 'val',
+      '{var:30}' => 'value',
+      '{list}' => 'red,green,blue',
+      '{list*}' => 'red,green,blue',
+      '{keys}' => [
+        'semi,%3B,dot,.,comma,%2C',
+        'dot,.,semi,%3B,comma,%2C',
+        'comma,%2C,semi,%3B,dot,.',
+        'semi,%3B,comma,%2C,dot,.',
+        'dot,.,comma,%2C,semi,%3B',
+        'comma,%2C,dot,.,semi,%3B'
+      ],
+      '{keys*}' => [
+        'semi=%3B,dot=.,comma=%2C',
+        'dot=.,semi=%3B,comma=%2C',
+        'comma=%2C,semi=%3B,dot=.',
+        'semi=%3B,comma=%2C,dot=.',
+        'dot=.,comma=%2C,semi=%3B',
+        'comma=%2C,dot=.,semi=%3B'
+      ]
+    }
   end
-
-  it "should have the correct mapping when extracting from '/1.1'" do
-    @template.extract("/1.1").should == {"number" => "1"}
+  context "Operator + with value modifiers" do
+    it_behaves_like 'expands', {
+      '{+path:6}/here' => '/foo/b/here',
+      '{+list}' => 'red,green,blue',
+      '{+list*}' => 'red,green,blue',
+      '{+keys}' => [
+        'semi,;,dot,.,comma,,',
+        'dot,.,semi,;,comma,,',
+        'comma,,,semi,;,dot,.',
+        'semi,;,comma,,,dot,.',
+        'dot,.,comma,,,semi,;',
+        'comma,,,dot,.,semi,;'
+      ],
+      '{+keys*}' => [
+        'semi=;,dot=.,comma=,',
+        'dot=.,semi=;,comma=,',
+        'comma=,,semi=;,dot=.',
+        'semi=;,comma=,,dot=.',
+        'dot=.,comma=,,semi=;',
+        'comma=,,dot=.,semi=;'
+      ]
+    }
   end
-
-  it "should have the correct mapping when extracting from '/99.99'" do
-    @template.extract("/99.99").should == {"number" => "99"}
+  context "Operator # with value modifiers" do
+    it_behaves_like 'expands', {
+      '{#path:6}/here' => '#/foo/b/here',
+      '{#list}' => '#red,green,blue',
+      '{#list*}' => '#red,green,blue',
+      '{#keys}' => [
+        '#semi,;,dot,.,comma,,',
+        '#dot,.,semi,;,comma,,',
+        '#comma,,,semi,;,dot,.',
+        '#semi,;,comma,,,dot,.',
+        '#dot,.,comma,,,semi,;',
+        '#comma,,,dot,.,semi,;'
+      ],
+      '{#keys*}' => [
+        '#semi=;,dot=.,comma=,',
+        '#dot=.,semi=;,comma=,',
+        '#comma=,,semi=;,dot=.',
+        '#semi=;,comma=,,dot=.',
+        '#dot=.,comma=,,semi=;',
+        '#comma=,,dot=.,semi=;'
+      ]
+    }
   end
-
-  it "should not match '/1.2'" do
-    @template.match("/1.2").should == nil
+  context "Operator . with value modifiers" do
+    it_behaves_like 'expands', {
+      'X{.var:3}' => 'X.val',
+      'X{.list}' => 'X.red,green,blue',
+      'X{.list*}' => 'X.red.green.blue',
+      'X{.keys}' => [
+        'X.semi,%3B,dot,.,comma,%2C',
+        'X.dot,.,semi,%3B,comma,%2C',
+        'X.comma,%2C,semi,%3B,dot,.',
+        'X.semi,%3B,comma,%2C,dot,.',
+        'X.dot,.,comma,%2C,semi,%3B',
+        'X.comma,%2C,dot,.,semi,%3B'
+      ],
+      'X{.keys*}' => [
+        'X.semi=%3B.dot=..comma=%2C',
+        'X.dot=..semi=%3B.comma=%2C',
+        'X.comma=%2C.semi=%3B.dot=.',
+        'X.semi=%3B.comma=%2C.dot=.',
+        'X.dot=..comma=%2C.semi=%3B',
+        'X.comma=%2C.dot=..semi=%3B'
+      ]
+    }
   end
-
-  it "should not match '/2.1'" do
-    @template.match("/2.1").should == nil
+  context "Operator / with value modifiers" do
+    it_behaves_like 'expands', {
+      '{/var:1,var}' => '/v/value',
+      '{/list}' => '/red,green,blue',
+      '{/list*}' => '/red/green/blue',
+      '{/list*,path:4}' => '/red/green/blue/%2Ffoo',
+      '{/keys}' => [
+        '/semi,%3B,dot,.,comma,%2C',
+        '/dot,.,semi,%3B,comma,%2C',
+        '/comma,%2C,semi,%3B,dot,.',
+        '/semi,%3B,comma,%2C,dot,.',
+        '/dot,.,comma,%2C,semi,%3B',
+        '/comma,%2C,dot,.,semi,%3B'
+      ],
+      '{/keys*}' => [
+        '/semi=%3B/dot=./comma=%2C',
+        '/dot=./semi=%3B/comma=%2C',
+        '/comma=%2C/semi=%3B/dot=.',
+        '/semi=%3B/comma=%2C/dot=.',
+        '/dot=./comma=%2C/semi=%3B',
+        '/comma=%2C/dot=./semi=%3B'
+      ]
+    }
   end
-
-  it "should not match '/1'" do
-    @template.match("/1").should == nil
+  context "Operator ; with value modifiers" do
+    it_behaves_like 'expands', {
+      '{;hello:5}' => ';hello=Hello',
+      '{;list}' => ';list=red,green,blue',
+      '{;list*}' => ';list=red;list=green;list=blue',
+      '{;keys}' => [
+        ';keys=semi,%3B,dot,.,comma,%2C',
+        ';keys=dot,.,semi,%3B,comma,%2C',
+        ';keys=comma,%2C,semi,%3B,dot,.',
+        ';keys=semi,%3B,comma,%2C,dot,.',
+        ';keys=dot,.,comma,%2C,semi,%3B',
+        ';keys=comma,%2C,dot,.,semi,%3B'
+      ],
+      '{;keys*}' => [
+        ';semi=%3B;dot=.;comma=%2C',
+        ';dot=.;semi=%3B;comma=%2C',
+        ';comma=%2C;semi=%3B;dot=.',
+        ';semi=%3B;comma=%2C;dot=.',
+        ';dot=.;comma=%2C;semi=%3B',
+        ';comma=%2C;dot=.;semi=%3B'
+      ]
+    }
   end
-
-  it "should not match '/1.1.1'" do
-    @template.match("/1.1.1").should == nil
+  context "Operator ? with value modifiers" do
+    it_behaves_like 'expands', {
+      '{?var:3}' => '?var=val',
+      '{?list}' => '?list=red,green,blue',
+      '{?list*}' => '?list=red&list=green&list=blue',
+      '{?keys}' => [
+        '?keys=semi,%3B,dot,.,comma,%2C',
+        '?keys=dot,.,semi,%3B,comma,%2C',
+        '?keys=comma,%2C,semi,%3B,dot,.',
+        '?keys=semi,%3B,comma,%2C,dot,.',
+        '?keys=dot,.,comma,%2C,semi,%3B',
+        '?keys=comma,%2C,dot,.,semi,%3B'
+      ],
+      '{?keys*}' => [
+        '?semi=%3B&dot=.&comma=%2C',
+        '?dot=.&semi=%3B&comma=%2C',
+        '?comma=%2C&semi=%3B&dot=.',
+        '?semi=%3B&comma=%2C&dot=.',
+        '?dot=.&comma=%2C&semi=%3B',
+        '?comma=%2C&dot=.&semi=%3B'
+      ]
+    }
   end
-
-  it "should not match '/1.23'" do
-    @template.match("/1.23").should == nil
+  context "Operator & with value modifiers" do
+    it_behaves_like 'expands', {
+      '{&var:3}' => '&var=val',
+      '{&list}' => '&list=red,green,blue',
+      '{&list*}' => '&list=red&list=green&list=blue',
+      '{&keys}' => [
+        '&keys=semi,%3B,dot,.,comma,%2C',
+        '&keys=dot,.,semi,%3B,comma,%2C',
+        '&keys=comma,%2C,semi,%3B,dot,.',
+        '&keys=semi,%3B,comma,%2C,dot,.',
+        '&keys=dot,.,comma,%2C,semi,%3B',
+        '&keys=comma,%2C,dot,.,semi,%3B'
+      ],
+      '{&keys*}' => [
+        '&semi=%3B&dot=.&comma=%2C',
+        '&dot=.&semi=%3B&comma=%2C',
+        '&comma=%2C&semi=%3B&dot=.',
+        '&semi=%3B&comma=%2C&dot=.',
+        '&dot=.&comma=%2C&semi=%3B',
+        '&comma=%2C&dot=.&semi=%3B'
+      ]
+    }
   end
 end
-
-describe Addressable::Template,
-    "created with the pattern '/{number}/{-suffix|/|number}'" do
-  before do
-    @template = Addressable::Template.new("/{number}/{-suffix|/|number}")
-  end
-
-  it "should have one variable" do
-    @template.variables.should == ["number"]
-  end
-
-  it "should have the correct mapping when extracting from '/1/1/'" do
-    @template.extract("/1/1/").should == {"number" => "1"}
-  end
-
-  it "should have the correct mapping when extracting from '/99/99/'" do
-    @template.extract("/99/99/").should == {"number" => "99"}
-  end
-
-  it "should not match '/1/1'" do
-    @template.match("/1/1").should == nil
-  end
-
-  it "should not match '/11/'" do
-    @template.match("/11/").should == nil
-  end
-
-  it "should not match '/1/2/'" do
-    @template.match("/1/2/").should == nil
-  end
-
-  it "should not match '/2/1/'" do
-    @template.match("/2/1/").should == nil
-  end
-
-  it "should not match '/1/'" do
-    @template.match("/1/").should == nil
-  end
-
-  it "should not match '/1/1/1/'" do
-    @template.match("/1/1/1/").should == nil
+describe "Modifiers" do
+  subject {
+    {
+      :var => "value",
+      :semi => ";",
+      :year => %w(1965 2000 2012),
+      :dom => %w(example com)
+    }
+  }
+  context "length" do
+    it_behaves_like 'expands', {
+      '{var:3}' => 'val',
+      '{var:30}' => 'value',
+      '{var}' => 'value',
+      '{semi}' => '%3B',
+      '{semi:2}' => '%3B'
+    }
   end
-
-  it "should not match '/1/23/'" do
-    @template.match("/1/23/").should == nil
+  context "explode" do
+    it_behaves_like 'expands', {
+      'find{?year*}' => 'find?year=1965&year=2000&year=2012',
+      'www{.dom*}' => 'www.example.com',
+    }
   end
 end
-
-describe Addressable::Template,
-    "created with the pattern '/{number}/?{-join|&|number}'" do
-  before do
-    @template = Addressable::Template.new(
-      "/{number}/?{-join|&|number,letter}"
-    )
-  end
-
-  it "should have one variable" do
-    @template.variables.should == ["number", "letter"]
-  end
-
-  it "should have the correct mapping when extracting from '/1/?number=1'" do
-    @template.extract("/1/?number=1").should == {"number" => "1"}
-  end
-
-  it "should have the correct mapping when extracting " +
-      "from '/99/?number=99'" do
-    @template.extract("/99/?number=99").should == {"number" => "99"}
-  end
-
-  it "should have the correct mapping when extracting " +
-      "from '/1/?number=1&letter=a'" do
-    @template.extract("/1/?number=1&letter=a").should == {
-      "number" => "1", "letter" => "a"
+describe "Expansion" do
+  subject {
+    {
+      :count => ["one", "two", "three"],
+      :dom => ["example", "com"],
+      :dub   => "me/too",
+      :hello => "Hello World!",
+      :half  => "50%",
+      :var   => "value",
+      :who   => "fred",
+      :base  => "http://example.com/home/",
+      :path  => "/foo/bar",
+      :list  => ["red", "green", "blue"],
+      :keys  => {"semi" => ";","dot" => ".","comma" => ","},
+      :v     => "6",
+      :x     => "1024",
+      :y     => "768",
+      :empty => "",
+      :empty_keys  => {},
+      :undef => nil
+    }
+  }
+  context "concatenation" do
+    it_behaves_like 'expands', {
+      '{count}' => 'one,two,three',
+      '{count*}' => 'one,two,three',
+      '{/count}' => '/one,two,three',
+      '{/count*}' => '/one/two/three',
+      '{;count}' => ';count=one,two,three',
+      '{;count*}' => ';count=one;count=two;count=three',
+      '{?count}' => '?count=one,two,three',
+      '{?count*}' => '?count=one&count=two&count=three',
+      '{&count*}' => '&count=one&count=two&count=three'
     }
   end
-
-  it "should not match '/1/?number=1&bogus=foo'" do
-    @template.match("/1/?number=1&bogus=foo").should == nil
-  end
-
-  it "should not match '/1/?number=2'" do
-    @template.match("/1/?number=2").should == nil
-  end
-
-  it "should not match '/2/?number=1'" do
-    @template.match("/2/?number=1").should == nil
+  context "simple expansion" do
+    it_behaves_like 'expands', {
+      '{var}' => 'value',
+      '{hello}' => 'Hello%20World%21',
+      '{half}' => '50%25',
+      'O{empty}X' => 'OX',
+      'O{undef}X' => 'OX',
+      '{x,y}' => '1024,768',
+      '{x,hello,y}' => '1024,Hello%20World%21,768',
+      '?{x,empty}' => '?1024,',
+      '?{x,undef}' => '?1024',
+      '?{undef,y}' => '?768',
+      '{var:3}' => 'val',
+      '{var:30}' => 'value',
+      '{list}' => 'red,green,blue',
+      '{list*}' => 'red,green,blue',
+      '{keys}' => [
+        'semi,%3B,dot,.,comma,%2C',
+        'dot,.,semi,%3B,comma,%2C',
+        'comma,%2C,semi,%3B,dot,.',
+        'semi,%3B,comma,%2C,dot,.',
+        'dot,.,comma,%2C,semi,%3B',
+        'comma,%2C,dot,.,semi,%3B'
+      ],
+      '{keys*}' => [
+        'semi=%3B,dot=.,comma=%2C',
+        'dot=.,semi=%3B,comma=%2C',
+        'comma=%2C,semi=%3B,dot=.',
+        'semi=%3B,comma=%2C,dot=.',
+        'dot=.,comma=%2C,semi=%3B',
+        'comma=%2C,dot=.,semi=%3B'
+      ]
+    }
   end
-
-  it "should not match '/1/?'" do
-    @template.match("/1/?").should == nil
+  context "reserved expansion (+)" do
+    it_behaves_like 'expands', {
+      '{+var}' => 'value',
+      '{+hello}' => 'Hello%20World!',
+      '{+half}' => '50%25',
+      '{base}index' => 'http%3A%2F%2Fexample.com%2Fhome%2Findex',
+      '{+base}index' => 'http://example.com/home/index',
+      'O{+empty}X' => 'OX',
+      'O{+undef}X' => 'OX',
+      '{+path}/here' => '/foo/bar/here',
+      'here?ref={+path}' => 'here?ref=/foo/bar',
+      'up{+path}{var}/here' => 'up/foo/barvalue/here',
+      '{+x,hello,y}' => '1024,Hello%20World!,768',
+      '{+path,x}/here' => '/foo/bar,1024/here',
+      '{+path:6}/here' => '/foo/b/here',
+      '{+list}' => 'red,green,blue',
+      '{+list*}' => 'red,green,blue',
+      '{+keys}' => [
+        'semi,;,dot,.,comma,,',
+        'dot,.,semi,;,comma,,',
+        'comma,,,semi,;,dot,.',
+        'semi,;,comma,,,dot,.',
+        'dot,.,comma,,,semi,;',
+        'comma,,,dot,.,semi,;'
+      ],
+      '{+keys*}' => [
+        'semi=;,dot=.,comma=,',
+        'dot=.,semi=;,comma=,',
+        'comma=,,semi=;,dot=.',
+        'semi=;,comma=,,dot=.',
+        'dot=.,comma=,,semi=;',
+        'comma=,,dot=.,semi=;'
+      ]
+    }
   end
-end
-
-describe Addressable::Template,
-    "created with the pattern '/{number}/{-list|/|number}/'" do
-  before do
-    @template = Addressable::Template.new("/{number}/{-list|/|number}/")
+  context "fragment expansion (#)" do
+    it_behaves_like 'expands', {
+      '{#var}' => '#value',
+      '{#hello}' => '#Hello%20World!',
+      '{#half}' => '#50%25',
+      'foo{#empty}' => 'foo#',
+      'foo{#undef}' => 'foo',
+      '{#x,hello,y}' => '#1024,Hello%20World!,768',
+      '{#path,x}/here' => '#/foo/bar,1024/here',
+      '{#path:6}/here' => '#/foo/b/here',
+      '{#list}' => '#red,green,blue',
+      '{#list*}' => '#red,green,blue',
+      '{#keys}' => [
+        '#semi,;,dot,.,comma,,',
+        '#dot,.,semi,;,comma,,',
+        '#comma,,,semi,;,dot,.',
+        '#semi,;,comma,,,dot,.',
+        '#dot,.,comma,,,semi,;',
+        '#comma,,,dot,.,semi,;'
+      ],
+      '{#keys*}' => [
+        '#semi=;,dot=.,comma=,',
+        '#dot=.,semi=;,comma=,',
+        '#comma=,,semi=;,dot=.',
+        '#semi=;,comma=,,dot=.',
+        '#dot=.,comma=,,semi=;',
+        '#comma=,,dot=.,semi=;'
+      ]
+    }
   end
-
-  it "should have one variable" do
-    @template.variables.should == ["number"]
+  context "label expansion (.)" do
+    it_behaves_like 'expands', {
+      '{.who}' => '.fred',
+      '{.who,who}' => '.fred.fred',
+      '{.half,who}' => '.50%25.fred',
+      'www{.dom*}' => 'www.example.com',
+      'X{.var}' => 'X.value',
+      'X{.empty}' => 'X.',
+      'X{.undef}' => 'X',
+      'X{.var:3}' => 'X.val',
+      'X{.list}' => 'X.red,green,blue',
+      'X{.list*}' => 'X.red.green.blue',
+      'X{.keys}' => [
+        'X.semi,%3B,dot,.,comma,%2C',
+        'X.dot,.,semi,%3B,comma,%2C',
+        'X.comma,%2C,semi,%3B,dot,.',
+        'X.semi,%3B,comma,%2C,dot,.',
+        'X.dot,.,comma,%2C,semi,%3B',
+        'X.comma,%2C,dot,.,semi,%3B'
+      ],
+      'X{.keys*}' => [
+        'X.semi=%3B.dot=..comma=%2C',
+        'X.dot=..semi=%3B.comma=%2C',
+        'X.comma=%2C.semi=%3B.dot=.',
+        'X.semi=%3B.comma=%2C.dot=.',
+        'X.dot=..comma=%2C.semi=%3B',
+        'X.comma=%2C.dot=..semi=%3B'
+      ],
+      'X{.empty_keys}' => 'X',
+      'X{.empty_keys*}' => 'X'
+    }
   end
-
-  it "should not match '/1/1/'" do
-    @template.match("/1/1/").should == nil
+  context "path expansion (/)" do
+    it_behaves_like 'expands', {
+      '{/who}' => '/fred',
+      '{/who,who}' => '/fred/fred',
+      '{/half,who}' => '/50%25/fred',
+      '{/who,dub}' => '/fred/me%2Ftoo',
+      '{/var}' => '/value',
+      '{/var,empty}' => '/value/',
+      '{/var,undef}' => '/value',
+      '{/var,x}/here' => '/value/1024/here',
+      '{/var:1,var}' => '/v/value',
+      '{/list}' => '/red,green,blue',
+      '{/list*}' => '/red/green/blue',
+      '{/list*,path:4}' => '/red/green/blue/%2Ffoo',
+      '{/keys}' => [
+        '/semi,%3B,dot,.,comma,%2C',
+        '/dot,.,semi,%3B,comma,%2C',
+        '/comma,%2C,semi,%3B,dot,.',
+        '/semi,%3B,comma,%2C,dot,.',
+        '/dot,.,comma,%2C,semi,%3B',
+        '/comma,%2C,dot,.,semi,%3B'
+      ],
+      '{/keys*}' => [
+        '/semi=%3B/dot=./comma=%2C',
+        '/dot=./semi=%3B/comma=%2C',
+        '/comma=%2C/semi=%3B/dot=.',
+        '/semi=%3B/comma=%2C/dot=.',
+        '/dot=./comma=%2C/semi=%3B',
+        '/comma=%2C/dot=./semi=%3B'
+      ]
+    }
   end
-
-  it "should not match '/1/2/'" do
-    @template.match("/1/2/").should == nil
+  context "path-style expansion (;)" do
+    it_behaves_like 'expands', {
+      '{;who}' => ';who=fred',
+      '{;half}' => ';half=50%25',
+      '{;empty}' => ';empty',
+      '{;v,empty,who}' => ';v=6;empty;who=fred',
+      '{;v,bar,who}' => ';v=6;who=fred',
+      '{;x,y}' => ';x=1024;y=768',
+      '{;x,y,empty}' => ';x=1024;y=768;empty',
+      '{;x,y,undef}' => ';x=1024;y=768',
+      '{;hello:5}' => ';hello=Hello',
+      '{;list}' => ';list=red,green,blue',
+      '{;list*}' => ';list=red;list=green;list=blue',
+      '{;keys}' => [
+        ';keys=semi,%3B,dot,.,comma,%2C',
+        ';keys=dot,.,semi,%3B,comma,%2C',
+        ';keys=comma,%2C,semi,%3B,dot,.',
+        ';keys=semi,%3B,comma,%2C,dot,.',
+        ';keys=dot,.,comma,%2C,semi,%3B',
+        ';keys=comma,%2C,dot,.,semi,%3B'
+      ],
+      '{;keys*}' => [
+        ';semi=%3B;dot=.;comma=%2C',
+        ';dot=.;semi=%3B;comma=%2C',
+        ';comma=%2C;semi=%3B;dot=.',
+        ';semi=%3B;comma=%2C;dot=.',
+        ';dot=.;comma=%2C;semi=%3B',
+        ';comma=%2C;dot=.;semi=%3B'
+      ]
+    }
   end
-
-  it "should not match '/2/1/'" do
-    @template.match("/2/1/").should == nil
+  context "form query expansion (?)" do
+    it_behaves_like 'expands', {
+      '{?who}' => '?who=fred',
+      '{?half}' => '?half=50%25',
+      '{?x,y}' => '?x=1024&y=768',
+      '{?x,y,empty}' => '?x=1024&y=768&empty=',
+      '{?x,y,undef}' => '?x=1024&y=768',
+      '{?var:3}' => '?var=val',
+      '{?list}' => '?list=red,green,blue',
+      '{?list*}' => '?list=red&list=green&list=blue',
+      '{?keys}' => [
+        '?keys=semi,%3B,dot,.,comma,%2C',
+        '?keys=dot,.,semi,%3B,comma,%2C',
+        '?keys=comma,%2C,semi,%3B,dot,.',
+        '?keys=semi,%3B,comma,%2C,dot,.',
+        '?keys=dot,.,comma,%2C,semi,%3B',
+        '?keys=comma,%2C,dot,.,semi,%3B'
+      ],
+      '{?keys*}' => [
+        '?semi=%3B&dot=.&comma=%2C',
+        '?dot=.&semi=%3B&comma=%2C',
+        '?comma=%2C&semi=%3B&dot=.',
+        '?semi=%3B&comma=%2C&dot=.',
+        '?dot=.&comma=%2C&semi=%3B',
+        '?comma=%2C&dot=.&semi=%3B'
+      ]
+    }
   end
-
-  it "should not match '/1/1/1/'" do
-    @template.match("/1/1/1/").should == nil
+  context "form query expansion (&)" do
+    it_behaves_like 'expands', {
+      '{&who}' => '&who=fred',
+      '{&half}' => '&half=50%25',
+      '?fixed=yes{&x}' => '?fixed=yes&x=1024',
+      '{&x,y,empty}' => '&x=1024&y=768&empty=',
+      '{&x,y,undef}' => '&x=1024&y=768',
+      '{&var:3}' => '&var=val',
+      '{&list}' => '&list=red,green,blue',
+      '{&list*}' => '&list=red&list=green&list=blue',
+      '{&keys}' => [
+        '&keys=semi,%3B,dot,.,comma,%2C',
+        '&keys=dot,.,semi,%3B,comma,%2C',
+        '&keys=comma,%2C,semi,%3B,dot,.',
+        '&keys=semi,%3B,comma,%2C,dot,.',
+        '&keys=dot,.,comma,%2C,semi,%3B',
+        '&keys=comma,%2C,dot,.,semi,%3B'
+      ],
+      '{&keys*}' => [
+        '&semi=%3B&dot=.&comma=%2C',
+        '&dot=.&semi=%3B&comma=%2C',
+        '&comma=%2C&semi=%3B&dot=.',
+        '&semi=%3B&comma=%2C&dot=.',
+        '&dot=.&comma=%2C&semi=%3B',
+        '&comma=%2C&dot=.&semi=%3B'
+      ]
+    }
   end
+  context "non-string key in match data" do
+    subject {Addressable::Template.new("http://example.com/{one}")}
 
-  it "should not match '/1/1/1/1/'" do
-    @template.match("/1/1/1/1/").should == nil
+    it "raises TypeError" do
+      expect { subject.expand(Object.new => "1") }.to raise_error TypeError
+    end
   end
 end
 
-describe Addressable::Template, "created with the pattern " +
-    "'http://www.example.com/?{-join|&|query,number}'" do
-  before do
-    @template = Addressable::Template.new(
-      "http://www.example.com/?{-join|&|query,number}"
-    )
-  end
-
-  it "when inspected, should have the correct class name" do
-    @template.inspect.should include("Addressable::Template")
-  end
-
-  it "when inspected, should have the correct object id" do
-    @template.inspect.should include("%#0x" % @template.object_id)
-  end
-
-  it "should have the variables ['query', 'number']" do
-    @template.variables.should == ["query", "number"]
-  end
-
-  it "should not match the pattern 'http://www.example.com/'" do
-    @template.match("http://www.example.com/").should == nil
+class ExampleTwoProcessor
+  def self.restore(name, value)
+    return value.gsub(/-/, " ") if name == "query"
+    return value
   end
 
-  it "should match the pattern 'http://www.example.com/?'" do
-    @template.match("http://www.example.com/?").mapping.should == {}
+  def self.match(name)
+    return ".*?" if name == "first"
+    return ".*"
   end
-
-  it "should match the pattern " +
-      "'http://www.example.com/?query=mycelium'" do
-    match = @template.match(
-      "http://www.example.com/?query=mycelium"
-    )
-    match.variables.should == ["query", "number"]
-    match.values.should == ["mycelium", nil]
-    match.mapping.should == {"query" => "mycelium"}
-    match.inspect.should =~ /MatchData/
+  def self.validate(name, value)
+    return !!(value =~ /^[\w ]+$/) if name == "query"
+    return true
   end
 
-  it "should match the pattern " +
-      "'http://www.example.com/?query=mycelium&number=100'" do
-    @template.match(
-      "http://www.example.com/?query=mycelium&number=100"
-    ).mapping.should == {"query" => "mycelium", "number" => "100"}
+  def self.transform(name, value)
+    return value.gsub(/ /, "+") if name == "query"
+    return value
   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
-    Addressable::Template.new(
-      "/{number}/"
-    ).extract(@uri, SlashlessProcessor).should == nil
-  end
-
-  it "should have the correct mapping when extracting values " +
-      "using the pattern '/{number}/' without a processor" do
-    Addressable::Template.new("/{number}/").extract(@uri).should == {
-      "number" => "one/two"
-    }
-  end
-
-  it "should have the correct mapping when extracting values " +
-      "using the pattern '/{first}/{second}/' with the SlashlessProcessor" do
-    Addressable::Template.new(
-      "/{first}/{second}/"
-    ).extract(@uri, SlashlessProcessor).should == {
-      "first" => "one",
-      "second" => "two"
-    }
+class DumbProcessor
+  def self.match(name)
+    return ".*?" if name == "first"
   end
 end
 
-describe Addressable::URI, "when parsed from " +
-    "'http://example.com/search/an+example+search+query/'" do
-  before do
-    @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
-    Addressable::Template.new(
-      "http://example.com/search/{query}/"
-    ).extract(@uri, ExampleProcessor).should == {
-      "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
-    Addressable::Template.new(
-      "http://example.com/search/{-list|+|query}/"
-    ).extract(@uri).should == {
-      "query" => ["an", "example", "search", "query"]
-    }
-  end
-
-  it "should return nil when extracting values using " +
-      "a non-matching pattern" do
-    Addressable::Template.new(
-      "http://bogus.com/{thingy}/"
-    ).extract(@uri).should == nil
+describe Addressable::Template do
+  describe 'initialize' do
+    context 'with a non-string' do
+      it 'raises a TypeError' do
+        expect { Addressable::Template.new(nil) }.to raise_error(TypeError)
+      end
+    end
   end
-end
 
-describe Addressable::URI, "when parsed from " +
-    "'http://example.com/a/b/c/'" do
-  before do
-    @uri = Addressable::URI.parse(
-      "http://example.com/a/b/c/")
+  describe 'freeze' do
+    subject { Addressable::Template.new("http://example.com/{first}/{+second}/") }
+    it 'freezes the template' do
+      expect(subject.freeze).to be_frozen
+    end
   end
 
-  it "should have the correct mapping when extracting values " +
-      "using the pattern " +
-      "'http://example.com/{first}/{second}/' with the ExampleProcessor" do
-    Addressable::Template.new(
-      "http://example.com/{first}/{second}/"
-    ).extract(@uri, ExampleProcessor).should == {
-      "first" => "a",
-      "second" => "b/c"
+  describe "Matching" do
+    let(: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/{first}/{-list|/|second}/'" do
-    Addressable::Template.new(
-      "http://example.com/{first}/{-list|/|second}/"
-    ).extract(@uri).should == {
-      "first" => "a",
-      "second" => ["b", "c"]
+    let(:uri2){
+      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}/{-list|/|rot13}/' " +
-      "with the ExampleProcessor" do
-    Addressable::Template.new(
-      "http://example.com/{first}/{-list|/|rot13}/"
-    ).extract(@uri, ExampleProcessor).should == {
-      "first" => "a",
-      "rot13" => ["o", "p"]
+    let(:uri3){
+      Addressable::URI.parse("http://example.com/;a=1;b=2;c=3;first=foo")
     }
-  end
-
-  it "should have the correct mapping when extracting values " +
-      "using the pattern " +
-      "'http://example.com/{-list|/|rot13}/' " +
-      "with the ExampleProcessor" do
-    Addressable::Template.new(
-      "http://example.com/{-list|/|rot13}/"
-    ).extract(@uri, ExampleProcessor).should == {
-      "rot13" => ["n", "o", "p"]
+    let(:uri4){
+      Addressable::URI.parse("http://example.com/?a=1&b=2&c=3&first=foo")
     }
-  end
-
-  it "should not map to anything when extracting values " +
-      "using the pattern " +
-      "'http://example.com/{-list|/|rot13}/'" do
-    Addressable::Template.new(
-      "http://example.com/{-join|/|a,b,c}/"
-    ).extract(@uri).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
-    Addressable::Template.new(
-      "http://example.com/?{-join|&|a,b,c}"
-    ).extract(@uri).should == {
-      "a" => "one",
-      "b" => "two",
-      "c" => "three"
+    let(:uri5){
+      "http://example.com/foo"
     }
-  end
-end
+    context "first uri with ExampleTwoProcessor" do
+      subject {
+        Addressable::Template.new(
+          "http://example.com/search/{query}/"
+        ).match(uri, ExampleTwoProcessor)
+      }
+      its(:variables){ should == ["query"] }
+      its(:captures){ should == ["an example search query"] }
+    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
+    context "second uri with ExampleTwoProcessor" do
+      subject {
+        Addressable::Template.new(
+          "http://example.com/{first}/{+second}/"
+        ).match(uri2, ExampleTwoProcessor)
+      }
+      its(:variables){ should == ["first", "second"] }
+      its(:captures){ should == ["a", "b/c"] }
+    end
 
-  it "should have the correct mapping when extracting values " +
-      "using the pattern " +
-      "'http://example.com/?{-join|&|rot13}' with the ExampleProcessor" do
-    Addressable::Template.new(
-      "http://example.com/?{-join|&|rot13}"
-    ).extract(@uri, ExampleProcessor).should == {
-      "rot13" => "secret"
-    }
-  end
-end
+    context "second uri with DumbProcessor" do
+      subject {
+        Addressable::Template.new(
+          "http://example.com/{first}/{+second}/"
+        ).match(uri2, DumbProcessor)
+      }
+      its(:variables){ should == ["first", "second"] }
+      its(:captures){ should == ["a", "b/c"] }
+    end
 
-describe Addressable::URI, "when parsed from " +
-    "'http://example.org///something///'" do
-  before do
-    @uri = Addressable::URI.parse("http://example.org///something///")
+    context "second uri" do
+      subject {
+        Addressable::Template.new(
+          "http://example.com/{first}{/second*}/"
+        ).match(uri2)
+      }
+      its(:variables){ should == ["first", "second"] }
+      its(:captures){ should == ["a", ["b","c"]] }
+    end
+    context "third uri" do
+      subject {
+        Addressable::Template.new(
+          "http://example.com/{;hash*,first}"
+        ).match(uri3)
+      }
+      its(:variables){ should == ["hash", "first"] }
+      its(:captures){ should == [
+        {"a" => "1", "b" => "2", "c" => "3", "first" => "foo"}, nil] }
+    end
+    # Note that this expansion is impossible to revert deterministically - the
+    # * operator means first could have been a key of hash or a separate key.
+    # Semantically, a separate key is more likely, but both are possible.
+    context "fourth uri" do
+      subject {
+        Addressable::Template.new(
+          "http://example.com/{?hash*,first}"
+        ).match(uri4)
+      }
+      its(:variables){ should == ["hash", "first"] }
+      its(:captures){ should == [
+        {"a" => "1", "b" => "2", "c" => "3", "first"=> "foo"}, nil] }
+    end
+    context "fifth uri" do
+      subject {
+        Addressable::Template.new(
+          "http://example.com/{path}{?hash*,first}"
+        ).match(uri5)
+      }
+      its(:variables){ should == ["path", "hash", "first"] }
+      its(:captures){ should == ["foo", nil, nil] }
+    end
   end
 
-  it "should have the correct mapping when extracting values " +
-      "using the pattern 'http://example.org{-prefix|/|parts}/'" do
-    Addressable::Template.new(
-      "http://example.org{-prefix|/|parts}/"
-    ).extract(@uri).should == {
-      "parts" => ["", "", "something", "", ""]
-    }
+  describe 'match' do
+    subject { Addressable::Template.new('http://example.com/first/second/') }
+    context 'when the URI is the same as the template' do
+      it 'returns the match data itself with an empty mapping' do
+        uri = Addressable::URI.parse('http://example.com/first/second/')
+        match_data = subject.match(uri)
+        expect(match_data).to be_an Addressable::Template::MatchData
+        expect(match_data.uri).to eq(uri)
+        expect(match_data.template).to eq(subject)
+        expect(match_data.mapping).to be_empty
+        expect(match_data.inspect).to be_an String
+      end
+    end
   end
 
-  it "should have the correct mapping when extracting values " +
-      "using the pattern 'http://example.org/{-suffix|/|parts}'" do
-    Addressable::Template.new(
-      "http://example.org/{-suffix|/|parts}"
-    ).extract(@uri).should == {
-      "parts" => ["", "", "something", "", ""]
+  describe "extract" do
+    let(:template) {
+      Addressable::Template.new(
+        "http://{host}{/segments*}/{?one,two,bogus}{#fragment}"
+      )
     }
-  end
+    let(:uri){ "http://example.com/a/b/c/?one=1&two=2#foo" }
+    let(:uri2){ "http://example.com/a/b/c/#foo" }
+    it "should be able to extract with queries" do
+      expect(template.extract(uri)).to eq({
+        "host" => "example.com",
+        "segments" => %w(a b c),
+        "one" => "1",
+        "bogus" => nil,
+        "two" => "2",
+        "fragment" => "foo"
+      })
+    end
+    it "should be able to extract without queries" do
+      expect(template.extract(uri2)).to eq({
+        "host" => "example.com",
+        "segments" => %w(a b c),
+        "one" => nil,
+        "bogus" => nil,
+        "two" => nil,
+        "fragment" => "foo"
+      })
+    end
 
-  it "should have the correct mapping when extracting values " +
-      "using the pattern 'http://example.org/{-list|/|parts}'" do
-    Addressable::Template.new(
-      "http://example.org/{-list|/|parts}"
-    ).extract(@uri).should == {
-      "parts" => ["", "", "something", "", ""]
-    }
+    context "issue #137" do
+      subject { Addressable::Template.new('/path{?page,per_page}') }
+
+      it "can match empty" do
+        data = subject.extract("/path")
+        expect(data["page"]).to eq(nil)
+        expect(data["per_page"]).to eq(nil)
+        expect(data.keys.sort).to eq(['page', 'per_page'])
+      end
+
+      it "can match first var" do
+        data = subject.extract("/path?page=1")
+        expect(data["page"]).to eq("1")
+        expect(data["per_page"]).to eq(nil)
+        expect(data.keys.sort).to eq(['page', 'per_page'])
+      end
+
+      it "can match second var" do
+        data = subject.extract("/path?per_page=1")
+        expect(data["page"]).to eq(nil)
+        expect(data["per_page"]).to eq("1")
+        expect(data.keys.sort).to eq(['page', 'per_page'])
+      end
+
+      it "can match both vars" do
+        data = subject.extract("/path?page=2&per_page=1")
+        expect(data["page"]).to eq("2")
+        expect(data["per_page"]).to eq("1")
+        expect(data.keys.sort).to eq(['page', 'per_page'])
+      end
+    end
   end
-end
 
-describe Addressable::URI, "when parsed from " +
-    "'http://example.com/one/spacer/two/'" do
-  before do
-    @uri = Addressable::URI.parse("http://example.com/one/spacer/two/")
+  describe "Partial expand with symbols" do
+    context "partial_expand with two simple values" do
+      subject {
+        Addressable::Template.new("http://example.com/{one}/{two}/")
+      }
+      it "builds a new pattern" do
+        expect(subject.partial_expand(:one => "1").pattern).to eq(
+          "http://example.com/1/{two}/"
+        )
+      end
+    end
+    context "partial_expand query with missing param in middle" do
+      subject {
+        Addressable::Template.new("http://example.com/{?one,two,three}/")
+      }
+      it "builds a new pattern" do
+        expect(subject.partial_expand(:one => "1", :three => "3").pattern).to eq(
+          "http://example.com/?one=1{&two}&three=3/"
+        )
+      end
+    end
+    context "partial_expand form style query with missing param at beginning" do
+      subject {
+        Addressable::Template.new("http://example.com/{?one,two}/")
+      }
+      it "builds a new pattern" do
+        expect(subject.partial_expand(:two => "2").pattern).to eq(
+          "http://example.com/?two=2{&one}/"
+        )
+      end
+    end
+    context "issue #307 - partial_expand form query with nil params" do
+      subject do
+        Addressable::Template.new("http://example.com/{?one,two,three}/")
+      end
+      it "builds a new pattern with two=nil" do
+        expect(subject.partial_expand(two: nil).pattern).to eq(
+          "http://example.com/{?one}{&three}/"
+        )
+      end
+      it "builds a new pattern with one=nil and two=nil" do
+        expect(subject.partial_expand(one: nil, two: nil).pattern).to eq(
+          "http://example.com/{?three}/"
+        )
+      end
+      it "builds a new pattern with one=1 and two=nil" do
+        expect(subject.partial_expand(one: 1, two: nil).pattern).to eq(
+          "http://example.com/?one=1{&three}/"
+        )
+      end
+      it "builds a new pattern with one=nil and two=2" do
+        expect(subject.partial_expand(one: nil, two: 2).pattern).to eq(
+          "http://example.com/?two=2{&three}/"
+        )
+      end
+      it "builds a new pattern with one=nil" do
+        expect(subject.partial_expand(one: nil).pattern).to eq(
+          "http://example.com/{?two}{&three}/"
+        )
+      end
+    end
+    context "partial_expand with query string" do
+      subject {
+        Addressable::Template.new("http://example.com/{?two,one}/")
+      }
+      it "builds a new pattern" do
+        expect(subject.partial_expand(:one => "1").pattern).to eq(
+          "http://example.com/?one=1{&two}/"
+        )
+      end
+    end
+    context "partial_expand with path operator" do
+      subject {
+        Addressable::Template.new("http://example.com{/one,two}/")
+      }
+      it "builds a new pattern" do
+        expect(subject.partial_expand(:one => "1").pattern).to eq(
+          "http://example.com/1{/two}/"
+        )
+      end
+    end
+    context "partial expand with unicode values" do
+      subject do
+        Addressable::Template.new("http://example.com/{resource}/{query}/")
+      end
+      it "normalizes unicode by default" do
+        template = subject.partial_expand("query" => "Cafe\u0301")
+        expect(template.pattern).to eq(
+          "http://example.com/{resource}/Caf%C3%A9/"
+        )
+      end
+
+      it "does not normalize unicode when byte semantics requested" do
+        template = subject.partial_expand({"query" => "Cafe\u0301"}, nil, false)
+        expect(template.pattern).to eq(
+          "http://example.com/{resource}/Cafe%CC%81/"
+        )
+      end
+    end
   end
-
-  it "should have the correct mapping when extracting values " +
-      "using the pattern " +
-      "'http://example.com/{first}/spacer/{second}/'" do
-    Addressable::Template.new(
-      "http://example.com/{first}/spacer/{second}/"
-    ).extract(@uri).should == {
-      "first" => "one",
-      "second" => "two"
-    }
+  describe "Partial expand with strings" do
+    context "partial_expand with two simple values" do
+      subject {
+        Addressable::Template.new("http://example.com/{one}/{two}/")
+      }
+      it "builds a new pattern" do
+        expect(subject.partial_expand("one" => "1").pattern).to eq(
+          "http://example.com/1/{two}/"
+        )
+      end
+    end
+    context "partial_expand query with missing param in middle" do
+      subject {
+        Addressable::Template.new("http://example.com/{?one,two,three}/")
+      }
+      it "builds a new pattern" do
+        expect(subject.partial_expand("one" => "1", "three" => "3").pattern).to eq(
+          "http://example.com/?one=1{&two}&three=3/"
+        )
+      end
+    end
+    context "partial_expand with query string" do
+      subject {
+        Addressable::Template.new("http://example.com/{?two,one}/")
+      }
+      it "builds a new pattern" do
+        expect(subject.partial_expand("one" => "1").pattern).to eq(
+          "http://example.com/?one=1{&two}/"
+        )
+      end
+    end
+    context "partial_expand with path operator" do
+      subject {
+        Addressable::Template.new("http://example.com{/one,two}/")
+      }
+      it "builds a new pattern" do
+        expect(subject.partial_expand("one" => "1").pattern).to eq(
+          "http://example.com/1{/two}/"
+        )
+      end
+    end
   end
-
-  it "should have the correct mapping when extracting values " +
-      "using the pattern " +
-      "'http://example.com{-prefix|/|stuff}/'" do
-    Addressable::Template.new(
-      "http://example.com{-prefix|/|stuff}/"
-    ).extract(@uri).should == {
-      "stuff" => ["one", "spacer", "two"]
-    }
+  describe "Expand" do
+    context "expand with unicode values" do
+      subject do
+        Addressable::Template.new("http://example.com/search/{query}/")
+      end
+      it "normalizes unicode by default" do
+        uri = subject.expand("query" => "Cafe\u0301").to_str
+        expect(uri).to eq("http://example.com/search/Caf%C3%A9/")
+      end
+
+      it "does not normalize unicode when byte semantics requested" do
+        uri = subject.expand({ "query" => "Cafe\u0301" }, nil, false).to_str
+        expect(uri).to eq("http://example.com/search/Cafe%CC%81/")
+      end
+    end
+    context "expand with a processor" do
+      subject {
+        Addressable::Template.new("http://example.com/search/{query}/")
+      }
+      it "processes spaces" do
+        expect(subject.expand({"query" => "an example search query"},
+                      ExampleTwoProcessor).to_str).to eq(
+          "http://example.com/search/an+example+search+query/"
+        )
+      end
+      it "validates" do
+        expect{
+          subject.expand({"query" => "Bogus!"},
+                      ExampleTwoProcessor).to_str
+        }.to raise_error(Addressable::Template::InvalidTemplateValueError)
+      end
+    end
+    context "partial_expand query with missing param in middle" do
+      subject {
+        Addressable::Template.new("http://example.com/{?one,two,three}/")
+      }
+      it "builds a new pattern" do
+        expect(subject.partial_expand("one" => "1", "three" => "3").pattern).to eq(
+          "http://example.com/?one=1{&two}&three=3/"
+        )
+      end
+    end
+    context "partial_expand with query string" do
+      subject {
+        Addressable::Template.new("http://example.com/{?two,one}/")
+      }
+      it "builds a new pattern" do
+        expect(subject.partial_expand("one" => "1").pattern).to eq(
+          "http://example.com/?one=1{&two}/"
+        )
+      end
+    end
+    context "partial_expand with path operator" do
+      subject {
+        Addressable::Template.new("http://example.com{/one,two}/")
+      }
+      it "builds a new pattern" do
+        expect(subject.partial_expand("one" => "1").pattern).to eq(
+          "http://example.com/1{/two}/"
+        )
+      end
+    end
   end
+  context "Matching with operators" do
+    describe "Level 1:" do
+      subject { Addressable::Template.new("foo{foo}/{bar}baz") }
+      it "can match" do
+        data = subject.match("foofoo/bananabaz")
+        expect(data.mapping["foo"]).to eq("foo")
+        expect(data.mapping["bar"]).to eq("banana")
+      end
+      it "can fail" do
+        expect(subject.match("bar/foo")).to be_nil
+        expect(subject.match("foobaz")).to be_nil
+      end
+      it "can match empty" do
+        data = subject.match("foo/baz")
+        expect(data.mapping["foo"]).to eq(nil)
+        expect(data.mapping["bar"]).to eq(nil)
+      end
+      it "lists vars" do
+        expect(subject.variables).to eq(["foo", "bar"])
+      end
+    end
 
-  it "should have the correct mapping when extracting values " +
-      "using the pattern " +
-      "'http://example.com/o{-prefix|/|stuff}/'" do
-    Addressable::Template.new(
-      "http://example.com/o{-prefix|/|stuff}/"
-    ).extract(@uri).should == nil
-  end
+    describe "Level 2:" do
+      subject { Addressable::Template.new("foo{+foo}{#bar}baz") }
+      it "can match" do
+        data = subject.match("foo/test/banana#bazbaz")
+        expect(data.mapping["foo"]).to eq("/test/banana")
+        expect(data.mapping["bar"]).to eq("baz")
+      end
+      it "can match empty level 2 #" do
+        data = subject.match("foo/test/bananabaz")
+        expect(data.mapping["foo"]).to eq("/test/banana")
+        expect(data.mapping["bar"]).to eq(nil)
+        data = subject.match("foo/test/banana#baz")
+        expect(data.mapping["foo"]).to eq("/test/banana")
+        expect(data.mapping["bar"]).to eq("")
+      end
+      it "can match empty level 2 +" do
+        data = subject.match("foobaz")
+        expect(data.mapping["foo"]).to eq(nil)
+        expect(data.mapping["bar"]).to eq(nil)
+        data = subject.match("foo#barbaz")
+        expect(data.mapping["foo"]).to eq(nil)
+        expect(data.mapping["bar"]).to eq("bar")
+      end
+      it "lists vars" do
+        expect(subject.variables).to eq(["foo", "bar"])
+      end
+    end
 
-  it "should have the correct mapping when extracting values " +
-      "using the pattern " +
-      "'http://example.com/{first}/spacer{-prefix|/|stuff}/'" do
-    Addressable::Template.new(
-      "http://example.com/{first}/spacer{-prefix|/|stuff}/"
-    ).extract(@uri).should == {
-      "first" => "one",
-      "stuff" => "two"
-    }
+    describe "Level 3:" do
+      context "no operator" do
+        subject { Addressable::Template.new("foo{foo,bar}baz") }
+        it "can match" do
+          data = subject.match("foofoo,barbaz")
+          expect(data.mapping["foo"]).to eq("foo")
+          expect(data.mapping["bar"]).to eq("bar")
+        end
+        it "lists vars" do
+          expect(subject.variables).to eq(["foo", "bar"])
+        end
+      end
+      context "+ operator" do
+        subject { Addressable::Template.new("foo{+foo,bar}baz") }
+        it "can match" do
+          data = subject.match("foofoo/bar,barbaz")
+          expect(data.mapping["bar"]).to eq("foo/bar,bar")
+          expect(data.mapping["foo"]).to eq("")
+        end
+        it "lists vars" do
+          expect(subject.variables).to eq(["foo", "bar"])
+        end
+      end
+      context ". operator" do
+        subject { Addressable::Template.new("foo{.foo,bar}baz") }
+        it "can match" do
+          data = subject.match("foo.foo.barbaz")
+          expect(data.mapping["foo"]).to eq("foo")
+          expect(data.mapping["bar"]).to eq("bar")
+        end
+        it "lists vars" do
+          expect(subject.variables).to eq(["foo", "bar"])
+        end
+      end
+      context "/ operator" do
+        subject { Addressable::Template.new("foo{/foo,bar}baz") }
+        it "can match" do
+          data = subject.match("foo/foo/barbaz")
+          expect(data.mapping["foo"]).to eq("foo")
+          expect(data.mapping["bar"]).to eq("bar")
+        end
+        it "lists vars" do
+          expect(subject.variables).to eq(["foo", "bar"])
+        end
+      end
+      context "; operator" do
+        subject { Addressable::Template.new("foo{;foo,bar,baz}baz") }
+        it "can match" do
+          data = subject.match("foo;foo=bar%20baz;bar=foo;bazbaz")
+          expect(data.mapping["foo"]).to eq("bar baz")
+          expect(data.mapping["bar"]).to eq("foo")
+          expect(data.mapping["baz"]).to eq("")
+        end
+        it "lists vars" do
+          expect(subject.variables).to eq(%w(foo bar baz))
+        end
+      end
+      context "? operator" do
+        context "test" do
+          subject { Addressable::Template.new("foo{?foo,bar}baz") }
+          it "can match" do
+            data = subject.match("foo?foo=bar%20baz&bar=foobaz")
+            expect(data.mapping["foo"]).to eq("bar baz")
+            expect(data.mapping["bar"]).to eq("foo")
+          end
+          it "lists vars" do
+            expect(subject.variables).to eq(%w(foo bar))
+          end
+        end
+
+        context "issue #137" do
+          subject { Addressable::Template.new('/path{?page,per_page}') }
+
+          it "can match empty" do
+            data = subject.match("/path")
+            expect(data.mapping["page"]).to eq(nil)
+            expect(data.mapping["per_page"]).to eq(nil)
+            expect(data.mapping.keys.sort).to eq(['page', 'per_page'])
+          end
+
+          it "can match first var" do
+            data = subject.match("/path?page=1")
+            expect(data.mapping["page"]).to eq("1")
+            expect(data.mapping["per_page"]).to eq(nil)
+            expect(data.mapping.keys.sort).to eq(['page', 'per_page'])
+          end
+
+          it "can match second var" do
+            data = subject.match("/path?per_page=1")
+            expect(data.mapping["page"]).to eq(nil)
+            expect(data.mapping["per_page"]).to eq("1")
+            expect(data.mapping.keys.sort).to eq(['page', 'per_page'])
+          end
+
+          it "can match both vars" do
+            data = subject.match("/path?page=2&per_page=1")
+            expect(data.mapping["page"]).to eq("2")
+            expect(data.mapping["per_page"]).to eq("1")
+            expect(data.mapping.keys.sort).to eq(['page', 'per_page'])
+          end
+        end
+
+        context "issue #71" do
+          subject { Addressable::Template.new("http://cyberscore.dev/api/users{?username}") }
+          it "can match" do
+            data = subject.match("http://cyberscore.dev/api/users?username=foobaz")
+            expect(data.mapping["username"]).to eq("foobaz")
+          end
+          it "lists vars" do
+            expect(subject.variables).to eq(%w(username))
+            expect(subject.keys).to eq(%w(username))
+          end
+        end
+      end
+      context "& operator" do
+        subject { Addressable::Template.new("foo{&foo,bar}baz") }
+        it "can match" do
+          data = subject.match("foo&foo=bar%20baz&bar=foobaz")
+          expect(data.mapping["foo"]).to eq("bar baz")
+          expect(data.mapping["bar"]).to eq("foo")
+        end
+        it "lists vars" do
+          expect(subject.variables).to eq(%w(foo bar))
+        end
+      end
+    end
   end
 
-  it "should not match anything when extracting values " +
-      "using the incorrect suffix pattern " +
-      "'http://example.com/{-prefix|/|stuff}/'" do
-    Addressable::Template.new(
-      "http://example.com/{-prefix|/|stuff}/"
-    ).extract(@uri).should == nil
+  context "support regexes:" do
+    context "EXPRESSION" do
+      subject { Addressable::Template::EXPRESSION }
+      it "should be able to match an expression" do
+        expect(subject).to match("{foo}")
+        expect(subject).to match("{foo,9}")
+        expect(subject).to match("{foo.bar,baz}")
+        expect(subject).to match("{+foo.bar,baz}")
+        expect(subject).to match("{foo,foo%20bar}")
+        expect(subject).to match("{#foo:20,baz*}")
+        expect(subject).to match("stuff{#foo:20,baz*}things")
+      end
+      it "should fail on non vars" do
+        expect(subject).not_to match("!{foo")
+        expect(subject).not_to match("{foo.bar.}")
+        expect(subject).not_to match("!{}")
+      end
+    end
+    context "VARNAME" do
+      subject { Addressable::Template::VARNAME }
+      it "should be able to match a variable" do
+        expect(subject).to match("foo")
+        expect(subject).to match("9")
+        expect(subject).to match("foo.bar")
+        expect(subject).to match("foo_bar")
+        expect(subject).to match("foo_bar.baz")
+        expect(subject).to match("foo%20bar")
+        expect(subject).to match("foo%20bar.baz")
+      end
+      it "should fail on non vars" do
+        expect(subject).not_to match("!foo")
+        expect(subject).not_to match("foo.bar.")
+        expect(subject).not_to match("foo%2%00bar")
+        expect(subject).not_to match("foo_ba%r")
+        expect(subject).not_to match("foo_bar*")
+        expect(subject).not_to match("foo_bar:20")
+      end
+    end
+    context "VARIABLE_LIST" do
+      subject { Addressable::Template::VARIABLE_LIST }
+      it "should be able to match a variable list" do
+        expect(subject).to match("foo,bar")
+        expect(subject).to match("foo")
+        expect(subject).to match("foo,bar*,baz")
+        expect(subject).to match("foo.bar,bar_baz*,baz:12")
+      end
+      it "should fail on non vars" do
+        expect(subject).not_to match(",foo,bar*,baz")
+        expect(subject).not_to match("foo,*bar,baz")
+        expect(subject).not_to match("foo,,bar*,baz")
+      end
+    end
+    context "VARSPEC" do
+      subject { Addressable::Template::VARSPEC }
+      it "should be able to match a variable with modifier" do
+        expect(subject).to match("9:8")
+        expect(subject).to match("foo.bar*")
+        expect(subject).to match("foo_bar:12")
+        expect(subject).to match("foo_bar.baz*")
+        expect(subject).to match("foo%20bar:12")
+        expect(subject).to match("foo%20bar.baz*")
+      end
+      it "should fail on non vars" do
+        expect(subject).not_to match("!foo")
+        expect(subject).not_to match("*foo")
+        expect(subject).not_to match("fo*o")
+        expect(subject).not_to match("fo:o")
+        expect(subject).not_to match("foo:")
+      end
+    end
   end
+end
 
-  it "should have the correct mapping when extracting values " +
-      "using the pattern " +
-      "'http://example.com{-prefix|/|rot13}/' with the ExampleProcessor" do
-    Addressable::Template.new(
-      "http://example.com{-prefix|/|rot13}/"
-    ).extract(@uri, ExampleProcessor).should == {
-      "rot13" => ["bar", "fcnpre", "gjb"]
-    }
+describe Addressable::Template::MatchData do
+  let(:template) { Addressable::Template.new('{foo}/{bar}') }
+  subject(:its) { template.match('ab/cd') }
+  its(:uri) { should == Addressable::URI.parse('ab/cd') }
+  its(:template) { should == template }
+  its(:mapping) { should == { 'foo' => 'ab', 'bar' => 'cd' } }
+  its(:variables) { should == ['foo', 'bar'] }
+  its(:keys) { should == ['foo', 'bar'] }
+  its(:names) { should == ['foo', 'bar'] }
+  its(:values) { should == ['ab', 'cd'] }
+  its(:captures) { should == ['ab', 'cd'] }
+  its(:to_a) { should == ['ab/cd', 'ab', 'cd'] }
+  its(:to_s) { should == 'ab/cd' }
+  its(:string) { should == its.to_s }
+  its(:pre_match) { should == "" }
+  its(:post_match) { should == "" }
+
+  describe 'values_at' do
+    it 'returns an array with the values' do
+      expect(its.values_at(0, 2)).to eq(['ab/cd', 'cd'])
+    end
+    it 'allows mixing integer an string keys' do
+      expect(its.values_at('foo', 1)).to eq(['ab', 'ab'])
+    end
+    it 'accepts unknown keys' do
+      expect(its.values_at('baz', 'foo')).to eq([nil, 'ab'])
+    end
   end
 
-  it "should have the correct mapping when extracting values " +
-      "using the pattern " +
-      "'http://example.com{-prefix|/|rot13}' with the ExampleProcessor" do
-    Addressable::Template.new(
-      "http://example.com{-prefix|/|rot13}"
-    ).extract(@uri, 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
-    Addressable::Template.new(
-      "http://example.com/{-prefix|/|rot13}"
-    ).extract(@uri, ExampleProcessor).should == nil
-  end
-
-  it "should have the correct mapping when extracting values " +
-      "using the pattern " +
-      "'http://example.com/{-suffix|/|stuff}'" do
-    Addressable::Template.new(
-      "http://example.com/{-suffix|/|stuff}"
-    ).extract(@uri).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
-    Addressable::Template.new(
-      "http://example.com/{-suffix|/|stuff}o"
-    ).extract(@uri).should == nil
-  end
-
-  it "should have the correct mapping when extracting values " +
-      "using the pattern " +
-      "'http://example.com/o{-suffix|/|stuff}'" do
-    Addressable::Template.new(
-      "http://example.com/o{-suffix|/|stuff}"
-    ).extract(@uri).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
-    Addressable::Template.new(
-      "http://example.com/{first}/spacer/{-suffix|/|stuff}"
-    ).extract(@uri).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
-    Addressable::Template.new(
-      "http://example.com/{-suffix|/|stuff}/"
-    ).extract(@uri).should == nil
-  end
-
-  it "should have the correct mapping when extracting values " +
-      "using the pattern " +
-      "'http://example.com/{-suffix|/|rot13}' with the ExampleProcessor" do
-    Addressable::Template.new(
-      "http://example.com/{-suffix|/|rot13}"
-    ).extract(@uri, 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
-    Addressable::Template.new(
-      "http://example.com{-suffix|/|rot13}"
-    ).extract(@uri, 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
-    Addressable::Template.new(
-      "http://example.com/{-suffix|/|rot13}/"
-    ).extract(@uri, 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
-    Addressable::Template.new(
-      "http://example.com/?email={-opt|bogus@bogus.com|test}"
-    ).extract(@uri).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
-    Addressable::Template.new(
-      "http://example.com/?email={-neg|bogus@bogus.com|test}"
-    ).extract(@uri).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
-    Addressable::Template.new(
-      "http://example.com/?email={-opt|bob@sporkmonger.com|test}"
-    ).extract(@uri).should == {}
-  end
-
-  it "should indicate a match when extracting values " +
-      "using the neg pattern " +
-      "'http://example.com/?email={-neg|bob@sporkmonger.com|test}'" do
-    Addressable::Template.new(
-      "http://example.com/?email={-neg|bob@sporkmonger.com|test}"
-    ).extract(@uri).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
-    Addressable::Template.new(
-      "http://example.com/?email={-opt|bob@sporkmonger.com|test}"
-    ).extract(@uri).should == {}
-  end
-
-  it "should indicate a match when extracting values " +
-      "using the neg pattern " +
-      "'http://example.com/?email={-neg|bob@sporkmonger.com|test}'" do
-    Addressable::Template.new(
-      "http://example.com/?email={-neg|bob@sporkmonger.com|test}"
-    ).extract(@uri).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
-    Addressable::Template.new(
-      "http://{host}/{-suffix|/|segments}?{-join|&|one,two}\#{fragment}"
-    ).extract(@uri).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
-    Addressable::Template.new(
-      "http://{host}/{-suffix|/|segments}?{-join|&|one}\#{fragment}"
-    ).extract(@uri).should == nil
-  end
-
-  it "should not match when extracting values " +
-      "using the pattern " +
-      "'http://{host}/{-suffix|/|segments}?{-join|&|bogus}\#{fragment}'" do
-    Addressable::Template.new(
-      "http://{host}/{-suffix|/|segments}?{-join|&|bogus}\#{fragment}"
-    ).extract(@uri).should == nil
-  end
-
-  it "should not match when extracting values " +
-      "using the pattern " +
-      "'http://{host}/{-suffix|/|segments}?" +
-      "{-join|&|one,bogus}\#{fragment}'" do
-    Addressable::Template.new(
-      "http://{host}/{-suffix|/|segments}?{-join|&|one,bogus}\#{fragment}"
-    ).extract(@uri).should == nil
-  end
-
-  it "should not match when extracting values " +
-      "using the pattern " +
-      "'http://{host}/{-suffix|/|segments}?" +
-      "{-join|&|one,two,bogus}\#{fragment}'" do
-    Addressable::Template.new(
-      "http://{host}/{-suffix|/|segments}?{-join|&|one,two,bogus}\#{fragment}"
-    ).extract(@uri).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
-      Addressable::Template.new(
-        "http://example.com/{-bogus|/|a,b,c}/"
-      ).extract(@uri)
-    end).should raise_error(
-      Addressable::Template::InvalidTemplateOperatorError
-    )
-  end
-
-  it "should raise an InvalidTemplateOperatorError" do
-    (lambda do
-      Addressable::Template.new(
-        "http://example.com{-prefix|/|a,b,c}/"
-      ).extract(@uri)
-    end).should raise_error(
-      Addressable::Template::InvalidTemplateOperatorError
-    )
-  end
-
-  it "should raise an InvalidTemplateOperatorError" do
-    (lambda do
-      Addressable::Template.new(
-        "http://example.com/{-suffix|/|a,b,c}"
-      ).extract(@uri)
-    end).should raise_error(
-      Addressable::Template::InvalidTemplateOperatorError
-    )
-  end
-
-  it "should raise an InvalidTemplateOperatorError" do
-    (lambda do
-      Addressable::Template.new(
-        "http://example.com/{-list|/|a,b,c}/"
-      ).extract(@uri)
-    end).should raise_error(
-      Addressable::Template::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::Template.new(
-      "http://example.com/search/{-list|+|query}/"
-    ).expand(@mapping).to_str.should ==
-      "http://example.com/search/an+example+search+query/"
-  end
-
-  it "should result in 'http://example.com/search/an+example+search+query/'" +
-      " when used to expand 'http://example.com/search/{-list|+|query}/'" +
-      " with a NoOpProcessor" do
-    Addressable::Template.new(
-      "http://example.com/search/{-list|+|query}/"
-    ).expand(@mapping, NoOpProcessor).to_str.should ==
-      "http://example.com/search/an+example+search+query/"
-  end
-end
-
-describe Addressable::URI, "when given an empty mapping" do
-  before do
-    @mapping = {}
-  end
-
-  it "should result in 'http://example.com/search/'" +
-      " when used to expand 'http://example.com/search/{-list|+|query}'" do
-    Addressable::Template.new(
-      "http://example.com/search/{-list|+|query}"
-    ).expand(@mapping).to_str.should == "http://example.com/search/"
-  end
-
-  it "should result in 'http://example.com'" +
-      " when used to expand 'http://example.com{-prefix|/|foo}'" do
-    Addressable::Template.new(
-      "http://example.com{-prefix|/|foo}"
-    ).expand(@mapping).to_str.should == "http://example.com"
-  end
-
-  it "should result in 'http://example.com'" +
-      " when used to expand 'http://example.com{-suffix|/|foo}'" do
-    Addressable::Template.new(
-      "http://example.com{-suffix|/|foo}"
-    ).expand(@mapping).to_str.should == "http://example.com"
-  end
-end
-
-describe Addressable::URI, "when given the template pattern " +
-    "'http://example.com/search/{query}/' " +
-    "to be processed with the ExampleProcessor" do
-  before do
-    @pattern = "http://example.com/search/{query}/"
-  end
-
-  it "should expand to " +
-      "'http://example.com/search/an+example+search+query/' " +
-      "with a mapping of {\"query\" => \"an example search query\"} " do
-    Addressable::Template.new(
-      "http://example.com/search/{query}/"
-    ).expand({
-      "query" => "an example search query"
-    }, ExampleProcessor).to_s.should ==
-      "http://example.com/search/an+example+search+query/"
-  end
-
-  it "should raise an error " +
-      "with a mapping of {\"query\" => \"invalid!\"}" do
-    (lambda do
-      Addressable::Template.new(
-        "http://example.com/search/{query}/"
-      ).expand({"query" => "invalid!"}, ExampleProcessor).to_s
-    end).should raise_error(Addressable::Template::InvalidTemplateValueError)
-  end
-end
-
-# 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 v 01" do
-  before do
-    @mapping = {
-      "a" => "fred",
-      "b" => "barney",
-      "c" => "cheeseburger",
-      "d" => "one two three",
-      "e" => "20% tricky",
-      "f" => "",
-      "20" => "this-is-spinal-tap",
-      "scheme" => "https",
-      "p" => "quote=to+be+or+not+to+be",
-      "q" => "hullo#world"
-    }
-  end
-
-  it "should result in 'http://example.org/page1#fred' " +
-      "when used to expand 'http://example.org/page1\#{a}'" do
-    Addressable::Template.new(
-      "http://example.org/page1\#{a}"
-    ).expand(@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::Template.new(
-      "http://example.org/{a}/{b}/"
-    ).expand(@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::Template.new(
-      "http://example.org/{a}{b}/"
-    ).expand(@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::Template.new(
-      "http://example.com/order/{c}/{c}/{c}/"
-    ).expand(@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::Template.new(
-      "http://example.org/{d}"
-    ).expand(@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::Template.new(
-      "http://example.org/{e}"
-    ).expand(@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::Template.new(
-      "http://example.com/{f}/"
-    ).expand(@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::Template.new(
-      "{scheme}://{20}.example.org?date={wilma}&option={a}"
-    ).expand(@mapping).to_s.should ==
-      "https://this-is-spinal-tap.example.org?date=&option=fred"
-  end
-
-  # 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::Template.new(
-      "http://example.org?{p}"
-    ).expand(@mapping).to_s.should ==
-      "http://example.org?quote%3Dto%2Bbe%2Bor%2Bnot%2Bto%2Bbe"
-  end
-
-  # 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::Template.new(
-      "http://example.com/{q}"
-    ).expand(@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::Template.new(
-      "http://example.org/?q={bar}"
-    ).expand(@mapping).to_s.should == "http://example.org/?q=fred"
-  end
-
-  it "should result in '/' " +
-      "when used to expand '/{xyzzy}'" do
-    Addressable::Template.new(
-      "/{xyzzy}"
-    ).expand(@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::Template.new(
-      "http://example.org/?{-join|&|foo,bar,xyzzy,baz}"
-    ).expand(@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::Template.new(
-      "http://example.org/?d={-list|,|qux}"
-    ).expand(
-      @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::Template.new(
-      "http://example.org/?d={-list|&d=|qux}"
-    ).expand(
-      @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::Template.new(
-      "http://example.org/{bar}{bar}/{garply}"
-    ).expand(
-      @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::Template.new(
-      "http://example.org/{bar}{-prefix|/|fred}"
-    ).expand(
-      @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::Template.new(
-      "{-neg|:|corge}{-suffix|:|plugh}"
-    ).expand(
-      @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::Template.new(
-      "../{waldo}/"
-    ).expand(
-      @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::Template.new(
-      "telnet:192.0.2.16{-opt|:80|grault}"
-    ).expand(
-      @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::Template.new(
-      ":{1-a_b.c}:"
-    ).expand(
-      @mapping
-    ).to_s.should == ":200:"
-  end
-end
-
-describe Addressable::URI, "when given a mapping that contains a " +
-  "template-var within a value" do
-  before do
-    @mapping = {
-      "a" => "{b}",
-      "b" => "barney",
-    }
-  end
-
-  it "should result in 'http://example.com/%7Bb%7D/barney/' " +
-      "when used to expand 'http://example.com/{a}/{b}/'" do
-    Addressable::Template.new(
-      "http://example.com/{a}/{b}/"
-    ).expand(
-      @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::Template.new(
-      "http://example.com/{-opt|foo|foo}/{a}/"
-    ).expand(
-      @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::Template.new(
-      "http://example.com/{-neg|foo|b}/{a}/"
-    ).expand(
-      @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::Template.new(
-      "http://example.com/{-prefix|/|b}/{a}/"
-    ).expand(
-      @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::Template.new(
-      "http://example.com/{-suffix|/|b}/{a}/"
-    ).expand(
-      @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::Template.new(
-      "http://example.com/{a}/?{-join|&|b,c=42}"
-    ).expand(
-      @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::Template.new(
-      "http://example.com/{c=42}/?{-join|&|b}"
-    ).expand(@mapping).to_s.should == "http://example.com/42/?b=barney"
-  end
-end
-
-describe Addressable::URI, "when given a single variable mapping" do
-  before do
-    @mapping = {
-      "foo" => "fred"
-    }
-  end
-
-  it "should result in 'fred' when used to expand '{foo}'" do
-    Addressable::Template.new(
-      "{foo}"
-    ).expand(@mapping).to_s.should == "fred"
-  end
-
-  it "should result in 'wilma' when used to expand '{bar=wilma}'" do
-    Addressable::Template.new(
-      "{bar=wilma}"
-    ).expand(@mapping).to_s.should == "wilma"
-  end
-
-  it "should result in '' when used to expand '{baz}'" do
-    Addressable::Template.new(
-      "{baz}"
-    ).expand(@mapping).to_s.should == ""
-  end
-end
-
-describe Addressable::URI, "when given a simple mapping" do
-  before do
-    @mapping = {
-      "foo" => "fred",
-      "bar" => "barney",
-      "baz" => ""
-    }
-  end
-
-  it "should result in 'foo=fred&bar=barney&baz=' when used to expand " +
-      "'{-join|&|foo,bar,baz,qux}'" do
-    Addressable::Template.new(
-      "{-join|&|foo,bar,baz,qux}"
-    ).expand(@mapping).to_s.should == "foo=fred&bar=barney&baz="
-  end
-
-  it "should result in 'bar=barney' when used to expand " +
-      "'{-join|&|bar}'" do
-    Addressable::Template.new(
-      "{-join|&|bar}"
-    ).expand(@mapping).to_s.should == "bar=barney"
-  end
-
-  it "should result in '' when used to expand " +
-      "'{-join|&|qux}'" do
-    Addressable::Template.new(
-      "{-join|&|qux}"
-    ).expand(@mapping).to_s.should == ""
-  end
-end
-
-describe Addressable::URI, "extracting defaults from a pattern" do
-  before do
-    @template = Addressable::Template.new("{foo}{bar=baz}{-opt|found|cond}")
-  end
-
-  it "should extract default value" do
-    @template.variable_defaults.should == {"bar" => "baz"}
-  end
-end
-
-describe Addressable::URI, "when given a mapping with symbol keys" do
-  before do
-    @mapping = { :name => "fred" }
-  end
-
-  it "should result in 'fred' when used to expand '{foo}'" do
-    Addressable::Template.new(
-      "{name}"
-    ).expand(@mapping).to_s.should == "fred"
-  end
-end
-
-describe Addressable::URI, "when given a mapping with bogus keys" do
-  before do
-    @mapping = { Object.new => "fred" }
-  end
-
-  it "should raise an error" do
-    (lambda do
-      Addressable::Template.new(
-        "{name}"
-      ).expand(@mapping)
-    end).should raise_error(TypeError)
-  end
-end
-
-describe Addressable::URI, "when given a mapping with numeric values" do
-  before do
-    @mapping = { :id => 123 }
-  end
-
-  it "should result in 'fred' when used to expand '{foo}'" do
-    Addressable::Template.new(
-      "{id}"
-    ).expand(@mapping).to_s.should == "123"
-  end
-end
-
-describe Addressable::URI, "when given a mapping containing values " +
-    "that are already percent-encoded" do
-  before do
-    @mapping = {
-      "a" => "%7Bb%7D"
-    }
-  end
-
-  it "should result in 'http://example.com/%257Bb%257D/' " +
-      "when used to expand 'http://example.com/{a}/'" do
-    Addressable::Template.new(
-      "http://example.com/{a}/"
-    ).expand(@mapping).to_s.should == "http://example.com/%257Bb%257D/"
-  end
-end
-
-describe Addressable::URI, "when given a pattern with bogus operators" do
-  it "should raise an InvalidTemplateOperatorError" do
-    (lambda do
-      Addressable::Template.new(
-        "http://example.com/{-bogus|/|a,b,c}/"
-      ).expand({
-        "a" => "a", "b" => "b", "c" => "c"
-      })
-    end).should raise_error(
-      Addressable::Template::InvalidTemplateOperatorError
-    )
-  end
-
-  it "should raise an InvalidTemplateOperatorError" do
-    (lambda do
-      Addressable::Template.new(
-        "http://example.com/{-prefix|/|a,b,c}/"
-      ).expand({
-        "a" => "a", "b" => "b", "c" => "c"
-      })
-    end).should raise_error(
-      Addressable::Template::InvalidTemplateOperatorError
-    )
-  end
-
-  it "should raise an InvalidTemplateOperatorError" do
-    (lambda do
-      Addressable::Template.new(
-        "http://example.com/{-suffix|/|a,b,c}/"
-      ).expand({
-        "a" => "a", "b" => "b", "c" => "c"
-      })
-    end).should raise_error(
-      Addressable::Template::InvalidTemplateOperatorError
-    )
-  end
-
-  it "should raise an InvalidTemplateOperatorError" do
-    (lambda do
-      Addressable::Template.new(
-        "http://example.com/{-join|/|a,b,c}/"
-      ).expand({
-        "a" => ["a"], "b" => ["b"], "c" => "c"
-      })
-    end).should raise_error(
-      Addressable::Template::InvalidTemplateOperatorError
-    )
-  end
-
-  it "should raise an InvalidTemplateOperatorError" do
-    (lambda do
-      Addressable::Template.new(
-        "http://example.com/{-list|/|a,b,c}/"
-      ).expand({
-        "a" => ["a"], "b" => ["b"], "c" => "c"
-      })
-    end).should raise_error(
-      Addressable::Template::InvalidTemplateOperatorError
-    )
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{one}/{two}/"
-    )
-    @partial_template = @initial_template.partial_expand({"one" => "1"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1", "two" => "2"}).should ==
-      @partial_template.expand({"two" => "2"})
-  end
-
-  it "should raise an error if the template is expanded with bogus values" do
-    (lambda do
-      @initial_template.expand({"one" => Object.new, "two" => Object.new})
-    end).should raise_error(TypeError)
-    (lambda do
-      @partial_template.expand({"two" => Object.new})
-    end).should raise_error(TypeError)
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{one}/{two}/"
-    )
-    @partial_template = @initial_template.partial_expand({"two" => "2"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1", "two" => "2"}).should ==
-      @partial_template.expand({"one" => "1"})
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{one}/{two}/"
-    )
-    @partial_template = @initial_template.partial_expand({"two" => "2"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1", "two" => "2"}).should ==
-      @partial_template.expand({"one" => "1"})
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{one=1}/{two=2}/"
-    )
-    @partial_template = @initial_template.partial_expand({"one" => "3"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "3", "two" => "4"}).should ==
-      @partial_template.expand({"two" => "4"})
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).should === "http://example.com/3/2/"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{one=1}/{two=2}/"
-    )
-    @partial_template = @initial_template.partial_expand({"two" => "4"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "3", "two" => "4"}).should ==
-      @partial_template.expand({"one" => "3"})
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).should === "http://example.com/1/4/"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{-opt|found|one,two,three}"
-    )
-    @partial_template = @initial_template.partial_expand({})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1"}).to_str.should ==
-      @partial_template.expand({"two" => "2"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"one" => "1"}).to_str.should ==
-      "http://example.com/found"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"two" => "2"}).to_str.should ==
-      "http://example.com/found"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"three" => "3"}).to_str.should ==
-      "http://example.com/found"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"four" => "4"}).to_str.should ==
-      "http://example.com/"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"one" => "1", "two" => "2"}).to_str.should ==
-      "http://example.com/found"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{-opt|found|one,two,three}"
-    )
-    @partial_template = @initial_template.partial_expand({"one" => "1"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1"}).to_str.should ==
-      @partial_template.expand({"two" => "2"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/found"
-  end
-
-  it "should produce the correct pattern" do
-    @partial_template.pattern.should == "http://example.com/found"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{-neg|notfound|one,two,three}"
-    )
-    @partial_template = @initial_template.partial_expand({})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1"}).to_str.should ==
-      @partial_template.expand({"two" => "2"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/notfound"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"one" => "1"}).to_str.should ==
-      "http://example.com/"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"two" => "2"}).to_str.should ==
-      "http://example.com/"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"three" => "3"}).to_str.should ==
-      "http://example.com/"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"four" => "4"}).to_str.should ==
-      "http://example.com/notfound"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"one" => "1", "two" => "2"}).to_str.should ==
-      "http://example.com/"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{-neg|notfound|one,two,three}"
-    )
-    @partial_template = @initial_template.partial_expand({"one" => "1"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1"}).to_str.should ==
-      @partial_template.expand({"two" => "2"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/"
-  end
-
-  it "should produce the correct pattern" do
-    @partial_template.pattern.should == "http://example.com/"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-prefix|x=|one}"
-    )
-    @partial_template = @initial_template.partial_expand({})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1"}).to_str.should ==
-      @partial_template.expand({"one" => "1"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/?"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"one" => "1"}).to_str.should ==
-      "http://example.com/?x=1"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"two" => "2"}).to_str.should ==
-      "http://example.com/?"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"one" => "1", "two" => "2"}).to_str.should ==
-      "http://example.com/?x=1"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-prefix|x=|one}"
-    )
-    @partial_template = @initial_template.partial_expand({"one" => "1"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1"}).to_str.should ==
-      @partial_template.expand({}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/?x=1"
-  end
-
-  it "should produce the correct pattern" do
-    @partial_template.pattern.should == "http://example.com/?x=1"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-suffix|=x|one}"
-    )
-    @partial_template = @initial_template.partial_expand({})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1"}).to_str.should ==
-      @partial_template.expand({"one" => "1"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/?"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"one" => "1"}).to_str.should ==
-      "http://example.com/?1=x"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"two" => "2"}).to_str.should ==
-      "http://example.com/?"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"one" => "1", "two" => "2"}).to_str.should ==
-      "http://example.com/?1=x"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-suffix|=x|one}"
-    )
-    @partial_template = @initial_template.partial_expand({"one" => "1"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1"}).to_str.should ==
-      @partial_template.expand({}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/?1=x"
-  end
-
-  it "should produce the correct pattern" do
-    @partial_template.pattern.should == "http://example.com/?1=x"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-join|&|one}"
-    )
-    @partial_template = @initial_template.partial_expand({})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1"}).to_str.should ==
-      @partial_template.expand({"one" => "1"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/?"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.pattern.should == @initial_template.pattern
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-join|&|one,two}"
-    )
-    @partial_template = @initial_template.partial_expand({"one" => "1"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1", "two" => "2"}).to_str.should ==
-      @partial_template.expand({"two" => "2"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/?one=1"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-join|&|one,two}"
-    )
-    @partial_template = @initial_template.partial_expand({"two" => "2"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({"one" => "1", "two" => "2"}).to_str.should ==
-      @partial_template.expand({"one" => "1"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/?two=2"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-join|&|one,two,three}"
-    )
-    @partial_template = @initial_template.partial_expand({"one" => "1"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({
-      "one" => "1", "two" => "2", "three" => "3"
-    }).to_str.should ==
-      @partial_template.expand({"two" => "2", "three" => "3"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/?one=1"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"two" => "2"}).to_str.should ==
-      "http://example.com/?one=1&two=2"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"three" => "3"}).to_str.should ==
-      "http://example.com/?one=1&three=3"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-join|&|one,two,three}"
-    )
-    @partial_template = @initial_template.partial_expand({"two" => "2"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({
-      "one" => "1", "two" => "2", "three" => "3"
-    }).to_str.should ==
-      @partial_template.expand({"one" => "1", "three" => "3"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/?two=2"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"one" => "1"}).to_str.should ==
-      "http://example.com/?one=1&two=2"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"three" => "3"}).to_str.should ==
-      "http://example.com/?two=2&three=3"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-join|&|one,two,three}"
-    )
-    @partial_template = @initial_template.partial_expand({"three" => "3"})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({
-      "one" => "1", "two" => "2", "three" => "3"
-    }).to_str.should ==
-      @partial_template.expand({"one" => "1", "two" => "2"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/?three=3"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"one" => "1"}).to_str.should ==
-      "http://example.com/?one=1&three=3"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"two" => "2"}).to_str.should ==
-      "http://example.com/?two=2&three=3"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-join|&|one,two,three}"
-    )
-    @partial_template = @initial_template.partial_expand({
-      "one" => "1", "two" => "2"
-    })
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({
-      "one" => "1", "two" => "2", "three" => "3"
-    }).to_str.should ==
-      @partial_template.expand({"three" => "3"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should ==
-      "http://example.com/?one=1&two=2"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"three" => "3"}).to_str.should ==
-      "http://example.com/?one=1&two=2&three=3"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-join|&|one,two,three}"
-    )
-    @partial_template = @initial_template.partial_expand({
-      "one" => "1", "three" => "3"
-    })
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({
-      "one" => "1", "two" => "2", "three" => "3"
-    }).to_str.should ==
-      @partial_template.expand({"two" => "2"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should ==
-      "http://example.com/?one=1&three=3"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"two" => "2"}).to_str.should ==
-      "http://example.com/?one=1&two=2&three=3"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-join|&|one,two,three}"
-    )
-    @partial_template = @initial_template.partial_expand({
-      "two" => "2", "three" => "3"
-    })
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({
-      "one" => "1", "two" => "2", "three" => "3"
-    }).to_str.should ==
-      @partial_template.expand({"one" => "1"}).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should ==
-      "http://example.com/?two=2&three=3"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({"one" => "1"}).to_str.should ==
-      "http://example.com/?one=1&two=2&three=3"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/?{-join|&|one,two,three}"
-    )
-  end
-
-  it "should raise an error when partially expanding a bogus operator" do
-    (lambda do
-      @initial_template.partial_expand({"one" => ["1"]})
-    end).should raise_error(
-      Addressable::Template::InvalidTemplateOperatorError
-    )
-    (lambda do
-      @initial_template.partial_expand({"two" => "2", "three" => ["3"]})
-    end).should raise_error(
-      Addressable::Template::InvalidTemplateOperatorError
-    )
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{-list|/|numbers}/{-list|/|letters}/"
-    )
-    @partial_template = @initial_template.partial_expand({})
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({
-      "numbers" => ["1", "2", "3"], "letters" => ["a", "b", "c"]
-    }).to_str.should == @partial_template.expand({
-      "numbers" => ["1", "2", "3"], "letters" => ["a", "b", "c"]
-    }).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com///"
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.pattern.should == @initial_template.pattern
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{-list|/|numbers}/{-list|/|letters}/"
-    )
-    @partial_template = @initial_template.partial_expand({
-      "numbers" => ["1", "2", "3"]
-    })
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({
-      "numbers" => ["1", "2", "3"], "letters" => ["a", "b", "c"]
-    }).to_str.should == @partial_template.expand({
-      "letters" => ["a", "b", "c"]
-    }).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com/1/2/3//"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{-list|/|numbers}/{-list|/|letters}/"
-    )
-    @partial_template = @initial_template.partial_expand({
-      "letters" => ["a", "b", "c"]
-    })
-  end
-
-  it "should produce the same result when fully expanded" do
-    @initial_template.expand({
-      "numbers" => ["1", "2", "3"], "letters" => ["a", "b", "c"]
-    }).to_str.should == @partial_template.expand({
-      "numbers" => ["1", "2", "3"]
-    }).to_str
-  end
-
-  it "should produce the correct result when fully expanded" do
-    @partial_template.expand({}).to_str.should == "http://example.com//a/b/c/"
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{-list|/|numbers}/{-list|/|letters}/"
-    )
-  end
-
-  it "should raise an error when partially expanding a bogus operator" do
-    (lambda do
-      @initial_template.partial_expand({"numbers" => "1"})
-    end).should raise_error(
-      Addressable::Template::InvalidTemplateOperatorError
-    )
-    (lambda do
-      @initial_template.partial_expand({"letters" => "a"})
-    end).should raise_error(
-      Addressable::Template::InvalidTemplateOperatorError
-    )
-  end
-end
-
-describe Addressable::Template, "with a partially expanded template" do
-  before do
-    @initial_template = Addressable::Template.new(
-      "http://example.com/{-bogus|/|one,two}/"
-    )
-  end
-
-  it "should raise an error when partially expanding a bogus operator" do
-    (lambda do
-      @initial_template.partial_expand({"one" => "1"})
-    end).should raise_error(
-      Addressable::Template::InvalidTemplateOperatorError
-    )
+  describe '[]' do
+    context 'string key' do
+      it 'returns the corresponding capture' do
+        expect(its['foo']).to eq('ab')
+        expect(its['bar']).to eq('cd')
+      end
+      it 'returns nil for unknown keys' do
+        expect(its['baz']).to be_nil
+      end
+    end
+    context 'symbol key' do
+      it 'returns the corresponding capture' do
+        expect(its[:foo]).to eq('ab')
+        expect(its[:bar]).to eq('cd')
+      end
+      it 'returns nil for unknown keys' do
+        expect(its[:baz]).to be_nil
+      end
+    end
+    context 'integer key' do
+      it 'returns the full URI for index 0' do
+        expect(its[0]).to eq('ab/cd')
+      end
+      it 'returns the corresponding capture' do
+        expect(its[1]).to eq('ab')
+        expect(its[2]).to eq('cd')
+      end
+      it 'returns nil for unknown keys' do
+        expect(its[3]).to be_nil
+      end
+    end
+    context 'other key' do
+      it 'raises an exception' do
+        expect { its[Object.new] }.to raise_error(TypeError)
+      end
+    end
+    context 'with length' do
+      it 'returns an array starting at index with given length' do
+        expect(its[0, 2]).to eq(['ab/cd', 'ab'])
+        expect(its[2, 1]).to eq(['cd'])
+      end
+    end
   end
 end