Add "overwrite" boolean to allow the possibility to edit a current handle

BUILD

@@ -49,6 +49,10 @@ cc_library(
         "src/served/net/connection_manager.hpp",
         "src/served/net/server.hpp",
     ],
+    defines = select({
+        "@bazel_tools//src/conditions:windows": ["NOGDI"],
+        "//conditions:default": [],
+    }),
     strip_include_prefix = "src/",
     visibility = ["//visibility:public"],
     deps = [

CMakeLists.txt

@@ -27,9 +27,9 @@ SET (APPLICATION_NAME "Served HTTP REST Library")
 SET (APPLICATION_CODENAME "${PROJECT_NAME}")
 SET (APPLICATION_COPYRIGHT_YEARS "2014")
 SET (APPLICATION_VERSION_MAJOR 1)
-SET (APPLICATION_VERSION_MINOR 4)
-SET (APPLICATION_VERSION_PATCH 3)
-SET (APPLICATION_VERSION_TYPE DS1)
+SET (APPLICATION_VERSION_MINOR 7)
+SET (APPLICATION_VERSION_PATCH 0)
+SET (APPLICATION_VERSION_TYPE DEVINTERNAL)
 SET (APPLICATION_VERSION_STRING "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}-${APPLICATION_VERSION_TYPE}")
 SET (APPLICATION_VENDOR_ID "com.meltwater")
 SET (APPLICATION_VENDOR_NAME "Meltwater")
@@ -77,13 +77,18 @@ FIND_PACKAGE (RAGEL)
 
 FIND_PACKAGE (Threads)
 
-INCLUDE (EnableStdCXX11)
-ENABLE_STDCXX11 ()
+# Enforce C++17
+# This has the advantage to remove an undefined behavior from shared_from_this
+# https://en.cppreference.com/w/cpp/memory/enable_shared_from_this/shared_from_this
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 
 #
 # Enable warnings
 #
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Wno-missing-field-initializers")
+set(CMAKE_CXX_FLAGS "-Wall -pedantic -Wextra -Wno-missing-field-initializers")
 
 #
 # Configure Files

README.md

@@ -21,7 +21,7 @@ Features:
 
 ### Requirements
 
-* [Required] - [Boost 1.56](http://www.boost.org/)
+* [Required] - [Boost (1.53 or newer)](http://www.boost.org/)
 * [Optional] - [Ragel](http://www.complang.org/ragel/)
 
 ### Building

WORKSPACE

@@ -1,8 +1,9 @@
 workspace(name = "com_github_meltwater_served")
 
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 git_repository(
     name = "com_github_nelhage_rules_boost",
-    commit = "72ec09168e5c3a296f667b3d956a853ccd65c8ed",
+    commit = "552baa34c17984ca873cd0c4fdd010c177737b6f",
     remote = "https://github.com/nelhage/rules_boost",
 )
 load("@com_github_nelhage_rules_boost//:boost/boost.bzl", "boost_deps")

cmake/CPackConfigRPM.cmake

@@ -24,7 +24,7 @@ IF(RPMBUILD_CMD)
     SET(CPACK_RPM_PACKAGE_RELEASE "${APPLICATION_VERSION_TYPE}")
     SET(CPACK_RPM_PACKAGE_LICENSE "MIT")
     SET(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
-    SET(CPACK_RPM_PACKAGE_REQUIRES "libboost >= 1.53")
+    SET(CPACK_RPM_PACKAGE_REQUIRES "boost >= 1.53")
     SET(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
     SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_ARCHITECTURE}")
     SET(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_SOURCE_DIR}/install/post_install_script.sh")

src/examples/CMakeLists.txt

@@ -23,6 +23,7 @@ ADD_SUBDIRECTORY (form_data)
 ADD_SUBDIRECTORY (handlers)
 ADD_SUBDIRECTORY (hello_world)
 ADD_SUBDIRECTORY (hello_world_no_blocking)
+ADD_SUBDIRECTORY (json_data)
 ADD_SUBDIRECTORY (query_params)
 ADD_SUBDIRECTORY (list_endpoints)
 ADD_SUBDIRECTORY (request_logger_plugin)

src/examples/json_data/CMakeLists.txt

@@ -0,0 +1,36 @@
+# Copyright (C) 2014 MediaSift Ltd.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+#
+# Locate project sources
+#
+FILE (GLOB_RECURSE json_data_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
+
+#
+# Configure common project settings
+#
+SET (json_data_LIBS ${PROJECT_NAME} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+
+#
+# Executable build rules
+#
+ADD_EXECUTABLE (json_data ${json_data_SRCS})
+TARGET_LINK_LIBRARIES (json_data ${json_data_LIBS})
+INSTALL (TARGETS json_data DESTINATION bin)

src/examples/json_data/main.cpp

@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2014 MediaSift Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <served/served.hpp>
+
+#include <boost/property_tree/json_parser.hpp>
+
+/* json_data example
+ *
+ * This is a JSON data example of served in action.
+ */
+int main(int, char const**)
+{
+	served::multiplexer mux;
+
+	mux.handle("/flat")
+		.get([](served::response & res, const served::request &) {
+			boost::property_tree::ptree root;
+			std::string response;
+			std::stringstream ss;
+
+			// Populate JSON response
+			root.put("bool", true);
+			root.put("integer", 123);
+			root.put("string", "String");
+
+			// Export JSON response
+			boost::property_tree::json_parser::write_json(ss, root, true /* human */);
+			res << ss.str();
+		});
+
+	mux.handle("/nested")
+		.get([](served::response & res, const served::request &) {
+			boost::property_tree::ptree root;
+			boost::property_tree::ptree arrayTree;
+			boost::property_tree::ptree flatTree;
+			std::stringstream ss;
+
+			// Populate JSON response
+			flatTree.put("bool", true);
+			flatTree.put("integer", 123);
+			flatTree.put("string", "String");
+			arrayTree.push_back(std::make_pair("", flatTree));
+			arrayTree.push_back(std::make_pair("", flatTree));
+			arrayTree.push_back(std::make_pair("", flatTree));
+			root.add_child("node_array", arrayTree);
+			root.add_child("node_1", flatTree);
+
+			// Export JSON response
+			boost::property_tree::json_parser::write_json(ss, root, true /* human */);
+			res << ss.str();
+		});
+
+	std::cout << "Try this example with:" << std::endl;
+	std::cout << " curl http://localhost:8123/flat" << std::endl;
+	std::cout << " curl http://localhost:8123/nested" << std::endl;
+
+	served::net::server server("127.0.0.1", "8123", mux);
+	server.run(10); // Run with a pool of 10 threads.
+
+	return 0;
+}

src/served/CMakeLists.txt

@@ -62,14 +62,20 @@ IF (NOT DEFINED SERVED_BUILD_STATIC)
 	SET(SERVED_BUILD_STATIC 1)
 ENDIF (NOT DEFINED SERVED_BUILD_STATIC)
 
+IF (SERVED_BUILD_SHARED)
+	SET(SERVED_TARGET_STATIC_SUFFIX "-static")
+ELSE (SERVED_BUILD_SHARED)
+	SET(SERVED_TARGET_STATIC_SUFFIX "")
+ENDIF (SERVED_BUILD_SHARED)
+
 #
 # Static lib build rules
 #
 IF (SERVED_BUILD_STATIC)
-	ADD_LIBRARY (${PROJECT_NAME} STATIC ${served_SRCS} ${served_RLSOURCES})
-	TARGET_LINK_LIBRARIES (${PROJECT_NAME} ${served_LIBS})
-	SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}" OUTPUT_NAME ${served_BIN} CLEAN_DIRECT_OUTPUT 1)
-	INSTALL (TARGETS ${PROJECT_NAME} DESTINATION lib)
+	ADD_LIBRARY (${PROJECT_NAME}${SERVED_TARGET_STATIC_SUFFIX} STATIC ${served_SRCS} ${served_RLSOURCES})
+	TARGET_LINK_LIBRARIES (${PROJECT_NAME}${SERVED_TARGET_STATIC_SUFFIX} ${served_LIBS})
+	SET_TARGET_PROPERTIES (${PROJECT_NAME}${SERVED_TARGET_STATIC_SUFFIX} PROPERTIES VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}" OUTPUT_NAME ${served_BIN} CLEAN_DIRECT_OUTPUT 1)
+	INSTALL (TARGETS ${PROJECT_NAME}${SERVED_TARGET_STATIC_SUFFIX} DESTINATION lib)
 ENDIF (SERVED_BUILD_STATIC)
 
 #

src/served/methods.hpp

@@ -26,6 +26,12 @@
 #include <string>
 #include <stdexcept>
 
+#ifdef _MSC_VER
+	// DELETE is also defined as a macro in winnt.h, included through boost::asio
+	#pragma push_macro("DELETE")
+	#undef DELETE
+#endif // _MSC_VER
+
 namespace served {
 
 /*
@@ -116,4 +122,8 @@ method_from_string(const std::string & str)
 
 } // served
 
+#ifdef _MSC_VER
+	#pragma pop_macro("DELETE")
+#endif // _MSC_VER
+
 #endif // SERVED_METHODS_HPP

src/served/multiplexer.cpp

@@ -121,14 +121,22 @@ multiplexer::get_segments(const std::string & path)
 //  -----  http request handlers  -----
 
 served::methods_handler &
-multiplexer::handle(const std::string & path, const std::string info /* = "" */)
+multiplexer::handle(const std::string & path, const std::string info /* = "" */, bool overwrite)
 {
+
 	// Remove any duplicates.
 	for ( auto it = _handler_candidates.begin(); it != _handler_candidates.end(); )
 	{
 		if ( std::get<2>(*it) == path )
 		{
-			it = _handler_candidates.erase(it);
+			if(overwrite)
+			{
+				it = _handler_candidates.erase(it);
+			}
+			else
+			{
+				return std::get<1>(*it);
+			}
 		}
 		else
 		{

src/served/multiplexer.hpp

@@ -139,7 +139,7 @@ class multiplexer
 	 *
 	 * @return returns a methods_handler used to specify handlers per HTTP method
 	 */
-	served::methods_handler & handle(const std::string & path, const std::string info = "");
+	served::methods_handler & handle(const std::string & path, const std::string info = "", bool overwrite = true);
 
 	//  ----- request forwarding  -----
 

src/served/mux/segment_matcher.hpp

@@ -54,6 +54,12 @@ class segment_matcher
 	 * @param path_segment the segment of path the variable should be extracted from
 	 */
 	virtual void get_param(served::parameters & params, const std::string & path_segment) = 0;
+
+	/*
+	 * Class destructor.
+	 */
+	virtual ~segment_matcher()
+	{ }
 };
 
 typedef std::shared_ptr<segment_matcher> segment_matcher_ptr;