Fixed cookie_datetime, cookie_date and cookie_time classes.

Author: JosephP91

include/cookie.h

@@ -44,11 +44,11 @@ namespace curl {
         /**
          * The constructor allow a fast way to build a cookie.
          */
-        cookie(const std::string, const cookie_datetime &, const std::string = "/", const std::string = "", const bool = false);
+        cookie(const std::string, const std::string, const cookie_datetime &, const std::string = "", const std::string = "", const bool = false);
         /**
          * This constructor overloades the previous one.
          */
-        cookie(const char *, const cookie_datetime &, const char * = "/", const char * = "", const bool = false);
+        cookie(const char *, const char *, const cookie_datetime &, const char * = "", const char * = "", const bool = false);
         /**
          * This method allows to specify the cookie name.
          */
@@ -58,6 +58,14 @@ namespace curl {
          * instead of a string.
          */
         cookie *set_name(const char *);
+        /**
+         * This method allows to specify the cookie value.
+         */
+        cookie *set_value(const std::string);
+        /**
+         * This method allows to specify the cookie value,
+         */
+        cookie *set_value(const char *);
         /**
          * This method allows to specify the cookie path.
          */
@@ -93,6 +101,10 @@ namespace curl {
          * This method returns the cookie name.
          */
         std::string get_name() const NOEXCEPT;
+        /**
+         * This method returns the cookie value.
+         */
+        std::string get_value() const NOEXCEPT;
         /**
          * This method returns the cookie path.
          */
@@ -119,6 +131,10 @@ namespace curl {
          * The cookie name.
          */
         std::string name;
+        /**
+         * Il valore del cookie.
+         */
+        std::string value;
         /**
          * The cookie path.
          */

src/cookie.cpp

@@ -8,13 +8,13 @@
 using std::string;
 
 // Implementation of constructor.
-curl::cookie::cookie(const string name, const cookie_datetime &datetime, const string path, const string domain, const bool secure) {
-    this->set_name(name)->set_path(path)->set_domain(domain)->set_secure(secure)->set_datetime(datetime);
+curl::cookie::cookie(const string name, const string value, const cookie_datetime &datetime, const string path, const string domain, const bool secure) {
+    this->set_name(name)->set_value(value)->set_path(path)->set_domain(domain)->set_secure(secure)->set_datetime(datetime);
 }
 
 // Implementation of overloaded constructor.
-curl::cookie::cookie(const char *name, const cookie_datetime &datetime, const char *path, const char *domain, const bool secure) {
-    this->set_name(name)->set_path(path)->set_domain(domain)->set_secure(secure)->set_datetime(datetime);
+curl::cookie::cookie(const char *name, const char * value, const cookie_datetime &datetime, const char *path, const char *domain, const bool secure) {
+    this->set_name(name)->set_value(value)->set_path(path)->set_domain(domain)->set_secure(secure)->set_datetime(datetime);
 }
 
 // Implementation of set_name method.
@@ -35,6 +35,22 @@ curl::cookie *curl::cookie::set_name(const char *name) {
     return this;
 }
 
+// Implementation of set_name method.
+curl::cookie *curl::cookie::set_value(const string value) {
+    this->value = value;
+    return this;
+}
+
+// Implementation of set_value method.
+curl::cookie *curl::cookie::set_value(const char *value) {
+    if (value == nullptr) {
+        this->value = "";
+    } else {
+        this->value = string(value);
+    }
+    return this;
+}
+
 // Implementation of set_path method.
 curl::cookie *curl::cookie::set_path(const string path) NOEXCEPT {
     this->path = path.empty() ? "/" : path;
@@ -96,6 +112,11 @@ string curl::cookie::get_name() const NOEXCEPT {
     return this->name;
 }
 
+// Implmentation of get_value method.
+string curl::cookie::get_value() const NOEXCEPT {
+    return this->value;
+}
+
 // Implementation of get_path method.
 string curl::cookie::get_path() const NOEXCEPT {
     return this->path;
@@ -118,17 +139,5 @@ curl::cookie_datetime curl::cookie::get_datetime() const NOEXCEPT {
 
 // Implementation of get_formatted method.
 string curl::cookie::get_formatted() NOEXCEPT {
-    return "Set-cookie: name="+this->name+"; expires="+this->datetime.get_formatted()+"path="+this->path+"; domain="+this->domain;
-}
-
-/*
- *
- *time_t rawtime;
-  struct tm * timeinfo;
-  char buffer [80];
-
-  time (&rawtime);
-  timeinfo = localtime (&rawtime);
-
-  strftime (buffer,80,"%d-%b-%Y %X GMT",timeinfo);
- */
+    return "Set-cookie: "+this->name+"="+this->value+"; expires="+this->datetime.get_formatted()+"path="+this->path+"; domain="+this->domain;
+}

src/cookie_datetime.cpp

@@ -13,11 +13,13 @@ curl::cookie_datetime::cookie_datetime(const cookie_time &time, const cookie_dat
 // Implementation of set_time method.
 curl::cookie_datetime *curl::cookie_datetime::set_time(const cookie_time &time) NOEXCEPT {
     this->time = time;
+    return this;
 }
 
 // Implementation of set_date method.
 curl::cookie_datetime *curl::cookie_datetime::set_date(const cookie_date &date) NOEXCEPT {
     this->date = date;
+    return this;
 }
 
 // Implementation of get_time method.

src/cookie_time.cpp

@@ -12,18 +12,20 @@ curl::cookie_time::cookie_time(const unsigned int hour, const unsigned int minut
 
 // Implementation of set_hour method.
 curl::cookie_time *curl::cookie_time::set_hour(const unsigned int hour) NOEXCEPT {
-    this->hour = (hour < 0 or hour > 23) ? 0 : hour;
+    this->hour = hour < 0 or hour > 23 ? 0 : hour;
     return this;
 }
 
 // Implementation of set_minutes method.
 curl::cookie_time *curl::cookie_time::set_minutes(const unsigned int minutes) NOEXCEPT {
     this->minutes = (minutes < 0 or minutes > 59) ? 0 : minutes;
+    return this;
 }
 
 // Implementation of set_seconds method.
 curl::cookie_time *curl::cookie_time::set_seconds(const unsigned int seconds) NOEXCEPT {
     this->seconds = (seconds < 0 or seconds > 59) ? 0 : seconds;
+    return this;
 }
 
 // Implementation of get_hour method.

test/cookie.cpp

@@ -4,13 +4,17 @@
 #include "curl_exception.h"
 #include "curl_form.h"
 #include "curl_cookie.h"
+#include "curl_ios.h"
+
+using std::ostringstream;
 
 using curl::cookie;
 using curl::curl_header;
 using curl::curl_easy;
 using curl::curl_easy_exception;
 using curl::curl_cookie;
 using curl::curlcpp_cookies;
+using curl::curl_ios;
 
 
 /**
@@ -19,24 +23,32 @@ using curl::curlcpp_cookies;
  */
 
 int main() {
+    // Let's declare a stream
+    ostringstream str;
+    // We are going to put the request's output in the previously declared stream
+    curl_ios<ostringstream> ios(str);
+
     // Easy object to handle the connection, url and verbosity level.
-    curl_easy easy;
+    curl_easy easy(ios);
     easy.add<CURLOPT_URL>("http://example.com");
-    easy.add<CURLOPT_VERBOSE>(1L);
 
     // Let's create a cooie
-    cookie ck("test","/",".example.com",null);
+    cookie ck;
+    ck.set_name("nome cookie");
+    ck.set_value("valore cookie");
+    ck.set_path("/");
+    ck.set_domain(".example.com");
 
     // Create a cookie object and add the previously created cookie.
-    curl_cookie cookie_object(easy);
-    cookie_object.set(ck);
+    curl_cookie c_obj(easy);
+    c_obj.set(ck);
 
     // This rapresents a vector of cookies.
     curlcpp_cookies cookies;
     try {
         easy.perform();
         // Retrieve all the cookies for the example.com
-        cookies = cookie_object.get();
+        cookies = c_obj.get();
         // Delete all the memory helded cookies.
         easy.add<CURLOPT_COOKIEFILE>("ALL");
     } catch (curl_easy_exception error) {