Fixed a bug in url-parsing where the url-arguments.

Closes 55

Author: jgaa

include/restc-cpp/Url.h

@@ -24,13 +24,15 @@ namespace restc_cpp {
      boost::string_ref GetHost() const { return host_; }
      boost::string_ref GetPort() const { return port_; }
      boost::string_ref GetPath() const { return path_; }
+     boost::string_ref GetArgs() const { return args_; }
      Protocol GetProtocol() const { return protocol_; }
 
  private:
      boost::string_ref protocol_name_;
      boost::string_ref host_;
      boost::string_ref port_;
      boost::string_ref path_ = "/";
+     boost::string_ref args_;
      Protocol protocol_ = Protocol::UNKNOWN;
  };
 

src/Url.cpp

@@ -36,25 +36,42 @@ Url& Url::operator = (const char *url) {
         throw ParseException("Invalid protocol in url. Must be 'http[s]://'");
     }
 
-    host_ = boost::string_ref(protocol_name_.end());
-    const auto port_start = host_.find(':');
-    if (port_start != host_.npos) {
-        if (host_.length() <= static_cast<decltype(host_.length())>(port_start + 2)) {
+    auto remains = boost::string_ref(protocol_name_.end());
+    const auto args_start = remains.find('?');
+    if (args_start != remains.npos) {
+        args_ = {remains.begin() +  args_start + 1,
+            remains.size() - (args_start + 1)};
+        remains = {remains.begin(), args_start};
+    }
+    const auto port_start = remains.find(':');
+    if (port_start != remains.npos) {
+        if (remains.length() <= static_cast<decltype(host_.length())>(port_start + 2)) {
             throw ParseException("Invalid host (no port after column)");
         }
-        port_ = boost::string_ref(&host_[port_start+1]);
-        host_ = boost::string_ref(host_.data(), port_start);
+        //port_ = boost::string_ref(&remains[port_start+1]);
+        //host_ = boost::string_ref(host_.data(), port_start);
+        host_ = {remains.begin(), port_start};
+        remains = {remains.begin() + port_start + 1, remains.size() - (port_start + 1)};
 
-        const auto path_start = port_.find('/');
+        const auto path_start = remains.find('/');
         if (path_start != port_.npos) {
-            path_ = &port_[path_start];
-            port_ = boost::string_ref(port_.data(), path_start);
+            path_ = {remains.begin() + path_start, remains.size() - path_start};// &port_[path_start];
+            port_ = {remains.begin(), path_start};
+            remains = {};
+        } else {
+            port_ = remains;
         }
     } else {
-        const auto path_start = host_.find('/');
+        const auto path_start = remains.find('/');
         if (path_start != host_.npos) {
-            path_ = &host_[path_start];
-            host_ = boost::string_ref(host_.data(), path_start);
+            //path_ = &host_[path_start];
+            //host_ = boost::string_ref(host_.data(), path_start);
+
+            host_ = {remains.begin(), path_start};
+            path_ = {remains.begin() + host_.size(), remains.size() - host_.size()};
+            remains = {};
+        } else {
+            host_ = remains;
         }
     }
 

tests/unit/UrlTests.cpp

@@ -188,7 +188,34 @@ STARTCASE(HttpsUrlSimple)
     CHECK_EQUAL("443"s, url.GetPort());
     CHECK_EQUAL_ENUM(Url::Protocol::HTTPS, url.GetProtocol());
     CHECK_EQUAL("/"s, url.GetPath());
+    CHECK_EQUAL(""s, url.GetArgs());
 } ENDCASE
+
+
+STARTCASE(HttpsWithPortAndPathAndArgs)
+{
+    Url url("https://github.com:12345/jgaa?arg=abc:5432");
+    CHECK_EQUAL("github.com"s, url.GetHost());
+    CHECK_EQUAL("12345"s, url.GetPort());
+    CHECK_EQUAL_ENUM(Url::Protocol::HTTPS, url.GetProtocol());
+    CHECK_EQUAL("/jgaa"s, url.GetPath());
+    CHECK_EQUAL("arg=abc:5432"s, url.GetArgs());
+} ENDCASE
+
+STARTCASE(HttpsWithArgsOnly)
+{
+    Url url("https://github.com?arg=abc:123");
+    CHECK_EQUAL("github.com"s, url.GetHost());
+    CHECK_EQUAL("443"s, url.GetPort());
+    CHECK_EQUAL_ENUM(Url::Protocol::HTTPS, url.GetProtocol());
+    CHECK_EQUAL("/"s, url.GetPath());
+    CHECK_EQUAL("arg=abc:123"s, url.GetArgs());
+    const string args{"arg=abc:123"};
+    CHECK_EQUAL(args, url.GetArgs());
+    CHECK_EQUAL(args.size(), url.GetArgs().size());
+} ENDCASE
+
+
 }; // lest