Merge branch 'staging'

closes #154

Author: jgaa

include/restc-cpp/url_encode.h

@@ -1,7 +1,16 @@
+#pragma once
+
+#ifndef RESTC_CPP_URL_ENCODE_H_
+#define RESTC_CPP_URL_ENCODE_H_
+
 #include "restc-cpp.h"
 
+#include <boost/utility/string_ref.hpp>
+
 namespace restc_cpp {
 
 std::string url_encode(const boost::string_ref& src);
 
 } // namespace
+
+#endif // RESTC_CPP_URL_ENCODE_H_

src/Url.cpp

@@ -46,8 +46,12 @@ Url& Url::operator = (const char *url) {
             remains.size() - (args_start + 1)};
         remains = {remains.begin(), args_start};
     }
+    auto path_start = remains.find('/');
     const auto port_start = remains.find(':');
-    if (port_start != string::npos) {
+    if (port_start != string::npos &&
+        ( path_start == string::npos ||
+          port_start < path_start )
+       ) {
         if (remains.length() <= static_cast<decltype(host_.length())>(port_start + 2)) {
             throw ParseException("Invalid host (no port after column)");
         }
@@ -56,16 +60,16 @@ Url& Url::operator = (const char *url) {
         host_ = {remains.begin(), port_start};
         remains = {remains.begin() + port_start + 1, remains.size() - (port_start + 1)};
 
-        const auto path_start = remains.find('/');
         if (path_start != string::npos) {
+            //path_start = remains.find('/');
+            path_start -= port_start + 1;
             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 = remains.find('/');
         if (path_start != string::npos) {
             //path_ = &host_[path_start];
             //host_ = boost::string_ref(host_.data(), path_start);

tests/unit/UrlTests.cpp

@@ -49,6 +49,15 @@ TEST(Url, UrlWithPathAndSlash)
     EXPECT_EQ("/jgaa/"s, url.GetPath());
 }
 
+TEST(Url, UrlWithPathInclColon)
+{
+    Url url("http://github.com/jgaa:test");
+    EXPECT_EQ("github.com"s, url.GetHost());
+    EXPECT_EQ("80"s, url.GetPort());
+    EXPECT_EQ_ENUM(Url::Protocol::HTTP, url.GetProtocol());
+    EXPECT_EQ("/jgaa:test"s, url.GetPath());
+}
+
 TEST(Url, HttpWithPort)
 {
     Url url("http://github.com:56");
@@ -85,6 +94,15 @@ TEST(Url, HttpWithPortAndPath)
     EXPECT_EQ("/jgaa"s, url.GetPath());
 }
 
+TEST(Url, HttpWithPortAndPathInclColon)
+{
+    Url url("http://github.com:12345/jgaa:test");
+    EXPECT_EQ("github.com"s, url.GetHost());
+    EXPECT_EQ("12345"s, url.GetPort());
+    EXPECT_EQ_ENUM(Url::Protocol::HTTP, url.GetProtocol());
+    EXPECT_EQ("/jgaa:test"s, url.GetPath());
+}
+
 TEST(Url, HttpWithPortAndPathPath)
 {
     Url url("http://github.com:12345/jgaa/andmore");