RubyGems - rack-canonical-host - Versions diffs - 0.0.4 → 0.0.5 - Mend

rack-canonical-host 0.0.4 → 0.0.5

Files changed (8) hide show

data/.travis.yml ADDED Viewed

@@ -0,0 +1,6 @@
+language: ruby
+script: bundle exec rspec
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,9 @@
 # Changelog
+## Rack::CanonicalHost 0.0.5
+  * Rename `ignored_hosts` option to `ignore`
 ## Rack::CanonicalHost 0.0.4
   * Add option to ignored certain hosts ([Eric Allam][rubymaverick])

data/README.md CHANGED Viewed

@@ -4,6 +4,11 @@ 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.
+[![Build Status][travis-image]][travis]
+[travis]: http://travis-ci.org/tylerhunt/rack-canonical-host
+[travis-image]: https://secure.travis-ci.org/tylerhunt/rack-canonical-host.png
 ## Installation
@@ -62,11 +67,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_hosts`
+If you'd like the middleware to ignore certain hosts, use the `:ignore`
 option:
 ``` ruby
-use Rack::CanonicalHost, 'example.com', ignored_hosts: ['api.example.com']
+use Rack::CanonicalHost, 'example.com', ignore: ['api.example.com']
 ```
 In this case, requests for the host `api.example.com` will not be redirected.

data/lib/rack/canonical_host/redirect.rb ADDED Viewed

@@ -0,0 +1,46 @@
+module Rack
+  class CanonicalHost
+    class Redirect
+      HTML_TEMPLATE = <<-HTML
+        <!DOCTYPE html>
+        <html lang="en-US">
+          <head><title>301 Moved Permanently</title></head>
+          <body>
+            <h1>Moved Permanently</h1>
+            <p>The document has moved <a href="%s">here</a>.</p>
+          </body>
+        </html>
+      HTML
+      def initialize(env, host, options={})
+        @env = env
+        @host = host
+        @ignore = options[:ignore]
+      end
+      def known_host?
+        request_uri.host == @host || ignored?
+      end
+      def response
+        headers = { 'Location' => new_url, 'Content-Type' => 'text/html' }
+        [301, headers, [HTML_TEMPLATE % new_url]]
+      end
+      def ignored?
+        @ignore.include?(request_uri.host) if @ignore
+      end
+      private :ignored?
+      def new_url
+        request_uri.tap { |uri| uri.host = @host }.to_s
+      end
+      private :new_url
+      def request_uri
+        URI.parse(Rack::Request.new(@env).url)
+      end
+      private :request_uri
+    end
+  end
+end

data/lib/rack/canonical_host/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Rack
   class CanonicalHost
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/lib/rack/canonical_host.rb CHANGED Viewed

@@ -1,44 +1,25 @@
 require 'rack'
+require 'rack/canonical_host/redirect'
-module Rack # :nodoc:
+module Rack
   class CanonicalHost
-    HTML_TEMPLATE = <<-HTML
-      <!DOCTYPE html>
-      <html lang="en-US">
-        <head><title>301 Moved Permanently</title></head>
-        <body>
-          <h1>Moved Permanently</h1>
-          <p>The document has moved <a href="%s">here</a>.</p>
-        </body>
-      </html>
-    HTML
     def initialize(app, host=nil, options={}, &block)
       @app = app
       @host = host
+      @options = options
       @block = block
-      @ignored_hosts = options[:ignored_hosts] || []
     end
     def call(env)
-      if url = url(env)
-        [
-          301,
-          { 'Location' => url, 'Content-Type' => 'text/html' },
-          [HTML_TEMPLATE % url]
-        ]
-      else
-        @app.call(env)
-      end
-    end
+      host = host(env)
+      redirect = Redirect.new(env, host, @options)
-    def url(env)
-      if (host = host(env)) && env['SERVER_NAME'] != host && !@ignored_hosts.include?(env['SERVER_NAME'])
-        url = Rack::Request.new(env).url
-        url.sub(%r{\A(https?://)(.*?)(:\d+)?(/|$)}, "\\1#{host}\\3/")
+      if redirect.known_host?
+        @app.call(env)
+      else
+        redirect.response
       end
     end
-    private :url
     def host(env)
       @block ? @block.call(env) || @host : @host

data/spec/rack/canonical_host_spec.rb CHANGED Viewed

@@ -47,8 +47,8 @@ describe Rack::CanonicalHost do
       include_context 'matching and non-matching requests'
     end
-    context 'with ignored hosts' do
-      let(:app) { build_app('example.com', ignored_hosts: ['example.net']) }
+    context 'with :ignore option' do
+      let(:app) { build_app('example.com', :ignore => ['example.net']) }
       include_context 'matching and non-matching requests'
@@ -68,6 +68,12 @@ describe Rack::CanonicalHost do
       let(:app) { build_app { 'example.com' } }
       include_context 'matching and non-matching requests'
+      context 'that returns nil' do
+        let(:app) { build_app('example.com') { nil } }
+        include_context 'matching and non-matching requests'
+      end
     end
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-canonical-host
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -51,6 +51,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -58,6 +59,7 @@ files:
 - Rakefile
 - lib/rack-canonical-host.rb
 - lib/rack/canonical_host.rb
+- lib/rack/canonical_host/redirect.rb
 - lib/rack/canonical_host/version.rb
 - rack-canonical-host.gemspec
 - spec/rack/canonical_host_spec.rb