Baby steps: request implementation.

deanberris · deanberris · commit df8eb44a2ced · 2011-12-14T23:56:05.000+11:00
In order to move on to getting the other tests to build, the request
implementation needs to get to a point where it's building as well.
diff --git a/boost/network/protocol/http/message/directives/major_version.hpp b/boost/network/protocol/http/message/directives/major_version.hpp
@@ -6,29 +6,20 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/network/protocol/http/support/is_server.hpp>
-#include <boost/utility/enable_if.hpp>
 #include <boost/cstdint.hpp>
 
 namespace boost { namespace network { namespace http {
 
-    template <class Tag>
-    struct basic_request;
+struct major_version_directive {
+  boost::uint8_t major_version;
+  explicit major_version_directive(boost::uint8_t major_version);
+  void operator()(request_base &request) const;
+};
 
-    struct major_version_directive {
-        boost::uint8_t major_version;
-        explicit major_version_directive(boost::uint8_t major_version)
-        : major_version(major_version) {}
-        template <class Tag>
-        void operator()(basic_request<Tag> & request) const {
-            request.http_version_major = major_version;
-        }
-    };
-
-    inline major_version_directive
-    major_version(boost::uint8_t major_version_) {
-        return major_version_directive(major_version_);
-    }
+inline major_version_directive
+major_version(boost::uint8_t major_version_) {
+  return major_version_directive(major_version_);
+}
     
 } /* http */
     
diff --git a/boost/network/protocol/http/request/request.hpp b/boost/network/protocol/http/request/request.hpp
@@ -8,8 +8,10 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/network/protocol/http/request/request_base.hpp>
-#include <boost/network/protocol/http/request/request_concept.hpp>
 #include <boost/network/uri/uri.hpp>
+#include <boost/network/protocol/http/message/directives/major_version.hpp>
+#include <boost/network/protocol/http/message/directives/minor_version.hpp>
+#include <boost/scoped_ptr.hpp>
 
 namespace boost { namespace network { namespace http {
 
@@ -20,8 +22,8 @@ struct request : request_base {
 
   // We support full value semantics.
   request();
-  explicit request(std::string url);
-  explicit request(uri::uri url);
+  explicit request(std::string const & url);
+  explicit request(uri::uri const & url);
   request(request const &);
   request& operator=(request);
   void swap(request & other);
@@ -65,7 +67,7 @@ struct request : request_base {
 
   virtual ~request();
  private:
-  request_pimpl * pimpl_;
+  scoped_ptr<request_pimpl> pimpl_;
 };
 
 template <class Directive>
@@ -96,8 +98,4 @@ inline void swap(request &l, request &r) {
 #include <boost/network/protocol/http/message/modifiers.hpp>
 #include <boost/network/protocol/http/message/wrappers.hpp>
 
-#ifdef BOOST_NETWORK_DEBUG
-BOOST_CONCEPT_ASSERT((boost::network::http::ClientRequest<boost::network::http::request>));
-#endif
-
 #endif /* BOOST_NETWORK_PROTOCOL_HTTP_REQUEST_REQUEST_HPP_20111021 */
diff --git a/boost/network/protocol/http/request/request.ipp b/boost/network/protocol/http/request/request.ipp
@@ -7,6 +7,32 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-// TODO Implement the basic request proxy!
+#include <boost/network/protocol/http/request/request.hpp>
+#include <boost/network/protocol/http/request/request_concept.hpp>
+
+#ifdef BOOST_NETWORK_DEBUG
+BOOST_CONCEPT_ASSERT((boost::network::http::ClientRequest<boost::network::http::request>));
+#endif
+
+namespace boost { namespace network { namespace http {
+
+struct request_pimpl {
+  explicit request_pimpl(std::string const & url) {}
+};
+
+request::~request() {
+  // Do nothing here.
+}
+
+request::request(std::string const & url)
+: pimpl_(new request_pimpl(url))
+{}
+
+
+}  // namespace http
+
+}  // namespace network
+
+}  // namespace boost
 
 #endif /* BOOST_NETWORK_PROTOCOL_HTTP_REQUEST_IPP_20110910 */
diff --git a/libs/network/src/http/request.cpp b/libs/network/src/http/request.cpp
@@ -8,6 +8,7 @@
 #undef BOOST_NETWORK_NO_LIB
 #endif
 
+#include <boost/network/protocol/http/request/request.ipp>
 #include <boost/network/protocol/http/request/request_base.ipp>
 #include <boost/network/protocol/http/message/wrappers/anchor.ipp>
 #include <boost/network/protocol/http/message/wrappers/host.ipp>
diff --git a/libs/network/test/http/client_get_different_port_test.cpp b/libs/network/test/http/client_get_different_port_test.cpp
@@ -7,17 +7,14 @@
 #define BOOST_TEST_MODULE HTTP Client Get Different Port Test
 #include <boost/network/include/http/client.hpp>
 #include <boost/test/unit_test.hpp>
-#include "client_types.hpp"
 
-namespace net = boost::network;
-namespace http = boost::network::http;
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_different_port, client, client_types) {
-    typename client::request request("http://www.boost.org:80/");
-    client client_;
-    typename client::response response_ = client_.get(request);
-    typename net::headers_range<typename client::response>::type range = headers(response_)["Content-Type"];
-    BOOST_CHECK ( boost::begin(range) != boost::end(range) );
-    BOOST_CHECK ( body(response_).size() != 0 );
+BOOST_AUTO_TEST_CASE(http_get_test_different_port) {
+  using namespace boost::network::http;
+  request request_("http://www.boost.org:80/");
+  client client_;
+  response response_ = client_.get(request_);
+  boost::network::headers_wrapper::range_type headers_ = headers(response_)["Content-Type"];
+  BOOST_CHECK( boost::begin(headers_) != boost::end(headers_) );
+  BOOST_CHECK( body(response_).size() > 0 );
 }
 
