rack-force_domain 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7989be2cdf424464752efd83db25bc9c4c5386ab
+  data.tar.gz: 8eb430c9cf27ed7bc73856ad9667dfee0d0c0586
+SHA512:
+  metadata.gz: 3b691e982e97b819356eca3c0ec21c656243895c95e239cc261ae7c3d3bd579a67602cabe9dcbb4c530b2e40393cc9597b21d8cce07976f72ae8b6a9bfcb76cc
+  data.tar.gz: a0f790ad36368589a9ed7bd7967a95da15af717c5bf585000ec261e076129a8ef065d7ccd6e077ef086a0c9cb5671ae6b14a2b0ad8353a086495337dc280f6e9

data/lib/rack/force_domain.rb

@@ -1,32 +1,24 @@
 require 'rack'
 
 class Rack::ForceDomain
-  def initialize(app, domain)
+  def initialize(app, host, alternate_domains = [])
     @app = app
-    if domain and domain != ""
-      @domain = domain
-
-      # set host from domain
-      domain_parts = domain.split(":")
-      @host = domain_parts[0]
+    @host = host unless host.to_s.empty?
+    @allowable_domains = [@host, *alternate_domains].compact
+  end
 
-      # add port if applicable
-      if domain_parts[1]
-        port = domain_parts[1].to_i
-        @port = port if port > 0
-      end
-    end
+  def ok?(domain)
+    @host.nil? or @allowable_domains.include?(domain)
   end
 
   def call(env)
     request = Rack::Request.new(env)
-    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
+
+    if ok? request.host
       @app.call(env)
+    else
+      fake_request = Rack::Request.new(env.merge("HTTP_HOST" => @host))
+      Rack::Response.new([], 301, "Location" => fake_request.url).finish
     end
   end
 end

data/test/force_domain_test.rb

@@ -21,18 +21,35 @@ 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"))
     assert_equal 200, status
     assert @called, "expected the request to be passed through"
   end
+
+  def test_should_allow_domains_listed_in_alternate_domains_through
+    app = Rack::ForceDomain.new(lambda{|env| @called = true; [200, [], {}] } , "foo.com", ["bar.com", "baz.com"])
+
+    @called = false
+    status, body, headers = app.call(Rack::MockRequest.env_for("http://bar.com/baz"))
+    assert_equal 200, status
+    assert @called, "expected the request to be passed through"
+
+    @called = false
+    status, body, headers = app.call(Rack::MockRequest.env_for("http://baz.com/baz"))
+    assert_equal 200, status
+    assert @called, "expected the request to be passed through"
+
+    status, body, headers = app.call(Rack::MockRequest.env_for("http://other.com/baz"))
+    assert_equal 301, status
+    assert_equal "http://foo.com/baz", headers["Location"]
+  end
+
+  def test_it_redirects_https_to_https
+    app = Rack::ForceDomain.new(lambda{|env| @called = true; [200, [], {}] } , "foo.com")
+    status, body, headers = app.call(Rack::MockRequest.env_for("https://bar.com/baz"))
+    assert_equal 301, status
+    assert_equal "https://foo.com/baz", headers["Location"]
+  end
 end

metadata

@@ -1,71 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-force_domain
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Tom Lea
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-16 00:00:00 +01:00
-default_executable: 
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: contrib@tomlea.co.uk
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - README.markdown
 - test/force_domain_test.rb
 - lib/rack/force_domain.rb
 - lib/rack-force_domain.rb
-has_rdoc: true
 homepage: http://tomlea.co.uk/
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.markdown
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rack-force_domain
-rubygems_version: 1.3.7
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Force all visitors onto a single domain.
 test_files: []
-