Merge pull request #1127 from tyler92/bind_const_memfn

Add the ability to use Routes::bind with constant member functions
pistacheio · Mar 25, 2023 · a68ad09 · a68ad09
2 parents 7f6bb27 + fa6e5da
commit a68ad09
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 5 deletions.
diff --git a/include/pistache/router.h b/include/pistache/router.h
@@ -416,6 +416,18 @@ namespace Pistache::Rest
             };
         }
 
+        template <typename Result, typename Cls, typename... Args, typename Obj>
+        Route::Handler bind(Result (Cls::*func)(Args...) const, Obj obj)
+        {
+            details::static_checks<details::BindChecks, Args...>();
+
+            return [=](const Rest::Request& request, Http::ResponseWriter response) {
+                (obj->*func)(request, std::move(response));
+
+                return Route::Result::Ok;
+            };
+        }
+
         template <typename Result, typename Cls, typename... Args, typename Obj>
         Route::Handler bind(Result (Cls::*func)(Args...), std::shared_ptr<Obj> objPtr)
         {
@@ -428,6 +440,18 @@ namespace Pistache::Rest
             };
         }
 
+        template <typename Result, typename Cls, typename... Args, typename Obj>
+        Route::Handler bind(Result (Cls::*func)(Args...) const, std::shared_ptr<Obj> objPtr)
+        {
+            details::static_checks<details::BindChecks, Args...>();
+
+            return [=](const Rest::Request& request, Http::ResponseWriter response) {
+                (objPtr.get()->*func)(request, std::move(response));
+
+                return Route::Result::Ok;
+            };
+        }
+
         template <typename Result, typename... Args>
         Route::Handler bind(Result (*func)(Args...))
         {

diff --git a/tests/router_test.cc b/tests/router_test.cc
@@ -257,14 +257,23 @@ class MyHandler
         const Pistache::Rest::Request&,
         Pistache::Http::ResponseWriter response)
     {
-        count_++;
+        (*count_)++;
         response.send(Pistache::Http::Code::Ok);
     }
 
-    int getCount() { return count_; }
+    void handleConst(
+        const Pistache::Rest::Request&,
+        Pistache::Http::ResponseWriter response) const
+    {
+        (*count_)++;
+        response.send(Pistache::Http::Code::Ok);
+    }
+
+
+    int getCount() { return *count_; }
 
 private:
-    int count_ = 0;
+    std::unique_ptr<int> count_ = std::make_unique<int>(0);
 };
 
 TEST(router_test, test_bind_shared_ptr)
@@ -280,6 +289,7 @@ TEST(router_test, test_bind_shared_ptr)
     Rest::Router router;
 
     Routes::Head(router, "/tinkywinky", Routes::bind(&MyHandler::handle, sharedPtr));
+    Routes::Head(router, "/checkconst", Routes::bind(&MyHandler::handleConst, sharedPtr));
 
     endpoint->setHandler(router.handler());
     endpoint->serveThreaded();
@@ -289,6 +299,8 @@ TEST(router_test, test_bind_shared_ptr)
     ASSERT_EQ(sharedPtr->getCount(), 0);
     client.Head("/tinkywinky");
     ASSERT_EQ(sharedPtr->getCount(), 1);
+    client.Head("/checkconst");
+    ASSERT_EQ(sharedPtr->getCount(), 2);
 
     endpoint->shutdown();
 }
@@ -382,7 +394,7 @@ TEST(router_test, test_auth_middleware)
     router.addMiddleware(Routes::middleware(&fill_auth_header));
     router.addMiddleware(Routes::middleware(&HandlerWithAuthMiddleware::do_auth, &handler));
 
-    Routes::Head(router, "/tinkywinky", Routes::bind(&HandlerWithAuthMiddleware::handle, &handler));
+    Routes::Head(router, "/tinkywinky", Routes::bind(&HandlerWithAuthMiddleware::handleConst, &handler));
     endpoint->setHandler(router.handler());
     endpoint->serveThreaded();
 

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.1.1.20230219
+0.1.1.20230324