socket.io-rails 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa3e436bf211e5063bbf2d958116b0b7fc89fd6b
-  data.tar.gz: 8d8ede182179bc03fdf972a238b2fcf1fcc25121
+  metadata.gz: ae004a0e89d45dcf2aab359f03c9371f722ac8ea
+  data.tar.gz: 9caad930a2db41dbd687fdebf23d58758dee98b8
 SHA512:
-  metadata.gz: d6443dfd027388723895f665851b5b9757d550a0b4543d4d0215ad7ff35b5eb44cacd12c8cd01e983617d52adf927225a32942fdae32577fa3ca8283af7ed78e
-  data.tar.gz: 986e8942506544830789c62c4719cac3945a4dc086786fae3db5c9f5bcde4927bac753df1cb250b8c3a24647d9b6155e1becd7ad857991da54e96070184795be
+  metadata.gz: 7589d32f8ad710d3cd080054f396ea949a7d08e09055c95218e48e700881261ea7a15b75498295fe9fab7935c061c26de84c4c06583c44f9be31eb1b5d3753de
+  data.tar.gz: 78d7ffb75cb350a3b398e258ede2a457aef1d669a285e9fd5cb63351945f8dad964e1ec6d261a23ec550019f597809027967dc46e93cb8c185154b5237805956

data/lib/socket.io-rails/version.rb

@@ -1,5 +1,5 @@
 module Socketio
   module Rails
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

data/vendor/assets/javascripts/socket.io.js

@@ -514,7 +514,7 @@ Manager.prototype.reconnect = function(){
     this.reconnecting = true;
     var timer = setTimeout(function(){
       debug('attempting reconnect');
-      self.emitAll('reconnect_attempt');
+      self.emitAll('reconnect_attempt', self.attempts);
       self.emitAll('reconnecting', self.attempts);
       self.open(function(err){
         if (err) {
@@ -640,6 +640,7 @@ function Socket(io, nsp){
   this.sendBuffer = [];
   this.connected = false;
   this.disconnected = true;
+  this.subEvents();
 }
 
 /**
@@ -649,21 +650,31 @@ function Socket(io, nsp){
 Emitter(Socket.prototype);
 
 /**
- * Called upon engine `open`.
+ * Subscribe to open, close and packet events
  *
  * @api private
  */
 
-Socket.prototype.open =
-Socket.prototype.connect = function(){
-  if (this.connected) return this;
+Socket.prototype.subEvents = function() {
   var io = this.io;
-  io.open(); // ensure open
   this.subs = [
     on(io, 'open', bind(this, 'onopen')),
     on(io, 'packet', bind(this, 'onpacket')),
     on(io, 'close', bind(this, 'onclose'))
   ];
+};
+
+/**
+ * Called upon engine `open`.
+ *
+ * @api private
+ */
+
+Socket.prototype.open =
+Socket.prototype.connect = function(){
+  if (this.connected) return this;
+
+  this.io.open(); // ensure open
   if ('open' == this.io.readyState) this.onopen();
   return this;
 };
@@ -2284,8 +2295,14 @@ Transport.prototype.onOpen = function () {
  * @api private
  */
 
-Transport.prototype.onData = function (data) {
-  this.onPacket(parser.decodePacket(data, this.socket.binaryType));
+Transport.prototype.onData = function(data){
+  try {
+    var packet = parser.decodePacket(data, this.socket.binaryType);
+    this.onPacket(packet);
+  } catch(e){
+    e.data = data;
+    this.onError('parser decode error', e);
+  }
 };
 
 /**

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socket.io-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Jason Chen