Skip to content

refactor: use the transfer algorithms and source/sink types from http #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mvandeberg wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

refactor: use the transfer algorithms and source/sink types from http #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/modules/ROOT/pages/2.guide/2n.extending.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct MyRequestBody
{
std::optional<std::string> content_type() const;
std::optional<std::uint64_t> content_length() const;
capy::io_task<> write(capy::any_buffer_sink& sink) const;
capy::io_task<> write(http::any_buffer_sink& sink) const;
};
----

Expand Down
2 changes: 1 addition & 1 deletion example/nlohmann_json.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ tag_invoke(burl::body_from_tag<nlohmann::json>, const nlohmann::json& value)
}

capy::io_task<>
write(capy::any_buffer_sink& sink) const
write(http::any_buffer_sink& sink) const
{
auto [ec, n] = co_await sink.write_eof(capy::make_buffer(text_));
co_return { ec };
Expand Down
8 changes: 4 additions & 4 deletions include/boost/burl/any_request_body.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <boost/burl/detail/config.hpp>
#include <boost/burl/request_body.hpp>

#include <boost/capy/io/any_buffer_sink.hpp>
#include <boost/http/io/any_buffer_sink.hpp>
#include <boost/capy/io_task.hpp>

#include <cstdint>
Expand Down Expand Up @@ -59,7 +59,7 @@ class any_request_body
content_length() const = 0;

virtual capy::io_task<>
write(capy::any_buffer_sink& sink) const = 0;
write(http::any_buffer_sink& sink) const = 0;
};

template<RequestBody T>
Expand All @@ -85,7 +85,7 @@ class any_request_body
}

capy::io_task<>
write(capy::any_buffer_sink& sink) const override
write(http::any_buffer_sink& sink) const override
{
return body.write(sink);
}
Expand Down Expand Up @@ -215,7 +215,7 @@ class any_request_body
@return An awaitable yielding `(error_code)`.
*/
capy::io_task<>
write(capy::any_buffer_sink& sink) const
write(http::any_buffer_sink& sink) const
{
return impl_->write(sink);
}
Expand Down
2 changes: 1 addition & 1 deletion include/boost/burl/detail/parser.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include <boost/capy/buffers/buffer_copy.hpp>
#include <boost/capy/buffers/buffer_param.hpp>
#include <boost/capy/concept/buffer_source.hpp>
#include <boost/http/concept/buffer_source.hpp>
#include <boost/capy/io/any_read_stream.hpp>
#include <boost/capy/io_task.hpp>
#include <boost/capy/read.hpp>
Expand Down
4 changes: 2 additions & 2 deletions include/boost/burl/request_body.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <boost/burl/detail/config.hpp>

#include <boost/capy/io/any_buffer_sink.hpp>
#include <boost/http/io/any_buffer_sink.hpp>
#include <boost/capy/io_task.hpp>

