rack-www 1.1.0 → 1.2.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 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.

data/lib/rack/www.rb

@@ -11,33 +11,37 @@ module Rack
     end
 
     def call(env)
-      status, headers, body = @app.call(env)
-      req  = Request.new(env)
-      host = URI(req.host).to_s
-      if (already_www?(host) && @www == true) || (!already_www?(host) && @www == false)
-        [status, headers, @message || body]
+      if (already_www?(env) && @www == true) || (!already_www?(env) && @www == false)
+        status, headers, body = @app.call(env)
       else
-        url = prepare_url(req)
-        headers = headers.merge('Location' => url)
-        [301, headers, @message || body]
+        url = prepare_url(env)
+        headers = {"Content-Type" => "text/html", "location" => url}
+        [301, headers, @message || ""]
       end
     end
 
     private
-    def already_www?(host)
-      host.downcase =~ /^(www.)/ 
+    def already_www?(env)
+      env["HTTP_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
+    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
+        query_string = "?" + env["QUERY_STRING"]
+      end
+
       if @www == true
         host = "://www." + host
       else
         host = "://" + host
       end
-      scheme + host + path
+      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: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Jhimy Fernandes Villar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 -03:00
+date: 2011-05-17 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency