Merge branch 'master' of https://github.com/CopernicaMarketingSoftware/AMQP-CPP

CMakeLists.txt

@@ -23,11 +23,12 @@ endmacro()
 
 add_subdirectory(src)
 add_subdirectory(include)
-add_subdirectory(amqp_boost_test)
 
-include_directories(${CMAKE_SOURCE_DIR}/include)
 add_library(amqp-cpp STATIC ${SRCS})
 target_include_directories(amqp-cpp SYSTEM PUBLIC ${PROJECT_SOURCE_DIR})
+install(TARGETS amqp-cpp
+        ARCHIVE DESTINATION lib
+)
 
 set(AMQP-CPP_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 set(AMQP-CPP_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)

README.md

@@ -27,9 +27,16 @@ This library is created and maintained by Copernica (www.copernica.com), and is
 used inside the MailerQ (www.mailerq.com) application, MailerQ is a tool for
 sending large volumes of email, using AMQP message queues.
 
+Do you appreciate our work and are you looking for high quality email solutions? 
+Then check out our commercial solutions:
 
-HOW TO USE
-==========
+* Copernica Marketing Suite (www.copernica.com)
+* MailerQ MTA (www.mailerq.com)
+* Responsive Email web service (www.responsiveemail.com)
+
+
+HOW TO USE AMQP-CPP
+===================
 
 As we mentioned above, the library does not do any IO by itself, and you need
 to pass an object to the library that the library can use for that. So, before

include/channel.h

@@ -338,6 +338,7 @@ public:
      */
     bool publish(const std::string &exchange, const std::string &routingKey, const Envelope &envelope) { return _implementation->publish(exchange, routingKey, envelope); }
     bool publish(const std::string &exchange, const std::string &routingKey, const std::string &message) { return _implementation->publish(exchange, routingKey, Envelope(message)); }
+    bool publish(const std::string &exchange, const std::string &routingKey, std::string &&message) { return _implementation->publish(exchange, routingKey, Envelope(std::move(message))); }
     bool publish(const std::string &exchange, const std::string &routingKey, const char *message, size_t size) { return _implementation->publish(exchange, routingKey, Envelope(message, size)); }
     bool publish(const std::string &exchange, const std::string &routingKey, const char *message) { return _implementation->publish(exchange, routingKey, Envelope(message, strlen(message))); }
 

include/envelope.h

@@ -56,6 +56,12 @@ public:
      */
     Envelope(const std::string &body) : MetaData(), _str(body), _body(_str.data()), _bodySize(_str.size()) {}
 
+    /**
+     *  Constructor based on a string
+     *  @param  body
+     */
+    Envelope(std::string &&body) : MetaData(), _str(std::move(body)), _body(_str.data()), _bodySize(_str.size()) {}
+
     /**
      *  Destructor
      */