[URI] Added specific schemes for builder.

Author: glynos

boost/network/uri/directives.hpp

@@ -9,14 +9,6 @@
 
 
 # include <boost/network/uri/uri.hpp>
-# include <boost/network/uri/directives/scheme.hpp>
-# include <boost/network/uri/directives/user_info.hpp>
-# include <boost/network/uri/directives/host.hpp>
-# include <boost/network/uri/directives/port.hpp>
-# include <boost/network/uri/directives/authority.hpp>
-# include <boost/network/uri/directives/path.hpp>
-# include <boost/network/uri/directives/query.hpp>
-# include <boost/network/uri/directives/fragment.hpp>
 
 
 namespace boost {
@@ -43,4 +35,14 @@ uri &operator << (uri &uri_, const Directive &directive) {
 } // namespace boost
 
 
+# include <boost/network/uri/directives/scheme.hpp>
+# include <boost/network/uri/directives/user_info.hpp>
+# include <boost/network/uri/directives/host.hpp>
+# include <boost/network/uri/directives/port.hpp>
+# include <boost/network/uri/directives/authority.hpp>
+# include <boost/network/uri/directives/path.hpp>
+# include <boost/network/uri/directives/query.hpp>
+# include <boost/network/uri/directives/fragment.hpp>
+
+
 #endif // __BOOST_NETWORK_URI_DIRECTIVES_INC__

boost/network/uri/directives/scheme.hpp

@@ -37,6 +37,18 @@ inline
 scheme_directive scheme(const std::string &scheme) {
     return scheme_directive(scheme);
 }
+
+namespace schemes {
+inline
+uri &http(uri &uri_) {
+    return uri_ << scheme("http");
+}
+
+inline
+uri &https(uri &uri_) {
+    return uri_ << scheme("https");
+}
+} // namespace schemes
 } // namespace uri
 } // namespace network
 } // namespace boost

libs/network/test/uri/url_builder_test.cpp

@@ -129,15 +129,25 @@ BOOST_AUTO_TEST_CASE(from_root_test)
     BOOST_CHECK_EQUAL(uri::fragment(instance), "fragment");
 }
 
-//BOOST_AUTO_TEST_CASE(scheme_test)
-//{
-//    uri_type instance;
-//    instance << uri::schemes::http << uri::host("www.example.com") << uri::path("/");
-//    BOOST_REQUIRE(uri::valid(instance));
-//    BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
-//    BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
-//    BOOST_CHECK_EQUAL(uri::path(instance), "/");
-//}
+BOOST_AUTO_TEST_CASE(scheme_http_test)
+{
+    uri::uri instance;
+    instance << uri::schemes::http << uri::host("www.example.com") << uri::path("/");
+    BOOST_REQUIRE(uri::valid(instance));
+    BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
+    BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
+    BOOST_CHECK_EQUAL(uri::path(instance), "/");
+}
+
+BOOST_AUTO_TEST_CASE(scheme_https_test)
+{
+    uri::uri instance;
+    instance << uri::schemes::https << uri::host("www.example.com") << uri::path("/");
+    BOOST_REQUIRE(uri::valid(instance));
+    BOOST_CHECK_EQUAL(uri::scheme(instance), "https");
+    BOOST_CHECK_EQUAL(uri::host(instance), "www.example.com");
+    BOOST_CHECK_EQUAL(uri::path(instance), "/");
+}
 
 BOOST_AUTO_TEST_CASE(encoded_null_char_test)
 {