Fixes and added more overloaded methods to cookie class.

Author: JosephP91

include/cookie.h

@@ -92,7 +92,17 @@ namespace curl {
          * This method overloads the previous one allowing to specify an integer instead
          * of a bool.
          */
-        cookie *set_secure(const unsigned int);
+        cookie *set_secure(const unsigned int) NOEXCEPT;
+        /**
+         * This method overloads the previous one allowing to specify a string to indicate
+         * whether the cookie is secure (with "secure" keyword) or not (empty string).
+         */
+        cookie *set_secure(const std::string) NOEXCEPT;
+        /**
+         * This method overloads the previous one allowing to specify a string to indicate
+         * whether the cookie is secure (with "secure" keyword) or not (empty string).
+         */
+        cookie *set_secure(const char *) NOEXCEPT;
         /**
          * This method allows to specify a datetime expiration to this cookie.
          */

include/curl_multi.h

@@ -198,6 +198,7 @@ namespace curl {
             const void *whatever;
             const CURLcode code;
         };
+
         /**
          * Simple default constructor. It is used to give a
          * default value to all the attributes and provide a

src/cookie.cpp

@@ -89,8 +89,23 @@ curl::cookie *curl::cookie::set_secure(const bool secure) NOEXCEPT {
     return this;
 }
 
+// Implementation of set_secure overloaded method.
+curl::cookie *curl::cookie::set_secure(const string secure) NOEXCEPT {
+    if (secure == "secure") {
+        this->secure = 1;
+    } else {
+        this->secure = 0;
+    }
+    return this;
+}
+
+// Implementation of set_secure overloaded method.
+curl::cookie *curl::cookie::set_secure(const char *secure) NOEXCEPT {
+    return this->set_secure(string(secure));
+}
+
 // Implementation of set_secure method.
-curl::cookie *curl::cookie::set_secure(const unsigned int secure) {
+curl::cookie *curl::cookie::set_secure(const unsigned int secure) NOEXCEPT {
     if (secure == 0) {
         this->secure = false;
     } else if (secure == 1) {
@@ -139,5 +154,6 @@ curl::cookie_datetime curl::cookie::get_datetime() const NOEXCEPT {
 
 // Implementation of get_formatted method.
 string curl::cookie::get_formatted() NOEXCEPT {
-    return "Set-Cookie: "+this->name+"="+this->value+"; expires="+this->datetime.get_formatted()+"; path="+this->path+"; domain="+this->domain;
+    string secure = this->is_secure() == 1 ? "secure" : "";
+    return "Set-Cookie: "+this->name+"="+this->value+"; expires="+this->datetime.get_formatted()+"; path="+this->path+"; domain="+this->domain+" "+secure;
 }

src/cookie_date.cpp

@@ -5,6 +5,9 @@
 
 #include "cookie_date.h"
 
+using std::out_of_range;
+using std::ostringstream;
+
 // Implementation of constructor with parameters.
 curl::cookie_date::cookie_date(const unsigned int week_day, const unsigned int day, const unsigned int month, const unsigned int year) NOEXCEPT {
     this->set_week_day(week_day)->set_day(day)->set_month(month)->set_year(year);
@@ -14,7 +17,7 @@ curl::cookie_date::cookie_date(const unsigned int week_day, const unsigned int d
 curl::cookie_date *curl::cookie_date::set_week_day(const unsigned int week_day) NOEXCEPT {
     try {
         this->week_day = details::weekday_names.at(week_day);
-    } catch (const std::out_of_range &exception) {
+    } catch (const out_of_range &exception) {
         this->week_day = "Mon";
     }
     return this;
@@ -30,7 +33,7 @@ curl::cookie_date *curl::cookie_date::set_day(const unsigned int day) NOEXCEPT {
 curl::cookie_date *curl::cookie_date::set_month(const unsigned int month) {
     try {
         this->month = details::months_names.at(month);
-    } catch (const std::out_of_range &exception) {
+    } catch (const out_of_range &exception) {
         this->month = "Jan";
     }
     return this;
@@ -63,7 +66,7 @@ unsigned int curl::cookie_date::get_year() const NOEXCEPT {
 
 // Implementation of get_formatted method.
 std::string curl::cookie_date::get_formatted() NOEXCEPT {
-    std::ostringstream stream;
+    ostringstream stream;
     stream<<this->week_day<<", "<<this->day<<"-"<<this->month<<"-"<<this->year;
     return stream.str();
 }

src/cookie_time.cpp

@@ -5,6 +5,8 @@
 
 #include "cookie_time.h"
 
+using std::ostringstream;
+
 // Implementation of constructor with parameters.
 curl::cookie_time::cookie_time(const unsigned int hour, const unsigned int minutes, const unsigned int seconds) {
     this->set_hour(hour)->set_minutes(minutes)->set_seconds(seconds);
@@ -45,7 +47,7 @@ const unsigned int curl::cookie_time::get_seconds() const NOEXCEPT {
 
 // Implementation of get_formatted method.
 std::string curl::cookie_time::get_formatted() NOEXCEPT {
-    std::ostringstream stream;
+    ostringstream stream;
     stream<<this->get_hour()<<":"<<this->get_minutes()<<":"<<this->get_seconds()<<" GMT";
     return stream.str();
 }