rack-canonical-host 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7351e7d1c54f3951648e9a1b9f0468d5c631edc0
+  data.tar.gz: dedd6608456b3b02233428832026f30ab72560d5
+SHA512:
+  metadata.gz: 79f6fb8fab7040d6a002e5c27e521e5c2f3f35760865f3dc80c29da399a22df2bf945b768dd701b7d4709146cf0a7e6b2a9954d7e8e0a3c6063c38e5be84b052
+  data.tar.gz: 3ea4f3d955331bf2a96471564c7ba1cf82b57805ed127aac803a646b50f23d7b5ca8b9b5883a1cde7b1358962e074ca457bb152e80d048692c1cadbd80a57adf

data/CHANGELOG.md

@@ -1,40 +1,50 @@
 # Changelog
 
-## Rack::CanonicalHost 0.0.8
+## 0.0.9 (2014-02-14)
 
-  * Switch to `Addressable::URI` for URI parsing
+  * Add `:if` option ([Nick Ostrovsky][firedev])
+  * Improve documentation ([Joost Schuur][jschuur])
 
-## Rack::CanonicalHost 0.0.7
+## 0.0.8 (2012-06-22)
 
-  * Fix an issue handling URLs containing `|` characters
+  * Switch to `Addressable::URI` for URI parsing ([Tyler Hunt][tylerhunt])
 
-## Rack::CanonicalHost 0.0.6
+## 0.0.7 (2012-06-21)
 
-  * Prevent redirect if the canonical host name is `nil`
+  * Fix handling of URLs containing `|` characters ([Tyler Hunt][tylerhunt])
 
-## Rack::CanonicalHost 0.0.5
+## 0.0.6 (2012-06-21)
 
-  * Rename `ignored_hosts` option to `ignore`
+  * Prevent redirect if the canonical host is `nil` ([Tyler Hunt][tylerhunt])
 
-## Rack::CanonicalHost 0.0.4
+## 0.0.5 (2012-06-21)
+
+  * Rename `ignored_hosts` option to `ignore` ([Tyler Hunt][tylerhunt])
+
+## 0.0.4 (2012-06-20)
 
   * Add option to ignored certain hosts ([Eric Allam][rubymaverick])
   * Add tests ([Nathaniel Bibler][nbibler])
   * Add HTML response body on redirect
   * Set `Content-Type` header on redirect ([Jon Wood][jellybob])
+  * Improve documentation ([Peter Baker][finack])
 
-## Rack::CanonicalHost 0.0.3
+## 0.0.3 (2011-02-09)
 
-  * Allow `env` to be passed to the optional block
+  * Allow `env` to be passed to the optional block ([Tyler Hunt][tylerhunt])
 
-## Rack::CanonicalHost 0.0.2
+## 0.0.2 (2010-11-18)
 
-  * Move `CanonicalHost` into `Rack` namespace
+  * Move `CanonicalHost` into `Rack` namespace ([Tyler Hunt][tylerhunt])
 
-## Rack::CanonicalHost 0.0.1
+## 0.0.1 (2009-11-04)
 
-  * Initial release
+  * Initial release ([Tyler Hunt][tylerhunt])
 
+[finack]: http://github.com/finack
+[firedev]: http://github.com/firedev
 [jellybob]: http://github.com/jellybob
+[jschuur]: http://github.com/jschuur
 [nbibler]: http://github.com/nbibler
-[rubymaverick]: http://github.com/rubymaverick
+[rubymaverick]: http://github.com/ericallam
+[tylerhunt]: http://github.com/tylerhunt

data/README.md

@@ -80,14 +80,22 @@ Alternatively, you can pass a block whose return value will be used as the
 canonical host name.
 
 ``` ruby
-use Rack::CanonicalHost do
-  case ENV['RACK_ENV'].to_sym
-    when :staging then 'example.com'
-    when :production then 'staging.example.com'
+use Rack::CanonicalHost do |env|
+  case env['RACK_ENV'].to_sym
+    when :staging then 'staging.example.com'
+    when :production then 'example.com'
   end
 end
 ```
 
+If you want it to react only on specific hosts for multi-domain environment use `:if`,
+it accepts string, regexp or an array.
+
+``` ruby
+use Rack::CanonicalHost, 'example.com', if: /.*\.example\.com/
+use Rack::CanonicalHost, 'example.ru', if: /.*\.example\.ru/
+```
+
 
 ## Contributing
 
