Added week_day to cookie_date expiration

Author: JosephP91

include/cookie_date.h

@@ -36,6 +36,8 @@
 namespace curl {
     // Enumeration to better define months.
     enum months { JANUARY = 1, FEBRUARY, MARCH, APRIL, MAY, JUNE, JULY, AUGUST, SEPTEMBER, OCTOBER, NOVEMBER, DECEMBER};
+    // Enumeration to better define week days.
+    enum weekdays {MONDAY = 1, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY};
 
     // Leave this alone :)
     namespace details {
@@ -44,6 +46,11 @@ namespace curl {
                 {JANUARY,"Jan"}, {FEBRUARY,"Feb"}, {MARCH,"Mar"}, {APRIL,"Apr"}, {MAY,"May"}, {JUNE,"Jun"},
                 {JULY,"Jul"},{AUGUST,"Aug"},{SEPTEMBER,"Sep"},{OCTOBER,"Oct"},{NOVEMBER,"Nov"},{DECEMBER,"Dec"}
         };
+        // Map week days numbers with days short names (cookies likes it, still, short XD)
+        static const std::map<int,std::string> weekday_names = {
+                {MONDAY,"Mon"}, {TUESDAY,"Tue"}, {WEDNESDAY,"Wed"}, {THURSDAY,"Thu"}, {FRIDAY,"Fri"}, {SATURDAY,"Sat"},
+                {SUNDAY,"Sun"}
+        };
     }
 
     /**
@@ -54,11 +61,16 @@ namespace curl {
         /**
          * Default constructor. Inizialize the attributes with default values.
          */
-        cookie_date() : day(1), month("Jan"), year(1970) {}
+        cookie_date() : week_day("Mon"), day(1), month("Jan"), year(1970) {}
         /**
          * Constructor with parameters, which gives a fast way to build a cookie_date object.
          */
-        cookie_date(const unsigned int, const unsigned int, const unsigned int) NOEXCEPT;
+        cookie_date(const unsigned int, const unsigned int, const unsigned int, const unsigned int) NOEXCEPT;
+        /**
+         * This method allows to specify the week dayname for the date. If the day is less or equal
+         * than zero or greater than 7, 1 will be choosen
+         */
+        cookie_date *set_week_day(const unsigned int) NOEXCEPT;
         /**
          * This method allows to specify a day for the date. If the day is less than zero or
          * greater than 31, 1 will be choosen.
@@ -74,6 +86,10 @@ namespace curl {
          * be choosen.
          */
         cookie_date *set_year(const unsigned int) NOEXCEPT;
+        /**
+         * This method returns the week day name
+         */
+        std::string get_week_day() const NOEXCEPT;
         /**
          * This method returns the day number.
          */
@@ -99,6 +115,10 @@ namespace curl {
          * The month name.
          */
         std::string month;
+        /**
+         * The week dayname.
+         */
+        std::string week_day;
         /**
          * The month year.
          */

src/cookie.cpp

@@ -139,5 +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: "+this->name+"="+this->value+"; expires="+this->datetime.get_formatted()+"path="+this->path+"; domain="+this->domain;
-}
+    return "Set-Cookie: "+this->name+"="+this->value+"; expires="+this->datetime.get_formatted()+"; path="+this->path+"; domain="+this->domain;
+}

src/cookie_date.cpp

@@ -6,8 +6,18 @@
 #include "cookie_date.h"
 
 // Implementation of constructor with parameters.
-curl::cookie_date::cookie_date(const unsigned int day, const unsigned int month, const unsigned int year) NOEXCEPT {
-    this->set_day(day)->set_month(month)->set_year(year);
+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);
+}
+
+// Implementation of set_week_day method.
+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) {
+        this->week_day = "Mon";
+    }
+    return this;
 }
 
 // Implementation of set_day method.
@@ -32,6 +42,10 @@ curl::cookie_date *curl::cookie_date::set_year(const unsigned int year) NOEXCEPT
     return this;
 }
 
+std::string curl::cookie_date::get_week_day() const NOEXCEPT {
+    return this->week_day;
+}
+
 // Implementation of get_day method.
 unsigned int curl::cookie_date::get_day() const NOEXCEPT {
     return this->day;
@@ -50,6 +64,6 @@ 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;
-    stream<<this->get_day()<<"-"<<this->get_month()<<"-"<<this->get_year();
+    stream<<this->week_day<<", "<<this->day<<"-"<<this->month<<"-"<<this->year;
     return stream.str();
 }

src/curl_cookie.cpp

@@ -54,4 +54,4 @@ namespace curl {
     void curl_cookie::reload() {
         this->easy.add<CURLOPT_COOKIELIST>("RELOAD");
     }
-}
+}

test/cookie.cpp

@@ -34,10 +34,11 @@ int main() {
 
     // Let's create a cooie
     cookie ck;
-    ck.set_name("nome cookie");
-    ck.set_value("valore cookie");
+    ck.set_name("nomecookie");
+    ck.set_value("valorecookie");
     ck.set_path("/");
     ck.set_domain(".example.com");
+    std::cout<<ck.get_formatted()<<std::endl;
 
     // Create a cookie object and add the previously created cookie.
     curl_cookie c_obj(easy);
@@ -54,6 +55,7 @@ int main() {
     } catch (curl_easy_exception error) {
         error.print_traceback();
     }
+    std::cout<<cookies.size()<<std::endl;
     // Print them all!
     for (auto cook : cookies) {
         std::cout<<cook<<std::endl;