Updated some core functions, added extra tests for URL serializer (#69)

Author: glynos

.clang-format

@@ -11,7 +11,7 @@ AlwaysBreakBeforeMultilineStrings: true
 BreakBeforeBinaryOperators: None
 BreakConstructorInitializersBeforeComma: false
 BinPackParameters: true
-ColumnLimit:     80
+ColumnLimit:     120
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ExperimentalAutoDetectBinPacking: false
 IndentCaseLabels: true

include/skyr/core/schemes.hpp

@@ -21,44 +21,38 @@ using default_port_list = std::vector<std::pair<std::string, std::optional<std::
 
 inline auto special_schemes() noexcept -> const default_port_list & {
   static const auto schemes = default_port_list{
-      {"ftp", 21},
       {"file", std::nullopt},
+      {"ftp", 21},
       {"http", 80},
       {"https", 443},
       {"ws", 80},
       {"wss", 443},
   };
   return schemes;
 }
+
+inline auto scheme_less(
+    const default_port_list::value_type &special_scheme,
+    std::string_view scheme) -> bool {
+  return special_scheme.first < scheme;
+};
 }  // namespace details
 
 /// \param scheme
 /// \returns
 inline auto is_special(std::string_view scheme) noexcept -> bool {
   const auto &schemes = details::special_schemes();
-  auto first = begin(schemes), last = end(schemes);
-  auto it = std::find_if(
-      first, last,
-      [&scheme](const auto &special_scheme) -> bool {
-        return scheme == special_scheme.first;
-      });
-  return (it != last);
+  auto it = std::lower_bound(begin(schemes), end(schemes), scheme, details::scheme_less);
+  return ((it != end(schemes)) && !(scheme < it->first));
 }
 
 /// \param scheme
 /// \returns
-inline auto default_port(std::string_view scheme) noexcept -> std::optional<std::uint16_t> {
+inline auto default_port(std::string_view scheme) noexcept
+    -> std::optional<std::uint16_t> {
   const auto &schemes = details::special_schemes();
-  auto first = begin(schemes), last = end(schemes);
-  auto it = std::find_if(
-      first, last,
-      [&scheme](const auto &special_scheme) -> bool {
-        return scheme == special_scheme.first;
-      });
-  if (it != last) {
-    return it->second;
-  }
-  return std::nullopt;
+  auto it = std::lower_bound(begin(schemes), end(schemes), scheme, details::scheme_less);
+  return ((it != end(schemes)) && !(scheme < it->first)) ? it->second : std::nullopt;
 }
 }  // namespace v1
 }  // namespace skyr

include/skyr/core/url_record.hpp

@@ -10,6 +10,8 @@
 #include <string>
 #include <cstdint>
 #include <optional>
+#include <skyr/network/ipv4_address.hpp>
+#include <skyr/network/ipv6_address.hpp>
 #include <skyr/core/schemes.hpp>
 
 namespace skyr {

include/skyr/network/ipv4_address.hpp

@@ -94,7 +94,7 @@ class ipv4_address {
   }
 
   /// \returns The address as a string
-  [[nodiscard]] auto to_string() const -> std::string;
+  [[nodiscard]] auto serialize() const -> std::string;
 
 };
 

include/skyr/network/ipv6_address.hpp

@@ -97,7 +97,7 @@ class ipv6_address {
   }
 
    /// \returns The IPv6 address as a string
-  [[nodiscard]] auto to_string() const -> std::string;
+  [[nodiscard]] auto serialize() const -> std::string;
 
 };
 

src/core/serialize.cpp

@@ -22,8 +22,15 @@ auto serialize(
       output += "@";
     }
 
-    // TODO: serialize host
-    output += url.host.value();
+    if (auto ipv4_address = parse_ipv4_address(url.host.value())) {
+      output += ipv4_address.value().serialize();
+    }
+    else if (auto ipv6_address = parse_ipv6_address(url.host.value())) {
+      output += ipv6_address.value().serialize();
+    }
+    else {
+      output += url.host.value();
+    }
 
     if (url.port) {
       output += ":";

src/core/url_parser_context.cpp

@@ -120,7 +120,7 @@ auto parse_host(
     view.remove_suffix(1);
     auto ipv6_address = parse_ipv6_address(view);
     if (ipv6_address) {
-      return "[" + ipv6_address.value().to_string() + "]";
+      return "[" + ipv6_address.value().serialize() + "]";
     }
     else {
       return tl::make_unexpected(url_parse_errc::invalid_ipv6_address);
@@ -158,7 +158,7 @@ auto parse_host(
       return ascii_domain.value();
     }
   }
-  return host.value().to_string();
+  return host.value().serialize();
 }
 
 auto port_number(std::string_view port) noexcept -> tl::expected<std::uint16_t, url_parse_errc> {

src/network/ipv4_address.cpp

@@ -45,7 +45,7 @@ auto parse_ipv4_number(
 }
 }  // namespace
 
-auto ipv4_address::to_string() const -> std::string {
+auto ipv4_address::serialize() const -> std::string {
   using namespace std::string_literals;
 
   auto output = ""s;

src/network/ipv6_address.cpp

@@ -31,7 +31,7 @@ inline auto hex_to_dec(char byte) noexcept {
 }
 }  // namespace
 
-auto ipv6_address::to_string() const -> std::string {
+auto ipv6_address::serialize() const -> std::string {
   using namespace std::string_literals;
 
   auto output = ""s;

tests/network/ipv4_address_tests.cpp

@@ -12,17 +12,17 @@ TEST_CASE("ipv4 addresses", "[ipv4]") {
 
   SECTION("zero_test") {
     auto instance = skyr::ipv4_address(0);
-    CHECK("0.0.0.0" == instance.to_string());
+    CHECK("0.0.0.0" == instance.serialize());
   }
 
   SECTION("loopback_test") {
     auto instance = skyr::ipv4_address(0x7f000001);
-    CHECK("127.0.0.1" == instance.to_string());
+    CHECK("127.0.0.1" == instance.serialize());
   }
 
   SECTION("address_test") {
     auto instance = skyr::ipv4_address(0x814ff5fc);
-    CHECK("129.79.245.252" == instance.to_string());
+    CHECK("129.79.245.252" == instance.serialize());
   }
 
   SECTION("parse_zero_test") {