rewritten 0.2.2 → 0.3.0

data/HISTORY.rdoc

@@ -1,3 +1,6 @@
+== 0.3.0
+
+* support for forwarded request staying on the forwarding host
 
 == 0.2.1
 

data/lib/rack/subdomain.rb

@@ -17,9 +17,13 @@ module Rack
 
         @fqdns.each do |n|
           if req.host =~ /(.+)\.#{n}$/
-            env["SUBDOMAIN"] = $1
-            env["FQDN"] = n 
-            break
+            if $1 == 'www'
+              break
+            else
+              env["SUBDOMAIN"] = $1
+              env["FQDN"] = n 
+              break
+            end
           end
         end
 

data/lib/rack/url.rb

@@ -11,13 +11,10 @@ module Rack
       end
 
       def call(env)
-        puts "-> Rack::Rewritten::Url"
         req = Rack::Request.new(env)
 
         subdomain = env["SUBDOMAIN"] ? "#{env["SUBDOMAIN"]}:" : ""
 
-        puts "SUBDOMAIN: #{subdomain}"
-
         if to = ::Rewritten.redis.get("from:#{subdomain}#{req.path_info}")
           current_path = ::Rewritten.list_range("to:#{to}", -1, 1)  
           current_path = current_path.split(":").last
@@ -34,12 +31,16 @@ module Rack
             
             new_path = env["rack.url_scheme"].dup
             new_path << "://"
-            new_path << env["HTTP_HOST"].dup.sub(/^#{subdomain.chomp(':')}\./, '')
+            if env["HTTP_X_FORWARDED_HOST"]
+              new_path << env["HTTP_X_FORWARDED_HOST"].dup.sub(/^#{subdomain.chomp(':')}\./, '')
+            else
+              new_path << env["HTTP_HOST"].dup.sub(/^#{subdomain.chomp(':')}\./, '')
+            end
             new_path << current_path
 
             r.redirect(new_path, 301)
             a = r.finish
-            puts a.inspect
+            #puts a.inspect
             a
           end
         else

data/lib/rewritten/version.rb

@@ -1,3 +1,3 @@
 module Rewritten
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Kai Rubarth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 Z
+date: 2011-12-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis-namespace
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rewritten
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A redis-based URL rewriting engine