BlackMATov/curly.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/curly.hpp.git synced 2025-12-16 22:19:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

rename response_code to http_code

Browse Source
This commit is contained in:
Matvey Cherevko
2019-06-30 20:59:38 +07:00
parent dcea9f9951
commit ee00b426b2
4 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -74,7 +74,7 @@ auto request = net::request_builder()
auto response = request.get();
// prints results
std::cout << "Status code: " << response.code() << std::endl;
std::cout << "Status code: " << response.http_code() << std::endl;
std::cout << "Content type: " << response.headers["content-type"] << std::endl;
std::cout << "Body content: " << response.content.as_string_view() << std::endl;
@@ -136,7 +136,7 @@ auto request = net::request_builder()
if ( request.wait() == net::request::statuses::done ) {
auto response = request.get();
std::cout << "Status code: " << response.code() << std::endl;
std::cout << "Status code: " << response.http_code() << std::endl;
} else {
// throws net::exception because a response is unavailable
// auto response = request.get();

8
headers/curly.hpp/curly.hpp
View File

@@ -42,7 +42,7 @@ namespace curly_hpp
post
};
using response_code_t = std::uint16_t;
using http_code_t = std::uint16_t;
using headers_t = std::map<std::string, std::string, icase_string_compare>;
using time_sec_t = std::chrono::seconds;
@@ -107,15 +107,15 @@ namespace curly_hpp
response(const response&) = delete;
response& operator=(const response&) = delete;
explicit response(response_code_t rc) noexcept;
response_code_t code() const noexcept;
explicit response(http_code_t c) noexcept;
http_code_t http_code() const noexcept;
public:
content_t content;
headers_t headers;
uploader_uptr uploader;
downloader_uptr downloader;
private:
response_code_t code_{0u};
http_code_t http_code_{0u};
};
}

10
sources/curly.cpp
View File

