diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/chunked_hello_world/src/toppage_handler.erl | 10 | ||||
-rw-r--r-- | examples/compress_response/src/toppage_handler.erl | 6 | ||||
-rw-r--r-- | examples/cookie/src/toppage_handler.erl | 14 | ||||
-rw-r--r-- | examples/echo_get/src/toppage_handler.erl | 10 | ||||
-rw-r--r-- | examples/echo_post/src/toppage_handler.erl | 23 | ||||
-rw-r--r-- | examples/eventsource/src/eventsource_handler.erl | 10 | ||||
-rw-r--r-- | examples/hello_world/src/toppage_handler.erl | 6 | ||||
-rw-r--r-- | examples/rest_pastebin/src/toppage_handler.erl | 7 | ||||
-rw-r--r-- | examples/ssl_hello_world/src/toppage_handler.erl | 6 | ||||
-rw-r--r-- | examples/upload/src/upload_handler.erl | 4 | ||||
-rw-r--r-- | examples/websocket/src/ws_handler.erl | 6 |
11 files changed, 51 insertions, 51 deletions
diff --git a/examples/chunked_hello_world/src/toppage_handler.erl b/examples/chunked_hello_world/src/toppage_handler.erl index 22e52b9..3865698 100644 --- a/examples/chunked_hello_world/src/toppage_handler.erl +++ b/examples/chunked_hello_world/src/toppage_handler.erl @@ -5,11 +5,11 @@ -export([init/2]). -init(Req, Opts) -> - cowboy_req:chunked_reply(200, Req), - cowboy_req:chunk("Hello\r\n", Req), +init(Req0, Opts) -> + Req = cowboy_req:stream_reply(200, Req0), + cowboy_req:stream_body("Hello\r\n", nofin, Req), timer:sleep(1000), - cowboy_req:chunk("World\r\n", Req), + cowboy_req:stream_body("World\r\n", nofin, Req), timer:sleep(1000), - cowboy_req:chunk("Chunked!\r\n", Req), + cowboy_req:stream_body("Chunked!\r\n", fin, Req), {ok, Req, Opts}. diff --git a/examples/compress_response/src/toppage_handler.erl b/examples/compress_response/src/toppage_handler.erl index 4631f71..35a3b9c 100644 --- a/examples/compress_response/src/toppage_handler.erl +++ b/examples/compress_response/src/toppage_handler.erl @@ -5,7 +5,7 @@ -export([init/2]). -init(Req, Opts) -> +init(Req0, Opts) -> BigBody = <<"A cowboy is an animal herder who tends cattle on ranches in North America, traditionally on horseback, and often performs a multitude of other ranch- @@ -19,5 +19,5 @@ have established the ability to work at virtually identical tasks and obtained considerable respect for their achievements. There are also cattle handlers in many other parts of the world, particularly South America and Australia, who perform work similar to the cowboy in their respective nations.\n">>, - Req2 = cowboy_req:reply(200, [], BigBody, Req), - {ok, Req2, Opts}. + Req = cowboy_req:reply(200, [], BigBody, Req0), + {ok, Req, Opts}. diff --git a/examples/cookie/src/toppage_handler.erl b/examples/cookie/src/toppage_handler.erl index e795cf8..3df6045 100644 --- a/examples/cookie/src/toppage_handler.erl +++ b/examples/cookie/src/toppage_handler.erl @@ -5,17 +5,17 @@ -export([init/2]). -init(Req, Opts) -> +init(Req0, Opts) -> NewValue = integer_to_list(rand:uniform(1000000)), - Req2 = cowboy_req:set_resp_cookie( - <<"server">>, NewValue, [{path, <<"/">>}], Req), + Req1 = cowboy_req:set_resp_cookie(<<"server">>, NewValue, + #{path => <<"/">>}, Req0), #{client := ClientCookie, server := ServerCookie} - = cowboy_req:match_cookies([{client, [], <<>>}, {server, [], <<>>}], Req2), + = cowboy_req:match_cookies([{client, [], <<>>}, {server, [], <<>>}], Req1), {ok, Body} = toppage_dtl:render([ {client, ClientCookie}, {server, ServerCookie} ]), - cowboy_req:reply(200, #{ + Req = cowboy_req:reply(200, #{ <<"content-type">> => <<"text/html">> - }, Body, Req2), - {ok, Req2, Opts}. + }, Body, Req1), + {ok, Req, Opts}. diff --git a/examples/echo_get/src/toppage_handler.erl b/examples/echo_get/src/toppage_handler.erl index 4c7f595..280b5b0 100644 --- a/examples/echo_get/src/toppage_handler.erl +++ b/examples/echo_get/src/toppage_handler.erl @@ -5,14 +5,14 @@ -export([init/2]). -init(Req, Opts) -> - Method = cowboy_req:method(Req), - #{echo := Echo} = cowboy_req:match_qs([echo], Req), - echo(Method, Echo, Req), +init(Req0, Opts) -> + Method = cowboy_req:method(Req0), + #{echo := Echo} = cowboy_req:match_qs([{echo, [], undefined}], Req0), + Req = echo(Method, Echo, Req0), {ok, Req, Opts}. echo(<<"GET">>, undefined, Req) -> - cowboy_req:reply(400, [], <<"Missing echo parameter.">>, Req); + cowboy_req:reply(400, #{}, <<"Missing echo parameter.">>, Req); echo(<<"GET">>, Echo, Req) -> cowboy_req:reply(200, #{ <<"content-type">> => <<"text/plain; charset=utf-8">> diff --git a/examples/echo_post/src/toppage_handler.erl b/examples/echo_post/src/toppage_handler.erl index a84bfe5..398a377 100644 --- a/examples/echo_post/src/toppage_handler.erl +++ b/examples/echo_post/src/toppage_handler.erl @@ -5,24 +5,21 @@ -export([init/2]). -init(Req, Opts) -> - Method = cowboy_req:method(Req), - HasBody = cowboy_req:has_body(Req), - Req2 = maybe_echo(Method, HasBody, Req), - {ok, Req2, Opts}. +init(Req0, Opts) -> + Method = cowboy_req:method(Req0), + HasBody = cowboy_req:has_body(Req0), + Req = maybe_echo(Method, HasBody, Req0), + {ok, Req, Opts}. -maybe_echo(<<"POST">>, true, Req) -> - {ok, PostVals, Req2} = cowboy_req:body_qs(Req), +maybe_echo(<<"POST">>, true, Req0) -> + {ok, PostVals, Req} = cowboy_req:read_urlencoded_body(Req0), Echo = proplists:get_value(<<"echo">>, PostVals), - echo(Echo, Req2), - Req2; + echo(Echo, Req); maybe_echo(<<"POST">>, false, Req) -> - cowboy_req:reply(400, [], <<"Missing body.">>, Req), - Req; + cowboy_req:reply(400, [], <<"Missing body.">>, Req); maybe_echo(_, _, Req) -> %% Method not allowed. - cowboy_req:reply(405, Req), - Req. + cowboy_req:reply(405, Req). echo(undefined, Req) -> cowboy_req:reply(400, [], <<"Missing echo parameter.">>, Req); diff --git a/examples/eventsource/src/eventsource_handler.erl b/examples/eventsource/src/eventsource_handler.erl index 6dced4b..d4f51c1 100644 --- a/examples/eventsource/src/eventsource_handler.erl +++ b/examples/eventsource/src/eventsource_handler.erl @@ -6,15 +6,15 @@ -export([init/2]). -export([info/3]). -init(Req, Opts) -> - Req2 = cowboy_req:chunked_reply(200, #{ +init(Req0, Opts) -> + Req = cowboy_req:stream_reply(200, #{ <<"content-type">> => <<"text/event-stream">> - }, Req), + }, Req0), erlang:send_after(1000, self(), {message, "Tick"}), - {cowboy_loop, Req2, Opts, 5000}. + {cowboy_loop, Req, Opts, 5000}. info({message, Msg}, Req, State) -> - cowboy_req:chunk(["id: ", id(), "\ndata: ", Msg, "\n\n"], Req), + cowboy_req:stream_body(["id: ", id(), "\ndata: ", Msg, "\n\n"], nofin, Req), erlang:send_after(1000, self(), {message, "Tick"}), {ok, Req, State}. diff --git a/examples/hello_world/src/toppage_handler.erl b/examples/hello_world/src/toppage_handler.erl index eb95bf3..a5a8458 100644 --- a/examples/hello_world/src/toppage_handler.erl +++ b/examples/hello_world/src/toppage_handler.erl @@ -5,8 +5,8 @@ -export([init/2]). -init(Req, Opts) -> - cowboy_req:reply(200, #{ +init(Req0, Opts) -> + Req = cowboy_req:reply(200, #{ <<"content-type">> => <<"text/plain">> - }, <<"Hello world!">>, Req), + }, <<"Hello world!">>, Req0), {ok, Req, Opts}. diff --git a/examples/rest_pastebin/src/toppage_handler.erl b/examples/rest_pastebin/src/toppage_handler.erl index 324fa4a..ddf4c50 100644 --- a/examples/rest_pastebin/src/toppage_handler.erl +++ b/examples/rest_pastebin/src/toppage_handler.erl @@ -16,7 +16,6 @@ -export([paste_text/2]). init(Req, Opts) -> - random:seed(os:timestamp()), {cowboy_rest, Req, Opts}. allowed_methods(Req, State) -> @@ -45,7 +44,7 @@ resource_exists(Req, _State) -> create_paste(Req, State) -> PasteID = new_paste_id(), - {ok, [{<<"paste">>, Paste}], Req2} = cowboy_req:body_qs(Req), + {ok, [{<<"paste">>, Paste}], Req2} = cowboy_req:read_urlencoded_body(Req), ok = file:write_file(full_path(PasteID), Paste), case cowboy_req:method(Req2) of <<"POST">> -> @@ -87,13 +86,13 @@ valid_path(<<$/, _T/binary>>) -> false; valid_path(<<_Char, T/binary>>) -> valid_path(T). new_paste_id() -> - Initial = random:uniform(62) - 1, + Initial = rand:uniform(62) - 1, new_paste_id(<<Initial>>, 7). new_paste_id(Bin, 0) -> Chars = <<"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890">>, << <<(binary_part(Chars, B, 1))/binary>> || <<B>> <= Bin >>; new_paste_id(Bin, Rem) -> - Next = random:uniform(62) - 1, + Next = rand:uniform(62) - 1, new_paste_id(<<Bin/binary, Next>>, Rem - 1). format_html(Paste, plain) -> diff --git a/examples/ssl_hello_world/src/toppage_handler.erl b/examples/ssl_hello_world/src/toppage_handler.erl index eb95bf3..a5a8458 100644 --- a/examples/ssl_hello_world/src/toppage_handler.erl +++ b/examples/ssl_hello_world/src/toppage_handler.erl @@ -5,8 +5,8 @@ -export([init/2]). -init(Req, Opts) -> - cowboy_req:reply(200, #{ +init(Req0, Opts) -> + Req = cowboy_req:reply(200, #{ <<"content-type">> => <<"text/plain">> - }, <<"Hello world!">>, Req), + }, <<"Hello world!">>, Req0), {ok, Req, Opts}. diff --git a/examples/upload/src/upload_handler.erl b/examples/upload/src/upload_handler.erl index dec634d..08bca6f 100644 --- a/examples/upload/src/upload_handler.erl +++ b/examples/upload/src/upload_handler.erl @@ -6,8 +6,8 @@ -export([init/2]). init(Req, Opts) -> - {ok, Headers, Req2} = cowboy_req:part(Req), - {ok, Data, Req3} = cowboy_req:part_body(Req2), + {ok, Headers, Req2} = cowboy_req:read_part(Req), + {ok, Data, Req3} = cowboy_req:read_part_body(Req2), {file, <<"inputfile">>, Filename, ContentType, _TE} = cow_multipart:form_data(Headers), io:format("Received file ~p of content-type ~p as follow:~n~p~n~n", diff --git a/examples/websocket/src/ws_handler.erl b/examples/websocket/src/ws_handler.erl index eaa9284..69d8d7b 100644 --- a/examples/websocket/src/ws_handler.erl +++ b/examples/websocket/src/ws_handler.erl @@ -1,13 +1,17 @@ -module(ws_handler). -export([init/2]). +-export([websocket_init/2]). -export([websocket_handle/3]). -export([websocket_info/3]). init(Req, Opts) -> - erlang:start_timer(1000, self(), <<"Hello!">>), {cowboy_websocket, Req, Opts}. +websocket_init(Req, State) -> + erlang:start_timer(1000, self(), <<"Hello!">>), + {ok, Req, State}. + websocket_handle({text, Msg}, Req, State) -> {reply, {text, << "That's what she said! ", Msg/binary >>}, Req, State}; websocket_handle(_Data, Req, State) -> |