avdi-rack_base_uri 0.0.3 → 0.0.4

data/lib/rack_base_uri.rb

@@ -16,9 +16,14 @@ module Rack
         env['SERVER_NAME']  + ':' + env['SERVER_PORT']
       }
       base    = host + env['SCRIPT_NAME']
+
+      # Make sure it begins with e.g. 'http://'
       unless base =~ %r[://]
         base = (env['rack.url_scheme'] + '://' + base)
       end
+
+      base.sub!(%r[/*$], '/')   # Make sure it ends with a '/'
+
       result  = @app.call(env)
       headers = result[1]
       doc     = Hpricot(result[2].to_s)

data/spec/rack_base_uri_spec.rb

@@ -39,7 +39,7 @@ describe Rack::BaseUri do
       @response.should be_ok
       tag = @doc.at("head base")
       tag.should_not be_nil
-      tag['href'].should == "http://example.org/subdir"
+      tag['href'].should == "http://example.org/subdir/"
     end
 
     describe "with a HTTP_HOST of example.org" do
@@ -51,9 +51,10 @@ describe Rack::BaseUri do
         do_request
         @response.should be_ok
         tag = @doc.at("head base")
-        tag['href'].should == "http://example.org/subdir"
+        tag['href'].should == "http://example.org/subdir/"
       end
     end
+
   end
   describe "with application/xhtml+xml content type" do
     before :each do
@@ -65,7 +66,7 @@ describe Rack::BaseUri do
       @response.should be_ok
       html = @doc.at("html")
       html.should_not be_nil
-      html['xml:base'].should == "http://example.org/subdir"
+      html['xml:base'].should == "http://example.org/subdir/"
     end
   end
 
@@ -79,7 +80,7 @@ describe Rack::BaseUri do
       @response.should be_ok
       html = @doc.at("html")
       html.should_not be_nil
-      html['xml:base'].should == "http://example.org/subdir"
+      html['xml:base'].should == "http://example.org/subdir/"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: avdi-rack_base_uri
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Avdi Grimm