rack-force_domain 0.1.1 → 0.2.0

data/README.markdown

@@ -6,15 +6,17 @@ Directs all traffic to a single domain via 301 redirects.
 
 ### config.ru
     use Rack::ForceDomain, ENV["DOMAIN"]
-    
+
 ### environment.rb
     config.middleware.use Rack::ForceDomain, ENV["DOMAIN"]
 
 ### Heroku Config
 
-    heroku config add DOMAIN="foo.com"
+    heroku config:add DOMAIN="foo.com"
 
 
 Now all requests to www.foo.com (or anything else pointed at the app) will 301 to foo.com.
 
 If the `$DOMAIN` environment variable is missing, no redirection will occur.
+
+You can also give provide a port along with your domain "foo.com:3000".

data/lib/rack/force_domain.rb

@@ -3,13 +3,27 @@ require 'rack'
 class Rack::ForceDomain
   def initialize(app, domain)
     @app = app
-    @domain = domain
+    if domain and domain != ""
+      @domain = domain
+
+      # set host from domain
+      domain_parts = domain.split(":")
+      @host = domain_parts[0]
+
+      # add port if applicable
+      if domain_parts[1]
+        port = domain_parts[1].to_i
+        @port = port if port > 0
+      end
+    end
   end
 
   def call(env)
     request = Rack::Request.new(env)
-    if @domain and request.host != @domain
-      fake_request = Rack::Request.new(env.merge("HTTP_HOST" => @domain))
+    host_mismatch = (@host && request.host != @host)
+    port_mismatch = (@port && request.port != @port)
+    if host_mismatch or port_mismatch
+      fake_request = Rack::Request.new(env.merge("HTTP_HOST" => @domain, "SERVER_PORT" => @port || request.port))
       Rack::Response.new([], 301, "Location" => fake_request.url).finish
     else
       @app.call(env)

data/test/force_domain_test.rb

@@ -21,6 +21,14 @@ class ForceDomainTest < Test::Unit::TestCase
     assert !@called, "should not have passed through"
   end
 
+  def test_should_301_if_port_is_wrong
+    app = Rack::ForceDomain.new(lambda{|env| @called = true; [200, [], {}] } , "foo.com:3000")
+    status, body, headers = app.call(Rack::MockRequest.env_for("http://foo.com/baz"))
+    assert_equal 301, status
+    assert_equal "http://foo.com:3000/baz", headers["Location"]
+    assert !@called, "should not have passed through"
+  end
+
   def test_should_passthrough_for_correct_domain
     app = Rack::ForceDomain.new(lambda{|env| @called = true; [200, [], {}] } , "foo.com")
     status, body, headers = app.call(Rack::MockRequest.env_for("http://foo.com/baz"))

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-force_domain
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tom Lea
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 +00:00
+date: 2011-04-16 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -37,21 +43,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rack-force_domain
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Force all visitors onto a single domain.