Some minor changes to the URI interface.

glynos · glynos · commit 78d6f12c131c · 2011-08-25T20:11:39.000+02:00
diff --git a/boost/network/uri/uri.hpp b/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
diff --git a/boost/network/uri/uri_accessors.hpp b/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;
diff --git a/libs/network/test/uri/url_test.cpp b/libs/network/test/uri/url_test.cpp
@@ -243,7 +243,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);
 }
 
@@ -287,7 +287,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));
 }
@@ -305,7 +305,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));

Original file line number	Diff line number	Diff line change
`@@ -181,12 +181,12 @@ class basic_uri`
`181`	`181`	`return string_type(boost::begin(range), boost::end(range));`
`182`	`182`	`}`
`183`	`183`
`184`		`- string_type to_string() const {`
	`184`	`+ string_type string() const {`
`185`	`185`	`return uri_;`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`string_type raw() const {`
`189`		`- return to_string();`
	`189`	`+ return string();`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`bool is_valid() const {`
`@@ -198,7 +198,7 @@ class basic_uri`
`198`	`198`	`void parse();`
`199`	`199`
`200`	`200`	`string_type uri_;`
`201`		`- detail::uri_parts<typename string<Tag>::type> uri_parts_;`
	`201`	`+ detail::uri_parts<typename boost::network::string<Tag>::type> uri_parts_;`
`202`	`202`	`bool is_valid_;`
`203`	`203`
`204`	`204`	`};`
`@@ -345,7 +345,7 @@ template <`
`345`	`345`	`>`
`346`	`346`	`inline`
`347`	`347`	`bool operator == (const basic_uri<Tag> &lhs, const basic_uri<Tag> &rhs) {`
`348`		`- return lhs.to_string() == rhs.to_string();`
	`348`	`+ return std::equal(lhs.begin(), lhs.end(), rhs.begin());`
`349`	`349`	`}`
`350`	`350`	`} // namespace uri`
`351`	`351`	`} // namespace network`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ struct key_value_sequence`
`32`	`32`	`{`
`33`	`33`	`query = pair >> *((spirit::qi::lit(';') \| '&') >> pair);`
`34`	`34`	`pair = key >> -('=' >> value);`
`35`		`- key = spirit::qi::char_("a-zA-Z_") >> *spirit::qi::char_("a-zA-Z_0-9%");`
`36`		`- value = +spirit::qi::char_("a-zA-Z_0-9%");`
	`35`	`+ key = spirit::qi::char_("a-zA-Z_") >> *spirit::qi::char_("a-zA-Z_0-9/%");`
	`36`	`+ value = +spirit::qi::char_("a-zA-Z_0-9/%");`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`spirit::qi::rule<const_iterator_type, Map()> query;`