Clean code. Remove deprecated method in channel.

Author: phlegx

README.md

@@ -194,6 +194,13 @@ boost::bind(bind_func_with_params, _1, 123, param2);
 To authenticate a user a separate C++ HTTP client library is required.
 
 
+## TODO
+
+* Add timestamp to events so that it is possible to clean the events queue with old events without response.
+* Implement a clean-up method for the queue.
+* See how to persist the connection object (```this->conn```) in the dispatcher so that the function ```trigger()``` can put the event trigger in event_queue if disconnected.
+
+
 ## Author
 
 Egon Zemmer, Phlegx Systems - @phlegx

websocket-rails-client/channel.cpp

@@ -87,20 +87,6 @@ Event Channel::trigger(std::string event_name, jsonxx::Object event_data) {
   }
 }
 
-Event Channel::trigger(std::string event_name, jsonxx::Object event_data, cb_func success_callback, cb_func failure_callback) {
-  jsonxx::Array data = this->initEventData(event_name);
-  data.get<jsonxx::Object>(1).import("channel", this->name);
-  data.get<jsonxx::Object>(1).import("data", event_data);
-  data.get<jsonxx::Object>(1).import("token", this->token);
-  Event event(data, success_callback, failure_callback);
-  if(this->token.empty()) {
-    this->event_queue.push(event);
-    return event;
-  } else {
-    return this->dispatcher->triggerEvent(event);
-  }
-}
-
 
 std::string Channel::getName() {
   return this->name;

websocket-rails-client/channel.hpp

@@ -46,7 +46,6 @@ class Channel {
   void destroy();
   void bind(std::string event_name, cb_func callback);
   Event trigger(std::string event_name, jsonxx::Object event_data);
-  Event trigger(std::string event_name, jsonxx::Object event_data, cb_func success_callback, cb_func failure_callback);
   std::string getName();
   map_vec_cb_func getCallbacks();
   void setCallbacks(map_vec_cb_func callbacks);

websocket-rails-client/websocket_connection.cpp

@@ -181,7 +181,7 @@ void WebsocketConnection::messageHandler(websocketpp::connection_hdl hdl, messag
 
 
 void WebsocketConnection::sendEvent(Event event) {
-  if(this->connection_id != "0") {
+  if(this->connection_id != "") {
     event.setConnectionId(this->connection_id);
   }
   websocketpp::lib::error_code ec;

websocket-rails-client/websocket_rails.cpp

@@ -206,7 +206,7 @@ Event WebsocketRails::triggerEvent(Event event) {
  ************************************/
 
 Channel WebsocketRails::subscribe(std::string channel_name) {
-  if (this->channels.find(channel_name) == this->channels.end()) {
+  if(this->channels.find(channel_name) == this->channels.end()) {
     Channel channel(channel_name, *this, false);
     this->channels[channel_name] = channel;
     return channel;
@@ -217,7 +217,7 @@ Channel WebsocketRails::subscribe(std::string channel_name) {
 
 
 Channel WebsocketRails::subscribe(std::string channel_name, cb_func success_callback, cb_func failure_callback) {
-  if (this->channels.find(channel_name) == this->channels.end()) {
+  if(this->channels.find(channel_name) == this->channels.end()) {
     Channel channel(channel_name, *this, false, success_callback, failure_callback);
     this->channels[channel_name] = channel;
     return channel;