addressable 2.4.0 → 2.9.0

data/lib/addressable/version.rb

@@ -1,6 +1,7 @@
-# encoding:utf-8
+# frozen_string_literal: true
+
 #--
-# Copyright (C) 2006-2015 Bob Aman
+# 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.
@@ -21,7 +22,7 @@ if !defined?(Addressable::VERSION)
   module Addressable
     module VERSION
       MAJOR = 2
-      MINOR = 4
+      MINOR = 9
       TINY  = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/addressable.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'addressable/uri'
 require 'addressable/template'

metadata

@@ -1,33 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: addressable
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Bob Aman
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
+        version: 2.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '8.0'
 description: |
-  Addressable is a replacement for the URI implementation that is part of
-  Ruby's standard library. It more closely conforms to the relevant RFCs and
-  adds support for IRIs and URI templates.
+  Addressable is an alternative implementation to the URI implementation that is
+  part of Ruby's standard library. It is flexible, offers heuristic parsing, and
+  additionally provides extensive support for IRIs and URI templates.
 email: bob@sporkmonger.com
 executables: []
 extensions: []
@@ -35,12 +40,8 @@ extra_rdoc_files:
 - README.md
 files:
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- addressable.gemspec
-- data/unicode.data
 - lib/addressable.rb
 - lib/addressable/idna.rb
 - lib/addressable/idna/native.rb
@@ -48,24 +49,11 @@ files:
 - lib/addressable/template.rb
 - lib/addressable/uri.rb
 - lib/addressable/version.rb
-- spec/addressable/idna_spec.rb
-- spec/addressable/net_http_compat_spec.rb
-- spec/addressable/rack_mount_compat_spec.rb
-- spec/addressable/security_spec.rb
-- spec/addressable/template_spec.rb
-- spec/addressable/uri_spec.rb
-- spec/spec_helper.rb
-- tasks/clobber.rake
-- tasks/gem.rake
-- tasks/git.rake
-- tasks/metrics.rake
-- tasks/rspec.rake
-- tasks/yard.rake
 homepage: https://github.com/sporkmonger/addressable
 licenses:
 - Apache-2.0
-metadata: {}
-post_install_message: 
+metadata:
+  changelog_uri: https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md#v2.9.0
 rdoc_options:
 - "--main"
 - README.md
@@ -75,16 +63,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.0
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.0
-signing_key: 
+rubygems_version: 4.0.6
 specification_version: 4
 summary: URI Implementation
 test_files: []

data/Gemfile

@@ -1,27 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'rake', '~> 10.4', '>= 10.4.2'
-
-group :test do
-  gem 'rspec', '~> 3.0'
-  gem 'rspec-its', '~> 1.1'
-end
-
-group :development do
-  gem 'launchy', '~> 2.4', '>= 2.4.3'
-  gem 'redcarpet', :platform => :mri_19
-  gem 'yard'
-end
-
-group :test, :development do
-  gem 'simplecov', :require => false
-  gem 'coveralls', :require => false, :platforms => [
-    :ruby_19, :ruby_20, :ruby_21, :rbx, :jruby
-  ]
-  # Used to test compatibility.
-  gem 'rack-mount', git: 'https://github.com/sporkmonger/rack-mount.git', require: 'rack/mount'
-end
-
-gem 'idn-ruby', :platform => [:mri_19, :mri_20, :mri_21, :mri_22]

data/Rakefile

@@ -1,32 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-require File.join(File.dirname(__FILE__), 'lib', 'addressable', 'version')
-
-PKG_DISPLAY_NAME   = 'Addressable'
-PKG_NAME           = PKG_DISPLAY_NAME.downcase
-PKG_VERSION        = Addressable::VERSION::STRING
-PKG_FILE_NAME      = "#{PKG_NAME}-#{PKG_VERSION}"
-
-RELEASE_NAME       = "REL #{PKG_VERSION}"
-
-PKG_SUMMARY        = "URI Implementation"
-PKG_DESCRIPTION    = <<-TEXT
-Addressable is a replacement for the URI implementation that is part of
-Ruby's standard library. It more closely conforms to the relevant RFCs and
-adds support for IRIs and URI templates.
-TEXT
-
-PKG_FILES = FileList[
-    "lib/**/*", "spec/**/*", "vendor/**/*", "data/**/*",
-    "tasks/**/*",
-    "[A-Z]*", "Rakefile"
-].exclude(/pkg/).exclude(/database\.yml/).
-  exclude(/Gemfile\.lock/).exclude(/[_\.]git$/)
-
-task :default => "spec"
-
-WINDOWS = (RUBY_PLATFORM =~ /mswin|win32|mingw|bccwin|cygwin/) rescue false
-SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }

