Added a message_base class.

glynos · glynos · commit 70a99a9947cc · 2013-08-26T18:32:14.000+02:00
diff --git a/http/src/CMakeLists.txt b/http/src/CMakeLists.txt
@@ -8,6 +8,7 @@
 
 
 include_directories(
+  ${CPP-NETLIB_SOURCE_DIR}/config/src
   ${CPP-NETLIB_SOURCE_DIR}/uri/src
   ${CPP-NETLIB_SOURCE_DIR}/message/src
   ${CPP-NETLIB_SOURCE_DIR}/logging/src
diff --git a/http/src/network/http/v2/client/byte_source.hpp b/http/src/network/http/v2/client/byte_source.hpp
diff --git a/http/src/network/http/v2/client/request.hpp b/http/src/network/http/v2/client/request.hpp
@@ -8,20 +8,68 @@
 
 #include <cstdint>
 #include <memory>
-#include <network/uri.hpp>
-#include <network/http/v2/client/byte_source.hpp>
+#include <string>
+#include <network/http/v2/message_base.hpp>
+#include <network/http/v2/url.hpp>
 
 namespace network {
 namespace http {
 namespace v2 {
+  class byte_source {
+
+  public:
+
+    typedef message_base::string_type string_type;
+    typedef message_base::size_type size_type;
+
+    virtual ~byte_source() {}
+
+    virtual size_type read(string_type &source, size_type length) = 0;
+
+  };
+
+  class string_byte_source : public byte_source {
+
+  public:
+
+    explicit string_byte_source(string_type source);
+
+    virtual ~string_byte_source() {}
+
+    virtual size_type read(string_type &source, size_type length);
+
+  private:
+
+    string_type source_;
+
+  };
+
   class request {
 
+    typedef byte_source::string_type string_type;
+
   public:
 
-    request(uri locator, std::shared_ptr<byte_source> = nullptr)
-      : locator_(locator) { }
+    request(url locator, std::shared_ptr<byte_source> source = nullptr)
+      : locator_(locator), source_(source) { }
+
+    request(const request &other)
+      : locator_(other.locator_), source_(other.source_) { }
+
+    request(request &&other) noexcept
+      : locator_(std::move(other.locator_)), source_(std::move(other.source_)) { }
+
+    request &operator = (request other) {
+      other.swap(*this);
+      return *this;
+    }
+
+    void swap(request &other) noexcept {
+      locator_.swap(other.locator_);
+      source_.swap(other.source_);
+    }
 
-    // destination
+    void set_destination(string_type destination);
     // source
     // add_header
     // remove_header
@@ -36,7 +84,7 @@ namespace v2 {
     // uri
     // version
 
-    uri locator_;
+    url locator_;
     std::shared_ptr<byte_source> source_;
 
   };
diff --git a/http/src/network/http/v2/message_base.hpp b/http/src/network/http/v2/message_base.hpp
@@ -0,0 +1,55 @@
+// 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_MESSAGE_BASE_INC__
+#define __NETWORK_HTTP_V2_MESSAGE_BASE_INC__
+
+#include <network/config.hpp>
+#include <network/uri.hpp>
+#include <string>
+#include <functional>
+
+namespace network {
+  namespace http {
+    class message_base {
+
+    public:
+
+      typedef std::string string_type;
+      typedef string_type::size_type size_type;
+
+      message_base() NETWORK_DEFAULTED_FUNCTION;
+
+      message_base(const message_base &) NETWORK_DELETED_FUNCTION;
+
+      message_base &operator = (const message_base &) NETWORK_DELETED_FUNCTION;
+
+      virtual ~message_base() NETWORK_NOEXCEPT = 0;
+
+      // Mutators
+      virtual void set_destination(string_type destination) = 0;
+      virtual void set_source(string_type source) = 0;
+      virtual void append_header(string_type name, string_type value) = 0;
+      virtual void remove_headers(string_type name) = 0;
+      virtual void clear_headers() = 0;
+      virtual void set_body(std::string body) = 0;
+      virtual void append_body(std::string data) = 0;
+
+      // Accessors
+      virtual string_type destination() const = 0;
+      virtual string_type source() = 0;
+      virtual string_type headers(std::function<void (string_type, string_type)> inserter) const = 0;
+      virtual string_type headers(std::function<bool (string_type, string_type)> predicate,
+				  std::function<void (string_type, string_type)> inserter) const = 0;
+      virtual string_type body() const = 0;
+      virtual void body(std::function<void (string_type::const_iterator, size_type)> chunk_reader,
+			size_type size) = 0;
+
+    };
+  } // namespace v2
+} // namespace network
+
+
+#endif // __NETWORK_HTTP_V2_MESSAGE_BASE_INC__
diff --git a/http/test/CMakeLists.txt b/http/test/CMakeLists.txt
@@ -5,6 +5,7 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 include_directories(
+  ${CPP-NETLIB_SOURCE_DIR}/config/src
   ${CPP-NETLIB_SOURCE_DIR}/uri/src
   ${CPP-NETLIB_SOURCE_DIR}/message/src
   ${CPP-NETLIB_SOURCE_DIR}/logging/src
diff --git a/http/test/v2/client/byte_source_test.cpp b/http/test/v2/client/byte_source_test.cpp
@@ -4,6 +4,6 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <gtest/gtest.h>
-#include <network/http/v2/client/byte_source.hpp>
+#include <network/http/v2/client/request.hpp>
 
 
