plezi 0.14.4 → 0.14.5

data/lib/plezi/websockets/redis.rb

@@ -1,55 +1,54 @@
-require 'securerandom'
 module Plezi
-  module Base
-    module MessageDispatch
-      module RedisDriver
-        @redis_locker ||= Mutex.new
-        @redis = @redis_sub_thread = nil
+   module Base
+      module MessageDispatch
+         module RedisDriver
+            @redis_locker ||= Mutex.new
+            @redis = @redis_sub_thread = nil
 
-        module_function
+            module_function
 
-        def connect
-          return false unless ENV['PL_REDIS_URL'] && defined?(::Redis)
-          return @redis if (@redis_sub_thread && @redis_sub_thread.alive?) && @redis
-          @redis_locker.synchronize do
-            return @redis if (@redis_sub_thread && @redis_sub_thread.alive?) && @redis # repeat the test inside syncing, things change.
-            @redis.quit if @redis
-            @redis = ::Redis.new(url: ENV['PL_REDIS_URL'])
-            raise "Redis connction failed for: #{ENV['PL_REDIS_URL']}" unless @redis
-            @redis_sub_thread = Thread.new do
-              begin
-                ::Redis.new(url: ENV['PL_REDIS_URL']).subscribe(::Plezi.app_name, ::Plezi::Base::MessageDispatch.pid) do |on|
-                  on.message do |_channel, msg|
-                    ::Plezi::Base::MessageDispatch << msg
+            def connect
+               return false unless ENV['PL_REDIS_URL'] && defined?(::Redis)
+               return @redis if (@redis_sub_thread && @redis_sub_thread.alive?) && @redis
+               @redis_locker.synchronize do
+                  return @redis if (@redis_sub_thread && @redis_sub_thread.alive?) && @redis # repeat the test inside syncing, things change.
+                  @redis.quit if @redis
+                  @redis = ::Redis.new(url: ENV['PL_REDIS_URL'])
+                  raise "Redis connction failed for: #{ENV['PL_REDIS_URL']}" unless @redis
+                  @redis_sub_thread = Thread.new do
+                     begin
+                        ::Redis.new(url: ENV['PL_REDIS_URL']).subscribe(::Plezi.app_name, ::Plezi::Base::MessageDispatch.pid) do |on|
+                           on.message do |_channel, msg|
+                              ::Plezi::Base::MessageDispatch << msg
+                           end
+                        end
+                     rescue => e
+                        puts e.message, e.backtrace
+                        retry
+                     end
                   end
-                end
-              rescue => e
-                puts e.message, e.backtrace
-                retry
-              end
+                  @redis
+               end
             end
-            @redis
-          end
-        end
 
-        # Get the current redis connection.
-        def redis
-          @redis || connect
-        end
+            # Get the current redis connection.
+            def redis
+               @redis || connect
+            end
 
-        def push(channel, message)
-          return unless connect
-          return if away?(channel)
-          redis.publish(channel, message)
-        end
+            def push(channel, message)
+               return unless connect
+               return if away?(channel)
+               redis.publish(channel, message)
+            end
 
-        def away?(server)
-          return true unless connect
-          @redis.pubsub('CHANNELS', server).empty?
-        end
+            def away?(server)
+               return true unless connect
+               @redis.pubsub('CHANNELS', server).empty?
+            end
+         end
       end
-    end
-  end
+   end
 end
 
 ::Plezi::Base::MessageDispatch.drivers << ::Plezi::Base::MessageDispatch::RedisDriver

data/plezi.gemspec

@@ -27,12 +27,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'iodine', '~> 0.2', '>= 0.2.7'
+  spec.add_dependency 'iodine', '~> 0.2', '>= 0.2.14'
   spec.add_dependency 'rack', '>= 2.0.0'
-  spec.add_dependency 'bundler', '~> 1.13'
+  spec.add_dependency 'bundler', '~> 1.14'
   # spec.add_dependency 'redcarpet', '> 3.3.0'
   # spec.add_dependency 'slim', '> 3.0.0'
 
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 11.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
 end

