handler can receive response as argument without request being anothe…

…r argument. PR ipkn#312 ukseong
rustyx · Feb 8, 2019 · b892260 · b892260
1 parent 157760e
commit b892260
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/include/crow/http_response.h b/include/crow/http_response.h
@@ -110,6 +110,12 @@ namespace crow
  }
  }
 
+ void end(const int &_code)
+ {
+ code = _code;
+ end();
+ }
+
  void end(const std::string& body_part)
  {
  body += body_part;

diff --git a/include/crow/routing.h b/include/crow/routing.h
@@ -516,7 +516,32 @@ namespace crow
  template <typename Func>
  typename std::enable_if<
  !black_magic::CallHelper<Func, black_magic::S<Args...>>::value &&
- !black_magic::CallHelper<Func, black_magic::S<crow::request, Args...>>::value, 
+ !black_magic::CallHelper<Func, black_magic::S<crow::request, Args...>>::value &&
+ black_magic::CallHelper<Func, black_magic::S<crow::response&, Args...>>::value,
+ void>::type
+ operator()(Func&& f) {
+ static_assert(black_magic::CallHelper<Func, black_magic::S<Args...>>::value ||
+ black_magic::CallHelper<Func, black_magic::S<crow::response&, Args...>>::value
+ ,
+ "Handler type is mismatched with URL parameters");
+ static_assert(std::is_same<void, decltype(f(std::declval<crow::response&>(), std::declval<Args>()...))>::value,
+ "Handler function with response argument should have void return type");
+ handler_ = (
+#ifdef CROW_CAN_USE_CPP14
+ [f = std::move(f)]
+#else
+ [f]
+#endif
+ (const crow::request& req, crow::response& res, Args ... args){
+ f(res, args...);
+ });
+ }
+
+ template <typename Func>
+ typename std::enable_if<
+ !black_magic::CallHelper<Func, black_magic::S<Args...>>::value &&
+ !black_magic::CallHelper<Func, black_magic::S<crow::request, Args...>>::value &&
+ !black_magic::CallHelper<Func, black_magic::S<crow::response&, Args...>>::value,
  void>::type
  operator()(Func&& f)
  {