rack-canonical-host 0.2.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8a6f24e954b7680ed4e2571398bc6d2012deaf38
-  data.tar.gz: 224fd0063568a627b4f37bf0ca6dc33d579645ba
+SHA256:
+  metadata.gz: 60b35e0827776d7a2e063e985a5239bd479314bcf9c5f4e14f36d68ee995c850
+  data.tar.gz: 71463943b6c8707eb4a73db1f2f2e43f73539c5beddd03fd677112a13a26126b
 SHA512:
-  metadata.gz: 981074ba73744daeff5a3e7e3256e42ed19cfdb56759ff8e133390ab353804886e9b3fce6bc5268934daa41275b6d1d38ec1c7c8e048e0d4017ce38df3539cb3
-  data.tar.gz: 6c191906b97d467c729b055abbf9ffade959d35f32071566d0796500f431fa790f9d59c03a5f1427e374ebd3b0e0c385ac749e661314e1007a52fcc982c3ab0b
+  metadata.gz: a34e6a6850579a3d8f0cdd1244468b5cc5b392912879ba9733b0a76e4895eedae167f2b2219fdabc3abf8450bb60ced81141842e3ed1418ce84e6926dfd6adb1
+  data.tar.gz: b8256000841f0bf5798f400e642b3f93e46abec2ae3a344306b5ad84f475cefb74c38cb0499965c2dd028d7f08391c9c38de3c7a5110167b25c7e7a1d27d7a1d

data/.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: CI
+on:
+  - push
+  - pull_request
+jobs:
+  test:
+    name: Ruby ${{ matrix.ruby }} & Rack ${{ matrix.rack }}
+    runs-on: 'ubuntu-latest'
+    strategy:
+      matrix:
+        ruby:
+          - '3.0'
+          - '2.7'
+          - '2.6'
+        rack:
+          - '1.5'
+          - '1.6'
+          - '2.0'
+          - '2.1'
+          - '2.2'
+      fail-fast: false
+    env:
+      BUNDLE_GEMFILE: "gemfiles/rack_${{ matrix.rack }}.gemfile"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: bundle exec rake

data/.gitignore

@@ -9,6 +9,7 @@ InstalledFiles
 _yardoc
 coverage
 doc
