address pr reviews

Author: anonrig

include/ada/url_search_params-inl.h

@@ -135,13 +135,9 @@ inline std::string url_search_params::to_string() const {
 }
 
 inline std::string url_search_params::to_raw_string() const {
-  auto character_set = ada::character_sets::QUERY_PERCENT_ENCODE;
   std::string out{};
-  for (size_t i = 0; i < params.size(); i++) {
-    auto key = ada::unicode::percent_encode(params[i].first, character_set);
-    auto value = ada::unicode::percent_encode(params[i].second, character_set);
-
-    if (i != 0) {
+  for (const auto &[key, value] : params) {
+    if (!out.empty()) {
       out += "&";
     }
     out.append(key);

tests/ada_c.cpp

@@ -367,18 +367,17 @@ TEST(ada_c, ada_search_params_to_raw_string) {
   ASSERT_EQ(convert_string(str), "a=b+c&d=e+f");
   ada_free_owned_string(str);
 
-  // to_raw_string preserves %20 encoding for spaces
+  // to_raw_string outputs raw key/value without any encoding
   ada_owned_string raw_str = ada_search_params_to_raw_string(out);
-  ASSERT_EQ(convert_string(raw_str), "a=b%20c&d=e%20f");
+  ASSERT_EQ(convert_string(raw_str), "a=b c&d=e f");
   ada_free_owned_string(raw_str);
 
   ada_free_search_params(out);
 
   SUCCEED();
 }
 
-TEST(ada_c, ada_search_params_to_raw_string_remove_preserves_encoding) {
-  // Test the exact scenario from the issue
+TEST(ada_c, ada_search_params_to_raw_string_remove) {
   std::string input("a=%20&b=remove&c=2");
   auto params = ada_parse_search_params(input.c_str(), input.length());
 
@@ -390,9 +389,9 @@ TEST(ada_c, ada_search_params_to_raw_string_remove_preserves_encoding) {
   ASSERT_EQ(convert_string(str), "a=+&c=2");
   ada_free_owned_string(str);
 
-  // to_raw_string preserves %20 encoding for spaces
+  // to_raw_string outputs raw key/value without any encoding
   ada_owned_string raw_str = ada_search_params_to_raw_string(params);
-  ASSERT_EQ(convert_string(raw_str), "a=%20&c=2");
+  ASSERT_EQ(convert_string(raw_str), "a= &c=2");
   ada_free_owned_string(raw_str);
 
   ada_free_search_params(params);

tests/url_search_params.cpp

@@ -454,8 +454,8 @@ TEST(url_search_params, to_raw_string_no_normalization) {
   params.append("a", "b c");
   // to_string normalizes space to +
   ASSERT_EQ(params.to_string(), "a=b+c");
-  // to_raw_string preserves %20 encoding
-  ASSERT_EQ(params.to_raw_string(), "a=b%20c");
+  // to_raw_string outputs raw key/value without any encoding
+  ASSERT_EQ(params.to_raw_string(), "a=b c");
   SUCCEED();
 }
 
@@ -465,23 +465,22 @@ TEST(url_search_params, to_raw_string_with_special_chars) {
   params.append("key2", "another value");
   // to_string normalizes spaces to +
   ASSERT_EQ(params.to_string(), "key1=value+with+spaces&key2=another+value");
-  // to_raw_string preserves %20 encoding
+  // to_raw_string outputs raw key/value without any encoding
   ASSERT_EQ(params.to_raw_string(),
-            "key1=value%20with%20spaces&key2=another%20value");
+            "key1=value with spaces&key2=another value");
   SUCCEED();
 }
 
 TEST(url_search_params, to_raw_string_with_accents) {
   auto params = ada::url_search_params();
   params.append("key1", "\u00E9t\u00E9");
   params.append("key2", "C\u00E9line Dion++");
-  // Both should encode accents the same way
-  // to_string normalizes spaces to +, to_raw_string uses %20
-  // Note: + signs are not encoded by QUERY_PERCENT_ENCODE
+  // to_string percent-encodes and normalizes spaces to +
   ASSERT_EQ(params.to_string(),
             "key1=%C3%A9t%C3%A9&key2=C%C3%A9line+Dion%2B%2B");
+  // to_raw_string outputs raw key/value without any encoding
   ASSERT_EQ(params.to_raw_string(),
-            "key1=%C3%A9t%C3%A9&key2=C%C3%A9line%20Dion++");
+            "key1=\u00E9t\u00E9&key2=C\u00E9line Dion++");
   SUCCEED();
 }