rack-canonical-hostname 0.1 → 0.2

data/README.md

@@ -12,7 +12,7 @@ Redirect preserves path and querystring.
 
 Add this line to your application's Gemfile:
 
-    gem 'rack-canonical-host', :require => 'rack/canonical_host'
+    gem 'rack-canonical-hostname', :require => 'rack/canonical_host'
 
 And then execute:
 
@@ -20,7 +20,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install rack-canonical-host
+    $ gem install rack-canonical-hostname
 
 ## Usage
 
@@ -36,7 +36,7 @@ Example for rails configuration:
   config.middleware.insert_before Rack::Lock, Rack::CanonicalHost, {
     :host   => 'my-site.com',
     :scheme => 'https',
-    :ignore => ['staging.my-site.com', 'balabik-staging.herokuapp.com']
+    :ignore => ['staging.my-site.com', 'my-site-staging.herokuapp.com']
   }
 ```
 

data/lib/rack/canonical_host.rb

@@ -1,7 +1,6 @@
 module Rack
   class CanonicalHost 
-
-    VERSION = 0.1 
+    VERSION = 0.2
 
     def initialize(app, options = {}) 
       @app    = app
@@ -10,18 +9,12 @@ module Rack
       @ignore = options.fetch(:ignore) { [] }
     end
 
-
-    def request_host 
-      @env['HTTP_HOST'].split(':').first
-    end
-
     def call(env)
-      @env = env 
-      if request_host != @host && !@ignore.include?(request_host)
-        uri        = URI.parse ''
+      request = rack_request(env)
+      
+      if request.host != @host && !@ignore.include?(request.host)
+        uri = URI.parse request.url
         uri.host   = @host
-        uri.query  = env['QUERY_STRING'] || ''
-        uri.path   = env['REQUEST_PATH'] || ''
         uri.scheme = @scheme
 
         status  = 301 
@@ -33,5 +26,11 @@ module Rack
         @app.call(env)
       end
     end
+
+    protected
+
+    def rack_request(env)
+      Rack::Request.new(env)
+    end
   end
 end

data/rack-canonical-hostname.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/rack/canonical_host', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Fabrizio Regini"]
-  gem.email         = ["freegenie@gmail.com"]
+  gem.authors       = ["Fabrizio Regini", "Daniel Vartanov"]
+  gem.email         = ["freegenie@gmail.com", "dan@vartanov.net"]
   gem.description   = %q{Handle redirect to canonical host}
   gem.summary       = %q{Rack module to redirect to one canonical host and redirect when hitting the app with any other name}
   gem.homepage      = ""
@@ -15,4 +15,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Rack::CanonicalHost::VERSION
   gem.add_development_dependency 'rspec', '~> 2.0'
+  gem.add_development_dependency 'rack'
 end

data/spec/canonical_host_spec.rb

@@ -33,7 +33,7 @@ describe Rack::CanonicalHost do
       response = Rack::MockRequest.new(app)
         .get('/', {
           'HTTP_HOST' => 'foo.example.org',
-          'REQUEST_PATH' => '/login'
+          'PATH_INFO' => '/login'
         })
 
       response.headers['Location'].should =~ /\/login/ 
@@ -43,7 +43,7 @@ describe Rack::CanonicalHost do
       response = Rack::MockRequest.new(app)
         .get('/', {
           'HTTP_HOST' => 'foo.example.org',
-          'REQUEST_PATH' => '/login', 
+          'PATH_INFO' => '/login', 
           'QUERY_STRING' => 'a=10&b=20'
         })
 

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rack-canonical-hostname
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
 - Fabrizio Regini
+- Daniel Vartanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000Z
+date: 2012-06-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154510280 !ruby/object:Gem::Requirement
+  requirement: &2162166960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +22,22 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2154510280
+  version_requirements: *2162166960
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2162166340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2162166340
 description: Handle redirect to canonical host
 email:
 - freegenie@gmail.com
+- dan@vartanov.net
 executables: []
 extensions: []
 extra_rdoc_files: []