lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-20 11:47:43 +03:00
Code

Merge branch 'hyperxor-remove_code_duplication_in_getting_query'

Browse Source
This commit is contained in:
yhirose 2020-02-24 21:15:01 -05:00
commit 6de8684328
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
httplib.h
View File

@ -2072,6 +2072,19 @@ inline std::string decode_url(const std::string &s) {
return result; return result;
} }
inline std::string params_to_query_str(const Params &params) {
std::string query;
for (auto it = params.begin(); it != params.end(); ++it) {
if (it != params.begin()) { query += "&"; }
query += it->first;
query += "=";
query += detail::encode_url(it->second);
}
return query;
}
inline void parse_query_text(const std::string &s, Params &params) { inline void parse_query_text(const std::string &s, Params &params) {
split(&s[0], &s[s.size()], '&', [&](const char *b, const char *e) { split(&s[0], &s[s.size()], '&', [&](const char *b, const char *e) {
std::string key; std::string key;
@ -4112,15 +4125,10 @@ Client::Post(const char *path, const Headers &headers, size_t content_length,
content_type); content_type);
} }
inline std::shared_ptr<Response> inline std::shared_ptr<Response>
Client::Post(const char *path, const Headers &headers, const Params &params) { Client::Post(const char *path, const Headers &headers, const Params &params) {
std::string query; std::string query = detail::params_to_query_str(params);
for (auto it = params.begin(); it != params.end(); ++it) {
if (it != params.begin()) { query += "&"; }
query += it->first;
query += "=";
query += detail::encode_url(it->second);
}
return Post(path, headers, query, "application/x-www-form-urlencoded"); return Post(path, headers, query, "application/x-www-form-urlencoded");
} }
@ -4193,13 +4201,7 @@ inline std::shared_ptr<Response> Client::Put(const char *path,
inline std::shared_ptr<Response> inline std::shared_ptr<Response>
Client::Put(const char *path, const Headers &headers, const Params &params) { Client::Put(const char *path, const Headers &headers, const Params &params) {
std::string query; std::string query = detail::params_to_query_str(params);
for (auto it = params.begin(); it != params.end(); ++it) {
if (it != params.begin()) { query += "&"; }
query += it->first;
query += "=";
query += detail::encode_url(it->second);
}
return Put(path, headers, query, "application/x-www-form-urlencoded"); return Put(path, headers, query, "application/x-www-form-urlencoded");
} }

15
test/test.cc
View File

@ -77,6 +77,21 @@ TEST(ParseQueryTest, ParseQueryString) {
EXPECT_EQ("val3", dic.find("key3")->second); EXPECT_EQ("val3", dic.find("key3")->second);
} }
TEST(ParamsToQueryTest, ConvertParamsToQuery) {
Params dic;
EXPECT_EQ(detail::params_to_query_str(dic), "");
dic.emplace("key1", "val1");
EXPECT_EQ(detail::params_to_query_str(dic), "key1=val1");
dic.emplace("key2", "val2");
dic.emplace("key3", "val3");
EXPECT_EQ(detail::params_to_query_str(dic), "key1=val1&key2=val2&key3=val3");
}
TEST(GetHeaderValueTest, DefaultValue) { TEST(GetHeaderValueTest, DefaultValue) {
Headers headers = {{"Dummy", "Dummy"}}; Headers headers = {{"Dummy", "Dummy"}};
auto val = detail::get_header_value(headers, "Content-Type", 0, "text/plain"); auto val = detail::get_header_value(headers, "Content-Type", 0, "text/plain");