First commit of network::http::v2::client.

glynos · glynos · commit 8bcce7a2d1f3 · 2013-08-26T18:32:14.000+02:00
diff --git a/http/src/network/http/v2/client.hpp b/http/src/network/http/v2/client.hpp
@@ -0,0 +1,27 @@
+// 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_INC__
+#define __NETWORK_HTTP_V2_CLIENT_INC__
+
+#include <cstdint>
+
+namespace network {
+namespace http {
+namespace v2 {
+  class client {
+
+  public:
+
+    client() { }
+    client(client const &) = delete;
+    client(client &&) = delete;
+
+  };
+} // namespace v2
+} // namespace http
+} // namespace network
+
+#endif // __NETWORK_HTTP_V2_CLIENT_INC__
diff --git a/http/src/network/http/v2/client_options.hpp b/http/src/network/http/v2/client_options.hpp
@@ -0,0 +1,84 @@
+// 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_OPTIONS_INC__
+#define __NETWORK_HTTP_V2_CLIENT_OPTIONS_INC__
+
+#include <cstdint>
+#include <algorithm>
+
+namespace network {
+namespace http {
+namespace v2 {
+  class client_options {
+
+  public:
+
+    // default timeout is 30 seconds
+    constexpr client_options()
+      : follow_redirects_(false)
+      , cache_resolved_(false)
+      , use_proxy_(false)
+      , timeout_(30000) { }
+
+    client_options(client_options const &) = default;
+    client_options(client_options &&) = default;
+
+    void swap(client_options &other) noexcept {
+      std::swap(follow_redirects_, other.follow_redirects_);
+      std::swap(cache_resolved_, other.cache_resolved_);
+      std::swap(use_proxy_, other.use_proxy_);
+      std::swap(timeout_, other.timeout_);
+    }
+
+    client_options &follow_redirects(bool follow_redirects) noexcept {
+      follow_redirects_ = follow_redirects;
+      return *this;
+    }
+
+    constexpr bool follow_redirects() const noexcept {
+      return follow_redirects_;
+    }
+
+    client_options &cache_resolved(bool cache_resolved) noexcept {
+      cache_resolved_ = cache_resolved;
+      return *this;
+    }
+
+    constexpr bool cache_resolved() const noexcept {
+      return cache_resolved_;
+    }
+
+    client_options &use_proxy(bool use_proxy) noexcept {
+      use_proxy_ = use_proxy;
+      return *this;
+    }
+
+    constexpr bool use_proxy() const noexcept {
+      return use_proxy_;
+    }
+
+    client_options &timeout(std::uint64_t timeout) noexcept {
+      timeout_ = timeout;
+      return *this;
+    }
+
+    constexpr std::uint64_t timeout() const noexcept {
+      return timeout_;
+    }
+
+  private:
+
+    bool follow_redirects_;
+    bool cache_resolved_;
+    bool use_proxy_;
+    std::uint64_t timeout_;
+
+  };
+} // namespace v2
+} // namespace http
+} // namespace network
+
+#endif // __NETWORK_HTTP_V2_CLIENT_OPTIONS_INC__
diff --git a/http/src/network/http/v2/request.hpp b/http/src/network/http/v2/request.hpp
@@ -0,0 +1,25 @@
+// 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_REQUEST_INC__
+#define __NETWORK_HTTP_V2_REQUEST_INC__
+
+#include <cstdint>
+
+namespace network {
+namespace http {
+namespace v2 {
+  class request {
+
+  public:
+
+    request() { }
+
+  };
+} // namespace v2
+} // namespace http
+} // namespace network
+
+#endif // __NETWORK_HTTP_V2_REQUEST_INC__
diff --git a/http/src/network/http/v2/request_options.hpp b/http/src/network/http/v2/request_options.hpp
@@ -0,0 +1,72 @@
+// 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_REQUEST_OPTIONS_INC__
+#define __NETWORK_HTTP_V2_REQUEST_OPTIONS_INC__
+
+#include <cstdint>
+#include <algorithm>
+
+namespace network {
+namespace http {
+namespace v2 {
+  class request_options {
+
+  public:
+
+    // default timeout is 30 seconds
+    constexpr request_options()
+      : resolve_timeout_(30000)
+      , read_timeout_(30000)
+      , total_timeout_(30000) { }
+
+    request_options(request_options const &) = default;
+    request_options(request_options &&) = default;
+
+    void swap(request_options &other) noexcept {
+      std::swap(resolve_timeout_, other.resolve_timeout_);
+      std::swap(read_timeout_, other.read_timeout_);
+      std::swap(total_timeout_, other.total_timeout_);
+    }
+
+    request_options &resolve_timeout(std::uint64_t resolve_timeout) noexcept {
+      resolve_timeout_ = resolve_timeout;
+      return *this;
+    }
+
+    constexpr std::uint64_t resolve_timeout() const noexcept {
+      return resolve_timeout_;
+    }
+
+    request_options &read_timeout(std::uint64_t read_timeout) noexcept {
+      read_timeout_ = read_timeout;
+      return *this;
+    }
+
+    constexpr std::uint64_t read_timeout() const noexcept {
+      return read_timeout_;
+    }
+
+    request_options &total_timeout(std::uint64_t total_timeout) noexcept {
+      total_timeout_ = total_timeout;
+      return *this;
+    }
+
+    constexpr std::uint64_t total_timeout() const noexcept {
+      return total_timeout_;
+    }
+
+  private:
+
+    std::uint64_t resolve_timeout_;
+    std::uint64_t read_timeout_;
+    std::uint64_t total_timeout_;
+
+  };
+} // namespace v2
+} // namespace http
+} // namespace network
+
+#endif // __NETWORK_HTTP_V2_REQUEST_OPTIONS_INC__
diff --git a/http/src/network/http/v2/response.hpp b/http/src/network/http/v2/response.hpp
@@ -0,0 +1,25 @@
+// 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_RESPONSE_INC__
+#define __NETWORK_HTTP_V2_RESPONSE_INC__
+
+#include <network/uri.hpp>
+
+namespace network {
+namespace http {
+namespace v2 {
+  class response {
+
+  public:
+
+    response() { }
+
+  };
+} // namespace v2
+} // namespace http
+} // namespace network
+
+#endif // __NETWORK_HTTP_V2_RESPONSE_INC__
diff --git a/http/test/CMakeLists.txt b/http/test/CMakeLists.txt
@@ -12,6 +12,8 @@ include_directories(
   ${GTEST_INCLUDE_DIRS}
   ${CPP-NETLIB_SOURCE_DIR})
 
