Incremental Progress on API.

deanberris · deanberris · commit 94fde6ce482c · 2012-03-06T22:38:51.000+11:00
This change basically brings the client type closer to full API parity
only simpler than how it used to be. The next change completely removes
the reliance on Boost.Parameter as that's largely unnecessary now with a
more scalable way of providing options and evolving the implementation
going forward.
diff --git a/boost/network/protocol/http/client.hpp b/boost/network/protocol/http/client.hpp
@@ -46,4 +46,8 @@ struct client : basic_client_facade {
 
 } // namespace boost
 
+#ifdef BOOST_NETWORK_NO_LIB
+#include <boost/network/protocol/http/client.ipp>
+#endif
+
 #endif // BOOST_NETWORK_PROTOCOL_HTTP_CLIENT_20091215
diff --git a/boost/network/protocol/http/client.ipp b/boost/network/protocol/http/client.ipp
@@ -0,0 +1,27 @@
+#ifndef BOOST_NETWORK_PROTOCOL_HTTP_CLIENT_IPP_20120306
+#define BOOST_NETWORK_PROTOCOL_HTTP_CLIENT_IPP_20120306
+
+// Copyright 2012 Dean Michael Berris <dberris@google.com>.
+// Copyright 2012 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/network/protocol/http/client.hpp>
+#include <boost/network/protocol/http/client/options.hpp>
+
+namespace boost { namespace network { namespace http {
+
+client::client()
+: base_facade_type()
+{}
+
+client::client(client_options const &options)
+: base_facade_type(options)
+{}
+
+}  // namespace http
+}  // namespace network
+}  // namespace boost
+
+#endif  // BOOST_NETWORK_PROTOCOL_HTTP_CLIENT_IPP_20120306
diff --git a/boost/network/protocol/http/client/base.hpp b/boost/network/protocol/http/client/base.hpp
@@ -26,6 +26,7 @@ struct client_base {
     function<void(boost::iterator_range<char const *> const &, system::error_code const &)>
     body_callback_function_type;
 
+  client_base();
   explicit client_base(client_options const &options);
   ~client_base();
   response const request_skeleton(request const & request_,
diff --git a/boost/network/protocol/http/client/base.ipp b/boost/network/protocol/http/client/base.ipp
@@ -28,6 +28,7 @@ struct client_base_pimpl {
                                   bool get_body,
                                   body_callback_function_type callback,
                                   request_options const &options);
+  void clear_resolved_cache();
   ~client_base_pimpl();
  private:
   client_options options_;
@@ -37,10 +38,18 @@ struct client_base_pimpl {
   shared_ptr<connection_manager> connection_manager_;
 };
 
+client_base::client_base()
+: pimpl(new (std::nothrow) client_base_pimpl(client_options()))
+{}
+
 client_base::client_base(client_options const &options)
 : pimpl(new (std::nothrow) client_base_pimpl(options))
 {}
 
+void client_base::clear_resolved_cache() {
+  pimpl->clear_resolved_cache();
+}
+
 response const client_base::request_skeleton(request const & request_,
                                              std::string const & method,
                                              bool get_body,
@@ -92,6 +101,10 @@ response const client_base_pimpl::request_skeleton(
   return connection_->send_request(method, request_, get_body, callback, options);
 }
 
+void client_base_pimpl::clear_resolved_cache() {
+  connection_manager_->clear_resolved_cache();
+}
+
 } // namespace http
 
 } // namespace network
diff --git a/boost/network/protocol/http/client/connection_manager.hpp b/boost/network/protocol/http/client/connection_manager.hpp
@@ -21,6 +21,7 @@ struct connection_manager {
       asio::io_service & service,
       request_base const & request,
       client_options const & options) = 0;
+  virtual void clear_resolved_cache() = 0;
   virtual void reset() = 0;
   virtual ~connection_manager() = 0;
 };
diff --git a/boost/network/protocol/http/client/facade.hpp b/boost/network/protocol/http/client/facade.hpp
@@ -16,7 +16,8 @@ namespace boost { namespace network { namespace http {
 struct basic_client_facade {
   typedef client_base::body_callback_function_type body_callback_function_type;
 
-  basic_client_facade(client_options const &options);
+  basic_client_facade();
+  explicit basic_client_facade(client_options const &options);
 
   response const head(request const &request, request_options const&options=request_options());
   response const get(request const &request,
diff --git a/boost/network/protocol/http/client/simple_connection_manager.hpp b/boost/network/protocol/http/client/simple_connection_manager.hpp
@@ -61,6 +61,12 @@ struct simple_connection_manager : connection_manager {
    */
   virtual void reset();  // override
 
+  /** clear_resolved_cache
+   *
+   * This function resets all the resolved endpoints that have been cached.
+   */
+  virtual void clear_resolved_cache();
+
   /** Destructor.
    */
   virtual ~simple_connection_manager();  // override
diff --git a/boost/network/protocol/http/client/simple_connection_manager.ipp b/boost/network/protocol/http/client/simple_connection_manager.ipp
@@ -28,6 +28,10 @@ struct simple_connection_manager_pimpl {
     // do nothing here.
   }
 
+  void clear_resolved_cache() {
+    // TODO(deanberris): Make this happen!
+  }
+
   ~simple_connection_manager_pimpl() {
     // do nothing here.
   }
@@ -52,6 +56,10 @@ void simple_connection_manager::reset() {
   pimpl->reset();
 }
 
+void simple_connection_manager::clear_resolved_cache() {
+  pimpl->clear_resolved_cache();
+}
+
 simple_connection_manager::~simple_connection_manager() {
   // do nothing here.
 }
diff --git a/libs/network/src/http/client.cpp b/libs/network/src/http/client.cpp
@@ -8,6 +8,8 @@
 #undef BOOST_NETWORK_NO_LIB
 #endif
 
+#include <boost/network/protocol/http/client.ipp>
 #include <boost/network/protocol/http/client/base.ipp>
 #include <boost/network/protocol/http/client/facade.ipp>
 #include <boost/network/protocol/http/client/options.ipp>
+

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,10 @@ struct simple_connection_manager_pimpl {`
`28`	`28`	`// do nothing here.`
`29`	`29`	`}`
`30`	`30`
	`31`	`+ void clear_resolved_cache() {`
	`32`	`+ // TODO(deanberris): Make this happen!`
	`33`	`+ }`
	`34`	`+`
`31`	`35`	`~simple_connection_manager_pimpl() {`
`32`	`36`	`// do nothing here.`
`33`	`37`	`}`
`@@ -52,6 +56,10 @@ void simple_connection_manager::reset() {`
`52`	`56`	`pimpl->reset();`
`53`	`57`	`}`
`54`	`58`
	`59`	`+void simple_connection_manager::clear_resolved_cache() {`
	`60`	`+ pimpl->clear_resolved_cache();`
	`61`	`+}`
	`62`	`+`
`55`	`63`	`simple_connection_manager::~simple_connection_manager() {`
`56`	`64`	`// do nothing here.`
`57`	`65`	`}`