#include <concepts>
Expand Down Expand Up @@ -44,7 +44,7 @@ namespace burl
@ref body_from_tag.
*/
template<typename T>
concept RequestBody = requires(T const& t, capy::any_buffer_sink& sink) {
concept RequestBody = requires(T const& t, http::any_buffer_sink& sink) {
{ t.content_type() } -> std::same_as<std::optional<std::string>>;
{ t.content_length() } -> std::same_as<std::optional<std::uint64_t>>;
{ t.write(sink) } -> std::same_as<capy::io_task<>>;
Expand Down
8 changes: 4 additions & 4 deletions include/boost/burl/response.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#include <boost/burl/detail/response_parser.hpp>
#include <boost/burl/error.hpp>
#include <boost/burl/test/fwd.hpp>
#include <boost/capy/io/any_buffer_source.hpp>
#include <boost/capy/io/any_read_source.hpp>
#include <boost/http/io/any_buffer_source.hpp>
#include <boost/http/io/any_read_source.hpp>
#include <boost/capy/io_task.hpp>
#include <boost/corosio/timeout.hpp>
#include <boost/http/fields_base.hpp>
Expand Down Expand Up @@ -416,7 +416,7 @@ class response
@see @ref as_read_source.
*/
BOOST_BURL_DECL
capy::any_buffer_source
http::any_buffer_source
as_buffer_source() &;

/** Return a read source for reading the body.
Expand All @@ -431,7 +431,7 @@ class response
@see @ref as_buffer_source.
*/
BOOST_BURL_DECL
capy::any_read_source
http::any_read_source
as_read_source() &;
};

Expand Down
2 changes: 1 addition & 1 deletion src/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ client::execute_impl(
sr.reset(&stream, &headers);
if(request.body.has_value())
{
capy::any_buffer_sink sink(&sr);
http::any_buffer_sink sink(&sr);
if(auto [wec] = co_await request.body.write(sink); wec)
co_return { wec, {} };
}
Expand Down
4 changes: 2 additions & 2 deletions src/detail/send_file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <boost/burl/error.hpp>
#include <boost/capy/cond.hpp>
#include <boost/capy/ex/this_coro.hpp>
#include <boost/capy/io/any_buffer_sink.hpp>
#include <boost/http/io/any_buffer_sink.hpp>
#include <boost/corosio/file_base.hpp>
#include <boost/corosio/stream_file.hpp>

Expand All @@ -29,7 +29,7 @@ namespace detail

capy::io_task<>
send_file(
capy::any_buffer_sink& sink,
http::any_buffer_sink& sink,
std::filesystem::path const& path,
std::uint64_t size,
bool call_eof)
Expand Down
4 changes: 2 additions & 2 deletions src/detail/send_file.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#ifndef BOOST_BURL_SRC_DETAIL_SEND_FILE_HPP
#define BOOST_BURL_SRC_DETAIL_SEND_FILE_HPP

#include <boost/capy/io/any_buffer_sink.hpp>
#include <boost/http/io/any_buffer_sink.hpp>
#include <boost/capy/io_task.hpp>

#include <cstdint>
Expand All @@ -32,7 +32,7 @@ namespace detail
// with error::file_changed if the file no longer holds `size` bytes.
capy::io_task<>
send_file(
capy::any_buffer_sink& sink,
http::any_buffer_sink& sink,
std::filesystem::path const& path,
std::uint64_t size,
bool call_eof = false);
Expand Down
8 changes: 4 additions & 4 deletions src/file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include "detail/send_file.hpp"

#include <boost/capy/ex/this_coro.hpp>
#include <boost/capy/io/any_buffer_source.hpp>
#include <boost/capy/io/push_to.hpp>
#include <boost/http/io/any_buffer_source.hpp>
#include <boost/http/io/push_to.hpp>
#include <boost/corosio/file_base.hpp>
#include <boost/corosio/stream_file.hpp>
#include <boost/http/server/mime_types.hpp>
Expand Down Expand Up @@ -61,7 +61,7 @@ class file_body
}

capy::io_task<>
write(capy::any_buffer_sink& sink) const
write(http::any_buffer_sink& sink) const
{
return detail::send_file(sink, path_, size_, true);
}
Expand Down Expand Up @@ -94,7 +94,7 @@ tag_invoke(
}

auto src = resp.as_buffer_source();
auto [ec, n] = co_await capy::push_to(src, f);
auto [ec, n] = co_await http::push_to(src, f);
co_return { ec, std::move(dest) };
}

Expand Down
2 changes: 1 addition & 1 deletion src/json.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class json_body
}

capy::io_task<>
write(capy::any_buffer_sink& sink) const
write(http::any_buffer_sink& sink) const
{
json::serializer sr;
sr.reset(&value_);
Expand Down
4 changes: 2 additions & 2 deletions src/multipart_form.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include <boost/capy/buffers.hpp>
#include <boost/capy/buffers/make_buffer.hpp>
#include <boost/capy/io/any_buffer_sink.hpp>
#include <boost/http/io/any_buffer_sink.hpp>
#include <boost/http/server/mime_types.hpp>

#include <cstdint>
Expand Down Expand Up @@ -173,7 +173,7 @@ class multipart_form::body
}

capy::io_task<>
write(capy::any_buffer_sink& sink) const
write(http::any_buffer_sink& sink) const
{
using capy::make_buffer;

Expand Down
8 changes: 4 additions & 4 deletions src/response.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@ response::as_view() &
co_return std::move(body);
}

capy::any_buffer_source
http::any_buffer_source
response::as_buffer_source() &
{
return capy::any_buffer_source(&parser_);
return http::any_buffer_source(&parser_);
}

capy::any_read_source
http::any_read_source
response::as_read_source() &
{
return capy::any_read_source(&parser_);
return http::any_read_source(&parser_);
}

} // namespace burl
Expand Down
4 changes: 2 additions & 2 deletions src/string.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class string_body
}

