diff options
author | Loïc Hoguin <[email protected]> | 2017-06-28 17:38:17 +0200 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2017-06-28 17:38:17 +0200 |
commit | c22173037134becbac882533f80339f4127a8ad2 (patch) | |
tree | 666fc6e31c9e02766eb33ecadc5068dd54e18aa4 /src/cowboy_req.erl | |
parent | 3eb7693e4fd7e1172b55b30ab25c5656040d1fd2 (diff) | |
download | cowboy-c22173037134becbac882533f80339f4127a8ad2.tar.gz cowboy-c22173037134becbac882533f80339f4127a8ad2.tar.bz2 cowboy-c22173037134becbac882533f80339f4127a8ad2.zip |
Improve the interface for constraints
There are two important changes in this commit.
Constraints are now producing an error tuple. This error tuple
in turn can be provided to a function for formatting a human
readable error message. Both the error tuple and the formatting
code are controlled by and part of the constraint function.
Constraints now also implement the reverse operation.
When constraint functions only validate, the reverse operation
will be the same as the forward operation. When they also do
some conversion then the reverse operation will reverse it.
Since constraints are now performing 3 different operations
(forward, reverse and format_error), they now take the form
of a function accepting two separate arguments. The operation
is the first argument.
In addition, the return value was changed to take the form
of {ok, Value} | {error, Reason}. The value must be returned
as-is if it was not modified.
Diffstat (limited to 'src/cowboy_req.erl')
-rw-r--r-- | src/cowboy_req.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cowboy_req.erl b/src/cowboy_req.erl index ab77a68..3eca379 100644 --- a/src/cowboy_req.erl +++ b/src/cowboy_req.erl @@ -780,10 +780,10 @@ filter([Key|Tail], Map) -> true = maps:is_key(Key, Map), filter(Tail, Map). -filter_constraints(Tail, Map, Key, Value, Constraints) -> - case cowboy_constraints:validate(Value, Constraints) of - true -> - filter(Tail, Map); - {true, Value2} -> - filter(Tail, Map#{Key => Value2}) +filter_constraints(Tail, Map, Key, Value0, Constraints) -> + case cowboy_constraints:validate(Value0, Constraints) of + {ok, Value} -> + filter(Tail, Map#{Key => Value}); + {error, Reason} -> + exit(Reason) end. |