server/http: move string related code to string_utils

Author: hyperblast

cpp/server/http.hpp

@@ -3,11 +3,10 @@
 #include "defines.hpp"
 #include "string_utils.hpp"
 
-#include <unordered_map>
-#include <boost/functional/hash.hpp>
-
 namespace msrv {
 
+using HttpKeyValueMap = AsciiLowerCaseMap<std::string>;
+
 enum class HttpMethod
 {
     UNDEFINED,
@@ -49,49 +48,6 @@ struct HttpHeader
     static const char LOCATION[];
 };
 
-inline char asciiToLower(char ch)
-{
-    return ch >= 'A' && ch <= 'Z' ? static_cast<char>(ch - 'A' + 'a') : ch;
-}
-
-struct HttpKeyHash
-{
-    size_t operator()(std::string const& str) const
-    {
-        size_t h = 0;
-
-        for (char ch : str)
-        {
-            boost::hash_combine(h, asciiToLower(ch));
-        }
-
-        return h;
-    }
-};
-
-struct HttpKeyEqual
-{
-    bool operator()(std::string const& s1, std::string const& s2) const
-    {
-        if (s1.size() != s2.size())
-        {
-            return false;
-        }
-
-        for (size_t i = 0; i < s1.size(); i++)
-        {
-            if (asciiToLower(s1[i]) != asciiToLower(s2[i]))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-};
-
-using HttpKeyValueMap = std::unordered_map<std::string, std::string, HttpKeyHash, HttpKeyEqual>;
-
 std::string toString(HttpMethod method);
 std::string toString(HttpStatus status);
 

cpp/server/string_utils.hpp

@@ -4,7 +4,9 @@
 
 #include <string>
 #include <sstream>
+#include <unordered_map>
 
+#include <boost/functional/hash.hpp>
 #include <boost/utility/string_view.hpp>
 
 namespace msrv {
@@ -45,4 +47,48 @@ StringView trimWhitespace(StringView str);
 
 void formatText(char* data, size_t maxWidth);
 
+inline char asciiToLower(char ch)
+{
+    return ch >= 'A' && ch <= 'Z' ? static_cast<char>(ch - 'A' + 'a') : ch;
+}
+
+struct AsciiLowerCaseHash
+{
+    size_t operator()(std::string const& str) const
+    {
+        size_t h = 0;
+
+        for (char ch : str)
+        {
+            boost::hash_combine(h, asciiToLower(ch));
+        }
+
+        return h;
+    }
+};
+
+struct AsciiLowerCaseEqual
+{
+    bool operator()(std::string const& s1, std::string const& s2) const
+    {
+        if (s1.size() != s2.size())
+        {
+            return false;
+        }
+
+        for (size_t i = 0; i < s1.size(); i++)
+        {
+            if (asciiToLower(s1[i]) != asciiToLower(s2[i]))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+};
+
+template<typename T>
+using AsciiLowerCaseMap = std::unordered_map<std::string, T, AsciiLowerCaseHash, AsciiLowerCaseEqual>;
+
 }

cpp/server/tests/CMakeLists.txt

@@ -7,10 +7,10 @@ set(
     test_main.hpp
     base64_tests.cpp
     fnv_hash_tests.cpp
-    http_tests.cpp
     parsing_tests.cpp
     router_tests.cpp
     server_tests.cpp
+    string_utils_tests.cpp
     timers_tests.cpp
 )
 

cpp/server/tests/http_tests.cpp cpp/server/tests/string_utils_tests.cppcpp/server/tests/http_tests.cpp renamed to cpp/server/tests/string_utils_tests.cpp

@@ -1,50 +1,50 @@
-#include "../http.hpp"
+#include "../string_utils.hpp"
 
 #include <catch.hpp>
 
-namespace msrv::http_tests {
+namespace msrv::string_utils_tests {
 
-TEST_CASE("HttpKeyEqual")
+TEST_CASE("AsciiLowerCaseEqual")
 {
     SECTION("works")
     {
-        HttpKeyEqual equal;
+        AsciiLowerCaseEqual equal;
         REQUIRE(equal("hello", "hello") == true);
         REQUIRE(equal("hello", "Hello") == true);
         REQUIRE(equal("hello", "hallo") == false);
         REQUIRE(equal("hello", "h") == false);
     }
 }
 
-TEST_CASE("HttpKeyHash")
+TEST_CASE("AsciiLowerCaseHash")
 {
     SECTION("works")
     {
-        HttpKeyHash hash;
+        AsciiLowerCaseHash hash;
         REQUIRE(hash("hello") == hash("hello"));
         REQUIRE(hash("hello") == hash("Hello"));
         REQUIRE(hash("hello") != hash("hallo"));
         REQUIRE(hash("hello") != hash("h"));
     }
 }
 
-TEST_CASE("HttpKeyValueMap")
+TEST_CASE("AsciiLowerCaseMap")
 {
     SECTION("works")
     {
-        HttpKeyValueMap map;
+        AsciiLowerCaseMap<int> map;
 
-        map.emplace("test", "1");
+        map.emplace("test", 1);
         auto it = map.find("TEST");
         REQUIRE(it != map.end());
-        REQUIRE(it->second == "1");
+        REQUIRE(it->second == 1);
 
-        map["Test"] = "2";
+        map["Test"] = 2;
         it = map.find("TEST");
         REQUIRE(it != map.end());
-        REQUIRE(it->second == "2");
+        REQUIRE(it->second == 2);
 
-        auto ret = map.try_emplace("tEst", "3");
+        auto ret = map.try_emplace("tEst", 3);
         REQUIRE(ret.second == false);
     }
 }