+gemfiles/*.lock
 lib/bundler/man
 pkg
 rdoc

data/Appraisals

@@ -0,0 +1,19 @@
+appraise 'rack-1.5' do
+  gem 'rack', '~> 1.5.0'
+end
+
+appraise 'rack-1.6' do
+  gem 'rack', '~> 1.6.0'
+end
+
+appraise 'rack-2.0' do
+  gem 'rack', '~> 2.0.0'
+end
+
+appraise 'rack-2.1' do
+  gem 'rack', '~> 2.1.0'
+end
+
+appraise 'rack-2.2' do
+  gem 'rack', '~> 2.2.0'
+end

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 1.1.0 (2021-11-10)
+
+  * Support lambda/proc on `:if` and `:ignore` options ([Sean Huber][shuber])
+  * Drop support for Ruby versions 2.3, 2.4, and 2.5 ([Tyler Hunt][tylerhunt])
+
+## 1.0.0 (2020-04-16)
+
+  * Use equality to determine string matches on `:if` and `:ignore`
+
+## 0.2.3 (2017-04-20)
+
+  * Add regexp support for `:ignore` option ([Daniel Searles][squaresurf])
+
+## 0.2.2 (2016-05-17)
+
+  * Add `:cache_control` option ([Pete Nicholls][Aupajo])
+
 ## 0.2.1 (2016-03-28)
 
   * Relax Rack dependency to allow for Rack 2 ([Tyler Ewing][zoso10])
@@ -57,6 +74,7 @@
 
   * Initial release ([Tyler Hunt][tylerhunt])
 
+[Aupajo]: http://github.com/Aupajo
 [finack]: http://github.com/finack
 [firedev]: http://github.com/firedev
 [jcarbo]: http://github.com/jcarbo
@@ -64,6 +82,8 @@
 [jschuur]: http://github.com/jschuur
 [nbibler]: http://github.com/nbibler
 [rubymaverick]: http://github.com/ericallam
+[shuber]: http://github.com/shuber
+[squaresurf]: https://github.com/squaresurf
 [tma]: http://github.com/tma
 [tylerhunt]: http://github.com/tylerhunt
 [zoso10]: http://github.com/zoso10

data/README.md

@@ -4,16 +4,15 @@ Rack middleware that lets you define a single host name as the canonical host
 for your application. Requests for other host names will then be redirected to
 the canonical host.
 
-[![Gem Version](https://img.shields.io/gem/v/rack-canonical-host.svg)](http://rubygems.org/gems/rack-canonical-host)
-[![Build Status](https://img.shields.io/travis/tylerhunt/rack-canonical-host/master.svg)](https://travis-ci.org/tylerhunt/rack-canonical-host)
-[![Code Climate](https://img.shields.io/codeclimate/github/tylerhunt/rack-canonical-host.svg)](https://codeclimate.com/github/tylerhunt/rack-canonical-host)
-[![Dependency Status](https://gemnasium.com/tylerhunt/rack-canonical-host.svg)](https://gemnasium.com/tylerhunt/rack-canonical-host)
+[![Gem Version](https://img.shields.io/gem/v/rack-canonical-host)](http://rubygems.org/gems/rack-canonical-host)
+[![Build Status](https://github.com/tylerhunt/rack-canonical-host/actions/workflows/ci.yml/badge.svg)](https://github.com/tylerhunt/rack-canonical-host/actions/workflows/ci.yml)
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/tylerhunt/rack-canonical-host)](https://codeclimate.com/github/tylerhunt/rack-canonical-host)
 
 ## Installation
 
-Add this line to your application's `Gemfile`:
+Add this line to your application’s `Gemfile`:
 
-``` ruby
+```ruby
 gem 'rack-canonical-host'
 ```
 
@@ -31,10 +30,11 @@ Or install it yourself as:
 For most applications, you can insert the middleware into the `config.ru` file
 in the root of the application.
 
-Here's a simple example of what the `config.ru` in a Rails application might
+Here’s a simple example of what the `config.ru` in a Rails application might
 look like after adding the `Rack::CanonicalHost` middleware.
 
-``` ruby
+```ruby
+require 'rack/canonical_host'
 require ::File.expand_path('../config/environment',  __FILE__)
 
 use Rack::CanonicalHost, 'example.com'
@@ -57,7 +57,7 @@ With Heroku, you would do this like so:
 
 Then, can configure the middleware like this:
 
-``` ruby
+```ruby
 use Rack::CanonicalHost, ENV['CANONICAL_HOST'] if ENV['CANONICAL_HOST']
 ```
 
@@ -66,11 +66,12 @@ Now, the middleware will only be used if a canonical host has been defined.
 
 ### Options
 
-If you'd like the middleware to ignore certain hosts, use the `:ignore`
-option:
+If you’d like the middleware to ignore certain hosts, use the `:ignore` option,
+which accepts a string, a regular expression, a proc, or an array of those
+objects.
 
-``` ruby
-use Rack::CanonicalHost, 'example.com', ignore: ['api.example.com']
+```ruby
+use Rack::CanonicalHost, 'example.com', ignore: 'api.example.com'
 ```
 
 In this case, requests for the host `api.example.com` will not be redirected.
@@ -78,7 +79,7 @@ In this case, requests for the host `api.example.com` will not be redirected.
 Alternatively, you can pass a block whose return value will be used as the
 canonical host name.
 
-``` ruby
+```ruby
 use Rack::CanonicalHost do |env|
   case env['RACK_ENV'].to_sym
     when :staging then 'staging.example.com'
@@ -87,12 +88,31 @@ use Rack::CanonicalHost do |env|
 end
 ```
 
-If you want it to react only on specific hosts for multi-domain environment use `:if`,
-it accepts string, regexp or an array.
+If you want it to react only on specific hosts within a multi-domain
+environment, use the `:if` option, which accepts a string, a regular
+expression, a `lambda` or `proc`, or an array of those objects.
 
-``` ruby
+```ruby
 use Rack::CanonicalHost, 'example.com', if: /.*\.example\.com/
-use Rack::CanonicalHost, 'example.ru', if: /.*\.example\.ru/
+use Rack::CanonicalHost, 'example.org',
+  if: ->(uri) { uri.host == 'www.example.org' }
+```
+
+### Cache-Control
+
+To avoid browsers indefinitely caching a `301` redirect, it’s a sensible idea
+to set an expiry on each redirect, to hedge against the chance you may need to
+change that redirect in the future.
+
+```ruby
+# Leave caching up to the browser (which could cache it indefinitely):
+use Rack::CanonicalHost, 'example.com'
+
+# Cache the redirect for up to an hour:
+use Rack::CanonicalHost, 'example.com', cache_control: 'max-age=3600'
+
+# Prevent caching of redirects:
+use Rack::CanonicalHost, 'example.com', cache_control: 'no-cache'
 ```
 
 ## Contributing
@@ -109,6 +129,7 @@ use Rack::CanonicalHost, 'example.ru', if: /.*\.example\.ru/
 Thanks to the following people who have contributed patches or helpful
 suggestions:
 
+  * [Pete Nicholls](https://github.com/Aupajo)
   * [Tyler Ewing](https://github.com/zoso10)
   * [Thomas Maurer](https://github.com/tma)
   * [Jeff Carbonella](https://github.com/jcarbo)
@@ -118,10 +139,12 @@ suggestions:
   * [Nathaniel Bibler](https://github.com/nbibler)
   * [Eric Allam](https://github.com/ericallam)
   * [Fabrizio Regini](https://github.com/freegenie)
-
+  * [Daniel Searles](https://github.com/squaresurf)
+  * [Daniel Searles](https://github.com/squaresurf)
+  * [Sean Huber](https://github.com/shuber)
 
 ## Copyright
 
-Copyright © 2009-2016 Tyler Hunt.
+Copyright © 2009-2021 Tyler Hunt.
 
 Released under the terms of the MIT license. See LICENSE for details.

data/gemfiles/rack_1.5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rack", "~> 1.5.0"
+
+gemspec path: "../"

data/gemfiles/rack_1.6.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rack", "~> 1.6.0"
+
+gemspec path: "../"

data/gemfiles/rack_2.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rack", "~> 2.0.0"
+
+gemspec path: "../"

data/gemfiles/rack_2.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rack", "~> 2.1.0"
+
+gemspec path: "../"

data/gemfiles/rack_2.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rack", "~> 2.2.0"
+
+gemspec path: "../"

data/lib/rack/canonical_host/redirect.rb

@@ -20,6 +20,7 @@ module Rack
         self.host = host
         self.ignore = Array(options[:ignore])
         self.conditions = Array(options[:if])
+        self.cache_control = options[:cache_control]
       end
 
       def canonical?
@@ -37,29 +38,39 @@ module Rack
       attr_accessor :host
       attr_accessor :ignore
       attr_accessor :conditions
+      attr_accessor :cache_control
 
     private
 
-      def any_match?(patterns, string)
-        patterns.any? { |pattern| string[pattern] }
+      def any_match?(patterns, request_uri)
+        patterns.any? { |pattern|
+          case pattern
+          when Proc   then pattern.call(request_uri)
+          when Regexp then request_uri.host =~ pattern
+          when String then request_uri.host == pattern
+          else false
+          end
+        }
       end
 
       def headers
         {
-          'Location' => new_url,
+          'Cache-Control' => cache_control,
           'Content-Type' => 'text/html',
-        }
+          'Location' => new_url,
+        }.reject { |_, value| !value }
       end
 
       def enabled?
         return true if conditions.empty?
 
-        conditions.include?(request_uri.host) ||
-          any_match?(conditions, request_uri.host)
+        any_match?(conditions, request_uri)
       end
 
       def ignored?
-        ignore.include?(request_uri.host)
+        return false if ignore.empty?
+
+        any_match?(ignore, request_uri)
       end
 
       def known?

data/lib/rack/canonical_host/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class CanonicalHost
-    VERSION = '0.2.1'
+    VERSION = '1.1.0'
   end
 end

data/rack-canonical-host.gemspec

@@ -4,11 +4,12 @@ Gem::Specification.new do |gem|
   gem.name = 'rack-canonical-host'
   gem.version = Rack::CanonicalHost::VERSION
   gem.summary = 'Rack middleware for defining a canonical host name.'
-  gem.homepage = 'http://github.com/tylerhunt/rack-canonical-host'
+  gem.homepage = 'https://github.com/tylerhunt/rack-canonical-host'
   gem.author = 'Tyler Hunt'
 
   gem.add_dependency 'addressable', '> 0', '< 3'
   gem.add_dependency 'rack', ['>= 1.0.0', '< 3']
+  gem.add_development_dependency 'appraisal', '~> 2.2'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3.0'
 

data/spec/rack/canonical_host_spec.rb

@@ -1,8 +1,13 @@
-require 'spec_helper'
-
-describe Rack::CanonicalHost do
-  let(:response) { [200, { 'Content-Type' => 'text/plain' }, ['OK']] }
-  let(:inner_app) { lambda { |env| response } }
+RSpec.describe Rack::CanonicalHost do
+  let(:app_response) { [200, { 'Content-Type' => 'text/plain' }, %w(OK)] }
+  let(:inner_app) { ->(env) { response } }
+
+  before do
+    allow(inner_app)
+      .to receive(:call)
+      .with(env)
+      .and_return(app_response)
+  end
 
   def build_app(host=nil, options={}, inner_app=inner_app(), &block)
     Rack::Builder.new do
@@ -19,8 +24,8 @@ describe Rack::CanonicalHost do
       it { should_not be_redirect }
 
       it 'calls the inner app' do
-        expect(inner_app).to receive(:call).with(env).and_return(response)
-        subject
+        expect(inner_app).to receive(:call).with(env)
+        call_app
       end
     end
   end
@@ -29,12 +34,14 @@ describe Rack::CanonicalHost do
     context 'with a request to a non-matching host' do
       let(:url) { 'http://www.example.com/full/path' }
 
-      it { should be_redirect.via(301).to('http://example.com/full/path') }
+      it { should redirect_to('http://example.com/full/path') }
 
       it 'does not call the inner app' do
         expect(inner_app).to_not receive(:call)
-        subject
+        call_app
       end
+
+      it { expect(response).to_not have_header('Cache-Control') }
     end
   end
 
@@ -44,119 +51,225 @@ describe Rack::CanonicalHost do
   end
 
   context '#call' do
-    let(:env) { Rack::MockRequest.env_for(url) }
+    let(:headers) { {} }
 
-    subject { app.call(env) }
+    let(:app) { build_app('example.com') }
+    let(:env) { Rack::MockRequest.env_for(url, headers) }
 
-    context 'without a host' do
-      let(:app) { build_app(nil) }
+    def call_app
+      app.call(env)
+    end
 
-      include_context 'a matching request'
+    subject(:response) { call_app }
+
+    include_context 'a matching request'
+    include_context 'a non-matching request'
+
+    context 'when the request has a pipe in the URL' do
+      let(:url) { 'https://example.com/full/path?value=withPIPE' }
+
+      before { env['QUERY_STRING'].sub!('PIPE', '|') }
+
+      it { expect { call_app }.to_not raise_error }
     end
 
-    context 'with an X-Forwarded-Host' do
+    context 'when the request has JavaScript in the URL' do
+      let(:url) { 'http://www.example.com/full/path' }
+
+      let(:headers) {
+        { 'QUERY_STRING' => '"><script>alert(73541);</script>' }
+      }
+
       let(:app) { build_app('example.com') }
-      let(:url) { 'http://proxied.url/full/path' }
+
+      it 'escapes the JavaScript' do
+        expect(response)
+          .to redirect_to('http://example.com/full/path?%22%3E%3Cscript%3Ealert(73541)%3B%3C/script%3E')
+      end
+    end
+
+    context 'with an X-Forwarded-Host' do
+      let(:url) { 'http://proxy.test/full/path' }
 
       context 'which matches the canonical host' do
-        let(:env) { Rack::MockRequest.env_for(url, 'HTTP_X_FORWARDED_HOST' => 'example.com:80') }
+        let(:headers) { { 'HTTP_X_FORWARDED_HOST' => 'example.com:80' } }
 
         include_context 'a matching request'
       end
 
       context 'which does not match the canonical host' do
-        let(:env) { Rack::MockRequest.env_for(url, 'HTTP_X_FORWARDED_HOST' => 'www.example.com:80') }
+        let(:headers) { { 'HTTP_X_FORWARDED_HOST' => 'www.example.com:80' } }
 
         include_context 'a non-matching request'
       end
     end
 
-    context 'without any options' do
-      let(:app) { build_app('example.com') }
+    context 'without a host' do
+      let(:app) { build_app(nil) }
+
+      include_context 'a matching request'
+    end
+
+    context 'with :ignore option' do
+      context 'with lambda/proc' do
+        let(:app) {
+          build_app(
+            'example.com',
+            ignore: ->(uri) { uri.host == 'example.net' }
+          )
+        }
 
-      include_context 'matching and non-matching requests'
+        include_context 'a matching request'
+        include_context 'a non-matching request'
 
-      context 'when the request has a pipe in the URL' do
-        let(:url) { 'https://example.com/full/path?value=withPIPE' }
+        context 'with a request to an ignored host' do
+          let(:url) { 'http://example.net/full/path' }
 
-        before { env['QUERY_STRING'].sub!('PIPE', '|') }
+          it { should_not be_redirect }
 
-        it { expect { subject }.to_not raise_error }
+          it 'calls the inner app' do
+            expect(inner_app).to receive(:call).with(env)
+            call_app
+          end
+        end
       end
-    end
 
-    context 'with :ignore option' do
-      let(:app) { build_app('example.com', :ignore => 'example.net') }
+      context 'with string' do
+        let(:app) { build_app('example.com', ignore: 'example.net') }
 
-      include_context 'matching and non-matching requests'
+        include_context 'a matching request'
+        include_context 'a non-matching request'
 
-      context 'with a request to an ignored host' do
-        let(:url) { 'http://example.net/full/path' }
+        context 'with a request to an ignored host' do
+          let(:url) { 'http://example.net/full/path' }
 
-        it { should_not be_redirect }
+          it { should_not be_redirect }
 
-        it 'calls the inner app' do
-          expect(inner_app).to receive(:call).with(env).and_return(response)
-          subject
+          it 'calls the inner app' do
+            expect(inner_app).to receive(:call).with(env)
+            call_app
+          end
+        end
+      end
+
+      context 'with regular expression' do
+        let(:app) { build_app('example.com', ignore: /ex.*\.net/) }
+
+        include_context 'a matching request'
+        include_context 'a non-matching request'
+
+        context 'with a request to an ignored host' do
+          let(:url) { 'http://example.net/full/path' }
+
+          it { should_not be_redirect }
+
+          it 'calls the inner app' do
+            expect(inner_app).to receive(:call).with(env)
+            call_app
+          end
         end
       end
     end
 
     context 'with :if option' do
+      context 'with a lambda/proc' do
+        let(:app) {
+          build_app(
+            'www.example.com',
+            if: ->(uri) { uri.host == 'example.com' }
+          )
+        }
+
+        context 'with a request to a matching host' do
+          let(:url) { 'http://example.com/full/path' }
+
+          it { should redirect_to('http://www.example.com/full/path') }
+        end
 
-      let(:app) { build_app('example.com', :if => 'www.example.net') }
+        context 'with a request to a non-matching host' do
+          let(:url) { 'http://api.example.com/full/path' }
 
-      context 'with a request to a :if matching host' do
-        let(:url) { 'http://www.example.net/full/path' }
-        it { should be_redirect.to('http://example.com/full/path') }
+          it { should_not be_redirect }
+        end
       end
 
-      context 'with a request to a :if non-matching host' do
-        let(:url) { 'http://www.sexample.net/full/path' }
-        it { should_not be_redirect }
+      context 'with string' do
+        let(:app) { build_app('www.example.com', if: 'example.com') }
+
+        context 'with a request to a matching host' do
+          let(:url) { 'http://example.com/full/path' }
+
+          it { should redirect_to('http://www.example.com/full/path') }
+        end
+
+        context 'with a request to a non-matching host' do
+          let(:url) { 'http://api.example.com/full/path' }
+
+          it { should_not be_redirect }
+        end
       end
 
+      context 'with a regular expression' do
+        let(:app) { build_app('example.com', if: '.*\.example\.com') }
+
+        context 'with a request to a matching host' do
+          let(:url) { 'http://www.example.com/full/path' }
+
+          it { should_not redirect_to('http://example.com/full/path') }
+        end
+
+        context 'with a request to a non-matching host' do
+          let(:url) { 'http://www.example.net/full/path' }
+
+          it { should_not be_redirect }
+        end
+      end
     end
 
-    context 'with :if and regexp as an option' do
+    context 'with a :cache_control option' do
+      let(:url) { 'http://subdomain.example.net/full/path' }
+
+      context 'with a max-age value' do
+        let(:app) {
+          build_app('example.com', cache_control: 'max-age=3600')
+        }
+
+        it {
+          expect(response).to have_header('Cache-Control').with('max-age=3600')
+        }
+      end
 
-      let(:app) { build_app('example.com', :if => /.*\.example\.net/) }
+      context 'with a no-cache value' do
+        let(:app) { build_app('example.com', cache_control: 'no-cache') }
 
-      context 'with a request to a :if matching host' do
-        let(:url) { 'http://subdomain.example.net/full/path' }
-        it { should be_redirect.to('http://example.com/full/path') }
+        it { expect(subject).to have_header('Cache-Control').with('no-cache') }
       end
 
-      context 'with a request to a :if non-matching host' do
-        let(:url) { 'http://example.net/full/path' }
-        it { should_not be_redirect }
+      context 'with a false value' do
+        let(:app) { build_app('example.com', cache_control: false) }
+
+        it { expect(subject).to_not have_header('Cache-Control') }
       end
 
+      context 'with a nil value' do
+        let(:app) { build_app('example.com', cache_control: false) }
+
+        it { expect(subject).to_not have_header('Cache-Control') }
+      end
     end
 
     context 'with a block' do
       let(:app) { build_app { 'example.com' } }
 
-      include_context 'matching and non-matching requests'
+      include_context 'a matching request'
+      include_context 'a non-matching request'
 
       context 'that returns nil' do
         let(:app) { build_app('example.com') { nil } }
 
-        include_context 'matching and non-matching requests'
-      end
-    end
-
-    context 'with URL containing JavaScript XSS' do
-      let(:url) { 'http://subdomain.example.net/full/path' }
-      let(:env) do
-        Rack::MockRequest.env_for(url).tap do |env|
-          env['QUERY_STRING'] = '"><script>alert(73541);</script>'
-        end
+        include_context 'a matching request'
+        include_context 'a non-matching request'
       end
-
-      let(:app) { build_app('example.com') }
-
-      it { should be_redirect.to('http://example.com/full/path?%22%3E%3Cscript%3Ealert(73541)%3B%3C/script%3E') }
     end
   end
 end

data/spec/support/matchers/have_header.rb

@@ -0,0 +1,56 @@
+module HaveHeader
+  class Matcher
+    def initialize(expected_header)
+      self.expected_header = expected_header
+    end
+
+    def matches?(response)
+      _, self.actual_headers, _ = response
+
+      if expected_value
+        actual_header == expected_value
+      else
+        actual_header
+      end
+    end
+
+    def with(expected_value)
+      self.expected_value = expected_value
+      self
+    end
+
+    def description
+      sentence = "have header #{expected_header.inspect}"
+      sentence << " with #{expected_value.inspect}" if expected_value
+      sentence
+    end
+
+    def failure_message
+      "Expected response to #{description}"
+    end
+
+    def failure_message_when_negated
+      "Did not expect response to #{description}"
+    end
+
+  protected
+
+    attr_accessor :actual_headers
+    attr_accessor :expected_header
+    attr_accessor :expected_value
+
+  private
+
+    def actual_header
+      actual_headers[expected_header]
+    end
+  end
+
+  def have_header(name)
+    Matcher.new(name)
+  end
+end
+
+RSpec.configure do |config|
+  config.include HaveHeader
+end

data/spec/support/matchers/{be_redirect.rb → redirect_to.rb}

@@ -1,36 +1,30 @@
-module BeRedirect
+module RedirectTo
   class Matcher
-    attr :expected_status_code
-    attr :expected_location
-    attr :actual_status_code
-    attr :actual_location
+    def initialize(expected_location)
+      self.expected_location = expected_location
+      self.expected_status_code = STATUS
+    end
 
     def matches?(response)
-      @actual_status_code, headers, _ = response
-      @actual_location = headers['Location']
+      self.actual_status_code, self.actual_headers, _ = response
 
       status_code_matches? && location_matches?
     end
 
     def via(expected_status_code)
-      @expected_status_code = expected_status_code
-      self
-    end
-
-    def to(expected_location)
-      @expected_location = expected_location
+      self.expected_status_code = expected_status_code
       self
     end
 
     def description
       if expected_status_code && expected_location
-        "redirect via #{expected_status_code} to #{expected_location.inspect}"
+        "redirect to #{expected_location.inspect} via #{expected_status_code}"
       elsif expected_status_code
         "redirect via #{expected_status_code}"
       elsif expected_location
         "redirect to #{expected_location.inspect}"
       else
-        "be a redirect"
+        'be a redirect'
       end
     end
 
@@ -42,6 +36,22 @@ module BeRedirect
       "Did not expect response to #{description}"
     end
 
+  protected
+
+    attr_accessor :actual_headers
+    attr_accessor :actual_status_code
+    attr_accessor :expected_location
+    attr_accessor :expected_status_code
+
+  private
+
+    LOCATION = 'Location'
+    STATUS = 301
+
+    def actual_location
+      actual_headers[LOCATION]
+    end
+
     def status_code_matches?
       if expected_status_code
         actual_status_code == expected_status_code
@@ -49,19 +59,23 @@ module BeRedirect
         actual_status_code.to_s =~ /^30[1237]$/
       end
     end
-    private :status_code_matches?
 
     def location_matches?
-      !expected_location || (expected_location == actual_location)
+      if expected_location
+        expected_location == actual_location
+      end
     end
-    private :location_matches?
+  end
+
+  def redirect_to(location)
+    Matcher.new(location)
   end
 
   def be_redirect
-    Matcher.new
+    Matcher.new(nil).via(nil)
   end
 end
 
 RSpec.configure do |config|
-  config.include(BeRedirect)
+  config.include RedirectTo
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-canonical-host
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Tyler Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -50,6 +50,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +98,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/rack_1.5.gemfile
+- gemfiles/rack_1.6.gemfile
+- gemfiles/rack_2.0.gemfile
+- gemfiles/rack_2.1.gemfile
+- gemfiles/rack_2.2.gemfile
 - lib/rack-canonical-host.rb
 - lib/rack/canonical_host.rb
 - lib/rack/canonical_host/redirect.rb
@@ -99,8 +119,9 @@ files:
 - rack-canonical-host.gemspec
 - spec/rack/canonical_host_spec.rb
 - spec/spec_helper.rb
-- spec/support/matchers/be_redirect.rb
-homepage: http://github.com/tylerhunt/rack-canonical-host
+- spec/support/matchers/have_header.rb
+- spec/support/matchers/redirect_to.rb
+homepage: https://github.com/tylerhunt/rack-canonical-host
 licenses: []
 metadata: {}
 post_install_message: 
@@ -118,12 +139,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rack middleware for defining a canonical host name.
 test_files:
 - spec/rack/canonical_host_spec.rb
 - spec/spec_helper.rb
-- spec/support/matchers/be_redirect.rb
+- spec/support/matchers/have_header.rb
+- spec/support/matchers/redirect_to.rb

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-cache: bundler
-script: bundle exec rspec
-sudo: false
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1