@@ -103,10 +111,11 @@ end
 Thanks to the following people who have contributed patches or helpful
 suggestions:
 
-  * [Peter Baker](https://github.com/finack)
+  * [Joost Schuur](https://github.com/jellybob)
   * [Jon Wood](https://github.com/jellybob)
+  * [Peter Baker](https://github.com/finack)
   * [Nathaniel Bibler](https://github.com/nbibler)
-  * [Eric Allam](https://github.com/rubymaverick)
+  * [Eric Allam](https://github.com/ericallam)
   * [Fabrizio Regini](https://github.com/freegenie)
 
 

data/Rakefile

@@ -1,3 +1,8 @@
 #!/usr/bin/env rake
 
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/lib/rack/canonical_host.rb

@@ -1,5 +1,6 @@
 require 'rack'
 require 'rack/canonical_host/redirect'
+require 'rack/canonical_host/version'
 
 module Rack
   class CanonicalHost
@@ -21,9 +22,10 @@ module Rack
       end
     end
 
+  private
+
     def host(env)
       @block ? @block.call(env) || @host : @host
     end
-    private :host
   end
 end

data/lib/rack/canonical_host/redirect.rb

@@ -3,7 +3,7 @@ require 'addressable/uri'
 module Rack
   class CanonicalHost
     class Redirect
-      HTML_TEMPLATE = <<-HTML
+      HTML_TEMPLATE = <<-HTML.gsub(/^\s+/, '')
         <!DOCTYPE html>
         <html lang="en-US">
           <head><title>301 Moved Permanently</title></head>
@@ -17,11 +17,12 @@ module Rack
       def initialize(env, host, options={})
         @env = env
         @host = host
-        @ignore = options[:ignore]
+        @ignore = Array(options[:ignore])
+        @if = Array(options[:if])
       end
 
       def canonical?
-        known? || ignored?
+          known? || ignored? || !conditions_match?
       end
 
       def response
@@ -29,25 +30,34 @@ module Rack
         [301, headers, [HTML_TEMPLATE % new_url]]
       end
 
+    private
+
       def known?
         @host.nil? || request_uri.host == @host
       end
-      private :known?
 
       def ignored?
         @ignore && @ignore.include?(request_uri.host)
       end
-      private :ignored?
+
+      def conditions_match?
+        return true unless @if.size > 0
+        @if.include?( request_uri.host ) || any_regexp_match?( @if, request_uri.host )
+      end
+      private :conditions_match?
+
+      def any_regexp_match?( regexp_array, string )
+        regexp_array.any?{ |r| string[r] }
+      end
+      private :any_regexp_match?
 
       def new_url
         request_uri.tap { |uri| uri.host = @host }.to_s
       end
-      private :new_url
 
       def request_uri
         Addressable::URI.parse(Rack::Request.new(@env).url)
       end
-      private :request_uri
     end
   end
 end

data/lib/rack/canonical_host/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class CanonicalHost
-    VERSION = '0.0.8'
+    VERSION = '0.0.9'
   end
 end

data/spec/rack/canonical_host_spec.rb

@@ -69,7 +69,7 @@ describe Rack::CanonicalHost do
     end
 
     context 'with :ignore option' do
-      let(:app) { build_app('example.com', :ignore => ['example.net']) }
+      let(:app) { build_app('example.com', :ignore => 'example.net') }
 
       include_context 'matching and non-matching requests'
 
@@ -85,6 +85,38 @@ describe Rack::CanonicalHost do
       end
     end
 
+    context 'with :if option' do
+
+      let(:app) { build_app('example.com', :if => 'www.example.net') }
+
+      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') }
+      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 }
+      end
+
+    end
+
+    context 'with :if and regexp as an option' do
+
+      let(:app) { build_app('example.com', :if => /.*\.example\.net/) }
+
+      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') }
+      end
+
+      context 'with a request to a :if non-matching host' do
+        let(:url) { 'http://example.net/full/path' }
+        it { should_not be_redirect }
+      end
+
+    end
+
     context 'with a block' do
       let(:app) { build_app { 'example.com' } }
 

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: rack-canonical-host
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Tyler Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,27 +76,26 @@ files:
 - spec/support/matchers/be_redirect.rb
 homepage: http://github.com/tylerhunt/rack-canonical-host
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rack middleware for defining a canonical host name.
 test_files:
 - spec/rack/canonical_host_spec.rb