data/addressable.gemspec

@@ -1,34 +0,0 @@
-# -*- encoding: utf-8 -*-
-# stub: addressable 2.4.0 ruby lib
-
-Gem::Specification.new do |s|
-  s.name = "addressable"
-  s.version = "2.4.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Bob Aman"]
-  s.date = "2015-12-07"
-  s.description = "Addressable is a replacement for the URI implementation that is part of\nRuby's standard library. It more closely conforms to the relevant RFCs and\nadds support for IRIs and URI templates.\n"
-  s.email = "bob@sporkmonger.com"
-  s.extra_rdoc_files = ["README.md"]
-  s.files = ["CHANGELOG.md", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "addressable.gemspec", "data/unicode.data", "lib/addressable.rb", "lib/addressable/idna.rb", "lib/addressable/idna/native.rb", "lib/addressable/idna/pure.rb", "lib/addressable/template.rb", "lib/addressable/uri.rb", "lib/addressable/version.rb", "spec/addressable/idna_spec.rb", "spec/addressable/net_http_compat_spec.rb", "spec/addressable/rack_mount_compat_spec.rb", "spec/addressable/security_spec.rb", "spec/addressable/template_spec.rb", "spec/addressable/uri_spec.rb", "spec/spec_helper.rb", "tasks/clobber.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/metrics.rake", "tasks/rspec.rake", "tasks/yard.rake"]
-  s.homepage = "https://github.com/sporkmonger/addressable"
-  s.licenses = ["Apache-2.0"]
-  s.rdoc_options = ["--main", "README.md"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9.0")
-  s.rubygems_version = "2.5.0"
-  s.summary = "URI Implementation"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-    else
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-    end
-  else
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-  end
-end

data/spec/addressable/idna_spec.rb

@@ -1,270 +0,0 @@
-# coding: utf-8
-# Copyright (C) 2006-2015 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"
-
-# Have to use RubyGems to load the idn gem.
-require "rubygems"
-
-require "addressable/idna"
-
-shared_examples_for "converting from unicode to ASCII" do
-  it "should convert 'www.google.com' correctly" do
-    expect(Addressable::IDNA.to_ascii("www.google.com")).to eq("www.google.com")
-  end
-
-  it "should convert 'www.詹姆斯.com' correctly" do
-    expect(Addressable::IDNA.to_ascii(
-      "www.詹姆斯.com"
-    )).to eq("www.xn--8ws00zhy3a.com")
-  end
-
-  it "should convert 'www.Iñtërnâtiônàlizætiøn.com' correctly" do
-    "www.Iñtërnâtiônàlizætiøn.com"
-    expect(Addressable::IDNA.to_ascii(
-      "www.I\xC3\xB1t\xC3\xABrn\xC3\xA2ti\xC3\xB4" +
-      "n\xC3\xA0liz\xC3\xA6ti\xC3\xB8n.com"
-    )).to eq("www.xn--itrntinliztin-vdb0a5exd8ewcye.com")
-  end
-
-  it "should convert 'www.Iñtërnâtiônàlizætiøn.com' correctly" do
-    expect(Addressable::IDNA.to_ascii(
-      "www.In\xCC\x83te\xCC\x88rna\xCC\x82tio\xCC\x82n" +
-      "a\xCC\x80liz\xC3\xA6ti\xC3\xB8n.com"
-    )).to eq("www.xn--itrntinliztin-vdb0a5exd8ewcye.com")
-  end
-
-  it "should convert " +
-      "'www.ほんとうにながいわけのわからないどめいんめいのらべるまだながくしないとたりない.w3.mag.keio.ac.jp' " +
-      "correctly" do
-    expect(Addressable::IDNA.to_ascii(
-      "www.\343\201\273\343\202\223\343\201\250\343\201\206\343\201\253\343" +
-      "\201\252\343\201\214\343\201\204\343\202\217\343\201\221\343\201\256" +
-      "\343\202\217\343\201\213\343\202\211\343\201\252\343\201\204\343\201" +
-      "\251\343\202\201\343\201\204\343\202\223\343\202\201\343\201\204\343" +
-      "\201\256\343\202\211\343\201\271\343\202\213\343\201\276\343\201\240" +
-      "\343\201\252\343\201\214\343\201\217\343\201\227\343\201\252\343\201" +
-      "\204\343\201\250\343\201\237\343\202\212\343\201\252\343\201\204." +
-      "w3.mag.keio.ac.jp"
-    )).to eq(
-      "www.xn--n8jaaaaai5bhf7as8fsfk3jnknefdde3" +
-      "fg11amb5gzdb4wi9bya3kc6lra.w3.mag.keio.ac.jp"
-    )
-  end
-
-  it "should convert " +
-      "'www.ほんとうにながいわけのわからないどめいんめいのらべるまだながくしないとたりない.w3.mag.keio.ac.jp' " +
-      "correctly" do
-    expect(Addressable::IDNA.to_ascii(
-      "www.\343\201\273\343\202\223\343\201\250\343\201\206\343\201\253\343" +
-      "\201\252\343\201\213\343\202\231\343\201\204\343\202\217\343\201\221" +
-      "\343\201\256\343\202\217\343\201\213\343\202\211\343\201\252\343\201" +
-      "\204\343\201\250\343\202\231\343\202\201\343\201\204\343\202\223\343" +
-      "\202\201\343\201\204\343\201\256\343\202\211\343\201\270\343\202\231" +
-      "\343\202\213\343\201\276\343\201\237\343\202\231\343\201\252\343\201" +
-      "\213\343\202\231\343\201\217\343\201\227\343\201\252\343\201\204\343" +
-      "\201\250\343\201\237\343\202\212\343\201\252\343\201\204." +
-      "w3.mag.keio.ac.jp"
-    )).to eq(
-      "www.xn--n8jaaaaai5bhf7as8fsfk3jnknefdde3" +
-      "fg11amb5gzdb4wi9bya3kc6lra.w3.mag.keio.ac.jp"
-    )
-  end
-
-  it "should convert '点心和烤鸭.w3.mag.keio.ac.jp' correctly" do
-    expect(Addressable::IDNA.to_ascii(
-      "点心和烤鸭.w3.mag.keio.ac.jp"
-    )).to eq("xn--0trv4xfvn8el34t.w3.mag.keio.ac.jp")
-  end
-
-  it "should convert '가각갂갃간갅갆갇갈갉힢힣.com' correctly" do
-    expect(Addressable::IDNA.to_ascii(
-      "가각갂갃간갅갆갇갈갉힢힣.com"
-    )).to eq("xn--o39acdefghijk5883jma.com")
-  end
-
-  it "should convert " +
-      "'\347\242\274\346\250\231\346\272\226\350" +
-      "\220\254\345\234\213\347\242\274.com' correctly" do
-    expect(Addressable::IDNA.to_ascii(
-      "\347\242\274\346\250\231\346\272\226\350" +
-      "\220\254\345\234\213\347\242\274.com"
-    )).to eq("xn--9cs565brid46mda086o.com")
-  end
-
-  it "should convert 'ﾘ宠퐱〹.com' correctly" do
-    expect(Addressable::IDNA.to_ascii(
-      "\357\276\230\345\256\240\355\220\261\343\200\271.com"
-    )).to eq("xn--eek174hoxfpr4k.com")
-  end
-
-  it "should convert 'リ宠퐱卄.com' correctly" do
-    expect(Addressable::IDNA.to_ascii(
-      "\343\203\252\345\256\240\355\220\261\345\215\204.com"
-    )).to eq("xn--eek174hoxfpr4k.com")
-  end
-
-  it "should convert 'ᆵ' correctly" do
-    expect(Addressable::IDNA.to_ascii(
-      "\341\206\265"
-    )).to eq("xn--4ud")
-  end
-
-  it "should convert 'ﾯ' correctly" do
-    expect(Addressable::IDNA.to_ascii(
-      "\357\276\257"
-    )).to eq("xn--4ud")
-  end
-
-  it "should handle two adjacent '.'s correctly" do
-    expect(Addressable::IDNA.to_ascii(
-      "example..host"
-    )).to eq("example..host")
-  end
-end
-
-shared_examples_for "converting from ASCII to unicode" do
-  it "should return the identity conversion when the ACE prefix has no suffix" do
-    expect(Addressable::IDNA.to_unicode("xn--...-")).to eq("xn--...-")
-  end
-
-  it "should convert 'www.google.com' correctly" do
-    expect(Addressable::IDNA.to_unicode("www.google.com")).to eq("www.google.com")
-  end
-
-  it "should convert 'www.詹姆斯.com' correctly" do
-    expect(Addressable::IDNA.to_unicode(
-      "www.xn--8ws00zhy3a.com"
-    )).to eq("www.詹姆斯.com")
-  end
-
-  it "should convert '詹姆斯.com' correctly" do
-    expect(Addressable::IDNA.to_unicode(
-      "xn--8ws00zhy3a.com"
-    )).to eq("詹姆斯.com")
-  end
-
-  it "should convert 'www.iñtërnâtiônàlizætiøn.com' correctly" do
-    expect(Addressable::IDNA.to_unicode(
-      "www.xn--itrntinliztin-vdb0a5exd8ewcye.com"
-    )).to eq("www.iñtërnâtiônàlizætiøn.com")
-  end
-
-  it "should convert 'iñtërnâtiônàlizætiøn.com' correctly" do
-    expect(Addressable::IDNA.to_unicode(
-      "xn--itrntinliztin-vdb0a5exd8ewcye.com"
-    )).to eq("iñtërnâtiônàlizætiøn.com")
-  end
-
-  it "should convert " +
-      "'www.ほんとうにながいわけのわからないどめいんめいのらべるまだながくしないとたりない.w3.mag.keio.ac.jp' " +
-      "correctly" do
-    expect(Addressable::IDNA.to_unicode(
-      "www.xn--n8jaaaaai5bhf7as8fsfk3jnknefdde3" +
-      "fg11amb5gzdb4wi9bya3kc6lra.w3.mag.keio.ac.jp"
-    )).to eq(
-      "www.ほんとうにながいわけのわからないどめいんめいのらべるまだながくしないとたりない.w3.mag.keio.ac.jp"
-    )
-  end
-
-  it "should convert '点心和烤鸭.w3.mag.keio.ac.jp' correctly" do
-    expect(Addressable::IDNA.to_unicode(
-      "xn--0trv4xfvn8el34t.w3.mag.keio.ac.jp"
-    )).to eq("点心和烤鸭.w3.mag.keio.ac.jp")
-  end
-
-  it "should convert '가각갂갃간갅갆갇갈갉힢힣.com' correctly" do
-    expect(Addressable::IDNA.to_unicode(
-      "xn--o39acdefghijk5883jma.com"
-    )).to eq("가각갂갃간갅갆갇갈갉힢힣.com")
-  end
-
-  it "should convert " +
-      "'\347\242\274\346\250\231\346\272\226\350" +
-      "\220\254\345\234\213\347\242\274.com' correctly" do
-    expect(Addressable::IDNA.to_unicode(
-      "xn--9cs565brid46mda086o.com"
-    )).to eq(
-      "\347\242\274\346\250\231\346\272\226\350" +
-      "\220\254\345\234\213\347\242\274.com"
-    )
-  end
-
-  it "should convert 'リ宠퐱卄.com' correctly" do
-    expect(Addressable::IDNA.to_unicode(
-      "xn--eek174hoxfpr4k.com"
-    )).to eq("\343\203\252\345\256\240\355\220\261\345\215\204.com")
-  end
-
-  it "should convert 'ﾯ' correctly" do
-    expect(Addressable::IDNA.to_unicode(
-      "xn--4ud"
-    )).to eq("\341\206\265")
-  end
-
-  it "should handle two adjacent '.'s correctly" do
-    expect(Addressable::IDNA.to_unicode(
-      "example..host"
-    )).to eq("example..host")
-  end
-
-  it "should normalize 'string' correctly" do
-    expect(Addressable::IDNA.unicode_normalize_kc(:'string')).to eq("string")
-    expect(Addressable::IDNA.unicode_normalize_kc("string")).to eq("string")
-  end
-end
-
-describe Addressable::IDNA, "when using the pure-Ruby implementation" do
-  before do
-    Addressable.send(:remove_const, :IDNA)
-    load "addressable/idna/pure.rb"
-  end
-
-  it_should_behave_like "converting from unicode to ASCII"
-  it_should_behave_like "converting from ASCII to unicode"
-
-  begin
-    require "fiber"
-
-    it "should not blow up inside fibers" do
-      f = Fiber.new do
-        Addressable.send(:remove_const, :IDNA)
-        load "addressable/idna/pure.rb"
-      end
-      f.resume
-    end
-  rescue LoadError
-    # Fibers aren't supported in this version of Ruby, skip this test.
-    warn('Fibers unsupported.')
-  end
-end
-
-begin
-  require "idn"
-
-  describe Addressable::IDNA, "when using the native-code implementation" do
-    before do
-      Addressable.send(:remove_const, :IDNA)
-      load "addressable/idna/native.rb"
-    end
-
-    it_should_behave_like "converting from unicode to ASCII"
-    it_should_behave_like "converting from ASCII to unicode"
-  end
-rescue LoadError
-  # Cannot test the native implementation without libidn support.
-  warn('Could not load native IDN implementation.')
-end

data/spec/addressable/net_http_compat_spec.rb

@@ -1,28 +0,0 @@
-# coding: utf-8
-# Copyright (C) 2006-2015 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"
-require "net/http"
-
-describe Net::HTTP do
-  it "should be compatible with Addressable" do
-    response_body =
-      Net::HTTP.get(Addressable::URI.parse('http://www.google.com/'))
-    expect(response_body).not_to be_nil
-  end
-end

data/spec/addressable/rack_mount_compat_spec.rb

@@ -1,104 +0,0 @@
-# coding: utf-8
-# Copyright (C) 2006-2015 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"
-require "addressable/template"
-require "rack/mount"
-
-describe Rack::Mount do
-  let(:app_one) do
-    proc { |env| [200, {'Content-Type' => 'text/plain'}, 'Route 1'] }
-  end
-  let(:app_two) do
-    proc { |env| [200, {'Content-Type' => 'text/plain'}, 'Route 2'] }
-  end
-  let(:app_three) do
-    proc { |env| [200, {'Content-Type' => 'text/plain'}, 'Route 3'] }
-  end
-  let(:routes) do
-    s = Rack::Mount::RouteSet.new do |set|
-      set.add_route(app_one, {
-        :request_method => 'GET',
-        :path_info => Addressable::Template.new('/one/{id}/')
-      }, {:id => 'unidentified'}, :one)
-      set.add_route(app_two, {
-        :request_method => 'GET',
-        :path_info => Addressable::Template.new('/two/')
-      }, {:id => 'unidentified'}, :two)
-      set.add_route(app_three, {
-        :request_method => 'GET',
-        :path_info => Addressable::Template.new('/three/{id}/').to_regexp
-      }, {:id => 'unidentified'}, :three)
-    end
-    s.rehash
-    s
-  end
-
-  it "should generate from routes with Addressable::Template" do
-    path, _ = routes.generate(:path_info, :one, {:id => '123'})
-    expect(path).to eq '/one/123/'
-  end
-
-  it "should generate from routes with Addressable::Template using defaults" do
-    path, _ = routes.generate(:path_info, :one, {})
-    expect(path).to eq '/one/unidentified/'
-  end
-
-  it "should recognize routes with Addressable::Template" do
-    request = Rack::Request.new(
-      'REQUEST_METHOD' => 'GET',
-      'PATH_INFO' => '/one/123/'
-    )
-    route, _, params = routes.recognize(request)
-    expect(route).not_to be_nil
-    expect(route.app).to eq app_one
-    expect(params).to eq({id: '123'})
-  end
-
-  it "should generate from routes with Addressable::Template" do
-    path, _ = routes.generate(:path_info, :two, {:id => '654'})
-    expect(path).to eq '/two/'
-  end
-
-  it "should generate from routes with Addressable::Template using defaults" do
-    path, _ = routes.generate(:path_info, :two, {})
-    expect(path).to eq '/two/'
-  end
-
-  it "should recognize routes with Addressable::Template" do
-    request = Rack::Request.new(
-      'REQUEST_METHOD' => 'GET',
-      'PATH_INFO' => '/two/'
-    )
-    route, _, params = routes.recognize(request)
-    expect(route).not_to be_nil
-    expect(route.app).to eq app_two
-    expect(params).to eq({id: 'unidentified'})
-  end
-
-  it "should recognize routes with derived Regexp" do
-    request = Rack::Request.new(
-      'REQUEST_METHOD' => 'GET',
-      'PATH_INFO' => '/three/789/'
-    )
-    route, _, params = routes.recognize(request)
-    expect(route).not_to be_nil
-    expect(route.app).to eq app_three
-    expect(params).to eq({id: '789'})
-  end
-end