-updated router;

-updated examples to support changes in hot_teacup library;
kamchatka-volcano · Aug 22, 2024 · 52b73c7 · 52b73c7
1 parent 9556fd6
commit 52b73c7
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ SealLake_Bundle(
 SealLake_Bundle(
         NAME asyncgi_whaleroute
         GIT_REPOSITORY https://github.com/kamchatka-volcano/whaleroute.git
-        GIT_TAG v3.1.0
+        GIT_TAG dev
         DESTINATION include/asyncgi/detail/external
         DIRECTORIES include/whaleroute
         TEXT_REPLACEMENTS

diff --git a/examples/example_guestbook.cpp b/examples/example_guestbook.cpp
@@ -46,14 +46,14 @@ http::Response showLoginPage(const http::Request&)
 http::Response loginAdmin(const http::Request& request)
 {
     if (request.formField("login") == "admin" && request.formField("passwd") == "12345")
-        return {http::Redirect{"/"}, {http::Cookie("admin_id", "ADMIN_SECRET")}};
+        return {http::Redirect{"/"}, http::Cookies{{"admin_id", "ADMIN_SECRET"}}};
     else
         return http::Redirect{"/login"};
 }
 
 http::Response logoutAdmin(const http::Request&)
 {
-    return {http::Redirect{"/"}, {http::Cookie("admin_id", "")}};
+    return {http::Redirect{"/"}, http::Cookies{{"admin_id", ""}}};
 }
 
 struct GuestBookMessage {
@@ -193,12 +193,11 @@ int main()
     auto io = asyncgi::IO{4};
     auto state = GuestBookState{};
     auto router = asyncgi::Router<RouteContext>{io};
-    router.route(asyncgi::rx{".*"}).process(authorizeAdmin);
+    router.route("{path}").process(authorizeAdmin);
     router.route("/", http::RequestMethod::Get).process(showGuestBookPage(state));
     router.route("/", http::RequestMethod::Post).process(addMessage(state));
-    router.route(asyncgi::rx{"/delete/(.+)"}, http::RequestMethod::Post, AccessRole::Admin)
-            .process(removeMessage(state));
-    router.route(asyncgi::rx{"/delete/(.+)"}, http::RequestMethod::Post, AccessRole::Guest)
+    router.route("/delete/{str}/", http::RequestMethod::Post, AccessRole::Admin).process(removeMessage(state));
+    router.route("/delete/{str}/", http::RequestMethod::Post, AccessRole::Guest)
             .set(http::ResponseStatus::_401_Unauthorized);
     router.route("/login", http::RequestMethod::Get, AccessRole::Guest).process(showLoginPage);
     router.route("/login", http::RequestMethod::Post, AccessRole::Guest).process(loginAdmin);

diff --git a/examples/example_route_context.cpp b/examples/example_route_context.cpp
@@ -46,7 +46,7 @@ struct LoginPageAuthorize {
     {
         if (context.role == AccessRole::Guest) {
             if (request.formField("login") == "admin" && request.formField("passwd") == "12345")
-                return {http::Redirect{"/"}, {asyncgi::http::Cookie("admin_id", "ADMIN_SECRET")}};
+                return {http::Redirect{"/"}, asyncgi::http::Cookies{{"admin_id", "ADMIN_SECRET"}}};
             else
                 return http::Redirect{"/login"};
         }
@@ -59,7 +59,7 @@ int main()
 {
     auto io = asyncgi::IO{4}; //4 threads processing requests
     auto router = asyncgi::Router<RouteContext>{io};
-    router.route(asyncgi::rx{".*"}).process<AdminAuthorizer>();
+    router.route("{path}").process<AdminAuthorizer>();
     router.route("/").process(
             [](const http::Request&, RouteContext& context) -> http::Response
             {

diff --git a/examples/example_route_matcher.cpp b/examples/example_route_matcher.cpp
@@ -60,7 +60,7 @@ int main()
 {
     auto io = asyncgi::IO{4};
     auto router = asyncgi::Router<RouteContext>{io};
-    router.route(asyncgi::rx{".*"}).process<AdminAuthorizer>();
+    router.route("{path}").process<AdminAuthorizer>();
     router.route("/").process(
             [](const http::Request&, RouteContext& context) -> http::Response
             {

diff --git a/examples/example_route_params.cpp b/examples/example_route_params.cpp
@@ -107,7 +107,7 @@ int main()
     auto router = asyncgi::Router{io};
     router.route("/", http::RequestMethod::Get).process<GuestBookPage>(state);
     router.route("/", http::RequestMethod::Post).process<GuestBookAddMessage>(state);
-    router.route(asyncgi::rx{"/delete/(.+)"}, http::RequestMethod::Post).process<GuestBookRemoveMessage>(state);
+    router.route("/delete/{str}", http::RequestMethod::Post).process<GuestBookRemoveMessage>(state);
     router.route().set(http::ResponseStatus::_404_Not_Found, "Page not found");
 
     auto server = asyncgi::Server{io, router};

diff --git a/examples/example_route_params_user_defined_types.cpp b/examples/example_route_params_user_defined_types.cpp
@@ -119,7 +119,7 @@ int main()
     auto router = asyncgi::Router{io};
     router.route("/", http::RequestMethod::Get).process<GuestBookPage>(state);
     router.route("/", http::RequestMethod::Post).process<GuestBookAddMessage>(state);
-    router.route(asyncgi::rx{"/delete/(.+)"}, http::RequestMethod::Post).process<GuestBookRemoveMessage>(state);
+    router.route("/delete/{str}", http::RequestMethod::Post).process<GuestBookRemoveMessage>(state);
     router.route().set(http::ResponseStatus::_404_Not_Found, "Page not found");
 
     auto server = asyncgi::Server{io, router};

diff --git a/include/asyncgi/types.h b/include/asyncgi/types.h
@@ -9,8 +9,6 @@
 namespace asyncgi {
 using _ = whaleroute::_;
 
-using rx = whaleroute::rx;
-namespace string_literals = whaleroute::string_literals;
 using TrailingSlashMode = whaleroute::TrailingSlashMode;
 template<int minSize = 0>
 using RouteParameters = whaleroute::RouteParameters<minSize>;