rack-canonical-host 0.2.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d3d9c586fbafde39480ab18a92bdb843db3b156c
-  data.tar.gz: 3c250e72ab7a6d4a6ff449a36f4a7377166e8f82
+SHA256:
+  metadata.gz: 36437f7276540d9097e0dfaccebde73e146de68039a3477013f94d2c96f5a2d9
+  data.tar.gz: bb2183b48c3379140f7119eb410c9b9b6a64ec2dd8ed9a7e0a5a86a01ef63e76
 SHA512:
-  metadata.gz: c845c4018a0eee4a644ab6ab008ca5f79efbbdc63af07852804f4c27583812eb4226fff89d70e7f6615eb7d1091a538e382f36848512dce3c799a659ee29fb56
-  data.tar.gz: fcd94a1908c05108707ce73dc22ff3a746ff637adb11af607b8554d05075cceec0e2af9490a0c6f4c71debc4495a92c90b8680b8da833896290fcec4afa3a98e
+  metadata.gz: 797fd843b45adb8ce8abff067c04d52792fbafb2a4752120b9b3f56502dc6c5e4c51356f810831a3199a13f00df33935139ef38a5186ea6a866f0851fe6d822b
+  data.tar.gz: d8733e910110b3dc6365ea862bbdb3e87984c34de9581adc27ce7ee3dcfc36661f1415b080845b24e74fa1eef853c1a75096b74bec65834338fb86e3760db93a

data/.travis.yml

@@ -7,17 +7,15 @@ 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.0.0
-  - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.3.8
+  - 2.4.9
+  - 2.5.8
+  - 2.6.5
+  - 2.7.0
 
-matrix:
-  exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/rack_2.0.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rack_2.0.gemfile
+before_install:
+  - gem install bundler -v 1.17.2

data/Appraisals

@@ -1,11 +1,19 @@
 appraise 'rack-1.5' do
-  gem 'rack', '~> 1.5'
+  gem 'rack', '~> 1.5.0'
 end
 
 appraise 'rack-1.6' do
-  gem 'rack', '~> 1.6'
+  gem 'rack', '~> 1.6.0'
 end
 
 appraise 'rack-2.0' do
-  gem 'rack', '~> 2.0'
+  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,9 @@
 # Changelog
 
+## 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])
@@ -73,7 +77,7 @@
 [jschuur]: http://github.com/jschuur
 [nbibler]: http://github.com/nbibler
 [rubymaverick]: http://github.com/ericallam
-[squaresurfSearles]: https://github.com/squaresurf
+[squaresurf]: https://github.com/squaresurf
 [tma]: http://github.com/tma
 [tylerhunt]: http://github.com/tylerhunt
 [zoso10]: http://github.com/zoso10

data/README.md

@@ -4,10 +4,9 @@ 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://img.shields.io/travis/tylerhunt/rack-canonical-host)](https://travis-ci.org/tylerhunt/rack-canonical-host)
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/tylerhunt/rack-canonical-host)](https://codeclimate.com/github/tylerhunt/rack-canonical-host)
 
 ## Installation
 
@@ -35,6 +34,7 @@ Here’s a simple example of what the `config.ru` in a Rails application might
 look like after adding the `Rack::CanonicalHost` middleware.
 
 ```ruby
+require 'rack/canonical_host'
 require ::File.expand_path('../config/environment',  __FILE__)
 
 use Rack::CanonicalHost, 'example.com'

data/gemfiles/rack_1.5.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rack", "~> 1.5"
+gem "rack", "~> 1.5.0"
 
 gemspec path: "../"

data/gemfiles/rack_1.5.gemfile.lock

@@ -0,0 +1,47 @@
+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

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rack", "~> 1.6"
+gem "rack", "~> 1.6.0"
 
 gemspec path: "../"

data/gemfiles/rack_1.6.gemfile.lock

@@ -0,0 +1,47 @@
+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

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rack", "~> 2.0"
+gem "rack", "~> 2.0.0"
 
 gemspec path: "../"

data/gemfiles/rack_2.0.gemfile.lock

@@ -0,0 +1,47 @@
+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

@@ -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.1.gemfile.lock

@@ -0,0 +1,47 @@
+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

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

data/gemfiles/rack_2.2.gemfile.lock

@@ -0,0 +1,47 @@
+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

data/lib/rack/canonical_host/redirect.rb

@@ -42,8 +42,14 @@ module Rack
 
     private
 
-      def any_match?(patterns, string)
-        patterns.any? { |pattern| string[pattern] }
+      def any_match?(patterns, host)
+        patterns.any? { |pattern|
+          case pattern
+          when Regexp then host =~ pattern
+          when String then host == pattern
+          else false
+          end
+        }
       end
 
       def headers
@@ -57,15 +63,13 @@ module Rack
       def enabled?
         return true if conditions.empty?
 
-        conditions.include?(request_uri.host) ||
-          any_match?(conditions, request_uri.host)
+        any_match?(conditions, request_uri.host)
       end
 
       def ignored?
         return false if ignore.empty?
 
-        ignore.include?(request_uri.host) ||
-          any_match?(ignore, request_uri.host)
+        any_match?(ignore, request_uri.host)
       end
 
       def known?

data/lib/rack/canonical_host/version.rb

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

data/spec/rack/canonical_host_spec.rb

@@ -110,71 +110,75 @@ RSpec.describe Rack::CanonicalHost do
       include_context 'a matching request'
     end
 
-    context 'with :ignore string option' do
-      let(:app) { build_app('example.com', :ignore => 'example.net') }
+    context 'with :ignore option' do
+      context 'with string' do
+        let(:app) { build_app('example.com', :ignore => 'example.net') }
 
-      include_context 'a matching request'
-      include_context 'a non-matching request'
+        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)
-          call_app
+          it 'calls the inner app' do
+            expect(inner_app).to receive(:call).with(env)
+            call_app
+          end
         end
       end
-    end
 
-    context 'with :ignore regex option' do
-      let(:app) { build_app('example.com', :ignore => /ex.*\.net/) }
+      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'
+        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)
-          call_app
+          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
-      let(:app) { build_app('example.com', :if => 'www.example.net') }
+      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://www.example.net/full/path' }
+        context 'with a request to a matching host' do
+          let(:url) { 'http://example.com/full/path' }
 
-        it { should redirect_to('http://example.com/full/path') }
-      end
+          it { should redirect_to('http://www.example.com/full/path') }
+        end
 
-      context 'with a request to a non-matching host' do
-        let(:url) { 'http://www.example.com/full/path' }
+        context 'with a request to a non-matching host' do
+          let(:url) { 'http://api.example.com/full/path' }
 
-        it { should_not be_redirect }
+          it { should_not be_redirect }
+        end
       end
-    end
 
-    context 'with a regular expression :if option' do
-      let(:app) { build_app('example.com', :if => /.*\.example\.net/) }
+      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://subdomain.example.net/full/path' }
+        context 'with a request to a matching host' do
+          let(:url) { 'http://www.example.com/full/path' }
 
-        it { should redirect_to('http://example.com/full/path') }
-      end
+          it { should_not redirect_to('http://example.com/full/path') }
+        end
 
-      context 'with a request to a non-matching host' do
-        let(:url) { 'http://example.net/full/path' }
+        context 'with a request to a non-matching host' do
+          let(:url) { 'http://www.example.net/full/path' }
 
-        it { should_not be_redirect }
+          it { should_not be_redirect }
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-canonical-host
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Tyler Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -108,8 +108,15 @@ 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
@@ -137,8 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rack middleware for defining a canonical host name.