rack-canonical-host 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afbfedb96e0996ded4ce9b2d21532dcbda77bded
-  data.tar.gz: 47d412e723522d44bf530af57fa03107fef9b745
+  metadata.gz: d3d9c586fbafde39480ab18a92bdb843db3b156c
+  data.tar.gz: 3c250e72ab7a6d4a6ff449a36f4a7377166e8f82
 SHA512:
-  metadata.gz: 83e23130511d87ee922ea34ed3f87384179fde266f818c04aace1c0d19a98b389380fcc250db824a06894cb53921eb3c4fd9dc079c48058ead99d61b7d3c56ce
-  data.tar.gz: 0c8d2c995d2f341bd63d1b51e8ffc6d5d7161236263ee2eda932b95edd847ee59beb6af002c805b08e3c3a5e8d66333bb5599efe1489c3937058f030e22dca29
+  metadata.gz: c845c4018a0eee4a644ab6ab008ca5f79efbbdc63af07852804f4c27583812eb4226fff89d70e7f6615eb7d1091a538e382f36848512dce3c799a659ee29fb56
+  data.tar.gz: fcd94a1908c05108707ce73dc22ff3a746ff637adb11af607b8554d05075cceec0e2af9490a0c6f4c71debc4495a92c90b8680b8da833896290fcec4afa3a98e

data/.travis.yml

@@ -2,8 +2,22 @@ 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
+
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+
+matrix:
+  exclude:
+    - rvm: 2.0.0
+      gemfile: gemfiles/rack_2.0.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rack_2.0.gemfile

data/Appraisals

@@ -0,0 +1,11 @@
+appraise 'rack-1.5' do
+  gem 'rack', '~> 1.5'
+end
+
+appraise 'rack-1.6' do
+  gem 'rack', '~> 1.6'
+end
+
+appraise 'rack-2.0' do
+  gem 'rack', '~> 2.0'
+end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 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])
@@ -69,6 +73,7 @@
 [jschuur]: http://github.com/jschuur
 [nbibler]: http://github.com/nbibler
 [rubymaverick]: http://github.com/ericallam
+[squaresurfSearles]: https://github.com/squaresurf
 [tma]: http://github.com/tma
 [tylerhunt]: http://github.com/tylerhunt
 [zoso10]: http://github.com/zoso10

data/README.md

@@ -11,9 +11,9 @@ the 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 +31,10 @@ 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 ::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,11 @@ 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, or an array of either.
 
-``` 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 +78,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,10 +87,11 @@ 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, or an array of either.
 
-``` ruby
+```ruby
 use Rack::CanonicalHost, 'example.com', if: /.*\.example\.com/
 use Rack::CanonicalHost, 'example.ru', if: /.*\.example\.ru/
 ```
@@ -101,7 +102,7 @@ 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
+```ruby
 # Leave caching up to the browser (which could cache it indefinitely):
 use Rack::CanonicalHost, 'example.com'
 
@@ -136,10 +137,11 @@ 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)
 
 
 ## Copyright
 
-Copyright © 2009-2016 Tyler Hunt.
+Copyright © 2009-2017 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"
+
+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"
+
+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"
+
+gemspec path: "../"

data/lib/rack/canonical_host/redirect.rb

@@ -62,7 +62,10 @@ module Rack
       end
 
       def ignored?
-        ignore.include?(request_uri.host)
+        return false if ignore.empty?
+
+        ignore.include?(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.2'
+    VERSION = '0.2.3'
   end
 end

data/rack-canonical-host.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |gem|
 
   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

@@ -110,7 +110,7 @@ RSpec.describe Rack::CanonicalHost do
       include_context 'a matching request'
     end
 
-    context 'with :ignore option' do
+    context 'with :ignore string option' do
       let(:app) { build_app('example.com', :ignore => 'example.net') }
 
       include_context 'a matching request'
@@ -128,6 +128,24 @@ RSpec.describe Rack::CanonicalHost do
       end
     end
 
+    context 'with :ignore regex option' 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
+
     context 'with :if option' do
       let(:app) { build_app('example.com', :if => 'www.example.net') }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-canonical-host
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Tyler Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2017-04-20 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
@@ -87,11 +101,15 @@ files:
 - ".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
 - lib/rack-canonical-host.rb
 - lib/rack/canonical_host.rb
 - lib/rack/canonical_host/redirect.rb
@@ -120,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Rack middleware for defining a canonical host name.