-wip refactoring 2

CMakeLists.txt

@@ -105,4 +105,8 @@ endif()
 
 if (ASYNCGI_USE_BOOST_ASIO)
     target_compile_definitions(asyncgi PUBLIC "ASYNCGI_USE_BOOST_ASIO")
-endif()
+endif()
+
+if (ASYNCGI_DISABLE_GLOBAL_HTTP_NAMESPACE)
+    target_compile_definitions(asyncgi PUBLIC "ASYNCGI_DISABLE_GLOBAL_HTTP_NAMESPACE")
+endif ()

examples/example_client.cpp

@@ -1,8 +1,6 @@
 #include <asyncgi/asyncgi.h>
 #include <iostream>
 
-using namespace asyncgi;
-
 int main()
 {
     auto io = asyncgi::IO{};

examples/example_client_in_processor.cpp

@@ -1,7 +1,5 @@
 #include <asyncgi/asyncgi.h>
 
-namespace http = asyncgi::http;
-
 struct RequestPage{
     void operator()(const http::Request&, asyncgi::Responder& responder)
     {

examples/example_guestbook.cpp

@@ -3,7 +3,6 @@
 #include <optional>
 #include <regex>
 
-namespace http = asyncgi::http;
 using namespace std::string_literals;
 
 enum class AccessRole {

examples/example_hello_world.cpp

@@ -1,7 +1,5 @@
 #include <asyncgi/asyncgi.h>
 
-namespace http = asyncgi::http;
-
 int main()
 {
     auto io = asyncgi::IO{};

examples/example_request_processor.cpp

@@ -1,7 +1,5 @@
 #include <asyncgi/asyncgi.h>
 
-namespace http = asyncgi::http;
-
 http::Response guestBookPage(const http::Request& request)
 {
     if (request.path() == "/")

examples/example_request_processor_fastcgi_types.cpp

@@ -0,0 +1,25 @@
+#include <asyncgi/asyncgi.h>
+
+fastcgi::Response guestBookPage(const fastcgi::Request& request)
+{
+    if (request.param("REQUEST_URI") == "/")
+        return {"Status: 200 OK \r\n"
+                "Content-Type: text/html\r\n"
+                "\r\n"
+                "<h1>Guest book</h1>\n"
+                "<p>No messages</p>\n"};
+    return {"Status: 404 Not found\r\n\r\n"};
+}
+
+int main()
+{
+    auto io = asyncgi::IO{};
+    auto server = asyncgi::Server{io, guestBookPage};
+#ifndef _WIN32
+    server.listen("/tmp/fcgi.sock");
+#else
+    server.listen("127.0.0.1", 9088);
+#endif
+    io.run();
+    return 0;
+}

examples/example_response_dispatching_asio_task.cpp

@@ -6,8 +6,6 @@ namespace asio = boost::asio;
 #include <asio/steady_timer.hpp>
 #endif
 
-namespace http = asyncgi::http;
-
 struct DelayedPage {
     void operator()(const http::Request&, asyncgi::Responder& responder)
     {

examples/example_response_wait_future.cpp

@@ -1,8 +1,6 @@
 #include <asyncgi/asyncgi.h>
 #include <thread>
 
-using namespace asyncgi;
-
 struct DelayedPage{
     void operator()(const http::Request&, asyncgi::Responder& responder)
     {

examples/example_route_context.cpp

@@ -2,7 +2,6 @@
 #include <mutex>
 #include <optional>
 
-namespace http = asyncgi::http;
 using namespace std::string_literals;
 
 enum class AccessRole {

examples/example_route_matcher.cpp

@@ -2,7 +2,6 @@
 #include <mutex>
 #include <optional>
 
-namespace http = asyncgi::http;
 using namespace std::string_literals;
 
 enum class AccessRole {

examples/example_route_params.cpp

@@ -1,7 +1,6 @@
 #include <asyncgi/asyncgi.h>
 #include <mutex>
 
-using namespace asyncgi;
 using namespace std::string_literals;
 
 class GuestBookState {

examples/example_route_params_user_defined_types.cpp

@@ -1,7 +1,6 @@
 #include <asyncgi/asyncgi.h>
 #include <mutex>
 
-using namespace asyncgi;
 using namespace std::string_literals;
 
 struct MessageNumber {

examples/example_router.cpp

@@ -1,7 +1,6 @@
 #include <asyncgi/asyncgi.h>
 #include <mutex>
 
-namespace http = asyncgi::http;
 using namespace std::string_literals;
 
 class GuestBookState {

examples/example_timer.cpp

@@ -1,7 +1,5 @@
 #include <asyncgi/asyncgi.h>
 
-namespace http = asyncgi::http;
-
 struct Greeter{
     Greeter(const int& secondsCounter)
         : secondsCounter_{&secondsCounter}

functional_tests/request_processor_fastcgi_types/test.toast

@@ -0,0 +1,9 @@
+-Launch detached: ../../build/examples/example_request_processor_fastcgi_types
+-Wait: 1 sec
+
+-Expect response from "/":
+<h1>Guest book</h1>
+<p>No messages</p>
+---
+
+-Expect status from "/foo": 404

include/asyncgi/asyncgi.h

@@ -10,4 +10,12 @@
 #include "server.h"
 #include "timer.h"
 
+#ifndef ASYNCGI_DISABLE_GLOBAL_HTTP_NAMESPACE
+namespace http = asyncgi::http;
+#endif
+
+#ifndef ASYNCGI_DISABLE_GLOBAL_FASTCGI_NAMESPACE
+namespace fastcgi = asyncgi::fastcgi;
+#endif
+
 #endif //ASYNCGI_H

include/asyncgi/asyncgi_fwd.h

@@ -3,7 +3,6 @@
 
 namespace asyncgi {
 class IO;
-class Request;
 class Responder;
 class Server;
 class Client;
@@ -13,13 +12,23 @@ class TaskContext;
 class Timer;
 
 namespace http {
+class Request;
 class Response;
-};
+}; //namespace http
+
 namespace fastcgi {
-struct Request;
-struct Response;
+class Request;
+class Response;
 } //namespace fastcgi
 
 } //namespace asyncgi
 
+#ifndef ASYNCGI_DISABLE_GLOBAL_HTTP_NAMESPACE
+namespace http = asyncgi::http;
+#endif
+
+#ifndef ASYNCGI_DISABLE_GLOBAL_FASTCGI_NAMESPACE
+namespace fastcgi = asyncgi::fastcgi;
+#endif
+
 #endif //ASYNCGI_FWD_H

include/asyncgi/fastcgi/response.h

@@ -23,7 +23,7 @@ ResponseData moveOutResponseData(Response&);
 class Response {
 public:
     explicit Response(detail::ResponseView);
-    Response(std::string data, std::string errorMsg);
+    Response(std::string data, std::string errorMsg = {});
     std::string_view data() const;
     std::string_view errorMsg() const;
 

include/asyncgi/requestprocessor.h

@@ -32,7 +32,9 @@ constexpr void checkRequestProcessorSignature()
                 std::is_same_v<TRequestProcessorReturnType, fastcgi::Response>);
         constexpr auto args = TRequestProcessorArgs{};
         static_assert(args.size() == 1);
-        static_assert(std::is_same_v<const http::Request&, typename decltype(sfun::get<0>(args))::type>);
+        static_assert(
+                std::is_same_v<const http::Request&, typename decltype(sfun::get<0>(args))::type> ||
+                std::is_same_v<const fastcgi::Request&, typename decltype(sfun::get<0>(args))::type>);
     }
 }
 } // namespace detail