rack-www 1.2.0 → 1.3.0

data/CHANGELOG.rdoc

@@ -1,10 +1,20 @@
+== 1.3
+
+* Added possibility to redirects to any given :subdomain [Ryan Weald (https://github.com/rweald)].
+* Added more tests
+
 == 1.2
+
 * Redirects to the right url without calling the app
 * Keep the path when redirecting
 * Keep the query string when redirecting
 * Added more tests
+
 == 1.1
+
 * Added possibility to redirects with www or without www.
 * Added possibility to set a param :message to show while redirecting.
+
 == 1.0
+
 * Redirects all traffic to www.

data/README.rdoc

@@ -1,6 +1,6 @@
-== rack-www
+= rack-www
 
-Rack middleware to force redirects all traffic to a single domain with or without www.
+Rack middleware to force subdomain redirects, e.g: www.
 
 === Installation
 
@@ -10,25 +10,40 @@ Rack middleware to force redirects all traffic to a single domain with or withou
   #when using bundler
   gem 'rack-www'
 
+
 === Usage
 
-Default usage:
+Default usage (by default will redirect all requests to www subdomain):
 
-  #redirects all traffic to www
+  #redirects all traffic to www subdomain
   config.middleware.use Rack::WWW
 
-You can also customize the :www option to true or false:
+Customizing the :www option to true or false:
 
   #redirects all traffic to www
   config.middleware.use Rack::WWW, :www => true
 
+
   #redirects all traffic to the same domain without www
   config.middleware.use Rack::WWW, :www => false
 
+Redirecting to a given subdomain:
+
+  #redirects all traffic to the 'secure' subdomain
+  config.middleware.use Rack::WWW, :subdomain => "secure"
+
 If you like it's also possible to show a message while redirecting the user:
 
   config.middleware.use Rack::WWW, :www => false, :message => "You are being redirected..."
 
+
+=== Options
+
+* :www => default is true, redirects all traffic to www;
+* :subdomain => redirects to any given subdomain;
+* :message => display a message while redirecting;
+
+
 === License
 
 MIT License. Copyright 2011 Jhimy Fernandes Villar. http://www.stjhimy.com

data/lib/rack/www.rb

@@ -4,15 +4,18 @@ require 'rack/request'
 module Rack
   class WWW
     def initialize(app, options = {})
-      @options = {:www => true}.merge(options)
+      @options = {:subdomain => "www" }.merge(options)
       @app = app
-      @www = @options[:www]
+
+      @redirect = true
+      @redirect = @options[:www] if @options[:www] != nil
       @message = @options[:message]
+      @subdomain = @options[:subdomain]
     end
 
     def call(env)
-      if (already_www?(env) && @www == true) || (!already_www?(env) && @www == false)
-        status, headers, body = @app.call(env)
+      if (already_subdomain?(env) && @redirect) || (!already_subdomain?(env) && !@redirect)
+        @app.call(env)
       else
         url = prepare_url(env)
         headers = {"Content-Type" => "text/html", "location" => url}
@@ -21,27 +24,30 @@ module Rack
     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.)/, "")
-      path = env["PATH_INFO"].to_s
 
-      if env["QUERY_STRING"].empty?
-        query_string = ""
-      else
+      host = env["SERVER_NAME"].gsub(/^(#{@subdomain}.)/, "")
+      host = host.gsub(/^(www.)/, "")
+
+      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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-www
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Jhimy Fernandes Villar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 -03:00
+date: 2011-05-25 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: "    Rack middleware to force redirects all traffic to a single domain with or without www.\n"
+description: "    Rack middleware to force subdomain redirects, e.g: www.\n"
 email: stjhimy@gmail.com
 executables: []
 
@@ -79,6 +79,6 @@ rubyforge_project:
 rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: Force redirects to a single domain with or without www
+summary: "Force redirects to a any given subdomain, e.g: www."
 test_files: []