rack-www 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da7f0cfe7b164575cae38adb196629c11f18f6a7
-  data.tar.gz: e7d06b79e38106649e038ef948ebe504927072de
+  metadata.gz: 151b5d3afad9d26db8298ca10ffe0bcebb96f84a
+  data.tar.gz: adb3b36ed144b19330806ee0d20404ecebe5d247
 SHA512:
-  metadata.gz: f9aee65608b0332c10002c0302bba3888878154829f3c54325879a0658d23ea5d95786ce9e3fd9a6d1012c7752cd52c375bf87b2d8414c135b3ee512ade5857a
-  data.tar.gz: e67fe65e9ec3c270b0ebddf5081762e0c3599e392ff47d42ab033c1f0365224d15afadbb693aff827e099644547835f32b3f4f5515cd7e689434d19e3ca4773f
+  metadata.gz: 75c3b09eb9cfbf3526a05c6de1e2b0db714985ff2b9fbc01f5162225d1d0d3b558e9f5b68f008927d41cd5edfe574219ad7d329c9c899fe59d0d5c7a31610420
+  data.tar.gz: 45af1d84526805b50dd59c2c9adcfcf3219d2afef283be53c6484fb7266a86536af244628bcae1e3f3afd353115efc08446162e555d0d6000df3f87900fd45ea

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.2.5
+  - 2.3.1

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+Version 2.3.0 (July 17, 2017)
+-----------------------------
+
+* Allow host-regex option
+
 Version 2.2.0 (August 11, 2016)
 -----------------------------
 

data/README.md

@@ -1,23 +1,20 @@
-## rack-www
+[![Build Status](https://travis-ci.org/stjhimy/rack-www.svg?branch=master)](https://travis-ci.org/stjhimy/rack-www)
+
+# rack-www
 
 Rack middleware to force subdomain redirects, e.g: www or www2
 
-### Installation
+## Installation
 
 ```ruby
-  #default installation
-  gem install rack-www
-
-  #when using bundler
   gem 'rack-www'
 ```
 
-### Usage
+## Usage
 
-Default usage (by default will redirect all requests to www subdomain):
+Usage (by default it will redirect all requests to www subdomain):
 
 ```ruby
-  #redirects all traffic to www subdomain
   config.middleware.use Rack::WWW
 ```
 
@@ -35,7 +32,6 @@ Customizing the :www option to true or false:
 Redirecting to a given subdomain:
 
 ```ruby
-  #redirects all traffic to the 'secure' subdomain
   config.middleware.use Rack::WWW, :subdomain => "secure"
 ```
 
@@ -53,15 +49,23 @@ You can optionally specify predicate to determine if redirect should take place:
   }
 ```
 
+Specifying host-regex to determine on what hosts to redirect:
+
+```ruby
+  config.middleware.use Rack::WWW, :host_regex => /example/i
+```
+
+This will only redirect when the host matches `example`, such as `example.com` or `example1.com`. It won't redirect on `localhost` or any other host that does not match the regex
+
 It ignores any redirects when using IP addresses.
 
-### Options
+## Options
 
 - :www => default is true, redirects all traffic to www;
 - :subdomain => redirects to any given subdomain;
 - :message => display a message while redirecting;
+- :host_regex => redirects if the given host match
 
+## License
 
-### License
-
-MIT License. Copyright 2011 Jhimy Fernandes Villar http://stjhimy.com
+MIT License. Copyright Jhimy Fernandes Villar http://stjhimy.com

data/lib/rack/www.rb

@@ -12,6 +12,7 @@ module Rack
       @redirect = !@options[:www].nil? ? @options[:www] : true
       @message = @options[:message]
       @subdomain = @options[:subdomain]
+      @host_regex = @options[:host_regex] || /.+/i
       @predicate = @options[:predicate]
     end
 
@@ -38,7 +39,8 @@ module Rack
     end
 
     def redirect?(env)
-      predicate?(env) && change_subdomain?(env) && !ip_request?(env)
+      predicate?(env) && change_subdomain?(env) && !ip_request?(env) &&
+        matches_host?(env)
     end
 
     def predicate?(env)
@@ -66,6 +68,10 @@ module Rack
       env['HTTP_HOST'].to_s.downcase =~ /^(#{@subdomain}\.)/
     end
 
+    def matches_host?(env)
+      env['HTTP_HOST'].to_s.downcase =~ @host_regex
+    end
+
     def prepare_url(env)
       scheme = env['rack.url_scheme']
       host, port, path, query_string = extract_host(env)

data/rack-www.gemspec

@@ -1,7 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'rack-www'
-  s.version     = '2.2.0'
-  s.date        = '2015-12-02'
+  s.version     = '2.3.0'
   s.homepage    = 'https://github.com/stjhimy/rack-www'
   s.email       = 'stjhimy@gmail.com'
   s.summary     = 'Force redirects to a any given subdomain.'
@@ -14,7 +13,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_runtime_dependency 'rack', '~> 1.0'
+  s.add_runtime_dependency 'rack', '< 3.0'
   s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'rack-test', '~> 0.6'
   s.add_development_dependency 'minitest', '~> 5.8'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rack-www
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Jhimy Fernandes Villar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,8 +115,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -151,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Force redirects to a any given subdomain.

data/.ruby-gemset

@@ -1 +0,0 @@
-rack-www

data/.ruby-version

@@ -1 +0,0 @@
-2.2.3