rack-www 1.3.0 → 1.4.0

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 1.4
+
+* Respect server port
+* Body responds to :each
+* Rack::Lint on tests
+
 == 1.3
 
 * Added possibility to redirects to any given :subdomain [Ryan Weald (https://github.com/rweald)].

data/lib/rack/www.rb

@@ -19,13 +19,18 @@ module Rack
       else
         url = prepare_url(env)
         headers = {"Content-Type" => "text/html", "location" => url}
-        [301, headers, @message || ""]
+        if @message.respond_to?(:each)
+          message = @message
+        else
+          message = [@message || '']
+        end
+        [301, headers, message]
       end
     end
 
     private
     def already_subdomain?(env)
-      env["HTTP_HOST"].downcase =~ /^(#{@subdomain}.)/ 
+      env["HTTP_HOST"].downcase =~ /^(#{@subdomain}.)/
     end
 
     def prepare_url(env)
@@ -34,6 +39,12 @@ module Rack
       host = env["SERVER_NAME"].gsub(/^(#{@subdomain}.)/, "")
       host = host.gsub(/^(www.)/, "")
 
+      if env['SERVER_PORT'] == '80'
+        port = ''
+      else
+        port = ":#{env['SERVER_PORT']}"
+      end
+
       path = env["PATH_INFO"]
 
       query_string = ""
@@ -46,8 +57,7 @@ module Rack
       else
         host = "://" + host
       end
-      scheme + host + path + query_string
+      "#{scheme}#{host}#{port}#{path}#{query_string}"
     end
-
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-www
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Jhimy Fernandes Villar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -03:00
+date: 2011-07-26 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: "Force redirects to a any given subdomain, e.g: www."