Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions src/uri/include/sourcemeta/jsontoolkit/uri.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,17 @@ class SOURCEMETA_JSONTOOLKIT_URI_EXPORT URI {
/// ```
URI(std::string input);

/// This constructor creates a URI from a C++ input stream. For example:
///
/// ```cpp
/// #include <sourcemeta/jsontoolkit/uri.h>
/// #include <sstream>
///
/// std::istringstream input{"https://www.sourcemeta.com"};
/// const sourcemeta::jsontoolkit::URI uri{input};
/// ```
URI(std::istream &input);

/// Destructor
~URI();

Expand Down
8 changes: 8 additions & 0 deletions src/uri/uri.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <cassert> // assert
#include <cstdint> // std::uint32_t
#include <istream> // std::istream
#include <sstream> // std::ostringstream
#include <stdexcept> // std::length_error, std::runtime_error
#include <string> // std::stoul, std::string, std::tolower
Expand Down Expand Up @@ -72,6 +73,13 @@ URI::URI(std::string input) : data{std::move(input)}, internal{new Internal} {
uri_parse(this->data, &this->internal->uri);
}

URI::URI(std::istream &input) : internal{new Internal} {
std::ostringstream output;
output << input.rdbuf();
this->data = output.str();
uri_parse(this->data, &this->internal->uri);
}

URI::~URI() { uriFreeUriMembersA(&this->internal->uri); }

URI::URI(const URI &other) : URI{other.recompose()} {}
Expand Down
6 changes: 6 additions & 0 deletions test/uri/uri_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ TEST(URI, from_fragment) {
EXPECT_EQ(fragment.value(), "foo");
EXPECT_EQ(uri.recompose(), "#foo");
}

TEST(URI, using_istream) {
std::istringstream input{"https://example.com"};
const sourcemeta::jsontoolkit::URI uri{input};
EXPECT_EQ(uri.recompose(), "https://example.com");
}