@@ -297,11 +297,11 @@ namespace curly_hpp
namespace curly_hpp
{
response::response(response_code_t rc) noexcept
: code_(rc) {}
response::response(http_code_t c) noexcept
: http_code_(c) {}
response_code_t response::code() const noexcept {
return code_;
http_code_t response::http_code() const noexcept {
return http_code_;
}
}
@@ -443,7 +443,7 @@ namespace curly_hpp
}
try {
response_ = response(static_cast<response_code_t>(code));
response_ = response(static_cast<http_code_t>(code));
response_.content = std::move(response_content_);
response_.headers = std::move(response_headers_);
response_.uploader = std::move(breq_.uploader());

58
untests/curly_tests.cpp
View File

@@ -67,14 +67,14 @@ TEST_CASE("curly") {
REQUIRE(req.wait() == net::request::statuses::done);
REQUIRE(req.status() == net::request::statuses::done);
auto resp = req.get();
REQUIRE(resp.code() == 200u);
REQUIRE(resp.http_code() == 200u);
REQUIRE(req.status() == net::request::statuses::empty);
}
{
auto req = net::request_builder("https://httpbin.org/delay/2").send();
REQUIRE(req.wait_for(net::time_sec_t(1)) == net::request::statuses::pending);
REQUIRE(req.wait_for(net::time_sec_t(5)) == net::request::statuses::done);
REQUIRE(req.get().code() == 200u);
REQUIRE(req.get().http_code() == 200u);
}
{
auto req = net::request_builder("https://httpbin.org/delay/2").send();
@@ -82,7 +82,7 @@ TEST_CASE("curly") {
== net::request::statuses::pending);
REQUIRE(req.wait_until(net::time_point_t::clock::now() + net::time_sec_t(5))
== net::request::statuses::done);
REQUIRE(req.get().code() == 200u);
REQUIRE(req.get().http_code() == 200u);
}
}
@@ -139,7 +139,7 @@ TEST_CASE("curly") {
auto req = net::request_builder("https://httpbin.org/status/204").send();
auto resp = req.get();
REQUIRE(req.status() == net::request::statuses::empty);
REQUIRE(resp.code() == 204u);
REQUIRE(resp.http_code() == 204u);
}
{
auto req = net::request_builder("https://httpbin.org/delay/2").send();
@@ -163,75 +163,75 @@ TEST_CASE("curly") {
.url("https://httpbin.org/put")
.method(net::methods::put)
.send();
REQUIRE(req0.get().code() == 200u);
REQUIRE(req0.get().http_code() == 200u);
auto req1 = net::request_builder()
.url("https://httpbin.org/put")
.method(net::methods::get)
.send();
REQUIRE(req1.get().code() == 405u);
REQUIRE(req1.get().http_code() == 405u);
auto req2 = net::request_builder()
.url("https://httpbin.org/put")
.method(net::methods::head)
.send();
REQUIRE(req2.get().code() == 405u);
REQUIRE(req2.get().http_code() == 405u);
auto req3 = net::request_builder()
.url("https://httpbin.org/put")
.method(net::methods::post)
.send();
REQUIRE(req3.get().code() == 405u);
REQUIRE(req3.get().http_code() == 405u);
}
{
auto req0 = net::request_builder()
.url("https://httpbin.org/get")
.method(net::methods::put)
.send();
REQUIRE(req0.get().code() == 405u);
REQUIRE(req0.get().http_code() == 405u);
auto req1 = net::request_builder()
.url("https://httpbin.org/get")
.method(net::methods::get)
.send();
REQUIRE(req1.get().code() == 200u);
REQUIRE(req1.get().http_code() == 200u);
auto req2 = net::request_builder()
.url("https://httpbin.org/get")
.method(net::methods::head)
.send();
REQUIRE(req2.get().code() == 200u);
REQUIRE(req2.get().http_code() == 200u);
auto req3 = net::request_builder()
.url("https://httpbin.org/get")
.method(net::methods::post)
.send();
REQUIRE(req3.get().code() == 405u);
REQUIRE(req3.get().http_code() == 405u);
}
{
auto req0 = net::request_builder()
.url("https://httpbin.org/post")
.method(net::methods::put)
.send();
REQUIRE(req0.get().code() == 405u);
REQUIRE(req0.get().http_code() == 405u);
auto req1 = net::request_builder()
.url("https://httpbin.org/post")
.method(net::methods::get)
.send();
REQUIRE(req1.get().code() == 405u);
REQUIRE(req1.get().http_code() == 405u);
auto req2 = net::request_builder()
.url("https://httpbin.org/post")
.method(net::methods::head)
.send();
REQUIRE(req2.get().code() == 405u);
REQUIRE(req2.get().http_code() == 405u);
auto req3 = net::request_builder()
.url("https://httpbin.org/post")
.method(net::methods::post)
.send();
REQUIRE(req3.get().code() == 200u);
REQUIRE(req3.get().http_code() == 200u);
}
}
@@ -241,28 +241,28 @@ TEST_CASE("curly") {
.url("https://httpbin.org/status/200")
.method(net::methods::put)
.send();
REQUIRE(req.get().code() == 200u);
REQUIRE(req.get().http_code() == 200u);
}
{
auto req = net::request_builder()
.url("https://httpbin.org/status/201")
.method(net::methods::get)
.send();
REQUIRE(req.get().code() == 201u);
REQUIRE(req.get().http_code() == 201u);
}
{
auto req = net::request_builder()
.url("https://httpbin.org/status/202")
.method(net::methods::head)
.send();
REQUIRE(req.get().code() == 202u);
REQUIRE(req.get().http_code() == 202u);
}
{
auto req = net::request_builder()
.url("https://httpbin.org/status/203")
.method(net::methods::post)
.send();
REQUIRE(req.get().code() == 203u);
REQUIRE(req.get().http_code() == 203u);
}
}
@@ -350,7 +350,7 @@ TEST_CASE("curly") {
.url("https://httpbin.org/image/png")
.method(net::methods::get)
.send().get();
REQUIRE(resp.code() == 200u);
REQUIRE(resp.http_code() == 200u);
REQUIRE(resp.headers.count("Content-Type"));
REQUIRE(resp.headers.at("Content-Type") == "image/png");
REQUIRE(untests::png_data_length == resp.content.size());
@@ -363,7 +363,7 @@ TEST_CASE("curly") {
.url("https://httpbin.org/image/jpeg")
.method(net::methods::get)
.send().get();
REQUIRE(resp.code() == 200u);
REQUIRE(resp.http_code() == 200u);
REQUIRE(resp.headers.count("Content-Type"));
REQUIRE(resp.headers.at("Content-Type") == "image/jpeg");
REQUIRE(untests::jpeg_data_length == resp.content.size());
@@ -380,21 +380,21 @@ TEST_CASE("curly") {
.url("https://httpbin.org/redirect/2")
.method(net::methods::get)
.send();
REQUIRE(req.get().code() == 200u);
REQUIRE(req.get().http_code() == 200u);
}
{
auto req = net::request_builder()
.url("https://httpbin.org/absolute-redirect/2")
.method(net::methods::get)
.send();
REQUIRE(req.get().code() == 200u);
REQUIRE(req.get().http_code() == 200u);
}
{
auto req = net::request_builder()
.url("https://httpbin.org/relative-redirect/2")
.method(net::methods::get)
.send();
REQUIRE(req.get().code() == 200u);
REQUIRE(req.get().http_code() == 200u);
}
}
{
@@ -404,7 +404,7 @@ TEST_CASE("curly") {
.method(net::methods::get)
.redirections(0)
.send();
REQUIRE(req.get().code() == 302u);
REQUIRE(req.get().http_code() == 302u);
}
{
auto req = net::request_builder()
@@ -428,7 +428,7 @@ TEST_CASE("curly") {
.method(net::methods::get)
.redirections(3)
.send();
REQUIRE(req.get().code() == 200u);
REQUIRE(req.get().http_code() == 200u);
}
}
}
@@ -554,7 +554,7 @@ TEST_CASE("curly_examples") {
auto response = request.get();
// prints results
std::cout << "Status code: " << response.code() << std::endl;
std::cout << "Status code: " << response.http_code() << std::endl;
std::cout << "Content type: " << response.headers["content-type"] << std::endl;
std::cout << "Body content: " << response.content.as_string_view() << std::endl;
@@ -612,7 +612,7 @@ TEST_CASE("curly_examples") {
if ( request.wait() == net::request::statuses::done ) {
auto response = request.get();
std::cout << "Status code: " << response.code() << std::endl;
std::cout << "Status code: " << response.http_code() << std::endl;
} else {
// throws net::exception because a response is unavailable
// auto response = request.get();