diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/README.md | 5 | ||||
-rw-r--r-- | examples/eventsource/src/eventsource_app.erl | 6 | ||||
-rw-r--r-- | examples/markdown_middleware/src/markdown_middleware_app.erl | 9 | ||||
-rw-r--r-- | examples/static_world/src/static_world_app.erl | 11 | ||||
-rw-r--r-- | examples/web_server/src/directory_lister.erl | 4 | ||||
-rw-r--r-- | examples/web_server/src/web_server_app.erl | 14 | ||||
-rw-r--r-- | examples/websocket/src/websocket_app.erl | 11 |
7 files changed, 17 insertions, 43 deletions
diff --git a/examples/README.md b/examples/README.md index 8b82296..0b1e67f 100644 --- a/examples/README.md +++ b/examples/README.md @@ -51,3 +51,8 @@ Cowboy examples * [websocket](./websocket): websocket example + +Other languages +--------------- + + * [elixir](https://github.com/joshrotenberg/elixir_cowboy_examples) diff --git a/examples/eventsource/src/eventsource_app.erl b/examples/eventsource/src/eventsource_app.erl index 4f5594b..6ee8611 100644 --- a/examples/eventsource/src/eventsource_app.erl +++ b/examples/eventsource/src/eventsource_app.erl @@ -14,11 +14,7 @@ start(_Type, _Args) -> Dispatch = cowboy_router:compile([ {'_', [ {"/eventsource", eventsource_handler, []}, - {"/", cowboy_static, [ - {directory, {priv_dir, eventsource, []}}, - {file, <<"index.html">>}, - {mimetypes, [{<<".html">>, [<<"text/html">>]}]} - ]} + {"/", cowboy_static, {priv_file, eventsource, "index.html"}} ]} ]), {ok, _} = cowboy:start_http(http, 100, [{port, 8080}], [ diff --git a/examples/markdown_middleware/src/markdown_middleware_app.erl b/examples/markdown_middleware/src/markdown_middleware_app.erl index 98a909d..0c1ea74 100644 --- a/examples/markdown_middleware/src/markdown_middleware_app.erl +++ b/examples/markdown_middleware/src/markdown_middleware_app.erl @@ -13,14 +13,7 @@ start(_Type, _Args) -> Dispatch = cowboy_router:compile([ {'_', [ - {"/[...]", cowboy_static, [ - {directory, {priv_dir, markdown_middleware, []}}, - {mimetypes, [ - {<<".html">>, [<<"text/html">>]}, - {<<".mp4">>, [<<"video/mp4">>]}, - {<<".ogv">>, [<<"video/ogg">>]} - ]} - ]} + {"/[...]", cowboy_static, {priv_dir, markdown_middleware, ""}} ]} ]), {ok, _} = cowboy:start_http(http, 100, [{port, 8080}], [ diff --git a/examples/static_world/src/static_world_app.erl b/examples/static_world/src/static_world_app.erl index 4cc0254..f5ab1a9 100644 --- a/examples/static_world/src/static_world_app.erl +++ b/examples/static_world/src/static_world_app.erl @@ -13,15 +13,8 @@ start(_Type, _Args) -> Dispatch = cowboy_router:compile([ {'_', [ - {"/[...]", cowboy_static, [ - {directory, {priv_dir, static_world, []}}, - {mimetypes, [ - {<<".html">>, [<<"text/html">>]}, - {<<".txt">>, [<<"text/plain">>]}, - {<<".mp4">>, [<<"video/mp4">>]}, - {<<".ogv">>, [<<"video/ogg">>]} - ]} - ]} + {"/[...]", cowboy_static, {priv_dir, static_world, "", + [{mimetypes, cow_mimetypes, all}]}} ]} ]), {ok, _} = cowboy:start_http(http, 100, [{port, 8080}], [ diff --git a/examples/web_server/src/directory_lister.erl b/examples/web_server/src/directory_lister.erl index aa36314..79d5ea3 100644 --- a/examples/web_server/src/directory_lister.erl +++ b/examples/web_server/src/directory_lister.erl @@ -14,8 +14,8 @@ execute(Req, Env) -> redirect_directory(Req, Env) -> {Path, Req1} = cowboy_req:path_info(Req), Path1 = << <<S/binary, $/>> || S <- Path >>, - {handler_opts, StaticOpts} = lists:keyfind(handler_opts, 1, Env), - {dir_handler, DirHandler} = lists:keyfind(dir_handler, 1, StaticOpts), + {handler_opts, {_, _, _, Extra}} = lists:keyfind(handler_opts, 1, Env), + {dir_handler, DirHandler} = lists:keyfind(dir_handler, 1, Extra), FullPath = resource_path(Path1), case valid_path(Path) and filelib:is_dir(FullPath) of true -> handle_directory(Req1, Env, Path1, FullPath, DirHandler); diff --git a/examples/web_server/src/web_server_app.erl b/examples/web_server/src/web_server_app.erl index 988a8fb..e32d947 100644 --- a/examples/web_server/src/web_server_app.erl +++ b/examples/web_server/src/web_server_app.erl @@ -13,16 +13,10 @@ start(_Type, _Args) -> Dispatch = cowboy_router:compile([ {'_', [ - {"/[...]", cowboy_static, [ - {directory, {priv_dir, web_server, []}}, - {dir_handler, directory_handler}, - {mimetypes, [ - {<<".html">>, [<<"text/html">>]}, - {<<".txt">>, [<<"text/plain">>]}, - {<<".mp4">>, [<<"video/mp4">>]}, - {<<".ogv">>, [<<"video/ogg">>]} - ]} - ]} + {"/[...]", cowboy_static, {priv_dir, web_server, "", [ + {mimetypes, cow_mimetypes, all}, + {dir_handler, directory_handler} + ]}} ]} ]), {ok, _} = cowboy:start_http(http, 100, [{port, 8080}], [ diff --git a/examples/websocket/src/websocket_app.erl b/examples/websocket/src/websocket_app.erl index 1b9a421..5a37227 100644 --- a/examples/websocket/src/websocket_app.erl +++ b/examples/websocket/src/websocket_app.erl @@ -12,16 +12,9 @@ start(_Type, _Args) -> Dispatch = cowboy_router:compile([ {'_', [ - {"/", cowboy_static, [ - {directory, {priv_dir, websocket, []}}, - {file, <<"index.html">>}, - {mimetypes, [{<<".html">>, [<<"text/html">>]}]} - ]}, + {"/", cowboy_static, {priv_file, websocket, "index.html"}}, {"/websocket", ws_handler, []}, - {"/static/[...]", cowboy_static, [ - {directory, {priv_dir, websocket, [<<"static">>]}}, - {mimetypes, [{<<".js">>, [<<"application/javascript">>]}]} - ]} + {"/static/[...]", cowboy_static, {priv_dir, websocket, "static"}} ]} ]), {ok, _} = cowboy:start_http(http, 100, [{port, 8080}], |