umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 20:30:23 +00:00
Code Issues Wiki Activity

Make HTTP req accessors call themselves with their default default value

Browse source 
Use lists:keyfind/3 in qs_val/3, binding/3 and header/3 and make qs_val/2,
binding/2 and header/2 call those.
This commit is contained in:
Anthony Ramine 2011-03-29 13:49:48 +02:00
parent 4eeabe5612
commit 96a770620e
1 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/cowboy_http_req.erl
View file

@ -1,4 +1,5 @@
%% Copyright (c) 2011, Loïc Hoguin <essen@dev-extend.eu>
%% Copyright (c) 2011, Anthony Ramine <nox@dev-extend.eu>
%%
%% Permission to use, copy, modify, and/or distribute this software for any
%% purpose with or without fee is hereby granted, provided that the above
@ -72,23 +73,21 @@ raw_path(Req) ->
-spec qs_val(Name::string(), Req::#http_req{})
-> {Value::string() | true | undefined, Req::#http_req{}}.
qs_val(Name, Req=#http_req{raw_qs=RawQs, qs_vals=undefined}) ->
QsVals = parse_qs(RawQs),
qs_val(Name, Req#http_req{qs_vals=QsVals});
%% @equiv qs_val(Name, Req) -> qs_val(Name, undefined, Req)
qs_val(Name, Req) ->
case lists:keyfind(Name, 1, Req#http_req.qs_vals) of
{Name, Value} -> {Value, Req};
false -> {undefined, Req}
end.
qs_val(Name, undefined, Req).
-spec qs_val(Name::string(), Default::term(), Req::#http_req{})
-> {Value::string() | term() | true, Req::#http_req{}}.
-spec qs_val(Name::string(), Default, Req::#http_req{})
-> {Value::string() | true | Default, Req::#http_req{}}
when Default::term().
qs_val(Name, Default, Req=#http_req{raw_qs=RawQs, qs_vals=undefined}) ->
QsVals = parse_qs(RawQs),
qs_val(Name, Default, Req#http_req{qs_vals=QsVals});
qs_val(Name, Default, Req) ->
Value = proplists:get_value(Name, Req#http_req.qs_vals, Default),
{Value, Req}.
case lists:keyfind(Name, 1, Req#http_req.qs_vals) of
{Name, Value} -> {Value, Req};
false -> {Default, Req}
end.
-spec qs_vals(Req::#http_req{})
-> {list({Name::string(), Value::string() | true}), Req::#http_req{}}.
@ -104,18 +103,18 @@ raw_qs(Req) ->
-spec binding(Name::atom(), Req::#http_req{})
-> {Value::string() | undefined, Req::#http_req{}}.
%% @equiv binding(Name, Req) -> binding(Name, undefined, Req)
binding(Name, Req) ->
binding(Name, undefined, Req).
-spec binding(Name::atom(), Default, Req::#http_req{})
-> {Value::string() | Default, Req::#http_req{}} when Default::term().
binding(Name, Default, Req) ->
case lists:keyfind(Name, 1, Req#http_req.bindings) of
{Name, Value} -> {Value, Req};
false -> {undefined, Req}
false -> {Default, Req}
end.
-spec binding(Name::atom(), Default::term(), Req::#http_req{})
-> {Value::string() | term(), Req::#http_req{}}.
binding(Name, Default, Req) ->
Value = proplists:get_value(Name, Req#http_req.bindings, Default),
{Value, Req}.
-spec bindings(Req::#http_req{})
-> {list({Name::atom(), Value::string()}), Req::#http_req{}}.
bindings(Req) ->
@ -123,18 +122,18 @@ bindings(Req) ->
-spec header(Name::atom() | string(), Req::#http_req{})
-> {Value::string() | undefined, Req::#http_req{}}.
%% @equiv header(Name, Req) -> header(Name, undefined, Req)
header(Name, Req) ->
header(Name, undefined, Req).
-spec header(Name::atom() | string(), Default, Req::#http_req{})
-> {Value::string() | Default, Req::#http_req{}} when Default::term().
header(Name, Default, Req) ->
case lists:keyfind(Name, 1, Req#http_req.headers) of
{Name, Value} -> {Value, Req};
false -> {undefined, Req}
false -> {Default, Req}
end.
-spec header(Name::atom() | string(), Default::term(), Req::#http_req{})
-> {Value::string() | term(), Req::#http_req{}}.
header(Name, Default, Req) ->
Value = proplists:get_value(Name, Req#http_req.headers, Default),
{Value, Req}.
-spec headers(Req::#http_req{})
-> {list({Name::atom() | string(), Value::string()}), Req::#http_req{}}.
headers(Req) ->