data/resources/client.js

@@ -7,16 +7,20 @@
 //
 //      var client = new PleziClient()
 //
-// To open a connection to a different path for the original server (SSL will be preserved when in use), use:
+// To open a connection to a different path for the original server (SSL will be
+// preserved when in use), use:
 //
 //      var client = new PleziClient(PleziClient.origin + "/path")
 //
-// To automatically renew the connection when disconnections are reported by the browser, use:
+// To automatically renew the connection when disconnections are reported by the
+// browser, use:
 //
 //      client.autoreconnect = true
-//      client.reconnect_interval = 250 // sets how long to wait before reconnection attempts. default is 250 ms.
+//      client.reconnect_interval = 250 // sets how long to wait before
+//      reconnection attempts. default is 250 ms.
 //
-// To set up event handling, directly set an `<event name>` callback. i.e., for an event called `chat`:
+// To set up event handling, directly set an `<event name>` callback. i.e., for
+// an event called `chat`:
 //
 //      client.chat = function(event) { "..." }
 //
@@ -25,229 +29,250 @@
 //      client.emit({event: "chat", data: "the message"})
 //
 function PleziClient(url, autoreconnect) {
-    // Set URL
-    if (url) {
-        this.url = url;
-    } else {
-        this.url = PleziClient.origin + self.location.pathname;
-    }
-    // Connect Websocket
-    this.reconnect();
-    // Setup AJAJ
-    this.ajaj = {};
-    this.ajaj.client = this;
-    this.ajaj.url = this.url.replace(/^ws:\/\//i, "http://").replace(/^wss:\/\//i, "https://");
-    this.ajaj.add = {};
-    this.ajaj.emit = this.___ajaj__emit;
-    this.ajaj.auto = false;
-    // auto-reconnection
-    this.autoreconnect = false;
-    this.reconnect_interval = 200;
-    // dump data to console?
-    this.log_events = false;
-    // the timeout for a message ack receipt
-    this.emit_timeout = false;
-    // Set the autoreconnect property
-    if (autoreconnect) {
-        this.autoreconnect = true;
-    }
+  // Set URL
+  if (url) {
+    this.url = url;
+  } else {
+    this.url = PleziClient.origin + self.location.pathname;
+  }
+  // Connect Websocket
+  this.reconnect();
+  // Setup AJAJ
+  this.ajaj = {};
+  this.ajaj.client = this;
+  this.ajaj.url = this.url.replace(/^ws:\/\//i, "http://")
+                      .replace(/^wss:\/\//i, "https://");
+  this.ajaj.add = {};
+  this.ajaj.emit = this.___ajaj__emit;
+  this.ajaj.auto = false;
+  // auto-reconnection
+  this.autoreconnect = false;
+  this.reconnect_interval = 200;
+  // dump data to console?
+  this.log_events = false;
+  // the timeout for a message ack receipt
+  this.emit_timeout = false;
+  // Set the autoreconnect property
+  if (autoreconnect) {
+    this.autoreconnect = true;
+  }
 }
 // The Websocket onopen callback
-PleziClient.prototype.___on_open = function(e) {
-        this.owner.connected = true;
-        if (this.owner.onopen) {
-            this.owner.onopen(e);
-        }
-    }
+PleziClient.prototype.___on_open =
+    function(e) {
+  this.owner.connected = true;
+  if (this.owner.onopen) {
+    this.owner.onopen(e);
+  }
+}
     // The Websocket onclose callback
-PleziClient.prototype.___on_close = function(e) {
-        this.owner.connected = false;
-        if (this.owner.onclose) {
-            this.owner.onclose(e);
-        }
-        if (this.owner.autoreconnect) {
-            setTimeout(function(obj) {
-                obj.reconnect();
-            }, this.owner.reconnect_interval, this.owner);
-        }
-    }
-    // The Websocket onerror callback
-PleziClient.prototype.___on_error = function(e) {
-        if (this.owner.onerror) {
-            this.owner.onerror(e);
-        }
+    PleziClient.prototype.___on_close =
+        function(e) {
+  this.owner.connected = false;
+  if (this.owner.onclose) {
+    this.owner.onclose(e);
+  }
+  if (this.owner.autoreconnect) {
+    setTimeout(function(obj) { obj.reconnect(); },
+               this.owner.reconnect_interval, this.owner);
+  }
+}
+        // The Websocket onerror callback
+        PleziClient.prototype.___on_error =
+            function(e) {
+  if (this.owner.onerror) {
+    this.owner.onerror(e);
+  }
+}
+            // The Websocket onmessage callback
+            PleziClient.prototype.___on_message = function(e) {
+  try {
+    var msg = JSON.parse(e.data);
+    this.owner.___dispatch(msg);
+  } catch (err) {
+    console.error(
+        "PleziClient experienced an error parsing the following data (not JSON):",
+        err, e);
+  }
+};
+
+PleziClient.prototype.___dispatch =
+    function(msg) {
+  try {
+    if (this.log_events) {
+      console.log(msg);
     }
-    // The Websocket onmessage callback
-PleziClient.prototype.___on_message = function(e) {
-    try {
-        var msg = JSON.parse(e.data);
-        this.owner.___dispatch(msg);
-    } catch (err) {
-        console.error("PleziClient experienced an error parsing the following data (not JSON):",
-            err, e);
+    if (msg.event == '_ack_') {
+      clearTimeout(msg._EID_);
+      if (this[msg._EID_] && this[msg._EID_].callback) {
+        this[msg._EID_].callback(this[msg._EID_].event, this);
+      }
+      delete this[msg._EID_];
     }
-}
-PleziClient.prototype.___dispatch = function(msg) {
-    try {
-        if (this.log_events) {
-            console.log(msg);
-        }
-        if (msg.event == '_ack_') {
-            clearTimeout(msg._EID_);
-            if (this[msg._EID_] && this[msg._EID_].callback) {
-                this[msg._EID_].callback(this[msg._EID_].event, this);
-            }
-            delete this[msg._EID_];
-        }
-        if ((msg.event) && (this[msg.event])) {
-            this[msg.event](msg);
-        } else if ((msg.event) && (this['on' + msg.event])) {
-            console.warn('PleziClient: use a callback called "' + msg.event +
-                '" instead of of "on' + msg.event + '"');
-            this['on' + msg.event](msg);
-        } else {
-            if (this['unknown'] && (msg.event != '_ack_')) {
-                this['unknown'](msg);
-            };
-        }
-    } catch (err) {
-        console.error("PleziClient experienced an error while responding to the following onmessage event",
-            err, msg);
+    if ((msg.event) && (this[msg.event])) {
+      this[msg.event](msg);
+    } else if ((msg.event) && (this['on' + msg.event])) {
+      console.warn('PleziClient: use a callback called "' + msg.event +
+                   '" instead of of "on' + msg.event + '"');
+      this['on' + msg.event](msg);
+    } else {
+      if (this['unknown'] && (msg.event != '_ack_')) {
+        this['unknown'](msg);
+      };
     }
+  } catch (err) {
+    console.error(
+        "PleziClient experienced an error while responding to the following onmessage event",
+        err, msg);
+  }
 }
 
-// Clears meta timeout data
-PleziClient.prototype.___perform_timeout_callback = function(event, pl_client, callback) {
-    delete pl_client[event._EID_];
-    callback(event, pl_client);
+    // Clears meta timeout data
+    PleziClient.prototype.___perform_timeout_callback =
+        function(event, pl_client, callback) {
+  delete pl_client[event._EID_];
+  callback(event, pl_client);
 }
 
-// Sets a timeout for the websocket message
-PleziClient.prototype.___set_failed_timeout = function(event, callback, timeout) {
-        if (event._EID_) {
-            return event;
-        };
-        if (!timeout) {
-            timeout = this.emit_timeout;
-        };
-        if (!callback) {
-            callback = this.___on_timeout;
-        };
-        if (!timeout) {
-            return event;
-        };
-        event._EID_ = setTimeout(this.___perform_timeout_callback, timeout, event, this, callback);
-        return event;
-    }
-    // Removes the _client_ property from the event and calls
-    // the ontimeout callback within the correct scope
-PleziClient.prototype.___on_timeout = function(event, client) {
-        if (client.ajaj.auto) {
-            if (client.log_events) {
-                console.log("falling back on AJAJ for the event:", event);
-            }
-            client.ajaj.emit(event, client.ontimeout);
-        } else {
-            client.ontimeout(event);
-        }
+        // Sets a timeout for the websocket message
+        PleziClient.prototype.___set_failed_timeout =
+            function(event, callback, timeout) {
+  if (event._EID_) {
+    return event;
+  };
+  if (!timeout) {
+    timeout = this.emit_timeout;
+  };
+  if (!callback) {
+    callback = this.___on_timeout;
+  };
+  if (!timeout) {
+    return event;
+  };
+  event._EID_ = setTimeout(this.___perform_timeout_callback, timeout, event,
+                           this, callback);
+  return event;
+}
+            // Removes the _client_ property from the event and
+            // calls
+            // the ontimeout callback within the correct scope
+            PleziClient.prototype.___on_timeout =
+                function(event, client) {
+  if (client.ajaj.auto) {
+    if (client.log_events) {
+      console.log("falling back on AJAJ for the event:", event);
     }
-    // The timeout callback
-PleziClient.prototype.ontimeout = function(event) {
-    console.warn("Timeout reached - it's assumed the connection was lost " +
-        "and the following event was ignored by the server:", event);
-    console.log(this);
+    client.ajaj.emit(event, client.ontimeout);
+  } else {
+    client.ontimeout(event);
+  }
 }
-
-PleziClient.prototype.reconnect = function() {
-    this.connected = NaN;
-    this.ws = new WebSocket(this.url);
-    // lets us access the client from the callbacks
-    this.ws.owner = this;
-    // The Websocket onopen callback
-    this.ws.onopen = this.___on_open;
-    // The Websocket onclose callback
-    this.ws.onclose = this.___on_close;
-    // The Websocket onerror callback
-    this.ws.onerror = this.___on_error;
-    // The Websocket onmessage callback
-    this.ws.onmessage = this.___on_message;
+                // The timeout callback
+                PleziClient.prototype.ontimeout =
+                    function(event) {
+  console.warn("Timeout reached - it's assumed the connection was lost " +
+                   "and the following event was ignored by the server:",
+               event);
+  console.log(this);
 }
 
-PleziClient.prototype.close = function() {
-    this.autoreconnect = false;
-    this.ws.close();
+                    PleziClient.prototype.reconnect =
+                        function() {
+  this.connected = NaN;
+  this.ws = new WebSocket(this.url);
+  // lets us access the client from the callbacks
+  this.ws.owner = this;
+  // The Websocket onopen callback
+  this.ws.onopen = this.___on_open;
+  // The Websocket onclose callback
+  this.ws.onclose = this.___on_close;
+  // The Websocket onerror callback
+  this.ws.onerror = this.___on_error;
+  // The Websocket onmessage callback
+  this.ws.onmessage = this.___on_message;
 }
 
-PleziClient.origin = (self.location.protocol.match(/https/) ? 'wws' : 'ws') + '://' + self.location.hostname + (self.location.port == '' ? '' : (':' + self.location.port));
-
-PleziClient.prototype.sendraw = function(data) {
-    if (this.ws.readyState != 1) {
-        return false;
-    }
-    this.ws.send(data);
-    if (this.ws.readyState != 1) {
-        return false;
-    }
-    return true;
+                        PleziClient.prototype.close =
+                            function() {
+  this.autoreconnect = false;
+  this.ws.close();
 }
 
-PleziClient.prototype.emit = function(event, callback, timeout_callback, timeout) {
-    if (!timeout && callback && !this.emit_timeout)
-        timeout = 10;
-    this.___set_failed_timeout(event, timeout_callback, timeout)
-    if (callback) {
-        this[event._EID_] = {
-            callback: callback,
-            event: event
-        };
-    }
-    return this.sendraw(JSON.stringify(event));
+                            PleziClient.origin =
+                                (self.location.protocol.match(/https/) ? 'wws'
+                                                                       : 'ws') +
+                                '://' + self.location.hostname +
+                                (self.location.port == ''
+                                     ? ''
+                                     : (':' + self.location.port));
+
+PleziClient.prototype.sendraw =
+    function(data) {
+  if (this.ws.readyState != 1) {
+    return false;
+  }
+  this.ws.send(data);
+  if (this.ws.readyState != 1) {
+    return false;
+  }
+  return true;
 }
 
-PleziClient.prototype.readyState = function() {
-    return this.ws.readyState;
+    PleziClient.prototype.emit =
+        function(event, callback, timeout_callback, timeout) {
+  if (!timeout && callback && !this.emit_timeout)
+    timeout = 10;
+  this.___set_failed_timeout(event, timeout_callback, timeout);
+  if (callback) {
+    this[event._EID_] = {callback : callback, event : event};
+  }
+  return this.sendraw(JSON.stringify(event));
 }
 
-PleziClient.prototype.___ajaj__emit = function(event, callback) {
-    var combined = {}
-    for (var k in this.add) {
-        combined[k] = this.add[k];
-    };
-    for (var k in event) {
-        combined[k] = event[k];
-    };
-    if (!combined.id) {
-        combined.id = event.event;
-    };
-    var req = new XMLHttpRequest();
-    req.client = this.client;
-    req.json = combined;
-    req.callback = callback;
-    // if(!req.callback) req.callback = this.failed
-    req.onreadystatechange = function() {
-        if (this.readyState != 4) {
-            return;
-        }
-        if (this.status == 200) {
-            try {
-                var res = JSON.parse(this.responseText);
-                this.client.___dispatch(res);
-            } catch (err) {
-                console.error("PleziClient experienced an error parsing the following data (not JSON):",
-                    err, this.responseText);
-            }
+        PleziClient.prototype.readyState =
+            function() { return this.ws.readyState; }
 
-        } else {
-            if (this.callback) {
-                this.callback(this.json);
-            }
-        }
+            PleziClient.prototype.___ajaj__emit = function(event, callback) {
+  var combined = {};
+  for (var k in this.add) {
+    combined[k] = this.add[k];
+  };
+  for (var k in event) {
+    combined[k] = event[k];
+  };
+  if (!combined.id) {
+    combined.id = event.event;
+  };
+  var req = new XMLHttpRequest();
+  req.client = this.client;
+  req.json = combined;
+  req.callback = callback;
+  // if(!req.callback) req.callback = this.failed
+  req.onreadystatechange = function() {
+    if (this.readyState != 4) {
+      return;
     }
-    req.open("POST", this.url, true);
-    req.setRequestHeader("Content-type", "application/json");
-    try {
-        req.send(JSON.stringify(combined));
-    } catch (err) {
-        callback(event);
+    if (this.status == 200) {
+      try {
+        var res = JSON.parse(this.responseText);
+        this.client.___dispatch(res);
+      } catch (err) {
+        console.error(
+            "PleziClient experienced an error parsing the following data (not JSON):",
+            err, this.responseText);
+      }
+
+    } else {
+      if (this.callback) {
+        this.callback(this.json);
+      }
     }
+  };
+  req.open("POST", this.url, true);
+  req.setRequestHeader("Content-type", "application/json");
+  try {
+    req.send(JSON.stringify(combined));
+  } catch (err) {
+    callback(event);
+  }
 }