capy::io_task<>
write(capy::any_buffer_sink& sink) const
write(http::any_buffer_sink& sink) const
{
auto [ec, n] =
co_await sink.write_eof(
Expand Down Expand Up @@ -80,7 +80,7 @@ class string_view_body
}

capy::io_task<>
write(capy::any_buffer_sink& sink) const
write(http::any_buffer_sink& sink) const
{
auto [ec, n] = co_await sink.write_eof(
capy::make_buffer(body_));
Expand Down
4 changes: 2 additions & 2 deletions src/urlencoded_form.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <boost/burl/urlencoded_form.hpp>

#include <boost/capy/buffers/make_buffer.hpp>
#include <boost/capy/io/any_buffer_sink.hpp>
#include <boost/http/io/any_buffer_sink.hpp>
#include <boost/url/encode.hpp>
#include <boost/url/encoding_opts.hpp>
#include <boost/url/rfc/unreserved_chars.hpp>
Expand Down Expand Up @@ -78,7 +78,7 @@ class urlencoded_form::body
}

capy::io_task<>
write(capy::any_buffer_sink& sink) const
write(http::any_buffer_sink& sink) const
{
auto [ec, n] = co_await sink.write_eof(
capy::make_buffer(std::string_view(body_)));
Expand Down
12 changes: 6 additions & 6 deletions test/unit/body_test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
#include <boost/burl/any_request_body.hpp>

#include <boost/capy/ex/run_async.hpp>
#include <boost/capy/io/any_buffer_sink.hpp>
#include <boost/http/io/any_buffer_sink.hpp>
#include <boost/capy/task.hpp>
#include <boost/capy/test/buffer_sink.hpp>
#include <boost/http/test/buffer_sink.hpp>
#include <boost/capy/test/fuse.hpp>
#include <boost/corosio/io_context.hpp>

Expand All @@ -37,8 +37,8 @@ check_body(
BOOST_TEST(body.has_value());
capy::test::fuse f;
auto r = f.armed([&](capy::test::fuse& f) -> capy::task<> {
capy::test::buffer_sink bs(f);
capy::any_buffer_sink sink(&bs);
http::test::buffer_sink bs(f);
http::any_buffer_sink sink(&bs);

auto [ec] = co_await body.write(sink);
if(ec)
Expand All @@ -57,8 +57,8 @@ check_io_body(
{
corosio::io_context ioc;
std::error_code ec;
capy::test::buffer_sink bs;
capy::any_buffer_sink sink(&bs);
http::test::buffer_sink bs;
http::any_buffer_sink sink(&bs);
capy::run_async(
ioc.get_executor(),
[&](capy::io_result<> res) {ec = res.ec; })
Expand Down
12 changes: 6 additions & 6 deletions test/unit/detail/send_file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <boost/burl/error.hpp>

#include <boost/capy/ex/run_async.hpp>
#include <boost/capy/test/buffer_sink.hpp>
#include <boost/http/test/buffer_sink.hpp>
#include <boost/corosio/io_context.hpp>

#include "../temp_file.hpp"
Expand All @@ -32,11 +32,11 @@ class send_file_test
static std::error_code
run(std::filesystem::path const& path,
std::uint64_t size,
capy::test::buffer_sink& bs)
http::test::buffer_sink& bs)
{
corosio::io_context ioc;
std::error_code ret;
capy::any_buffer_sink sink(&bs);
http::any_buffer_sink sink(&bs);
capy::run_async(
ioc.get_executor(),
[&](capy::io_result<> r) { ret = r.ec; })
Expand All @@ -52,7 +52,7 @@ class send_file_test
std::string const contents = "hello file body";
temp_file tmp(contents);

capy::test::buffer_sink bs;
http::test::buffer_sink bs;
auto ec = run(tmp.path, contents.size(), bs);

BOOST_TEST(!ec);
Expand All @@ -65,7 +65,7 @@ class send_file_test
std::string const contents = "hello";
temp_file tmp(contents);

capy::test::buffer_sink bs;
http::test::buffer_sink bs;
auto ec = run(tmp.path, contents.size() + 10, bs);

BOOST_TEST(ec == error::file_changed);
Expand All @@ -77,7 +77,7 @@ class send_file_test
std::string const contents = "hello file body";
temp_file tmp(contents);

capy::test::buffer_sink bs;
http::test::buffer_sink bs;
auto ec = run(tmp.path, 5, bs);

BOOST_TEST(!ec);
Expand Down
8 changes: 4 additions & 4 deletions test/unit/urlencoded_form.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
#include <boost/burl/any_request_body.hpp>
#include <boost/burl/conversion.hpp>

#include <boost/capy/io/any_buffer_sink.hpp>
#include <boost/http/io/any_buffer_sink.hpp>
#include <boost/capy/task.hpp>
#include <boost/capy/test/buffer_sink.hpp>
#include <boost/http/test/buffer_sink.hpp>
#include <boost/capy/test/fuse.hpp>

#include "test_suite.hpp"
Expand Down Expand Up @@ -53,8 +53,8 @@ struct urlencoded_form_test
capy::test::fuse().armed(
[&](capy::test::fuse& f) -> capy::task<void>
{
capy::test::buffer_sink bs(f);
capy::any_buffer_sink sink(&bs);
http::test::buffer_sink bs(f);
http::any_buffer_sink sink(&bs);

auto [ec] = co_await body.write(sink);
if(ec)
Expand Down
Loading