From aeacc697884800182f159a5d16e0c867083fa5c9 Mon Sep 17 00:00:00 2001
From: Aaron Fiore <founder@evergreencrypto.co>
Date: Sat, 20 Jul 2024 21:33:25 -0700
Subject: [PATCH] root: macro: web: namespace/class name refactor

---
 container/src/root/macro/rootlogon.C          |  2 +-
 .../src/root/macro/web/internal/crypto.C      | 11 +++++--
 container/src/root/macro/web/internal/meta.C  | 12 ++++++--
 container/src/root/macro/web/server.C         | 30 ++++++++++++-------
 4 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/container/src/root/macro/rootlogon.C b/container/src/root/macro/rootlogon.C
index 3e9304c..a770935 100644
--- a/container/src/root/macro/rootlogon.C
+++ b/container/src/root/macro/rootlogon.C
@@ -112,7 +112,7 @@ void help()
       << "  2. Load webserver and run registered commands:\n"
       << "\n"
       << "      root [0] docker_finance::macro::load(\"web/server.C\")\n"
-      << "      root [1] docker_finance::macro::Web::run()\n"
+      << "      root [1] docker_finance::macro::web::Server::run()\n"
       << "\n"
       << "     Now, open your web browser to http://127.0.0.1:8080\n"
       << "\n"
diff --git a/container/src/root/macro/web/internal/crypto.C b/container/src/root/macro/web/internal/crypto.C
index b8206c6..e0a85cd 100644
--- a/container/src/root/macro/web/internal/crypto.C
+++ b/container/src/root/macro/web/internal/crypto.C
@@ -45,8 +45,13 @@ namespace docker_finance
 //! \since docker-finance 1.0.0
 namespace macro
 {
-//! \namespace docker_finance::macro::internal
-//! \brief ROOT macros for internal use only
+//! \namespace docker_finance::macro::web
+//! \brief ROOT web-based macros
+//! \since docker-finance 1.0.0
+namespace web
+{
+//! \namespace docker_finance::macro::web::internal
+//! \brief ROOT web-based macros for internal use only
 //! \since docker-finance 1.0.0
 namespace internal
 {
@@ -338,6 +343,7 @@ class Crypto final
           Crypto::fun_facts(c2, data);
         });
 
+    namespace utility = ::docker_finance::macro::internal::utility;
     const std::string timestamp{utility::make_timestamp()};
 
     data.title = "Botan_RNG_" + timestamp;
@@ -358,6 +364,7 @@ class Crypto final
   }
 };
 }  // namespace internal
+}  // namespace web
 }  // namespace macro
 }  // namespace docker_finance
 
diff --git a/container/src/root/macro/web/internal/meta.C b/container/src/root/macro/web/internal/meta.C
index cc48e47..c2cac2d 100644
--- a/container/src/root/macro/web/internal/meta.C
+++ b/container/src/root/macro/web/internal/meta.C
@@ -43,8 +43,13 @@ namespace docker_finance
 //! \since docker-finance 1.0.0
 namespace macro
 {
-//! \namespace docker_finance::macro::internal
-//! \brief ROOT macros for internal use only
+//! \namespace docker_finance::macro::web
+//! \brief ROOT web-based macros
+//! \since docker-finance 1.0.0
+namespace web
+{
+//! \namespace docker_finance::macro::web::internal
+//! \brief ROOT web-based macros for internal use only
 //! \since docker-finance 1.0.0
 namespace internal
 {
@@ -179,6 +184,8 @@ class Meta final
   //! \param column Existing CSV metadata column
   static void meta_sample(const std::string& column)
   {
+    namespace utility = ::docker_finance::macro::internal::utility;
+
     // Import meta file
     const std::string path{utility::get_env("global_conf_meta")};
     auto csv =
@@ -222,6 +229,7 @@ class Meta final
   }
 };
 }  // namespace internal
+}  // namespace web
 }  // namespace macro
 }  // namespace docker_finance
 
diff --git a/container/src/root/macro/web/server.C b/container/src/root/macro/web/server.C
index 7381e16..c65b816 100644
--- a/container/src/root/macro/web/server.C
+++ b/container/src/root/macro/web/server.C
@@ -35,41 +35,51 @@ namespace docker_finance
 //! \since docker-finance 1.0.0
 namespace macro
 {
+//! \namespace docker_finance::macro::web
+//! \brief ROOT web-based macros
+//! \since docker-finance 1.0.0
+namespace web
+{
 //! \brief Web server managing class
 //! \ingroup cpp_macro
 //! \since docker-finance 1.0.0
-class Web final
+class Server final
 {
  public:
-  Web() = default;
-  ~Web() = default;
+  Server() = default;
+  ~Server() = default;
 
-  Web(const Web&) = delete;
-  Web& operator=(const Web&) = delete;
+  Server(const Server&) = delete;
+  Server& operator=(const Server&) = delete;
 
-  Web(Web&&) = default;
-  Web& operator=(Web&&) = default;
+  Server(Server&&) = default;
+  Server& operator=(Server&&) = default;
 
  private:
   //! \brief ROOT HTTP server command registrar
   //! \details Registers internal macros
   static void register_commands()
   {
+    namespace internal = ::docker_finance::macro::internal;
+
     internal::Command::load({"web/internal/crypto.C"});
     internal::g_HTTPServer->RegisterCommand(
         "/rng_sample",
-        "::docker_finance::macro::internal::Crypto::rng_sample(\"%arg1%\")");
+        "::docker_finance::macro::web::internal::Crypto::rng_sample(\"%arg1%"
+        "\")");
 
     internal::Command::load({"web/internal/meta.C"});
     internal::g_HTTPServer->RegisterCommand(
         "/meta_sample",
-        "::docker_finance::macro::internal::Meta::meta_sample(\"%arg1%\")");
+        "::docker_finance::macro::web::internal::Meta::meta_sample(\"%arg1%"
+        "\")");
   }
 
  public:
   //! \brief Start webserver
-  static void run() { Web::register_commands(); }
+  static void run() { Server::register_commands(); }
 };
+}  // namespace web
 }  // namespace macro
 }  // namespace docker_finance