CreateServerLocationsの実装

docs/class/config_class.md

@@ -37,7 +37,7 @@ classDiagram
         -bool autoindex
         -string index_page
         -string path
-        -string redirect_uri
+        -string redirect_url
         -set~string~ allow_methods
         -string alias
         -string cgi_extension
@@ -74,7 +74,7 @@ classDiagram
         -int client_max_body_size
         -bool autoindex
         -string index_page
-        -string redirect_uri
+        -string redirect_url
         -set~string~ allow_methods
         -string path
         -string alias

docs/class/transaction_class.md

@@ -58,7 +58,7 @@ class Transaction {
                 throw HTTPException(413); // ステータスコードを設定。
             }
             if (sl.IsRedirect()) {
-                return ResponseBuilder.BuildRedirect(sl.redirect_uri());
+                return ResponseBuilder.BuildRedirect(sl.redirect_url());
             }
             if (sl.IsCGI()) {
                 return CGIExecutor(req, sl);
@@ -140,7 +140,7 @@ ResponseBuilder {
         }
         return new HTTPResponse();
     }
-    HTTPResponse BuildRedirect(string redirect_uri) {
+    HTTPResponse BuildRedirect(string redirect_url) {
         // locationにredirect_urlを設定
         // status_codeは302
         // TODO: これとerror_pageで302が設定されていた場合

srcs/Config/DefaultValues.cpp

@@ -0,0 +1,15 @@
+#include "DefaultValues.hpp"
+
+#include <string>
+
+const std::string DefaultValues::kServerName = "";  // NOLINT
+// TODO(iyamada)
+// デフォルトのpathはどうするか。正規表現で全部マッチみたいになってそう。
+const std::string DefaultValues::kPath = "";          // NOLINT
+const std::string DefaultValues::kIndexPage = "";     // NOLINT
+const std::string DefaultValues::kRedirectUrl = "";   // NOLINT
+const std::string DefaultValues::kAlias = "";         // NOLINT
+const std::string DefaultValues::kCgiExtension = "";  // NOLINT
+const int DefaultValues::kPort = 80;
+const int DefaultValues::kClientMaxBodySize = 1024;
+const bool DefaultValues::kAutoIndex = false;

srcs/Config/DefaultValues.hpp

@@ -0,0 +1,22 @@
+#ifndef SRCS_CONFIG_DEFAULTVALUES_HPP_
+#define SRCS_CONFIG_DEFAULTVALUES_HPP_
+
+#include <string>
+
+/*
+  Store default directive value
+*/
+class DefaultValues {
+ public:
+    static const std::string kServerName;
+    static const std::string kPath;
+    static const std::string kIndexPage;
+    static const std::string kRedirectUrl;
+    static const std::string kAlias;
+    static const std::string kCgiExtension;
+    static const int kPort;
+    static const int kClientMaxBodySize;
+    static const bool kAutoIndex;
+};
+
+#endif  // SRCS_CONFIG_DEFAULTVALUES_HPP_

srcs/Config/InitialValues.cpp

@@ -0,0 +1,13 @@
+#include "InitialValues.hpp"
+
+#include <string>
+
+const std::string InitialValues::kServerName = "";    // NOLINT
+const std::string InitialValues::kPath = "";          // NOLINT
+const std::string InitialValues::kIndexPage = "";     // NOLINT
+const std::string InitialValues::kRedirectUrl = "";   // NOLINT
+const std::string InitialValues::kAlias = "";         // NOLINT
+const std::string InitialValues::kCgiExtension = "";  // NOLINT
+const int InitialValues::kPort = -1;
+const int InitialValues::kClientMaxBodySize = -1;
+const bool InitialValues::kAutoIndex = false;

srcs/Config/InitialValues.hpp

@@ -0,0 +1,22 @@
+#ifndef SRCS_CONFIG_INITIALVALUES_HPP_
+#define SRCS_CONFIG_INITIALVALUES_HPP_
+
+#include <string>
+
+/*
+  Store initial directive value
+*/
+class InitialValues {
+ public:
+    static const std::string kServerName;
+    static const std::string kPath;
+    static const std::string kIndexPage;
+    static const std::string kRedirectUrl;
+    static const std::string kAlias;
+    static const std::string kCgiExtension;
+    static const int kPort;
+    static const int kClientMaxBodySize;
+    static const bool kAutoIndex;
+};
+
+#endif  // SRCS_CONFIG_INITIALVALUES_HPP_

srcs/Config/LocationContext.cpp

@@ -14,7 +14,7 @@ LocationContext& LocationContext::operator=(const LocationContext& other) {
         this->auto_index_ = other.auto_index_;
         this->index_page_ = other.index_page_;
         this->path_ = other.path_;
-        this->redirect_uri_ = other.redirect_uri_;
+        this->redirect_url_ = other.redirect_url_;
         this->allow_methods_ = other.allow_methods_;
         this->alias_ = other.alias_;
         this->cgi_extension_ = other.cgi_extension_;
@@ -33,8 +33,8 @@ int LocationContext::client_max_body_size() const {
 bool LocationContext::auto_index() const { return this->auto_index_; }
 std::string LocationContext::index_page() const { return this->index_page_; }
 std::string LocationContext::path() const { return this->path_; }
-std::string LocationContext::redirect_uri() const {
-    return this->redirect_uri_;
+std::string LocationContext::redirect_url() const {
+    return this->redirect_url_;
 }
 std::set<std::string> LocationContext::allow_methods() const {
     return this->allow_methods_;
@@ -54,8 +54,8 @@ void LocationContext::set_index_page(const std::string& index_page) {
     this->index_page_ = index_page;
 }
 void LocationContext::set_path(const std::string& path) { this->path_ = path; }
-void LocationContext::set_redirect_uri(const std::string& redirect_uri) {
-    this->redirect_uri_ = redirect_uri;
+void LocationContext::set_redirect_url(const std::string& redirect_url) {
+    this->redirect_url_ = redirect_url;
 }
 void LocationContext::set_alias(const std::string& alias) {
     this->alias_ = alias;

srcs/Config/LocationContext.hpp

@@ -17,7 +17,7 @@ class LocationContext {
     bool auto_index() const;
     std::string index_page() const;
     std::string path() const;
-    std::string redirect_uri() const;
+    std::string redirect_url() const;
     std::set<std::string> allow_methods() const;
     std::string alias() const;
     std::string cgi_extension() const;
@@ -26,7 +26,7 @@ class LocationContext {
     void set_auto_index(bool auto_index);
     void set_index_page(const std::string& index_page);
     void set_path(const std::string& path);
-    void set_redirect_uri(const std::string& redirect_uri);
+    void set_redirect_url(const std::string& redirect_url);
     void set_alias(const std::string& alias);
     void set_cgi_extension(const std::string& cgi_extension);
 
@@ -39,7 +39,7 @@ class LocationContext {
     bool auto_index_;
     std::string index_page_;
     std::string path_;
-    std::string redirect_uri_;
+    std::string redirect_url_;
     std::set<std::string> allow_methods_;
     std::string alias_;
     std::string cgi_extension_;

srcs/Config/ServerContext.cpp

@@ -2,6 +2,9 @@
 
 #include <sstream>
 
+#include "InitialValues.hpp"
+#include "WebservConfig.hpp"
+
 template <typename T>
 static T strtonum(const std::string& s) {
     std::stringstream ss(s);
@@ -11,7 +14,9 @@ static T strtonum(const std::string& s) {
 }
 
 ServerContext::ServerContext()
-    : client_max_body_size_(1024), auto_index_(false), port_(80) {}
+    : client_max_body_size_(InitialValues::kClientMaxBodySize),
+      auto_index_(InitialValues::kAutoIndex),
+      port_(InitialValues::kPort) {}
 
 ServerContext::ServerContext(const ServerContext& other) { *this = other; }