Merge pull request webmachine#26 from b/auto_location

Automatically insert a Location header as appropriate

include/wm_reqdata.hrl

@@ -1,4 +1,4 @@
--record(wm_reqdata, {method, version, peer, wm_state,
+-record(wm_reqdata, {method, scheme, version, peer, wm_state,
                      disp_path, path, raw_path, path_info, path_tokens,
                      app_root,response_code,max_recv_body, max_recv_hunk,
                      req_cookie, req_qs, req_headers, req_body,

src/webmachine.erl

@@ -39,11 +39,12 @@ stop() ->
 new_request(mochiweb, Request) ->
     Socket = Request:get(socket),
     Method = Request:get(method),
+    Scheme = Request:get(scheme),
     RawPath = Request:get(raw_path), 
     Version = Request:get(version),
     Headers = Request:get(headers),
     InitState = #wm_reqstate{socket=Socket,
-                          reqdata=wrq:create(Method,Version,RawPath,Headers)},
+                          reqdata=wrq:create(Method,Scheme,Version,RawPath,Headers)},
 
     InitReq = {webmachine_request,InitState},
     {Peer, ReqState} = InitReq:get_peer(),

src/webmachine_decision_core.erl

@@ -429,7 +429,21 @@ decision(v3n11) ->
                     case is_list(NewPath) of
                         false -> error_response("create_path not a string");
                         true ->
-                            wrcall({set_disp_path, NewPath}),
+                            BaseUri = case resource_call(base_uri) of
+                                undefined -> wrcall(base_uri);
+                                Any ->
+                                    case [lists:last(Any)] of
+                                        "/" -> lists:sublist(Any, erlang:length(Any) - 1);
+                                        _ -> Any
+                                    end
+                            end,
+                            FullPath = filename:join(["/", wrcall(path), NewPath]),
+                            wrcall({set_disp_path, FullPath}),
+                            case wrcall({get_resp_header, "Location"}) of
+                                undefined -> wrcall({set_resp_header, "Location", BaseUri ++ FullPath});
+                                _ -> ok
+                            end,
+
                             Res = accept_helper(),
                             case Res of
                                 {respond, Code} -> respond(Code);
@@ -665,4 +679,3 @@ variances() ->
             end
     end,
     Accept ++ AcceptEncoding ++ AcceptCharset ++ resource_call(variances).
-

src/webmachine_request.erl

@@ -121,6 +121,12 @@ x_peername(Default) ->
         string:strip(lists:last(string:tokens(Hosts, ",")))
     end.
 
+call(base_uri) ->
+    RD = ReqState#wm_reqstate.reqdata,
+    Scheme = erlang:atom_to_list(RD#wm_reqdata.scheme),
+    Host = string:join(RD#wm_reqdata.host_tokens, "."),
+    PortString = port_string(Scheme, RD#wm_reqdata.port),
+    {Scheme ++ "://" ++ Host ++ PortString,ReqState};
 call(socket) -> {ReqState#wm_reqstate.socket,ReqState};
 call(get_reqdata) -> {ReqState#wm_reqstate.reqdata, ReqState};
 call({set_reqdata, RD}) -> {ok, ReqState#wm_reqstate{reqdata=RD}};
@@ -792,3 +798,18 @@ load_dispatch_data(Bindings, HostTokens, Port, PathTokens,
           PathTokens, AppRoot, DispPath}).
 
 log_data() -> call(log_data).
+
+port_string(Scheme, Port) ->
+    case Scheme of
+        http ->
+            case Port of
+                80 -> "";
+                _ -> ":" ++ erlang:integer_to_list(Port)
+            end;
+        https ->
+            case Port of
+                443 -> "";
+                _ -> ":" ++ erlang:integer_to_list(Port)
+            end;
+        _ -> ":" ++ erlang:integer_to_list(Port)
+    end.

src/webmachine_resource.erl

@@ -65,6 +65,8 @@ default(post_is_create) ->
     false;
 default(create_path) ->
     undefined;
+default(base_uri) ->
+	undefined;
 default(process_post) ->
     false;
 default(language_available) ->

src/wrq.erl

@@ -16,11 +16,11 @@
 -module(wrq).
 -author('Justin Sheehy <justin@basho.com>').
 
--export([create/4,load_dispatch_data/7]).
--export([method/1,version/1,peer/1,disp_path/1,path/1,raw_path/1,path_info/1,
-         response_code/1,req_cookie/1,req_qs/1,req_headers/1,req_body/1,
-         stream_req_body/2,resp_redirect/1,resp_headers/1,resp_body/1,
-         app_root/1,path_tokens/1, host_tokens/1, port/1]).
+-export([create/4, create/5,load_dispatch_data/7]).
+-export([method/1,scheme/1,version/1,peer/1,disp_path/1,path/1,raw_path/1,
+         path_info/1,response_code/1,req_cookie/1,req_qs/1,req_headers/1,
+         req_body/1,stream_req_body/2,resp_redirect/1,resp_headers/1,
+         resp_body/1,app_root/1,path_tokens/1, host_tokens/1, port/1]).
 -export([path_info/2,get_req_header/2,do_redirect/2,fresh_resp_headers/2,
          get_resp_header/2,set_resp_header/3,set_resp_headers/2,
          set_disp_path/2,set_req_body/2,set_resp_body/2,set_response_code/2,
@@ -36,7 +36,9 @@
 
 
 create(Method,Version,RawPath,Headers) ->
-    create(#wm_reqdata{method=Method,version=Version,
+	create(Method,http,Version,RawPath,Headers).
+create(Method,Scheme,Version,RawPath,Headers) ->
+    create(#wm_reqdata{method=Method,scheme=Scheme,version=Version,
                        raw_path=RawPath,req_headers=Headers,
       wm_state=defined_on_call,
       path="defined_in_create",
@@ -71,6 +73,8 @@ load_dispatch_data(PathInfo, HostTokens, Port, PathTokens, AppRoot,
 
 method(_RD = #wm_reqdata{method=Method}) -> Method.
 
+scheme(_RD = #wm_reqdata{scheme=Scheme}) -> Scheme.
+
 version(_RD = #wm_reqdata{version=Version})
   when is_tuple(Version), size(Version) == 2,
      is_integer(element(1,Version)), is_integer(element(2,Version)) -> Version.