Big bug in channel and addressing. Changed from copy to address pointer.

Author: phlegx

README.md

@@ -1,4 +1,4 @@
-# WebsocketRailsClient++ (v0.7.3)
+# WebsocketRailsClient++ (v0.7.4)
 
 WebsocketRailsClient++ is a C++ library that uses the implementation of RFC6455 (The WebSocket Protocol)
 implemented in the WebSocket++ library, the Json++ light-weight JSON parser and the Boost library. It allows
@@ -35,9 +35,9 @@ connections to the Ruby Websocket-Rails server and supports the Websocket-Rails
 
 #### Connection Callbacks
 
- * ```on_open(boost::bind cb)```  : callback on open connection.
- * ```on_close(boost::bind cb)``` : callback on close connection.
- * ```on_fail(boost::bind cb)```  : callback on fail connection.
+ * ```onOpen(boost::bind cb)```  : callback on open connection.
+ * ```onClose(boost::bind cb)``` : callback on close connection.
+ * ```onFail(boost::bind cb)```  : callback on fail connection.
 
 #### Trigger an Event on Server
 
@@ -56,6 +56,7 @@ connections to the Ruby Websocket-Rails server and supports the Websocket-Rails
 
 #### Channel Management
 
+* ```getChannel(std::string channel_name)``` : Get a channel after subscribed to it.
 * ```subscribe(std::string channel_name)``` : Subscribe to a channel.
 * ```subscribePrivate(std::string channel_name, boost::bind cb_succ, boost::bind cb_fail)``` : Subscribe to a private channel with callbacks.
 * ```unsubscribe(std::string channel_name)``` : Unsubscribe a channel.
@@ -64,7 +65,6 @@ connections to the Ruby Websocket-Rails server and supports the Websocket-Rails
 #### Trigger a Channel-Event on Server
 
 * ```trigger(std::string event_name, jsonxx::Object event_data)``` : trigger channel event with data without callback.
-* ```trigger(std::string event_name, jsonxx::Object event_data, boost::bind cb_succ, boost::bind cb_fail)``` : trigger channel event with data and callbacks.
 
 #### Bind to an Incoming Channel-Event
 
@@ -147,36 +147,36 @@ dispatcher.connect();
 
 ```cpp
 /* Event bind callback definition */
-dispatcher.bind("users.pool", boost::bind(callback, _1));
+dispatcher.bind("users_pool", boost::bind(callback, _1));
 
 /* Event bind callback definition with member function callback */
 Foo my_foo;
-Event event3 = dispatcher.bind("users.pool", boost::bind(&Foo::success_func, my_foo, _1));
+dispatcher.bind("users_pool", boost::bind(&Foo::success_func, my_foo, _1));
 
 /* Event unbind callback definition */
-dispatcher.unbindAll("users.pool");
+dispatcher.unbindAll("users_pool");
 ```
 
 * Trigger events
 
 ```cpp
 /* Trigger an event */
-Event event1 = dispatcher.trigger("users.create", jsonxx::Object("name", "Hans Mustermann"));
-Event event2 = dispatcher.trigger("users.create", jsonxx::Object("name", "Frau Mustermann"), boost::bind(success_func, _1), boost::bind(failure_func, _1));
+dispatcher.trigger("users_create", jsonxx::Object("name", "Hans Mustermann"));
+dispatcher.trigger("users_create", jsonxx::Object("name", "Frau Mustermann"), boost::bind(success_func, _1), boost::bind(failure_func, _1));
 
 /* Trigger an event with member function callback */
 Bar my_bar;
-Event event3 = dispatcher.trigger("users.pool", boost::bind(&Foo::success_func, my_bar, _1), boost::bind(&Foo::failure_func, my_bar, _1));
+dispatcher.trigger("users_pool", boost::bind(&Foo::success_func, my_bar, _1), boost::bind(&Foo::failure_func, my_bar, _1));
 ```
 
 * Use channels
 
 ```cpp
 /* Subscribe to channels */
-Channel channel1 = dispatcher.subscribe("Authors");
-Channel channel2 = dispatcher.subscribe("Users", boost::bind(success_func, _1), boost::bind(failure_func, _1));
-Channel private_channel1 = dispatcher.subscribePrivate("Administrators");
-Channel private_channel2 = dispatcher.subscribePrivate("Moderators", boost::bind(success_func, _1), boost::bind(failure_func, _1));
+dispatcher.subscribe("Authors");
+dispatcher.subscribe("Users", boost::bind(success_func, _1), boost::bind(failure_func, _1));
+dispatcher.subscribePrivate("Administrators");
+dispatcher.subscribePrivate("Moderators", boost::bind(success_func, _1), boost::bind(failure_func, _1));
 
 /* Unsubscribe channels */
 dispatcher.unsubscribe("Authors");
@@ -187,14 +187,13 @@ dispatcher.unsubscribe("Users", boost::bind(success_func, _1), boost::bind(failu
 
 ```cpp
 /* Trigger an event on channel */
