Merge pull request #1 from rweald/rack-www-compliant

Custom Subdomain Code

.gitignore

@@ -1 +1,2 @@
 *.gem
+*.rbc

lib/rack/www.rb

@@ -4,14 +4,16 @@
 module Rack
   class WWW
     def initialize(app, options = {})
-      @options = {:www => true}.merge(options)
+      @options = {:redirect => true, :subdomain => "www" }.merge(options)
+      @options[:redirect] = @options[:www] if @options[:www] != nil
       @app = app
-      @www = @options[:www]
+      @redirect = @options[:redirect]
       @message = @options[:message]
+      @subdomain = @options[:subdomain]
     end
 
     def call(env)
-      if (already_www?(env) && @www) || (!already_www?(env) && !@www)
+      if (already_subdomain?(env) && @redirect) || (!already_subdomain?(env) && !@redirect)
         @app.call(env)
       else
         url = prepare_url(env)
@@ -21,26 +23,29 @@ def call(env)
     end
 
     private
-    def already_www?(env)
-      env["HTTP_HOST"].downcase =~ /^(www.)/ 
+    def already_subdomain?(env)
+      env["HTTP_HOST"].downcase =~ /^(#{@subdomain}.)/ 
     end
 
     def prepare_url(env)
       scheme = env["rack.url_scheme"]
-      host = env["SERVER_NAME"].gsub(/^(www.)/, "")
+
+      host = env["SERVER_NAME"].gsub(/^(#{@subdomain}.)/, "")
+
       path = env["PATH_INFO"]
 
       query_string = ""
       if !env["QUERY_STRING"].empty?
         query_string = "?" + env["QUERY_STRING"]
       end
 
-      if @www == true
-        host = "://www." + host
+      if @redirect == true
+        host = "://#{@subdomain}." + host
       else
         host = "://" + host
       end
       scheme + host + path + query_string
     end
+
   end
 end

test/test_www.rb

@@ -88,4 +88,29 @@ def app
     get "http://example.com/"
     assert_equal last_response.body, ""
   end
+
+  test 'allows for custom subdomain' do
+    self.app = Rack::WWW.new(default_app, :www => true, :subdomain => "secure")
+    get 'http://example.com'
+    assert_equal 'http://secure.example.com/', last_response.headers['Location']
+  end
+
+  test 'allows use of redirect as alias for www' do
+    self.app = Rack::WWW.new(default_app, :redirect => true, :subdomain => "secure")
+    get 'http://example.com'
+    assert_equal 'http://secure.example.com/', last_response.headers['Location']
+  end
+
+  test 'redirects to a non subdomain if redirect is false' do
+    self.app = Rack::WWW.new(default_app, :redirect => false)
+    get "http://example.com/"
+    assert last_response.ok?
+  end
+
+  test 'Redirects to a non subdomain url and keep the right query string when param :www => false' do
+    self.app = Rack::WWW.new(default_app, :redirect => false)
+    get "http://www.example.com/path/1?param=test"
+    assert_equal "http://example.com/path/1?param=test", last_response.headers['Location']
+  end
+
 end