Intermediate commit

Author: burbas

src/nova_router.erl

@@ -358,6 +358,7 @@ compile_paths([RouteInfo|Tl], Dispatch, Options) ->
 parse_url(_Host, [], _Prefix, _Value, Tree) -> {ok, Tree};
 parse_url(Host, [{StatusCode, Callback, Options}|Tl], T, Value, Tree) when is_integer(StatusCode) andalso
                                                                            is_function(Callback) ->
+    %% Store this information in a separate table for easy retrieval when we need to execute the callback for this status code
     Value0 = Value#nova_handler_value{callback = Callback},
     Res = lists:foldl(fun(Method, Tree0) ->
                               insert(Host, StatusCode, Method, Value0, Tree0)

src/nova_routing_trie.erl

@@ -205,8 +205,10 @@ member(Method0, Path, Trie) ->
 -spec member(method_in(), host_in(), iodata(), trie()) -> boolean().
 member(Method0, HostIn, Path, Trie) ->
     case lookup(Method0, HostIn, Path, Trie) of
-        {ok, _Node, _Payload, _Binds} -> true;
-        error                         -> false
+        {ok, _Node, _Payload, _Binds} ->
+            true;
+        _ ->
+            false
     end.
 
 %%--------------------------------------------------------------------
@@ -221,7 +223,7 @@ member(Method0, HostIn, Path, Trie) ->
 %%--------------------------------------------------------------------
 
 -spec lookup(iodata(), trie()) ->
-          {ok, trie_node(), term(), #{binary() => binary()}} | error.
+          {ok, trie_node(), term(), #{binary() => binary()}} | error | {error, comparator_not_found, MethodsAllowed :: binary() | [binary()]}.
 lookup(Path, Trie) ->
     lookup(<<"ALL">>, '_', Path, Trie).
 
@@ -246,8 +248,10 @@ lookup(Method0, HostIn, Path, Trie = #{hosts := Hosts}) ->
             case do_match(Jailed, HostTrie, #{}) of
                 {ok, Node, Binds} ->
                     case method_payload(M, Node) of
-                        {ok, Payload} -> {ok, Node, Payload, Binds};
-                        error         -> error
+                        {ok, Payload, Segs} ->
+                            {ok, Node, Payload, Binds};
+                        Error ->
+                            Error
                     end;
                 _ ->
                     error
@@ -429,8 +433,10 @@ method_payload(M, #{terminal := Term}) ->
                     {ok, Payload};
                 error ->
                     case maps:to_list(Term) of
-                        []           -> error;
-                        [{_, P} | _] -> {ok, P}
+                        [] ->
+                            {error, comparator_not_found, Term};
+                        [{_, P} | _] ->
+                            {ok, P}
                     end
             end;
         _ ->
@@ -439,8 +445,10 @@ method_payload(M, #{terminal := Term}) ->
                     {ok, Payload};
                 error ->
                     case maps:find(<<"ALL">>, Term) of
-                        {ok, Payload} -> {ok, Payload};
-                        error         -> error
+                        {ok, Payload} ->
+                            {ok, Payload};
+                        error ->
+                            {error, comparator_not_found, Term}
                     end
             end
     end.
@@ -718,10 +726,12 @@ do_match([Seg | Rest], N, Binds0) ->
                         error -> error;
                         Ok    -> Ok
                     end;
-                error -> error
+                error ->
+                    error
             end,
     case Exact of
-        {ok, _, _} -> Exact;
+        {ok, _, _} ->
+            Exact;
         error ->
             %% 2) Wildcard fallback
             case find_wild_child(Cs) of

src/nova_security_handler.erl

@@ -41,7 +41,6 @@ execute(Req = #{host := Host}, Env = #{secure := Callback}) ->
     end.
 
 
-
 handle_response({true, AuthData}, Req, Env) ->
     case maps:get(cowboy_handler, Env, undefined) of
         nova_ws_handler ->
@@ -53,9 +52,9 @@ handle_response({true, AuthData}, Req, Env) ->
 handle_response(true, Req, Env) ->
     {ok, Req, Env};
 handle_response({false, Headers}, Req, Env) ->
-    handle_response({false, 401, Headers, false}, Req, Env);
+    handle_response({false, 401, Headers, <<>>}, Req, Env);
 handle_response({false, StatusCode, Headers}, Req, Env) ->
-    handle_response({false, StatusCode, Headers, false}, Req, Env);
+    handle_response({false, StatusCode, Headers, <<>>}, Req, Env);
 handle_response({false, StatusCode, Headers, Body}, Req = #{host := Host}, Env) ->
     {ok, Req1, _Env1} =
         case Body of