Some minor changes to the URI interface.

Author: glynos

boost/network/uri/uri.hpp

@@ -181,12 +181,12 @@ class basic_uri
         return string_type(boost::begin(range), boost::end(range));
     }
 
-    string_type to_string() const {
+    string_type string() const {
         return uri_;
     }
 
     string_type raw() const {
-        return to_string();
+        return string();
     }
 
     bool is_valid() const {
@@ -198,7 +198,7 @@ class basic_uri
     void parse();
 
     string_type uri_;
-    detail::uri_parts<typename string<Tag>::type> uri_parts_;
+    detail::uri_parts<typename boost::network::string<Tag>::type> uri_parts_;
     bool is_valid_;
 
 };
@@ -345,7 +345,7 @@ template <
     >
 inline
 bool operator == (const basic_uri<Tag> &lhs, const basic_uri<Tag> &rhs) {
-    return lhs.to_string() == rhs.to_string();
+    return std::equal(lhs.begin(), lhs.end(), rhs.begin());
 }
 } // namespace uri
 } // namespace network

boost/network/uri/uri_accessors.hpp

@@ -32,8 +32,8 @@ struct key_value_sequence
     {
         query =  pair >> *((spirit::qi::lit(';') | '&') >> pair);
         pair  =  key >> -('=' >> value);
-        key   =  spirit::qi::char_("a-zA-Z_") >> *spirit::qi::char_("a-zA-Z_0-9%");
-        value = +spirit::qi::char_("a-zA-Z_0-9%");
+        key   =  spirit::qi::char_("a-zA-Z_") >> *spirit::qi::char_("a-zA-Z_0-9/%");
+        value = +spirit::qi::char_("a-zA-Z_0-9/%");
     }
 
     spirit::qi::rule<const_iterator_type, Map()> query;

libs/network/test/uri/url_test.cpp

@@ -235,7 +235,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(assignment_test, T, tag_types) {
     uri_type instance(string_type(boost::begin(url), boost::end(url)));
     uri_type copy;
     copy = instance;
-    BOOST_CHECK(instance.to_string() == copy.to_string());
+    BOOST_CHECK(instance.string() == copy.string());
     BOOST_CHECK(instance == copy);
 }
 
@@ -279,7 +279,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(http_query_map_test, T, tag_types) {
 
     std::map<string_type, string_type> queries;
     uri::query_map(instance, queries);
-    BOOST_CHECK_EQUAL(queries.size(), std::size_t(1));
+    BOOST_REQUIRE_EQUAL(queries.size(), std::size_t(1));
     BOOST_CHECK(boost::equal(queries.begin()->first, key));
     BOOST_CHECK(boost::equal(queries.begin()->second, value));
 }
@@ -297,7 +297,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(xmpp_query_map_test, T, tag_types) {
 
     std::map<string_type, string_type> queries;
     uri::query_map(instance, queries);
-    BOOST_CHECK_EQUAL(queries.size(), std::size_t(2));
+    BOOST_REQUIRE_EQUAL(queries.size(), std::size_t(2));
     BOOST_CHECK(boost::equal(queries.begin()->first, key_1));
     BOOST_CHECK(boost::equal(queries.begin()->second, value_1));
     BOOST_CHECK(boost::equal((++queries.begin())->first, key_2));