Updated some stuff that's not important.

glynos · glynos · commit dc2d4cb2b101 · 2013-09-06T20:21:29.000+02:00
diff --git a/http/src/network/http/v2/client/client_options.hpp b/http/src/network/http/v2/client/client_options.hpp
@@ -12,6 +12,7 @@
 #include <vector>
 #include <chrono>
 #include <boost/asio/io_service.hpp>
+#include <boost/optional.hpp>
 
 namespace network {
   namespace http {
@@ -22,7 +23,8 @@ namespace network {
 
 	// default timeout is 30 seconds
 	client_options()
-	  : follow_redirects_(false)
+	  : io_service_(boost::none)
+	  , follow_redirects_(false)
 	  , cache_resolved_(false)
 	  , use_proxy_(false)
 	  , timeout_(30000) { }
@@ -36,6 +38,7 @@ namespace network {
 	}
 
 	void swap(client_options &other) noexcept {
+	  std::swap(io_service_, other.io_service_);
 	  std::swap(follow_redirects_, other.follow_redirects_);
 	  std::swap(cache_resolved_, other.cache_resolved_);
 	  std::swap(use_proxy_, other.use_proxy_);
@@ -44,6 +47,14 @@ namespace network {
 	  std::swap(openssl_verify_paths_, other.openssl_verify_paths_);
 	}
 
+	client_options &io_service(boost::asio::io_service &io_service) {
+	  io_service_ = io_service;
+	}
+
+	boost::optional<boost::asio::io_service &> io_service() const {
+	  return io_service_;
+	}
+
 	client_options &follow_redirects(bool follow_redirects) noexcept {
 	  follow_redirects_ = follow_redirects;
 	  return *this;
@@ -100,6 +111,7 @@ namespace network {
 
       private:
 
+	boost::optional<boost::asio::io_service &> io_service_;
 	bool follow_redirects_;
 	bool cache_resolved_;
 	bool use_proxy_;
diff --git a/http/src/network/http/v2/client/connection_manager.hpp b/http/src/network/http/v2/client/connection_manager.hpp
@@ -22,6 +22,8 @@ namespace network {
 
       public:
 
+	typedef std::shared_ptr<connection> connection_ptr;
+
 	connection_manager() = default;
 
 	connection_manager(const connection_manager &) = delete;
@@ -30,9 +32,9 @@ namespace network {
 
 	virtual connection_manager() noexcept = 0;
 
-	virtual std::shared_ptr<connection> get_connection(boost::asio::io_service &io_service,
-							   const request &req,
-							   const client_options &options) = 0;
+	virtual connection_ptr get_connection(boost::asio::io_service &io_service,
+					      const request &req,
+					      const client_options &options) = 0;
 
 	virtual void clear_resolved_cache() = 0;
 
diff --git a/http/src/network/http/v2/client/default_connection_manager.hpp b/http/src/network/http/v2/client/default_connection_manager.hpp
@@ -4,10 +4,10 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#ifndef __NETWORK_HTTP_V2_CLIENT_SIMPLE_CONNECTION_MANAGER_INC__
-#define __NETWORK_HTTP_V2_CLIENT_SIMPLE_CONNECTION_MANAGER_INC__
+#ifndef __NETWORK_HTTP_V2_CLIENT_DEFAULT_CONNECTION_MANAGER_INC__
+#define __NETWORK_HTTP_V2_CLIENT_DEFAULT_CONNECTION_MANAGER_INC__
 
-#include "network/http/v2/client/connection/simple_connection_manager.hpp"
+#include "network/http/v2/client/connection/default_connection_manager.hpp"
 #include <network/http/v2/client/connection/async_resolver_delegate.hpp>
 
 namespace network {
@@ -18,15 +18,13 @@ namespace network {
       class client_connection;
       class client_options;
 
-      class simple_connection_manager {
+      class default_connection_manager {
 
       public:
 
-	typedef std::shared_ptr<connection> connection_ptr;
+	default_connection_manager() = default;
 
-	simple_connection_manager() = simple;
-
-	virtual simple_connection_manager() noexcept;
+	virtual default_connection_manager() noexcept;
 
 	virtual connection_ptr get_connection(boost::asio::io_service &io_service,
 					      const request &req,
@@ -46,4 +44,4 @@ namespace network {
 } // namespace network
 
 
-#endif // __NETWORK_HTTP_V2_CLIENT_SIMPLE_CONNECTION_MANAGER_INC__
+#endif // __NETWORK_HTTP_V2_CLIENT_DEFAULT_CONNECTION_MANAGER_INC__
diff --git a/http/src/network/http/v2/client/normal_connection.hpp b/http/src/network/http/v2/client/normal_connection.hpp
@@ -0,0 +1,50 @@
+// Copyright (C) 2013 by Glyn Matthews
+// 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)
+
+
+#ifndef __NETWORK_HTTP_V2_CLIENT_NORMAL_CONNECTION_INC__
+#define __NETWORK_HTTP_V2_CLIENT_NORMAL_CONNECTION_INC__
+
+#include <memory>
+#include <functional>
+#include <boost/utility/string_ref.hpp>
+
+namespace network {
+  namespace http {
+    namespace v2 {
+
+      class response;
+      class request;
+      class request_options;
+
+      class normal_connection {
+
+      public:
+
+	typedef std::function<void (boost::string_ref, boost::system::error_code)> callback_type;
+
+	normal_connection() = default;
+
+	normal_connection(const normal_connection &) = delete;
+
+	normal_connection &operator = (const normal_connection &) = delete;
+
+	virtual ~normal_connection() noexcept;
+
+	virtual response send_request(std::string method,
+				      request req,
+				      bool get_body,
+				      callback_type callback,
+				      request_options);
+
+	virtual void reset();
+
+      };
+    } // namespace v2
+  } // namespace http
+} // namespace network
+
+
+#endif // __NETWORK_HTTP_V2_CLIENT_NORMAL_CONNECTION_INC__
diff --git a/http/src/network/http/v2/headers.hpp b/http/src/network/http/v2/headers.hpp
diff --git a/http/test/v2/features/client/client_test.cpp b/http/test/v2/features/client/client_test.cpp
@@ -12,7 +12,8 @@ namespace http = network::http::v2;
 Describe(http_client) {
 
   It(gets_a_response) {
-    auto response = client_.get(http::request(network::uri("http://127.0.0.1/")));
+    http::request request(network::uri("http://127.0.0.1/"));
+    auto response = client_.get(request);
   }
 
   http::client client_;

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ namespace http = network::http::v2;`
`12`	`12`	`Describe(http_client) {`
`13`	`13`
`14`	`14`	`It(gets_a_response) {`
`15`		`- auto response = client_.get(http::request(network::uri("http://127.0.0.1/")));`
	`15`	`+ http::request request(network::uri("http://127.0.0.1/"));`
	`16`	`+ auto response = client_.get(request);`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`http::client client_;`