impl(rest): add AppendPath methods (#8461)

Author: scotthart

google/cloud/internal/rest_request.cc

@@ -13,7 +13,9 @@
 // limitations under the License.
 
 #include "google/cloud/internal/rest_request.h"
+#include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/log.h"
+#include "absl/strings/strip.h"
 #include <cctype>
 
 namespace google {
@@ -38,6 +40,13 @@ RestRequest& RestRequest::SetPath(std::string path) & {
   return *this;
 }
 
+RestRequest& RestRequest::AppendPath(std::string path) & {
+  if (path_.empty()) return SetPath(std::move(path));
+  path_ = absl::StrCat(absl::StripSuffix(path_, "/"), "/",
+                       absl::StripPrefix(std::move(path), "/"));
+  return *this;
+}
+
 RestRequest& RestRequest::AddHeader(std::string header, std::string value) & {
   std::transform(header.begin(), header.end(), header.begin(),
                  [](unsigned char c) { return std::tolower(c); });

google/cloud/internal/rest_request.h

@@ -42,37 +42,40 @@ class RestRequest {
   RestRequest(std::string path, HttpParameters parameters);
   RestRequest(std::string path, HttpHeaders headers, HttpParameters parameters);
 
-  inline std::string const& path() const { return path_; }
-  inline HttpHeaders const& headers() const { return headers_; }
-  inline HttpParameters const& parameters() const { return parameters_; }
+  std::string const& path() const { return path_; }
+  HttpHeaders const& headers() const { return headers_; }
+  HttpParameters const& parameters() const { return parameters_; }
 
   RestRequest& SetPath(std::string path) &;
-  inline RestRequest&& SetPath(std::string path) && {
+  RestRequest&& SetPath(std::string path) && {
     return std::move(SetPath(std::move(path)));
   }
 
+  RestRequest& AppendPath(std::string path) &;
+  RestRequest&& AppendPath(std::string path) && {
+    return std::move(AppendPath(std::move(path)));
+  }
+
   // Adding a header/value pair that already exists results in the new value
   // appended to the list of values for the existing header.
   RestRequest& AddHeader(std::string header, std::string value) &;
-  inline RestRequest&& AddHeader(std::string header, std::string value) && {
+  RestRequest&& AddHeader(std::string header, std::string value) && {
     return std::move(AddHeader(std::move(header), std::move(value)));
   }
   RestRequest& AddHeader(std::pair<std::string, std::string> header) &;
-  inline RestRequest&& AddHeader(
-      std::pair<std::string, std::string> header) && {
+  RestRequest&& AddHeader(std::pair<std::string, std::string> header) && {
     return std::move(AddHeader(std::move(header)));
   }
 
   // Adding a duplicate param and or value results in both the new and original
   // pairs stored in order of addition.
   RestRequest& AddQueryParameter(std::string parameter, std::string value) &;
-  inline RestRequest&& AddQueryParameter(std::string parameter,
-                                         std::string value) && {
+  RestRequest&& AddQueryParameter(std::string parameter, std::string value) && {
     return std::move(AddQueryParameter(std::move(parameter), std::move(value)));
   }
   RestRequest& AddQueryParameter(
       std::pair<std::string, std::string> parameter) &;
-  inline RestRequest&& AddQueryParameter(
+  RestRequest&& AddQueryParameter(
       std::pair<std::string, std::string> parameter) && {
     return std::move(AddQueryParameter(std::move(parameter)));
   }

google/cloud/internal/rest_request_test.cc

@@ -98,6 +98,17 @@ TEST_F(RestRequestTest, RvalueBuilder) {
               Eq(std::make_pair(std::string("param2"), std::string("value2"))));
 }
 
+TEST_F(RestRequestTest, AppendPath) {
+  auto request = RestRequest().AppendPath("able");
+  EXPECT_THAT(request.path(), Eq("able"));
+  request.AppendPath("baker");
+  EXPECT_THAT(request.path(), Eq("able/baker"));
+  request.AppendPath("/charlie");
+  EXPECT_THAT(request.path(), Eq("able/baker/charlie"));
+  request.AppendPath("delta/").AppendPath("/echo");
+  EXPECT_THAT(request.path(), Eq("able/baker/charlie/delta/echo"));
+}
+
 TEST_F(RestRequestTest, GetHeaderNotFound) {
   RestRequest request("foo/bar", headers_);
   auto result = request.GetHeader("NotFound");