Merge branch 'static-updates' of https://github.com/klaar/cowboy

2 files changed, 32 insertions, 4 deletions

diff --git a/src/cowboy_http_static.erl b/src/cowboy_http_static.erl
index a98026d..94ba6cd 100644
--- a/src/cowboy_http_static.erl
+++ b/src/cowboy_http_static.erl
@@ -65,13 +65,25 @@
 %% The mimetypes must be of a type that the `cowboy_http_rest' protocol can
 %% handle.
 %%
+%% The <a href="https://github.com/spawngrid/mimetypes">spawngrid/mimetypes</a>
+%% application, or an arbitrary function accepting the path to the file being
+%% served, can also be used to generate the list of content types for a static
+%% file resource. The function used must accept an additional argument after
+%% the file path argument.
+%%
 %% ==== Example ====
 %% ```
+%% %% Use a static list of content types.
 %% {[<<"static">>, '...'], cowboy_http_static,
 %%     [{directory, {priv_dir, cowboy, []}},
 %%      {mimetypes, [
 %%          {<<".css">>, [<<"text/css">>]},
 %%          {<<".js">>, [<<"application/javascript">>]}]}]}
+%%
+%% %% Use the default database in the mimetypes application.
+%% {[<<"static">>, '...', cowboy_http_static,
+%%     [{directory, {priv_dir, cowboy, []}},
+%%      {mimetypes, {fun mimetypes:path_to_mimes/2, default}}]]}
 %% '''
 -module(cowboy_http_static).
 
diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl
index bc8d1f7..ffb0beb 100644
--- a/test/http_SUITE.erl
+++ b/test/http_SUITE.erl
@@ -21,7 +21,8 @@
 -export([chunked_response/1, headers_dupe/1, headers_huge/1,
 	keepalive_nl/1, max_keepalive/1, nc_rand/1, nc_zero/1,
 	pipeline/1, raw/1, set_resp_header/1, set_resp_overwrite/1,
-	set_resp_body/1, stream_body_set_resp/1, response_as_req/1]). %% http.
+	set_resp_body/1, stream_body_set_resp/1, response_as_req/1,
+	static_mimetypes_function/1]). %% http.
 -export([http_200/1, http_404/1, file_200/1, file_403/1,
 	dir_403/1, file_404/1, file_400/1]). %% http and https.
 -export([http_10_hostless/1]). %% misc.
@@ -38,7 +39,8 @@ groups() ->
 	[{http, [], [chunked_response, headers_dupe, headers_huge,
 		keepalive_nl, max_keepalive, nc_rand, nc_zero, pipeline, raw,
 		set_resp_header, set_resp_overwrite,
-		set_resp_body, response_as_req, stream_body_set_resp] ++ BaseTests},
+		set_resp_body, response_as_req, stream_body_set_resp,
+		static_mimetypes_function] ++ BaseTests},
 	{https, [], BaseTests},
 	{misc, [], [http_10_hostless]},
 	{rest, [], [rest_simple, rest_keepalive]}].
@@ -100,9 +102,11 @@ end_per_group(https, Config) ->
 	application:stop(crypto),
 	end_static_dir(Config),
 	ok;
-end_per_group(Listener, Config) ->
+end_per_group(http, Config) ->
+	cowboy:stop_listener(http),
+	end_static_dir(Config);
+end_per_group(Listener, _Config) ->
 	cowboy:stop_listener(Listener),
-	end_static_dir(Config),
 	ok.
 
 %% Dispatch configuration.
@@ -126,6 +130,10 @@ init_http_dispatch(Config) ->
 			{[<<"static">>, '...'], cowboy_http_static,
 				[{directory, ?config(static_dir, Config)},
 				 {mimetypes, [{<<".css">>, [<<"text/css">>]}]}]},
+			{[<<"static_mimetypes_function">>, '...'], cowboy_http_static,
+				[{directory, ?config(static_dir, Config)},
+				 {mimetypes, {fun(Path, data) when is_binary(Path) ->
+					[<<"text/html">>] end, data}}]},
 			{[], http_handler, []}
 		]}
 	].
@@ -142,6 +150,7 @@ init_static_dir(Config) ->
 	ok = file:write_file(Level1("test_file.css"), "test_file.css\n"),
 	ok = file:write_file(Level1("test_noread"), "test_noread\n"),
 	ok = file:change_mode(Level1("test_noread"), 8#0333),
+	ok = file:write_file(Level1("test.html"), "test.html\n"),
 	ok = file:make_dir(Level1("test_dir")),
 	[{static_dir, Dir}|Config].
 
@@ -151,6 +160,7 @@ end_static_dir(Config) ->
 	ok = file:delete(Level1("test_file")),
 	ok = file:delete(Level1("test_file.css")),
 	ok = file:delete(Level1("test_noread")),
+	ok = file:delete(Level1("test.html")),
 	ok = file:del_dir(Level1("test_dir")),
 	ok = file:del_dir(Dir),
 	Config.
@@ -370,6 +380,12 @@ stream_body_set_resp(Config) ->
 	{ok, Data} = gen_tcp:recv(Socket, 0, 6000),
 	{_Start, _Length} = binary:match(Data, <<"stream_body_set_resp">>).
 
+static_mimetypes_function(Config) ->
+	TestURL = build_url("/static_mimetypes_function/test.html", Config),
+	{ok, {{"HTTP/1.1", 200, "OK"}, Headers1, "test.html\n"}} =
+		httpc:request(TestURL),
+	"text/html" = ?config("content-type", Headers1).
+
 
 %% http and https.