Feature/improve docs

- Alias boost::beast::http directly, less confusing
- Install all examples

Dockerfile

@@ -39,8 +39,7 @@ RUN cmake .. -GNinja \
 RUN cmake --build .
 
 # Install
-RUN cmake --install .
-RUN strip /usr/local/bin/usrv-hello
+RUN cmake --install . --strip
 
 FROM scratch as runtime
 

README.md

@@ -27,8 +27,8 @@ And a main function.
 #include <httpmicroservice/service.hpp>
 
 namespace asio = boost::asio;
+namespace http = boost::beast::http;
 namespace usrv = httpmicroservice;
-namespace http = httpmicroservice::http;
 
 int main()
 {
@@ -131,11 +131,11 @@ libraries with [find_package](https://cmake.org/cmake/help/latest/command/find_p
 
 ```console
 cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake
-cmake --build .
+cmake --build . --config=Release
 ```
 
 Run tests.
 
 ```console
-ctest
+ctest -C Release
 ```

examples/CMakeLists.txt

@@ -2,12 +2,16 @@ add_executable(usrv-echo echo.cpp)
 target_link_libraries(
     usrv-echo PRIVATE httpmicroservice::httpmicroservice)
 
+install(TARGETS usrv-echo RUNTIME)
+
 add_executable(usrv-hello hello.cpp)
 target_link_libraries(
     usrv-hello PRIVATE httpmicroservice::httpmicroservice)
 
+install(TARGETS usrv-hello RUNTIME)
+
 add_executable(usrv-producer producer.cpp)
 target_link_libraries(
     usrv-producer PRIVATE httpmicroservice::httpmicroservice)
 
-install(TARGETS usrv-hello RUNTIME)
+install(TARGETS usrv-producer RUNTIME)

examples/echo.cpp

@@ -8,8 +8,8 @@
 #include <exception>
 
 namespace asio = boost::asio;
+namespace http = boost::beast::http;
 namespace usrv = httpmicroservice;
-namespace http = httpmicroservice::http;
 
 // Handle POST requests, echo back the body contents
 usrv::response post(const usrv::request& req)
@@ -41,6 +41,7 @@ usrv::response get(const usrv::request& req)
         return usrv::response{http::status::not_found, req.version()};
     }
 
+    // Convert from boost::string_view
     std::string_view target{req.target().data(), req.target().size()};
 
     usrv::response res{http::status::ok, req.version()};

examples/hello.cpp

@@ -7,8 +7,8 @@
 #include <exception>
 
 namespace asio = boost::asio;
+namespace http = boost::beast::http;
 namespace usrv = httpmicroservice;
-namespace http = httpmicroservice::http;
 
 asio::awaitable<usrv::response> hello(usrv::request req)
 {

examples/producer.cpp

@@ -11,8 +11,8 @@
 #include <thread>
 
 namespace asio = boost::asio;
-namespace usrv = httpmicroservice;
 namespace http = boost::beast::http;
+namespace usrv = httpmicroservice;
 
 // Runs on the pool executor which runs in its own thread.
 asio::awaitable<usrv::response> producer(usrv::request req)

include/httpmicroservice/service.hpp

@@ -4,7 +4,6 @@
 
 #include <boost/asio/awaitable.hpp>
 #include <boost/asio/co_spawn.hpp>
-#include <boost/asio/detached.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/use_awaitable.hpp>
@@ -20,11 +19,11 @@ namespace asio = boost::asio;
   socket stream connection.
 
   loop {
+      // Incoming socket connection
       stream = accept()
 
-      // One coroutine per session. When it is complete, call the Reporter
-      // with the session stats.
-      stats = await session(stream)
+      // HTTP request/response loop
+      co_spawn session(stream)
   }
  */
 template <typename Acceptor, typename Handler, typename Reporter>

tests/test_service.cpp

@@ -14,12 +14,13 @@
 #include <string>
 #include <thread>
 
+namespace asio = boost::asio;
+namespace http = boost::beast::http;
+namespace usrv = httpmicroservice;
+
 TEST_CASE("async_run", "[service]")
 {
     using namespace std::chrono_literals;
-    namespace asio = boost::asio;
-    namespace http = boost::beast::http;
-    namespace usrv = httpmicroservice;
     using tcp = boost::asio::ip::tcp;
 
     constexpr auto kBodyNumBytes = 1000;
@@ -118,9 +119,6 @@ TEST_CASE("async_run", "[service]")
 
 TEST_CASE("make_co_handler", "[service]")
 {
-    namespace asio = boost::asio;
-    namespace usrv = httpmicroservice;
-
     asio::io_context ioc;
 
     const auto tid = std::this_thread::get_id();
@@ -154,10 +152,6 @@ TEST_CASE("make_co_handler", "[service]")
 
 TEST_CASE("async_run_functor", "[service]")
 {
-    namespace asio = boost::asio;
-    namespace http = boost::beast::http;
-    namespace usrv = httpmicroservice;
-
     constexpr auto kPort = 8080;
 
     struct Handler {
@@ -183,10 +177,6 @@ TEST_CASE("async_run_functor", "[service]")
 
 TEST_CASE("async_run_context", "[service]")
 {
-    namespace asio = boost::asio;
-    namespace http = boost::beast::http;
-    namespace usrv = httpmicroservice;
-
     constexpr auto kPort = 8080;
 
     auto handler = [](auto req) -> asio::awaitable<usrv::response> {
@@ -203,11 +193,8 @@ TEST_CASE("async_run_context", "[service]")
 
 TEST_CASE("integration", "[service]")
 {
-    namespace asio = boost::asio;
-    namespace http = boost::beast::http;
-    namespace usrv = httpmicroservice;
-    using tcp = boost::asio::ip::tcp;
     using namespace std::chrono_literals;
+    using tcp = boost::asio::ip::tcp;
 
     constexpr auto kPort = 8081;
 

tests/test_session.cpp

@@ -10,7 +10,7 @@
 #include <vector>
 
 namespace asio = boost::asio;
-namespace http = httpmicroservice::http;
+namespace http = boost::beast::http;
 namespace usrv = httpmicroservice;
 
 TEST_CASE("async_read_some", "[mock_sock]")