rack-canonical-host 0.0.2 → 0.0.3

data/lib/rack-canonical-host.rb

@@ -2,7 +2,8 @@ module Rack # :nodoc:
   class CanonicalHost
     def initialize(app, host=nil, &block)
       @app = app
-      @host = (block_given? && block.call) || host
+      @host = host
+      @block = block
     end
 
     def call(env)
@@ -14,11 +15,16 @@ module Rack # :nodoc:
     end
 
     def url(env)
-      if @host && env['SERVER_NAME'] != @host
+      if (host = host(env)) && env['SERVER_NAME'] != host
         url = Rack::Request.new(env).url
-        url.sub(%r{\A(https?://)(.*?)(:\d+)?(/|$)}, "\\1#{@host}\\3/")
+        url.sub(%r{\A(https?://)(.*?)(:\d+)?(/|$)}, "\\1#{host}\\3/")
       end
     end
     private :url
+
+    def host(env)
+      @block ? @block.call(env) || @host : @host
+    end
+    private :host
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Tyler Hunt
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 -05:00
+date: 2011-02-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency