specify explicit base_uri from rack SCRIPT_NAME when creating request for RackMapped

Author: madlep

lib/webmachine/adapters/rack.rb

@@ -100,13 +100,18 @@ def routing_tokens(rack_req)
         nil # no-op for default, un-mapped rack adapter
       end
 
+      def base_uri(rack_req)
+        nil # no-op for default, un-mapped rack adapter
+      end
+
       private
       def build_webmachine_request(rack_req, headers)
         Webmachine::Request.new(rack_req.request_method,
                                 rack_req.url,
                                 headers,
                                 RequestBody.new(rack_req),
-                                routing_tokens(rack_req)
+                                routing_tokens(rack_req),
+                                base_uri(rack_req)
                                )
       end
 
@@ -207,6 +212,14 @@ def routing_tokens(rack_req)
         routing_path = routing_match ? routing_match[1] : ""
         routing_path.split(SLASH)
       end
+
+      def base_uri(rack_req)
+        # rack SCRIPT_NAME env var doesn't end with "/". This causes weird
+        # behavour when URI.join concatenates URI components in
+        # Webmachine::Decision::Flow#n11
+        script_name = rack_req.script_name + SLASH
+        URI.join(rack_req.base_url, script_name)
+      end
     end
 
   end # module Adapters

spec/webmachine/adapters/rack_spec.rb

@@ -67,11 +67,38 @@
 end
 
 describe Webmachine::Adapters::RackMapped do
+  class CreateResource < Webmachine::Resource
+    def allowed_methods
+      ["POST"]
+    end
+
+    def content_types_accepted
+      [["application/json", :from_json]]
+    end
+
+    def content_types_provided
+      [["application/json", :to_json]]
+    end
+
+    def post_is_create?
+      true
+    end
+
+    def create_path
+      "created_path_here/123"
+    end
+
+    def from_json
+      response.body = %{ {"foo": "bar"} }
+    end
+  end
+
   let(:app) do
     Rack::Builder.new do
       map '/some/route' do
         run(Webmachine::Application.new do |app|
           app.add_route(["test"], Test::Resource)
+          app.add_route(["create_test"], CreateResource)
           app.configure do | config |
             config.adapter = :RackMapped
           end
@@ -87,5 +114,10 @@
       rack_response = get "some/route/test", nil, {"HTTP_ACCEPT" => "test/response.request_uri"}
       expect(rack_response.body).to eq "http://example.org/some/route/test"
     end
+
+    it "provides LOCATION header using custom base_uri when creating from POST request" do
+      rack_response = post "/some/route/create_test", %{{"foo": "bar"}}, {"HTTP_ACCEPT" => "application/json", "CONTENT_TYPE" => "application/json"}
+      expect(rack_response.headers["Location"]).to eq("http://example.org/some/route/created_path_here/123")
+    end
   end
 end