-Event event = channel1.trigger("users.create", jsonxx::Object("name", "Hans Mustermann"));
-Event event = channel2.trigger("users.create", jsonxx::Object("name", "Frau Mustermann"), boost::bind(success_func, _1), boost::bind(failure_func, _1));
+dispatcher.getChannel("Authors").trigger("users_create", jsonxx::Object("name", "Hans Mustermann"));
 
 /* Channel event bind callback definition */
-channel1.bind("users.pool", boost::bind(callback, _1));
+dispatcher.getChannel("Authors").bind("users_pool", boost::bind(callback, _1));
 
 /* Event unbind callback definition */
-channel1.unbindAll("users.pool");
+dispatcher.getChannel("Authors").unbindAll("users_pool");
 ```
 
 * Callback additional parameters

websocket-rails-client/channel.cpp

@@ -1,7 +1,7 @@
 /**
  *
  * Name        : channel.cpp
- * Version     : v0.7.3
+ * Version     : v0.7.4
  * Description : Channel Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems
@@ -69,7 +69,7 @@ void Channel::bind(std::string event_name, cb_func callback) {
     vec_cb_func v;
     this->callbacks[event_name] = v;
   }
-  return this->callbacks[event_name].push_back(callback);
+  this->callbacks[event_name].push_back(callback);
 }
 
 
@@ -93,19 +93,6 @@ void Channel::trigger(std::string event_name, jsonxx::Object event_data) {
   }
 }
 
-void 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);
-  } else {
-    this->dispatcher->triggerEvent(event);
-  }
-}
-
 
 std::string Channel::getName() {
   return this->name;

websocket-rails-client/channel.hpp

@@ -1,7 +1,7 @@
 /**
  *
  * Name        : channel.hpp
- * Version     : v0.7.3
+ * Version     : v0.7.4
  * Description : Channel Header Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems
@@ -47,7 +47,6 @@ class Channel {
   void bind(std::string event_name, cb_func callback);
   void unbindAll(std::string event_name);
   void trigger(std::string event_name, jsonxx::Object event_data);
-  void 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/event.cpp

@@ -1,7 +1,7 @@
 /**
  *
  * Name        : event.cpp
- * Version     : v0.7.3
+ * Version     : v0.7.4
  * Description : Event Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems

websocket-rails-client/event.hpp

@@ -1,7 +1,7 @@
 /**
  *
  * Name        : event.hpp
- * Version     : v0.7.3
+ * Version     : v0.7.4
  * Description : Event Header Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems

websocket-rails-client/websocket.hpp

@@ -1,7 +1,7 @@
 /**
  *
  * Name        : websocket.hpp
- * Version     : v0.7.3
+ * Version     : v0.7.4
  * Description : Websocket Header File in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems
@@ -44,7 +44,7 @@
 #include <websocketpp/client.hpp>
 #include <websocketpp/common/thread.hpp>
 
-#define TIMEOUT_CONN 30
+#define TIMEOUT_CONN 5
 
 typedef boost::function<void(jsonxx::Object)> cb_func;
 typedef std::vector<boost::function<void(jsonxx::Object)> > vec_cb_func;

websocket-rails-client/websocket_connection.cpp

@@ -1,7 +1,7 @@
 /**
  *
  * Name        : websocket.cpp
- * Version     : v0.7.3
+ * Version     : v0.7.4
  * Description : WebsocketConnection Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems

websocket-rails-client/websocket_connection.hpp

@@ -1,7 +1,7 @@
 /**
  *
  * Name        : websocket.hpp
- * Version     : v0.7.3
+ * Version     : v0.7.4
  * Description : WebsocketConnection Header Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems

websocket-rails-client/websocket_rails.cpp

@@ -1,7 +1,7 @@
 /**
  *
  * Name        : websocket_rails.cpp
- * Version     : v0.7.3
+ * Version     : v0.7.4
  * Description : WebsocketRails Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems
@@ -69,8 +69,7 @@ std::string WebsocketRails::disconnect() {
 }
 
 
-WebsocketRails::connection WebsocketRails::reconnect() {
-  connection conn_struct;
+void WebsocketRails::reconnect() {
   std::string oldconnection_id = this->getConn() != NULL ? this->getConn()->getConnectionId() : "";
   this->disconnect();
   if(this->connect() == "connected") {
@@ -80,10 +79,8 @@ WebsocketRails::connection WebsocketRails::reconnect() {
           this->triggerEvent(event);
         }
     }
-    conn_struct.channels = this->reconnectChannels();
+    this->reconnectChannels();
   }
-  conn_struct.state = this->state;
-  return conn_struct;
 }
 
 
@@ -215,47 +212,45 @@ void WebsocketRails::triggerEvent(Event event) {
  *  Channel functions               *
  ************************************/
 
-Channel WebsocketRails::subscribe(std::string channel_name) {
+
+Channel * WebsocketRails::getChannel(std::string channel_name) {
+  return &this->channel_queue[channel_name];
+}
+
+
+Channel * WebsocketRails::subscribe(std::string channel_name) {
   if(this->channel_queue.find(channel_name) == this->channel_queue.end()) {
     Channel channel(channel_name, *this, false);
     this->channel_queue[channel_name] = channel;
-    return channel;
-  } else {
-    return this->channel_queue[channel_name];
   }
+  return &this->channel_queue[channel_name];
 }
 
 
-Channel WebsocketRails::subscribe(std::string channel_name, cb_func success_callback, cb_func failure_callback) {
+Channel * WebsocketRails::subscribe(std::string channel_name, cb_func success_callback, cb_func failure_callback) {
   if(this->channel_queue.find(channel_name) == this->channel_queue.end()) {
     Channel channel(channel_name, *this, false, success_callback, failure_callback);
     this->channel_queue[channel_name] = channel;
-    return channel;
-  } else {
-    return this->channel_queue[channel_name];
   }
+  return &this->channel_queue[channel_name];
 }
 
 
-Channel WebsocketRails::subscribePrivate(std::string channel_name) {
+Channel * WebsocketRails::subscribePrivate(std::string channel_name) {
   if(this->channel_queue.find(channel_name) == this->channel_queue.end()) {
     Channel channel(channel_name, *this, true);
     this->channel_queue[channel_name] = channel;
-    return channel;
-  } else {
-    return this->channel_queue[channel_name];
   }
+  return &this->channel_queue[channel_name];
 }
 
 
-Channel WebsocketRails::subscribePrivate(std::string channel_name, cb_func success_callback, cb_func failure_callback) {
+Channel * WebsocketRails::subscribePrivate(std::string channel_name, cb_func success_callback, cb_func failure_callback) {
   if(this->channel_queue.find(channel_name) == this->channel_queue.end()) {
     Channel channel(channel_name, *this, true, success_callback, failure_callback);
     this->channel_queue[channel_name] = channel;
-    return channel;
-  } else {
-    return this->channel_queue[channel_name];
   }
+  return &this->channel_queue[channel_name];
 }
 
 
@@ -334,19 +329,16 @@ bool WebsocketRails::connectionStale() {
 }
 
 
-std::vector<Channel> WebsocketRails::reconnectChannels() {
-  std::vector<Channel> results;
+void WebsocketRails::reconnectChannels() {
   std::tr1::unordered_map<std::string, Channel> channel_queue_old = this->channel_queue;
   for(auto& x: channel_queue_old) {
-    Channel channel = x.second;
-    map_vec_cb_func callbacks = channel.getCallbacks();
+    Channel * channel = &x.second;
+    map_vec_cb_func callbacks = channel->getCallbacks();
     cb_func success_callback, failure_callback;
-    channel.destroy(success_callback, failure_callback);
-    std::string channel_name = channel.getName();
+    channel->destroy(success_callback, failure_callback);
+    std::string channel_name = channel->getName();
     this->channel_queue.erase(channel_name);
-    channel = channel.isPrivate() ? this->subscribePrivate(channel_name) : this->subscribe(channel_name);
-    channel.setCallbacks(callbacks);
-    results.push_back(channel);
+    channel = channel->isPrivate() ? this->subscribePrivate(channel_name) : this->subscribe(channel_name);
+    channel->setCallbacks(callbacks);
   }
-  return results;
 }

websocket-rails-client/websocket_rails.hpp

@@ -1,7 +1,7 @@
 /**
  *
  * Name        : websocket_rails.hpp
- * Version     : v0.7.3
+ * Version     : v0.7.4
  * Description : WesocketRails Header Class in C++, Ansi-style
  * Author      : Egon Zemmer
  * Company     : Phlegx Systems
@@ -33,14 +33,6 @@
 class WebsocketRails {
 public:
 
-  /**
-   *  Connection Return Type
-   **/
-  typedef struct {
-    std::string state;
-    std::vector<Channel> channels;
-  } connection;
-
   /**
    *  Constructors
    **/
@@ -52,7 +44,7 @@ class WebsocketRails {
    **/
   std::string connect();
   std::string disconnect();
-  connection reconnect();
+  void reconnect();
   std::string getState();
   std::string setState(std::string state);
   WebsocketConnection * getConn();
@@ -81,10 +73,11 @@ class WebsocketRails {
   /**
    *  Channel functions
    **/
-  Channel subscribe(std::string channel_name);
-  Channel subscribe(std::string channel_name, cb_func success_callback, cb_func failure_callback);
-  Channel subscribePrivate(std::string channel_name);
-  Channel subscribePrivate(std::string channel_name, cb_func success_callback, cb_func failure_callback);
+  Channel * getChannel(std::string channel_name);
+  Channel * subscribe(std::string channel_name);
+  Channel * subscribe(std::string channel_name, cb_func success_callback, cb_func failure_callback);
+  Channel * subscribePrivate(std::string channel_name);
+  Channel * subscribePrivate(std::string channel_name, cb_func success_callback, cb_func failure_callback);
   void unsubscribe(std::string channel_name);
   void unsubscribe(std::string channel_name, cb_func success_callback, cb_func failure_callback);
 
@@ -107,14 +100,14 @@ class WebsocketRails {
   /**
    *  Functions
    **/
-  Channel processSubscribe(std::string channel_name, bool is_private);
+  Channel * processSubscribe(std::string channel_name, bool is_private);
   void setConn(WebsocketConnection * conn);
   void connectionEstablished(jsonxx::Object data);
   void dispatch(Event event);
   void dispatchChannel(Event event);
   void pong();
   bool connectionStale();
-  std::vector<Channel> reconnectChannels();
+  void reconnectChannels();
 
 };