rack-www 1.0.0 → 1.1.0

data/CHANGELOG.rdoc

@@ -0,0 +1,5 @@
+== 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,16 +1,34 @@
 == rack-www
 
-Redirects all trafic from http://example.com to http://www.example.com
+Rack middleware to force redirects all traffic to a single domain with or without www.
 
 === Installation
 
-  gem install rack-www #default installation
-  gem 'rack-www' #when using bundler
+  #default installation
+  gem install rack-www
+
+  #when using bundler
+  gem 'rack-www'
 
 === Usage
 
+Default usage:
+
+  #redirects all traffic to www
   config.middleware.use Rack::WWW
 
+You can also customize 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
+
+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..."
+
 === License
 
 MIT License. Copyright 2011 Jhimy Fernandes Villar. http://www.stjhimy.com

data/lib/rack/www.rb

@@ -4,20 +4,22 @@ require 'rack/request'
 module Rack
   class WWW
     def initialize(app, options = {})
+      @options = {:www => true}.merge(options)
       @app = app
-      @options = options
+      @www = @options[:www]
+      @message = @options[:message]
     end
 
     def call(env)
       status, headers, body = @app.call(env)
       req  = Request.new(env)
       host = URI(req.host).to_s
-      if already_www?(host)
-        [status, headers, body]
+      if (already_www?(host) && @www == true) || (!already_www?(host) && @www == false)
+        [status, headers, @message || body]
       else
-        url = URI(req.url).scheme + "://www." + host + URI(req.path).to_s
+        url = prepare_url(req)
         headers = headers.merge('Location' => url)
-        [301, headers, body]
+        [301, headers, @message || body]
       end
     end
 
@@ -25,5 +27,17 @@ module Rack
     def already_www?(host)
       host.downcase =~ /^(www.)/ 
     end
+
+    def prepare_url(req)
+      scheme = URI(req.url).scheme 
+      host = URI(req.host).to_s.gsub(/^(www.)/, "")
+      path = URI(req.path).to_s
+      if @www == true
+        host = "://www." + host
+      else
+        host = "://" + host
+      end
+      scheme + host + path
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-www
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jhimy Fernandes Villar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 -03:00
+date: 2011-05-10 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 to www.\n"
+description: "    Rack middleware to force redirects all traffic to a single domain with or without www.\n"
 email: stjhimy@gmail.com
 executables: []
 
@@ -44,6 +44,7 @@ files:
 - lib/rack-www.rb
 - lib/rack/www.rb
 - LICENSE
+- CHANGELOG.rdoc
 - README.rdoc
 has_rdoc: true
 homepage: https://github.com/stjhimy/rack-www
@@ -78,6 +79,6 @@ rubyforge_project:
 rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: Force redirects to www.
+summary: Force redirects to a single domain with or without www
 test_files: []