diff options
| -rw-r--r-- | examples/static/src/static_app.erl | 2 | ||||
| -rw-r--r-- | src/cowboy_static.erl (renamed from src/cowboy_http_static.erl) | 24 | ||||
| -rw-r--r-- | test/http_SUITE.erl | 10 |
3 files changed, 18 insertions, 18 deletions
diff --git a/examples/static/src/static_app.erl b/examples/static/src/static_app.erl index b919c27..0777aec 100644 --- a/examples/static/src/static_app.erl +++ b/examples/static/src/static_app.erl @@ -13,7 +13,7 @@ start(_Type, _Args) -> Dispatch = [ {'_', [ - {['...'], cowboy_http_static, [ + {['...'], cowboy_static, [ {directory, {priv_dir, static, []}} ]} ]} diff --git a/src/cowboy_http_static.erl b/src/cowboy_static.erl index ca13532..7a84939 100644 --- a/src/cowboy_http_static.erl +++ b/src/cowboy_static.erl @@ -44,15 +44,15 @@ %% ==== Examples ==== %% ``` %% %% Serve files from /var/www/ under http://example.com/static/ -%% {[<<"static">>, '...'], cowboy_http_static, +%% {[<<"static">>, '...'], cowboy_static, %% [{directory, "/var/www"}]} %% %% %% Serve files from the current working directory under http://example.com/static/ -%% {[<<"static">>, '...'], cowboy_http_static, +%% {[<<"static">>, '...'], cowboy_static, %% [{directory, <<"./">>}]} %% %% %% Serve files from cowboy/priv/www under http://example.com/ -%% {['...'], cowboy_http_static, +%% {['...'], cowboy_static, %% [{directory, {priv_dir, cowboy, [<<"www">>]}}]} %% ''' %% @@ -74,14 +74,14 @@ %% ==== Example ==== %% ``` %% %% Use a static list of content types. -%% {[<<"static">>, '...'], cowboy_http_static, +%% {[<<"static">>, '...'], cowboy_static, %% [{directory, {priv_dir, cowboy, []}}, %% {mimetypes, [ %% {<<".css">>, [<<"text/css">>]}, %% {<<".js">>, [<<"application/javascript">>]}]}]} %% %% %% Use the default database in the mimetypes application. -%% {[<<"static">>, '...', cowboy_http_static, +%% {[<<"static">>, '...', cowboy_static, %% [{directory, {priv_dir, cowboy, []}}, %% {mimetypes, {fun mimetypes:path_to_mimes/2, default}}]]} %% ''' @@ -110,17 +110,17 @@ %% ==== Examples ==== %% ``` %% %% A value of default is equal to not specifying the option. -%% {[<<"static">>, '...', cowboy_http_static, +%% {[<<"static">>, '...', cowboy_static, %% [{directory, {priv_dir, cowboy, []}}, %% {etag, default}]]} %% %% %% Use all avaliable ETag function arguments to generate a header value. -%% {[<<"static">>, '...', cowboy_http_static, +%% {[<<"static">>, '...', cowboy_static, %% [{directory, {priv_dir, cowboy, []}}, %% {etag, {attributes, [filepath, filesize, inode, mtime]}}]]} %% %% %% Use a user defined function to generate a strong ETag header value. -%% {[<<"static">>, '...', cowboy_http_static, +%% {[<<"static">>, '...', cowboy_static, %% [{directory, {priv_dir, cowboy, []}}, %% {etag, {fun generate_strong_etag/2, strong_etag_extra}}]]} %% @@ -153,21 +153,21 @@ %% %% ``` %% %% Serve cowboy/priv/www/index.html as http://example.com/ -%% {[], cowboy_http_static, +%% {[], cowboy_static, %% [{directory, {priv_dir, cowboy, [<<"www">>]}} %% {file, <<"index.html">>}]} %% %% %% Serve cowboy/priv/www/page.html under http://example.com/*/page -%% {['*', <<"page">>], cowboy_http_static, +%% {['*', <<"page">>], cowboy_static, %% [{directory, {priv_dir, cowboy, [<<"www">>]}} %% {file, <<"page.html">>}]}. %% %% %% Always serve cowboy/priv/www/other.html under http://example.com/other -%% {[<<"other">>, '...'], cowboy_http_static, +%% {[<<"other">>, '...'], cowboy_static, %% [{directory, {priv_dir, cowboy, [<<"www">>]}} %% {file, "other.html"}]} %% ''' --module(cowboy_http_static). +-module(cowboy_static). %% include files -include("http.hrl"). diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl index 60cbbe7..6bed436 100644 --- a/test/http_SUITE.erl +++ b/test/http_SUITE.erl @@ -227,21 +227,21 @@ init_dispatch(Config) -> [{body, <<"A flameless dance does not equal a cycle">>}]}, {[<<"stream_body">>, <<"set_resp">>], http_handler_stream_body, [{reply, set_resp}, {body, <<"stream_body_set_resp">>}]}, - {[<<"static">>, '...'], cowboy_http_static, + {[<<"static">>, '...'], cowboy_static, [{directory, ?config(static_dir, Config)}, {mimetypes, [{<<".css">>, [<<"text/css">>]}]}]}, - {[<<"static_mimetypes_function">>, '...'], cowboy_http_static, + {[<<"static_mimetypes_function">>, '...'], cowboy_static, [{directory, ?config(static_dir, Config)}, {mimetypes, {fun(Path, data) when is_binary(Path) -> [<<"text/html">>] end, data}}]}, {[<<"handler_errors">>], http_handler_errors, []}, - {[<<"static_attribute_etag">>, '...'], cowboy_http_static, + {[<<"static_attribute_etag">>, '...'], cowboy_static, [{directory, ?config(static_dir, Config)}, {etag, {attributes, [filepath, filesize, inode, mtime]}}]}, - {[<<"static_function_etag">>, '...'], cowboy_http_static, + {[<<"static_function_etag">>, '...'], cowboy_static, [{directory, ?config(static_dir, Config)}, {etag, {fun static_function_etag/2, etag_data}}]}, - {[<<"static_specify_file">>, '...'], cowboy_http_static, + {[<<"static_specify_file">>, '...'], cowboy_static, [{directory, ?config(static_dir, Config)}, {mimetypes, [{<<".css">>, [<<"text/css">>]}]}, {file, <<"test_file.css">>}]}, |