rack-canonical-host 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36437f7276540d9097e0dfaccebde73e146de68039a3477013f94d2c96f5a2d9
-  data.tar.gz: bb2183b48c3379140f7119eb410c9b9b6a64ec2dd8ed9a7e0a5a86a01ef63e76
+  metadata.gz: 60b35e0827776d7a2e063e985a5239bd479314bcf9c5f4e14f36d68ee995c850
+  data.tar.gz: 71463943b6c8707eb4a73db1f2f2e43f73539c5beddd03fd677112a13a26126b
 SHA512:
-  metadata.gz: 797fd843b45adb8ce8abff067c04d52792fbafb2a4752120b9b3f56502dc6c5e4c51356f810831a3199a13f00df33935139ef38a5186ea6a866f0851fe6d822b
-  data.tar.gz: d8733e910110b3dc6365ea862bbdb3e87984c34de9581adc27ce7ee3dcfc36661f1415b080845b24e74fa1eef853c1a75096b74bec65834338fb86e3760db93a
+  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/CHANGELOG.md

@@ -1,5 +1,10 @@
 # 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`
@@ -77,6 +82,7 @@
 [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

data/README.md

@@ -5,7 +5,7 @@ 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)](http://rubygems.org/gems/rack-canonical-host)
-[![Build Status](https://img.shields.io/travis/tylerhunt/rack-canonical-host)](https://travis-ci.org/tylerhunt/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
@@ -66,8 +66,9 @@ 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, which accepts a string, a regular expression, or an array of either.
+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'
@@ -89,11 +90,12 @@ end
 
 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, or an array of either.
+expression, a `lambda` or `proc`, or an array of those objects.
 
 ```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
@@ -138,10 +140,11 @@ suggestions:
   * [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-2017 Tyler Hunt.
+Copyright © 2009-2021 Tyler Hunt.
 
 Released under the terms of the MIT license. See LICENSE for details.

data/lib/rack/canonical_host/redirect.rb

@@ -42,11 +42,12 @@ module Rack
 
     private
 
-      def any_match?(patterns, host)
+      def any_match?(patterns, request_uri)
         patterns.any? { |pattern|
           case pattern
-          when Regexp then host =~ pattern
-          when String then host == 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
         }
@@ -63,13 +64,13 @@ module Rack
       def enabled?
         return true if conditions.empty?
 
-        any_match?(conditions, request_uri.host)
+        any_match?(conditions, request_uri)
       end
 
       def ignored?
         return false if ignore.empty?
 
-        any_match?(ignore, request_uri.host)
+        any_match?(ignore, request_uri)
       end
 
       def known?

data/lib/rack/canonical_host/version.rb

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

data/rack-canonical-host.gemspec

@@ -4,7 +4,7 @@ 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'

data/spec/rack/canonical_host_spec.rb

@@ -1,6 +1,6 @@
 RSpec.describe Rack::CanonicalHost do
   let(:app_response) { [200, { 'Content-Type' => 'text/plain' }, %w(OK)] }
-  let(:inner_app) { lambda { |env| response } }
+  let(:inner_app) { ->(env) { response } }
 
   before do
     allow(inner_app)
@@ -111,8 +111,31 @@ RSpec.describe Rack::CanonicalHost do
     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 '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
+
       context 'with string' do
-        let(:app) { build_app('example.com', :ignore => 'example.net') }
+        let(:app) { build_app('example.com', ignore: 'example.net') }
 
         include_context 'a matching request'
         include_context 'a non-matching request'
@@ -130,7 +153,7 @@ RSpec.describe Rack::CanonicalHost do
       end
 
       context 'with regular expression' do
-        let(:app) { build_app('example.com', :ignore => /ex.*\.net/) }
+        let(:app) { build_app('example.com', ignore: /ex.*\.net/) }
 
         include_context 'a matching request'
         include_context 'a non-matching request'
@@ -149,8 +172,29 @@ RSpec.describe Rack::CanonicalHost do
     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
+
+        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 string' do
-        let(:app) { build_app('www.example.com', :if => 'example.com') }
+        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' }
@@ -166,7 +210,7 @@ RSpec.describe Rack::CanonicalHost do
       end
 
       context 'with a regular expression' do
-        let(:app) { build_app('example.com', :if => '.*\.example\.com') }
+        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' }
@@ -187,7 +231,7 @@ RSpec.describe Rack::CanonicalHost do
 
       context 'with a max-age value' do
         let(:app) {
-          build_app('example.com', :cache_control => 'max-age=3600')
+          build_app('example.com', cache_control: 'max-age=3600')
         }
 
         it {
@@ -196,19 +240,19 @@ RSpec.describe Rack::CanonicalHost do
       end
 
       context 'with a no-cache value' do
-        let(:app) { build_app('example.com', :cache_control => 'no-cache') }
+        let(:app) { build_app('example.com', cache_control: 'no-cache') }
 
         it { expect(subject).to have_header('Cache-Control').with('no-cache') }
       end
 
       context 'with a false value' do
-        let(:app) { build_app('example.com', :cache_control => false) }
+        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) }
+        let(:app) { build_app('example.com', cache_control: false) }
 
         it { expect(subject).to_not have_header('Cache-Control') }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-canonical-host
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tyler Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -98,9 +98,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -108,15 +108,10 @@ files:
 - README.md
 - Rakefile
 - gemfiles/rack_1.5.gemfile
-- gemfiles/rack_1.5.gemfile.lock
 - gemfiles/rack_1.6.gemfile
-- gemfiles/rack_1.6.gemfile.lock
 - gemfiles/rack_2.0.gemfile
-- gemfiles/rack_2.0.gemfile.lock
 - gemfiles/rack_2.1.gemfile
-- gemfiles/rack_2.1.gemfile.lock
 - gemfiles/rack_2.2.gemfile
-- gemfiles/rack_2.2.gemfile.lock
 - lib/rack-canonical-host.rb
 - lib/rack/canonical_host.rb
 - lib/rack/canonical_host/redirect.rb
@@ -126,7 +121,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/matchers/have_header.rb
 - spec/support/matchers/redirect_to.rb
-homepage: http://github.com/tylerhunt/rack-canonical-host
+homepage: https://github.com/tylerhunt/rack-canonical-host
 licenses: []
 metadata: {}
 post_install_message: 

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-cache: bundler
-script: bundle exec rspec
-sudo: false
-
-gemfile:
-  - 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
-
-rvm:
-  - 2.3.8
-  - 2.4.9
-  - 2.5.8
-  - 2.6.5
-  - 2.7.0
-
-before_install:
-  - gem install bundler -v 1.17.2

data/gemfiles/rack_1.5.gemfile.lock

@@ -1,47 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    rack-canonical-host (1.0.0)
-      addressable (> 0, < 3)
-      rack (>= 1.0.0, < 3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    diff-lcs (1.3)
-    public_suffix (4.0.4)
-    rack (1.5.5)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    thor (1.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 2.2)
-  rack (~> 1.5.0)
-  rack-canonical-host!
-  rake
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.17.2

data/gemfiles/rack_1.6.gemfile.lock

@@ -1,47 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    rack-canonical-host (1.0.0)
-      addressable (> 0, < 3)
-      rack (>= 1.0.0, < 3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    diff-lcs (1.3)
-    public_suffix (4.0.4)
-    rack (1.6.13)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    thor (1.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 2.2)
-  rack (~> 1.6.0)
-  rack-canonical-host!
-  rake
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.17.2

data/gemfiles/rack_2.0.gemfile.lock

@@ -1,47 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    rack-canonical-host (1.0.0)
-      addressable (> 0, < 3)
-      rack (>= 1.0.0, < 3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    diff-lcs (1.3)
-    public_suffix (4.0.4)
-    rack (2.0.9)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    thor (1.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 2.2)
-  rack (~> 2.0.0)
-  rack-canonical-host!
-  rake
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.17.2

data/gemfiles/rack_2.1.gemfile.lock

@@ -1,47 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    rack-canonical-host (1.0.0)
-      addressable (> 0, < 3)
-      rack (>= 1.0.0, < 3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    diff-lcs (1.3)
-    public_suffix (4.0.4)
-    rack (2.1.2)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    thor (1.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 2.2)
-  rack (~> 2.1.0)
-  rack-canonical-host!
-  rake
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.17.2

data/gemfiles/rack_2.2.gemfile.lock

@@ -1,47 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    rack-canonical-host (1.0.0)
-      addressable (> 0, < 3)
-      rack (>= 1.0.0, < 3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    diff-lcs (1.3)
-    public_suffix (4.0.4)
-    rack (2.2.2)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    thor (1.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 2.2)
-  rack (~> 2.2.0)
-  rack-canonical-host!
-  rake
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.17.2