aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorSlava Yurin <[email protected]>2013-02-15 22:41:55 +0700
committerSlava Yurin <[email protected]>2013-03-03 22:54:37 +0700
commitbb1362c744ec24a72fbb2fa3e1cc8e44ef51ab2d (patch)
treea36e4f404242b0408078a3e6eb59391dea3fcb24 /test
parentdbc1bc6d91548b199fc86a477bdc1873faa890ac (diff)
downloadcowboy-bb1362c744ec24a72fbb2fa3e1cc8e44ef51ab2d.tar.gz
cowboy-bb1362c744ec24a72fbb2fa3e1cc8e44ef51ab2d.tar.bz2
cowboy-bb1362c744ec24a72fbb2fa3e1cc8e44ef51ab2d.zip
Add '*' matcher for parameters
For get_type_provided: '*' will be match any parameters of media-range in "accept" header. If '*' matched, then '*' is replaced by the matching parameters. If Accept header is missing and '*' using, then in media_type in parameters will be '*' and reply content-type will be without any parameters. For content_types_accepted: '*' will be match any parameters in "content-type" header.
Diffstat (limited to 'test')
-rw-r--r--test/http_SUITE.erl42
-rw-r--r--test/rest_param_all.erl36
2 files changed, 78 insertions, 0 deletions
diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl
index 1b687c6..bd76f00 100644
--- a/test/http_SUITE.erl
+++ b/test/http_SUITE.erl
@@ -58,6 +58,7 @@
-export([rest_missing_get_callbacks/1]).
-export([rest_missing_put_callbacks/1]).
-export([rest_nodelete/1]).
+-export([rest_param_all/1]).
-export([rest_patch/1]).
-export([rest_resource_etags/1]).
-export([rest_resource_etags_if_none_match/1]).
@@ -124,6 +125,7 @@ groups() ->
rest_missing_get_callbacks,
rest_missing_put_callbacks,
rest_nodelete,
+ rest_param_all,
rest_patch,
rest_resource_etags,
rest_resource_etags_if_none_match,
@@ -346,6 +348,7 @@ init_dispatch(Config) ->
{file, <<"test_file.css">>}]},
{"/multipart", http_handler_multipart, []},
{"/echo/body", http_handler_echo_body, []},
+ {"/param_all", rest_param_all, []},
{"/bad_accept", rest_simple_resource, []},
{"/simple", rest_simple_resource, []},
{"/forbidden_post", rest_forbidden_resource, [true]},
@@ -790,6 +793,45 @@ pipeline_long_polling(Config) ->
{ok, 102, _, Client5} = cowboy_client:response(Client4),
{error, closed} = cowboy_client:response(Client5).
+rest_param_all(Config) ->
+ Client = ?config(client, Config),
+ URL = build_url("/param_all", Config),
+ % Accept without param
+ {ok, Client2} = cowboy_client:request(<<"GET">>, URL,
+ [{<<"accept">>, <<"text/plain">>}], Client),
+ Client3 = check_response(Client2, <<"[]">>),
+ % Accept with param
+ {ok, Client4} = cowboy_client:request(<<"GET">>, URL,
+ [{<<"accept">>, <<"text/plain;level=1">>}], Client3),
+ Client5 = check_response(Client4, <<"level=1">>),
+ % Accept with param and quality
+ {ok, Client6} = cowboy_client:request(<<"GET">>, URL,
+ [{<<"accept">>,
+ <<"text/plain;level=1;q=0.8, text/plain;level=2;q=0.5">>}],
+ Client5),
+ Client7 = check_response(Client6, <<"level=1">>),
+ {ok, Client8} = cowboy_client:request(<<"GET">>, URL,
+ [{<<"accept">>,
+ <<"text/plain;level=1;q=0.5, text/plain;level=2;q=0.8">>}],
+ Client7),
+ Client9 = check_response(Client8, <<"level=2">>),
+ % Without Accept
+ {ok, Client10} = cowboy_client:request(<<"GET">>, URL, [], Client9),
+ Client11 = check_response(Client10, <<"'*'">>),
+ % Content-Type without param
+ {ok, Client12} = cowboy_client:request(<<"PUT">>, URL,
+ [{<<"content-type">>, <<"text/plain">>}], Client11),
+ {ok, 204, _, Client13} = cowboy_client:response(Client12),
+ % Content-Type with param
+ {ok, Client14} = cowboy_client:request(<<"PUT">>, URL,
+ [{<<"content-type">>, <<"text/plain; charset=utf-8">>}], Client13),
+ {ok, 204, _, _} = cowboy_client:response(Client14).
+
+check_response(Client, Body) ->
+ {ok, 200, _, Client2} = cowboy_client:response(Client),
+ {ok, Body, Client3} = cowboy_client:response_body(Client2),
+ Client3.
+
rest_bad_accept(Config) ->
Client = ?config(client, Config),
{ok, Client2} = cowboy_client:request(<<"GET">>,
diff --git a/test/rest_param_all.erl b/test/rest_param_all.erl
new file mode 100644
index 0000000..09b8cd3
--- /dev/null
+++ b/test/rest_param_all.erl
@@ -0,0 +1,36 @@
+-module(rest_param_all).
+
+-export([init/3]).
+-export([allowed_methods/2]).
+-export([content_types_provided/2]).
+-export([get_text_plain/2]).
+-export([content_types_accepted/2]).
+-export([put_text_plain/2]).
+
+init(_Transport, _Req, _Opts) ->
+ {upgrade, protocol, cowboy_rest}.
+
+allowed_methods(Req, State) ->
+ {[<<"GET">>, <<"PUT">>], Req, State}.
+
+content_types_provided(Req, State) ->
+ {[{{<<"text">>, <<"plain">>, '*'}, get_text_plain}], Req, State}.
+
+get_text_plain(Req, State) ->
+ {{_, _, Param}, Req2} =
+ cowboy_req:meta(media_type, Req, {{<<"text">>, <<"plain">>}, []}),
+ Body = if
+ Param == '*' ->
+ <<"'*'">>;
+ Param == [] ->
+ <<"[]">>;
+ Param /= [] ->
+ iolist_to_binary([[Key, $=, Value] || {Key, Value} <- Param])
+ end,
+ {Body, Req2, State}.
+
+content_types_accepted(Req, State) ->
+ {[{{<<"text">>, <<"plain">>, '*'}, put_text_plain}], Req, State}.
+
+put_text_plain(Req, State) ->
+ {true, Req, State}.