avdi-rack_base_uri 0.0.2 → 0.0.3

data/lib/rack_base_uri.rb

@@ -13,9 +13,12 @@ module Rack
 
     def call(env)
       host    = env.fetch('HTTP_HOST') {
-        env['rack.url_scheme'] + '://' + env['SERVER_NAME']  + ':' + env['SERVER_PORT']
+        env['SERVER_NAME']  + ':' + env['SERVER_PORT']
       }
       base    = host + env['SCRIPT_NAME']
+      unless base =~ %r[://]
+        base = (env['rack.url_scheme'] + '://' + base)
+      end
       result  = @app.call(env)
       headers = result[1]
       doc     = Hpricot(result[2].to_s)

data/spec/rack_base_uri_spec.rb

@@ -23,12 +23,13 @@ describe Rack::BaseUri do
     @app     = stub("app", :call => @result)
     @it      = Rack::BaseUri.new(@app)
     @base    = 'http://example.org/subdir'
+    @host    = 'http://example.org'
   end
 
   def do_request
     @map      = Rack::URLMap.new({@base => @it})
     @request  = Rack::MockRequest.new(@map)
-    @response = @request.get("/subdir/foo", 'HTTP_HOST' => 'http://example.org')
+    @response = @request.get("/subdir/foo", 'HTTP_HOST' => @host)
     @doc      = Hpricot(@response.body)
   end
 
@@ -40,6 +41,19 @@ describe Rack::BaseUri do
       tag.should_not be_nil
       tag['href'].should == "http://example.org/subdir"
     end
+
+    describe "with a HTTP_HOST of example.org" do
+      before :each do
+        @host = "example.org"
+      end
+
+      it "should ensure base uri starts with URL scheme" do
+        do_request
+        @response.should be_ok
+        tag = @doc.at("head base")
+        tag['href'].should == "http://example.org/subdir"
+      end
+    end
   end
   describe "with application/xhtml+xml content type" do
     before :each do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: avdi-rack_base_uri
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Avdi Grimm
@@ -69,6 +69,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: A Rack plugin for automatically setting document base URIs in [X]HTML
+summary: A Rack middleware for automatically setting [X]HTML document base URIs.
 test_files: []