Remove boost (#3)

* Remove boost::string dependency

A bit silly for simple string manipulations, especially
now that AMQP support does not require boost::asio

* CMake: Remove boost

Author: jonnor

CMakeLists.txt

@@ -22,11 +22,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/json11/"
     DESTINATION "include"
     FILES_MATCHING PATTERN "*.hpp")
 
-# Boost
-set(Boost_USE_STATIC_LIBS ON)
-find_package(Boost COMPONENTS REQUIRED system)
-
-# libev
+# libev, used by AMQP
 find_path(libev_INCLUDE_DIRECTORY ev.h)
 find_library(libev_LIB ev)
 
@@ -47,8 +43,6 @@ add_library(msgflo src/msgflo.cpp src/mqtt_support.cpp src/mqtt_support.h ${JSON
 target_include_directories(msgflo
     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>
     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/json11>
-    # Boost could made private with little effort, migth be worth.
-    PUBLIC ${Boost_INCLUDE_DIR}
     PRIVATE ${libev_INCLUDE_DIRECTORY}
     PRIVATE ${amqp_install}/include
     PRIVATE ${mosquitto_INCLUDE_DIRECTORY}
@@ -58,7 +52,6 @@ target_include_directories(msgflo
 target_compile_options(msgflo PRIVATE -Wall -Wextra -Wno-unused-parameter)
 
 target_link_libraries(msgflo
-    PRIVATE ${Boost_LIBRARIES}
     PRIVATE ${amqp_install}/lib/libamqpcpp.a
     PRIVATE ${mosquitto_LIB}
     PRIVATE ${libev_LIB})

README.md

@@ -34,5 +34,4 @@ MIT, see [./LICENSE](./LICENSE)
 0.1
 
 * Fix missing port identifier in process()
-* Remove boost dependency
 * AMQP: Implement NACK

examples/repeat.cpp

@@ -3,7 +3,6 @@
 #include <algorithm>
 #include <chrono>
 #include <thread>
-#include <boost/algorithm/string.hpp>
 
 #include "msgflo.h"
 

include/msgflo.h

@@ -2,7 +2,6 @@
 
 #include <string>
 #include <memory>
-#include <boost/algorithm/string.hpp>
 #include "json11.hpp"
 
 namespace msgflo {

src/msgflo.cpp

@@ -11,6 +11,19 @@ using namespace trygvis::mqtt_support;
 
 namespace msgflo {
 
+std::string string_to_upper_copy(const std::string &str) {
+    std::string ret;
+    ret.resize(str.size());
+    for (uint i=0; i<str.size(); i++) {
+        ret[i] = toupper(str[i]);
+    }
+    return ret;
+}
+
+bool string_starts_with(const std::string &str, const std::string &prefix) {
+    return str.substr(0, prefix.size()) == prefix;
+}
+
 class DiscoveryMessage {
 public:
     DiscoveryMessage(const Definition &def)
@@ -179,7 +192,7 @@ class AmqpEngine final : public Engine, protected AbstractEngine<AmqpEngine> {
 
 protected:
     string generateQueueName(const Definition &d, const Definition::Port &port) override {
-        return d.role + "." + boost::to_upper_copy<std::string>(port.id);
+        return d.role + "." + string_to_upper_copy(port.id);
     }
 
 private:
@@ -281,7 +294,7 @@ class MosquittoEngine final : public Engine, protected mqtt_event_listener, prot
 
 protected:
     string generateQueueName(const Definition &d, const Definition::Port &port) override {
-        return "/" + d.role + "." + boost::to_upper_copy<std::string>(port.id);
+        return "/" + d.role + "." + string_to_upper_copy(port.id);
     }
 
     virtual void on_msg(const string &msg) override {
@@ -335,7 +348,7 @@ shared_ptr<Engine> createEngine(const EngineConfig config) {
         }
     }
 
-    if (boost::starts_with(url, "mqtt://")) {
+    if (string_starts_with(url, "mqtt://")) {
         string host, username, password;
         int port = 1883;
         int keep_alive = 180;
@@ -431,7 +444,7 @@ shared_ptr<Engine> createEngine(const EngineConfig config) {
         }
 
         return make_shared<MosquittoEngine>(config, host, port, keep_alive, client_id, clean_session);
-    } else if (boost::starts_with(url, "amqp://")) {
+    } else if (string_starts_with(url, "amqp://")) {
         return make_shared<AmqpEngine>(url);
     }