umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 20:30:23 +00:00
Code Issues Wiki Activity

create_path now returns a path, not an URI

Browse source 
Also add the new 'put_path' metadata information to the request
before entering the put_resource step (which proceeds to call
content_types_accepted and then the chosen content type's callback,
which is expected to use the 'put_path' value as the path to the new
resource instead of the original request path, because it may have
been changed by the create_path call.
This commit is contained in:
Loïc Hoguin 2011-12-19 10:29:44 +01:00
parent f390dbd606
commit c54c361adb
1 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/cowboy_http_rest.erl
View file

@ -638,16 +638,36 @@ post_is_create(Req, State) ->
expect(Req, State, post_is_create, false, fun process_post/2, fun create_path/2). expect(Req, State, post_is_create, false, fun process_post/2, fun create_path/2).
%% When the POST method can create new resources, create_path/2 will be called %% When the POST method can create new resources, create_path/2 will be called
%% and is expected to return the full URI of the new resource. %% and is expected to return the full path to the new resource
create_path(Req, State) -> %% (including the leading /).
create_path(Req=#http_req{meta=Meta}, State) ->
case call(Req, State, create_path) of case call(Req, State, create_path) of
{Location, Req2, HandlerState} -> {Path, Req2, HandlerState} ->
Location = create_path_location(Req2, Path),
State2 = State#state{handler_state=HandlerState}, State2 = State#state{handler_state=HandlerState},
{ok, Req3} = cowboy_http_req:set_resp_header( {ok, Req3} = cowboy_http_req:set_resp_header(
<<"Location">>, Location, Req2), <<"Location">>, Location, Req2),
put_resource(Req3, State2, 303) put_resource(Req3#http_req{meta=[{put_path, Path}|Meta]},
State2, 303)
end. end.
create_path_location(#http_req{transport=Transport, raw_host=Host,
port=Port}, Path) ->
TransportName = Transport:name(),
<< (create_path_location_protocol(TransportName))/binary, "://",
Host/binary, (create_path_location_port(TransportName, Port))/binary,
Path/binary >>.
create_path_location_protocol(ssl) -> <<"https">>;
create_path_location_protocol(_) -> <<"http">>.
create_path_location_port(ssl, 443) ->
<<>>;
create_path_location_port(tcp, 80) ->
<<>>;
create_path_location_port(_, Port) ->
<<":", (list_to_binary(integer_to_list(Port)))/binary>>.
process_post(Req, State) -> process_post(Req, State) ->
case call(Req, State, process_post) of case call(Req, State, process_post) of
{ok, Req2, HandlerState} -> {ok, Req2, HandlerState} ->
@ -658,14 +678,18 @@ process_post(Req, State) ->
is_conflict(Req, State) -> is_conflict(Req, State) ->
expect(Req, State, is_conflict, false, fun put_resource/2, 409). expect(Req, State, is_conflict, false, fun put_resource/2, 409).
put_resource(Req, State) -> put_resource(Req=#http_req{raw_path=RawPath, meta=Meta}, State) ->
put_resource(Req, State, fun is_new_resource/2). Req2 = Req#http_req{meta=[{put_path, RawPath}|Meta]},
put_resource(Req2, State, fun is_new_resource/2).
%% content_types_accepted should return a list of media types and their %% content_types_accepted should return a list of media types and their
%% associated callback functions in the same format as content_types_provided. %% associated callback functions in the same format as content_types_provided.
%% %%
%% The callback will then be called and is expected to process the content %% The callback will then be called and is expected to process the content
%% pushed to the resource in the request body. %% pushed to the resource in the request body. The path to the new resource
%% may be different from the request path, and is stored as request metadata.
%% It is always defined past this point. It can be retrieved as demonstrated:
%% {PutPath, Req2} = cowboy_http_req:meta(put_path, Req)
put_resource(Req, State, OnTrue) -> put_resource(Req, State, OnTrue) ->
case call(Req, State, content_types_accepted) of case call(Req, State, content_types_accepted) of
no_call -> no_call ->