+add_subdirectory(client/v2)
+
 if (OPENSSL_FOUND)
   include_directories( ${OPENSSL_INCLUDE_DIR} )
   add_definitions(-DNETWORK_ENABLE_HTTPS)
diff --git a/http/test/client/v2/CMakeLists.txt b/http/test/client/v2/CMakeLists.txt
@@ -0,0 +1,28 @@
+# 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)
+
+set(CPP-NETLIB_CLIENT_TESTS
+  client_options_test
+  )
+
+foreach(test ${CPP-NETLIB_CLIENT_TESTS})
+  if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+    set_source_files_properties(${test}.cpp
+      PROPERTIES COMPILE_FLAGS "-Wall")
+  endif()
+
+  add_executable(cpp-netlib-http-v2-${test} ${test}.cpp)
+  target_link_libraries(cpp-netlib-http-v2-${test}
+    ${Boost_LIBRARIES}
+    ${GTEST_BOTH_LIBRARIES}
+    ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    )
+  set_target_properties(cpp-netlib-http-v2-${test}
+    PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
+  add_test(cpp-netlib-http-v2-${test}
+    ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-v2-${test})
+
+endforeach(test)
diff --git a/http/test/client/v2/client_options_test.cpp b/http/test/client/v2/client_options_test.cpp
@@ -0,0 +1,42 @@
+// 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)
+
+#include <gtest/gtest.h>
+#include <network/http/v2/client_options.hpp>
+
+TEST(client_options_test, default_options_follow_redirects) {
+  network::http::v2::client_options opts;
+  ASSERT_FALSE(opts.follow_redirects());
+}
+
+TEST(client_options_test, default_options_cache_resolved) {
+  network::http::v2::client_options opts;
+  ASSERT_FALSE(opts.cache_resolved());
+}
+
+TEST(client_options_test, default_options_use_proxy) {
+  network::http::v2::client_options opts;
+  ASSERT_FALSE(opts.use_proxy());
+}
+
+TEST(client_options_test, set_option_follow_redirects) {
+  network::http::v2::client_options opts;
+  opts.follow_redirects(true);
+  ASSERT_TRUE(opts.follow_redirects());
+}
+
+TEST(client_options_test, set_option_cache_resolved) {
+  network::http::v2::client_options opts;
+  opts.cache_resolved(true);
+  ASSERT_TRUE(opts.cache_resolved());
+}
+
+TEST(client_options_test, set_option_use_proxy) {
+  network::http::v2::client_options opts;
+  opts.use_proxy(true);
+  ASSERT_TRUE(opts.use_proxy());
+}
+
+
