percent-encoding decode

inc/rum/http/uri.h

@@ -32,5 +32,8 @@ class URI {
   void set_port(const std::string& port) { this->port = port; }
 
   operator std::string() const;
+
+  static std::string decode(std::string text);
+  static std::string encode(std::string text);
 };
 } // namespace Rum::HTTP

src/rum/http/request.cpp

@@ -2,6 +2,8 @@
 #include <rum/http/request.h>
 #if __cplusplus >= 202302L
 #include <format>
+#else
+#include <sstream>
 #endif
 #include <iostream>
 #include <string>
@@ -19,7 +21,15 @@ Request::operator std::string() const {
     cookie_string += "\t\t'" + cookie.first + "': '" + cookie.second + "'\n";
   }
 #if __cplusplus < 202302L
-  return "";
+  std::stringstream text;
+  text << "Request{{\n"
+       << "\tmethod:  " << method << "\n"
+       << "\t" << (std::string)uri << "\n"
+       << "\theaders: \n"
+       << headers_string << "\tcookies: \n"
+       << cookie_string << "\tbody:    '" << body << "'\n}}";
+
+  return text.str();
 #else
   return std::vformat(
       "Request{{\n"

src/rum/http/uri.cpp

@@ -2,8 +2,11 @@
 #include <exception>
 #include <iostream>
 #include <regex>
+#include <sstream>
 #if __cplusplus >= 202302L
 #include <format>
+#else
+#include <sstream>
 #endif
 #include <string>
 
@@ -15,7 +18,18 @@ URI::operator std::string() const {
     query += "\t\t'" + param.first + "': '" + param.second + "'\n";
   }
 #if __cplusplus < 202302L
-  return "";
+  std::stringstream text;
+  text << "URI{{"
+       << "\n\tscheme:   '" << scheme << "'"
+       << "\n\tuser:     '" << user << "'"
+       << "\n\tpassword: '" << password << "'"
+       << "\n\thost:     '" << host << "'"
+       << "\n\tport:     '" << port << "'"
+       << "\n\tpath:     '" << path << "'"
+       << "\n\tquery:   \n"
+       << query << "\n\tfragment: '" << fragment << "'\n}}";
+
+  return text.str();
 #else
   return std::vformat(
       "URI{{"
@@ -33,12 +47,12 @@ URI::operator std::string() const {
 }
 
 URI::URI(const std::string& uri) {
-  std::regex uri_regex(R"((([\w\d]+):\/\/)?(([\w\d]+)(:([\w\d]+)?)@)?([\w\d\.]+)(:(\d+))?(\/?[\w\d\.\/]+)?(\?([^#]+))?(\#([\w\d]*))?)");
+  std::regex uri_regex(R"((([\w\d]+):\/\/)?(([\w\d%]+)(:([\w\d%]+)?)@)?([\w\d\.]+)(:(\d+))?(\/?[\w\d%\.\/]+)?(\?([^#]+))?(\#([\w\d%]*))?)");
 
   std::smatch match;
 
 #ifdef DEBUG
-  std::cout << uri << std::endl;
+  std::cout << uri_decoded << std::endl;
 #endif
 
   if (std::regex_match(uri.cbegin(), uri.cend(), match, uri_regex)) {
@@ -48,13 +62,18 @@ URI::URI(const std::string& uri) {
 
     MATCH(scheme, 2)
     MATCH(user, 4)
+    user = decode(user);
     MATCH(password, 6)
+    password = decode(password);
     MATCH(host, 7)
     MATCH(port, 9)
     MATCH(path, 10)
+    path = decode(path);
     std::string query;
     MATCH(query, 12)
+    query = decode(query);
     MATCH(fragment, 14)
+    fragment = decode(fragment);
 
     std::stringstream parameters_string(query);
     std::string parameter;
@@ -69,4 +88,19 @@ URI::URI(const std::string& uri) {
     throw std::exception();
   }
 }
+
+std::string URI::decode(std::string text) {
+  std::regex encoded_regex(R"(%([\w\d]{2}))");
+  std::smatch match;
+  while (std::regex_search(text.cbegin(), text.cend(), match, encoded_regex)) {
+    char decoded = (char)std::stoi(match.str(1), 0, 16);
+    text = text.substr(0, match.position()) + decoded + text.substr(match.position() + 3);
+  }
+
+  return text;
+}
+std::string URI::encode(std::string text) {
+  throw std::exception();
+  return text;
+}
 } // namespace Rum::HTTP