refactor fields_base operator<<

Fixes #182

Author: ashtum

include/boost/http_proto/fields_base.hpp

@@ -1303,6 +1303,46 @@ class fields_base
         core::string_view value,
         system::error_code& ec);
 
+    //--------------------------------------------
+
+    /** Format the container to the output stream
+
+        This function serializes the container to
+        the specified output stream.
+
+        @par Example
+        @code
+        request req;
+        req.set(field::content_length, "42");
+        std::stringstream ss;
+        ss << req;
+        assert( ss.str() == "GET / HTTP/1.1\nContent-Length: 42\n" );
+        @endcode
+
+        @par Effects
+        @code
+        return os << f.buffer();
+        @endcode
+
+        @par Complexity
+        Linear in `f.buffer().size()`
+
+        @par Exception Safety
+        Basic guarantee.
+
+        @return A reference to the output stream, for chaining
+
+        @param os The output stream to write to.
+
+        @param f The container to write.
+    */
+    friend
+    BOOST_HTTP_PROTO_DECL
+    std::ostream&
+    operator<<(
+        std::ostream& os,
+        const fields_base& f);
+
 private:
     BOOST_HTTP_PROTO_DECL
     void
@@ -1352,42 +1392,6 @@ class fields_base
         std::size_t i) const noexcept;
 };
 
-/** Format the container to the output stream
-
-    This function serializes the container to
-    the specified output stream.
-
-    @par Example
-    @code
-    request req;
-    std::stringstream ss;
-    ss << req;
-    assert( ss.str() == "GET / HTTP/1.1\r\n\r\n" );
-    @endcode
-
-    @par Effects
-    @code
-    return os << f.buffer();
-    @endcode
-
-    @par Complexity
-    Linear in `f.buffer().size()`
-
-    @par Exception Safety
-    Basic guarantee.
-
-    @return A reference to the output stream, for chaining
-
-    @param os The output stream to write to.
-
-    @param f The container to write.
-*/
-BOOST_HTTP_PROTO_DECL
-std::ostream&
-operator<<(
-    std::ostream& os,
-    const fields_base& f);
-
 } // http_proto
 } // boost
 

src/fields_base.cpp

@@ -850,14 +850,18 @@ find_all(
         &h_, find(name).i_);
 }
 
-//------------------------------------------------
-
 std::ostream&
 operator<<(
     std::ostream& os,
     const fields_base& f)
 {
-    return os << f.buffer();
+    if(f.h_.prefix != 0)
+        os << core::string_view(f.h_.cbuf, f.h_.prefix - 2) << '\n';
+
+    for(auto ref : f)
+        os << ref.name << ": " << ref.value << '\n';
+
+    return os;
 }
 
 //------------------------------------------------

test/unit/fields_base.cpp

@@ -1704,11 +1704,15 @@ struct fields_base_test
         // operator<<
         {
             std::stringstream ss;
-            fields f;
-            f.set(field::content_length, "42");
-            ss << f;
+            response r;
+            r.set(field::content_length, "42");
+            r.set(field::connection, "Close");
+            ss << r;
             BOOST_TEST_EQ(
-                ss.str(), "Content-Length: 42\r\n\r\n");
+                ss.str(),
+                "HTTP/1.1 200 OK\n"
+                "Content-Length: 42\n"
+                "Connection: Close\n");
         }
     }