pusher-fake 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4567bf9d8226e1d07e7f93382ae2f414a62888e
-  data.tar.gz: 8524195e9f243534d9a85b3d7c0a09c61c4fc252
+  metadata.gz: 5aa94db2edd0797091dc88becfdb8ae831846e76
+  data.tar.gz: 5ab407e3e83ea0755b36a3548d226e40f957979e
 SHA512:
-  metadata.gz: 90f3394b3891466ed3dd2b5c4dab7a6fba6d437608a7d8b4bf96702584b829a14fdb2d84ab614cf23dd74fb3fb118789f616326e259bae52ba07bff3302dfb6e
-  data.tar.gz: e67ed85fd2a1bec93104ab4102ca148b8d295f51056babd2a8b5c13e4396b80ab53663ad66567b21f2a83d2136e8709d44142a3b7e5df86f5d6d773f110fdb11
+  metadata.gz: 8fd3d7eae0e62bd30d631da88088720dbaff65c689b24bdd9016d2029841922e78706f83f68860b9488818a15e51965fff72bd4af0b3c85bd44c2efa29f878cd
+  data.tar.gz: 05ce0a03d04b78d02a0da9ae9a9ceee8766b3b67ae1833f58c6d0e8499f3780868cd89698237d4a9288c1fa582e0927f2a5db7e7c22939464af48a90499dccc1

data/features/support/application/public/javascripts/vendor/{pusher-2.1.3.js → pusher-2.1.5.js}

@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.1.3
+ * Pusher JavaScript Library v2.1.5
  * http://pusherapp.com/
  *
  * Copyright 2013, Pusher
@@ -86,6 +86,7 @@
     });
 
     Pusher.instances.push(this);
+    this.timeline.info({ instances: Pusher.instances.length });
 
     if (Pusher.isReady) self.connect();
   }
@@ -128,6 +129,10 @@
     return this.channels.find(name);
   };
 
+  prototype.allChannels = function() {
+    return this.channels.all();
+  };
+
   prototype.connect = function() {
     this.connection.connect();
 
@@ -208,6 +213,79 @@
   this.Pusher = Pusher;
 }).call(this);
 
+;(function() {
+  /** Cross-browser compatible timer abstraction.
+   *
+   * @param {Number} delay
+   * @param {Function} callback
+   */
+  function Timer(delay, callback) {
+    var self = this;
+
+    this.timeout = setTimeout(function() {
+      if (self.timeout !== null) {
+        callback();
+        self.timeout = null;
+      }
+    }, delay);
+  }
+  var prototype = Timer.prototype;
+
+  /** Returns whether the timer is still running.
+   *
+   * @return {Boolean}
+   */
+  prototype.isRunning = function() {
+    return this.timeout !== null;
+  };
+
+  /** Aborts a timer when it's running. */
+  prototype.ensureAborted = function() {
+    if (this.timeout) {
+      clearTimeout(this.timeout);
+      this.timeout = null;
+    }
+  };
+
+  Pusher.Timer = Timer;
+}).call(this);
+
+;(function() {
+  /** Cross-browser compatible periodic timer abstraction.
+   *
+   * @param {Number} interval
+   * @param {Function} callback
+   */
+  function PeriodicTimer(interval, callback) {
+    var self = this;
+
+    this.interval = setInterval(function() {
+      if (self.interval !== null) {
+        callback();
+      }
+    }, interval);
+  }
+  var prototype = PeriodicTimer.prototype;
+
+  /** Returns whether the timer is still running.
+   *
+   * @return {Boolean}
+   */
+  prototype.isRunning = function() {
+    return this.interval !== null;
+  };
+
+  /** Aborts a timer when it's running. */
+  prototype.ensureAborted = function() {
+    if (this.interval) {
+      clearInterval(this.interval);
+      this.interval = null;
+    }
+  };
+
+  Pusher.PeriodicTimer = PeriodicTimer;
+}).call(this);
+
 ;(function() {
   Pusher.Util = {
     now: function() {
@@ -218,6 +296,10 @@
       }
     },
 
+    defer: function(callback) {
+      return new Pusher.Timer(0, callback);
+    },
+
     /** Merges multiple objects into the target argument.
      *
      * For properties that are plain Objects, performs a deep-merge. For the
@@ -281,14 +363,48 @@
       return -1;
     },
 
-    keys: function(object) {
-      var result = [];
+    /** Applies a function f to all properties of an object.
+     *
+     * Function f gets 3 arguments passed:
+     * - element from the object
+     * - key of the element
+     * - reference to the object
+     *
+     * @param {Object} object
+     * @param {Function} f
+     */
+    objectApply: function(object, f) {
       for (var key in object) {
         if (Object.prototype.hasOwnProperty.call(object, key)) {
-          result.push(key);
+          f(object[key], key, object);
         }
       }
-      return result;
+    },
+
+    /** Return a list of object's own property keys
+     *
+     * @param {Object} object
+     * @returns {Array}
+     */
+    keys: function(object) {
+      var keys = [];
+      Pusher.Util.objectApply(object, function(_, key) {
+        keys.push(key);
+      });
+      return keys;
+    },
+
+    /** Return a list of object's own property values
+     *
+     * @param {Object} object
+     * @returns {Array}
+     */
+    values: function(object) {
+      var values = [];
+      Pusher.Util.objectApply(object, function(value) {
+        values.push(value);
+      });
+      return values;
     },
 
     /** Applies a function f to all elements of an array.
@@ -307,24 +423,6 @@
       }
     },
 
-    /** Applies a function f to all properties of an object.
-     *
-     * Function f gets 3 arguments passed:
-     * - element from the object
-     * - key of the element
-     * - reference to the object
-     *
-     * @param {Object} object
-     * @param {Function} f
-     */
-    objectApply: function(object, f) {
-      for (var key in object) {
-        if (Object.prototype.hasOwnProperty.call(object, key)) {
-          f(object[key], key, object);
-        }
-      }
-    },
-
     /** Maps all elements of the array and returns the result.
      *
      * Function f gets 4 arguments passed:
@@ -357,11 +455,9 @@
      */
     mapObject: function(object, f) {
       var result = {};
-      for (var key in object) {
-        if (Object.prototype.hasOwnProperty.call(object, key)) {
-          result[key] = f(object[key]);
-        }
-      }
+      Pusher.Util.objectApply(object, function(value, key) {
+        result[key] = f(value);
+      });
       return result;
     },
 
@@ -400,16 +496,12 @@
      * @param {Function} f
      */
     filterObject: function(object, test) {
-      test = test || function(value) { return !!value; };
-
       var result = {};
-      for (var key in object) {
-        if (Object.prototype.hasOwnProperty.call(object, key)) {
-          if (test(object[key], key, object, result)) {
-            result[key] = object[key];
-          }
+      Pusher.Util.objectApply(object, function(value, key) {
+        if ((test && test(value, key, object, result)) || Boolean(value)) {
+          result[key] = value;
         }
-      }
+      });
       return result;
     },
 
@@ -420,11 +512,9 @@
      */
     flatten: function(object) {
       var result = [];
-      for (var key in object) {
-        if (Object.prototype.hasOwnProperty.call(object, key)) {
-          result.push([key, object[key]]);
-        }
-      }
+      Pusher.Util.objectApply(object, function(value, key) {
+        result.push([key, value]);
+      });
       return result;
     },
 
@@ -509,8 +599,8 @@
 }).call(this);
 
 ;(function() {
-  Pusher.VERSION = '2.1.3';
-  Pusher.PROTOCOL = 6;
+  Pusher.VERSION = '2.1.5';
+  Pusher.PROTOCOL = 7;
 
   // DEPRECATED: WS connection parameters
   Pusher.host = 'ws.pusherapp.com';
@@ -852,79 +942,6 @@
   }
 })();
 
-;(function() {
-  /** Cross-browser compatible timer abstraction.
-   *
-   * @param {Number} delay
-   * @param {Function} callback
-   */
-  function Timer(delay, callback) {
-    var self = this;
-
-    this.timeout = setTimeout(function() {
-      if (self.timeout !== null) {
-        callback();
-        self.timeout = null;
-      }
-    }, delay);
-  }
-  var prototype = Timer.prototype;
-
-  /** Returns whether the timer is still running.
-   *
-   * @return {Boolean}
-   */
-  prototype.isRunning = function() {
-    return this.timeout !== null;
-  };
-
-  /** Aborts a timer when it's running. */
-  prototype.ensureAborted = function() {
-    if (this.timeout) {
-      clearTimeout(this.timeout);
-      this.timeout = null;
-    }
-  };
-
-  Pusher.Timer = Timer;
-}).call(this);
-
-;(function() {
-  /** Cross-browser compatible periodic timer abstraction.
-   *
-   * @param {Number} interval
-   * @param {Function} callback
-   */
-  function PeriodicTimer(interval, callback) {
-    var self = this;
-
-    this.interval = setInterval(function() {
-      if (self.interval !== null) {
-        callback();
-      }
-    }, interval);
-  }
-  var prototype = PeriodicTimer.prototype;
-
-  /** Returns whether the timer is still running.
-   *
-   * @return {Boolean}
-   */
-  prototype.isRunning = function() {
-    return this.interval !== null;
-  };
-
-  /** Aborts a timer when it's running. */
-  prototype.ensureAborted = function() {
-    if (this.interval) {
-      clearInterval(this.interval);
-      this.interval = null;
-    }
-  };
-
-  Pusher.PeriodicTimer = PeriodicTimer;
-}).call(this);
-
 (function() {
 
   var Base64 = {
@@ -1142,7 +1159,7 @@
       this.events.push(
         Pusher.Util.extend({}, event, {
           timestamp: Pusher.Util.now(),
-          level: level
+          level: (level !== Timeline.INFO ? level : undefined)
         })
       );
       if (this.options.limit && this.events.length > this.options.limit) {
@@ -1170,23 +1187,15 @@
   prototype.send = function(sendJSONP, callback) {
     var self = this;
 
-    if (Pusher.Network.isOnline() === false) {
-      return false;
-    }
-
-    var data = {};
-    if (self.sent === 0) {
-      data = Pusher.Util.extend({
-        key: self.key,
-        features: self.options.features,
-        version: self.options.version
-      }, self.options.params || {});
-    }
-    data.session = self.session;
-    data.timeline = self.events;
-    data = Pusher.Util.filterObject(data, function(v) {
-      return v !== undefined;
-    });
+    var data = Pusher.Util.extend({
+      session: self.session,
+      bundle: self.sent + 1,
+      key: self.key,
+      lib: "js",
+      version: self.options.version,
+      features: self.options.features,
+      timeline: self.events
+    }, self.options.params);
 
     self.events = [];
     sendJSONP(data, function(error, result) {
@@ -1226,7 +1235,9 @@
 
     var sendJSONP = function(data, callback) {
       var params = {
-        data: data,
+        data: Pusher.Util.filterObject(data, function(v) {
+          return v !== undefined;
+        }),
         url: scheme + (self.host || self.options.host) + self.options.path,
         receiver: Pusher.JSONP
       };
@@ -1331,6 +1342,7 @@
     this.strategy = strategy;
     this.transports = transports;
     this.ttl = options.ttl || 1800*1000;
+    this.encrypted = options.encrypted;
     this.timeline = options.timeline;
   }
   var prototype = CachedStrategy.prototype;
@@ -1340,7 +1352,8 @@
   };
 
   prototype.connect = function(minPriority, callback) {
-    var info = fetchTransportInfo();
+    var encrypted = this.encrypted;
+    var info = fetchTransportCache(encrypted);
 
     var strategies = [this.strategy];
     if (info && info.timestamp + this.ttl >= Pusher.Util.now()) {
@@ -1359,7 +1372,7 @@
       minPriority,
       function cb(error, handshake) {
         if (error) {
-          flushTransportInfo();
+          flushTransportCache(encrypted);
           if (strategies.length > 0) {
             startTimestamp = Pusher.Util.now();
             runner = strategies.pop().connect(minPriority, cb);
@@ -1367,8 +1380,11 @@
             callback(error);
           }
         } else {
-          var latency = Pusher.Util.now() - startTimestamp;
-          storeTransportInfo(handshake.transport.name, latency);
+          storeTransportCache(
+            encrypted,
+            handshake.transport.name,
+            Pusher.Util.now() - startTimestamp
+          );
           callback(null, handshake);
         }
       }
@@ -1387,26 +1403,30 @@
     };
   };
 
-  function fetchTransportInfo() {
+  function getTransportCacheKey(encrypted) {
+    return "pusherTransport" + (encrypted ? "Encrypted" : "Unencrypted");
+  }
+
+  function fetchTransportCache(encrypted) {
     var storage = Pusher.Util.getLocalStorage();
     if (storage) {
       try {
-        var info = storage.pusherTransport;
-        if (info) {
-          return JSON.parse(info);
+        var serializedCache = storage[getTransportCacheKey(encrypted)];
+        if (serializedCache) {
+          return JSON.parse(serializedCache);
         }
       } catch (e) {
-        flushTransportInfo();
+        flushTransportCache(encrypted);
       }
     }
     return null;
   }
 
-  function storeTransportInfo(transport, latency) {
+  function storeTransportCache(encrypted, transport, latency) {
     var storage = Pusher.Util.getLocalStorage();
     if (storage) {
       try {
-        storage.pusherTransport = JSON.stringify({
+        storage[getTransportCacheKey(encrypted)] = JSON.stringify({
           timestamp: Pusher.Util.now(),
           transport: transport,
           latency: latency
@@ -1417,13 +1437,13 @@
     }
   }
 
-  function flushTransportInfo() {
+  function flushTransportCache(encrypted) {
     var storage = Pusher.Util.getLocalStorage();
-    if (storage && storage.pusherTransport) {
+    if (storage) {
       try {
-        delete storage.pusherTransport;
+        delete storage[getTransportCacheKey(encrypted)];
       } catch (e) {
-        storage.pusherTransport = undefined;
+        // catch exceptions raised by localStorage
       }
     }
   }
@@ -1618,6 +1638,13 @@
     var timer = null;
     var runner = null;
 
+    if (options.timeout > 0) {
+      timer = new Pusher.Timer(options.timeout, function() {
+        runner.abort();
+        callback(true);
+      });
+    }
+
     runner = strategy.connect(minPriority, function(error, handshake) {
       if (error && timer && timer.isRunning() && !options.failFast) {
         // advance to the next strategy after the timeout
@@ -1629,13 +1656,6 @@
       callback(error, handshake);
     });
 
-    if (options.timeout > 0) {
-      timer = new Pusher.Timer(options.timeout, function() {
-        runner.abort();
-        callback(true);
-      });
-    }
-
     return {
       abort: function() {
         if (timer) {
@@ -1673,9 +1693,7 @@
    * @returns {Boolean}
    */
   prototype.isSupported = function() {
-    return this.transport.isSupported({
-      disableFlash: !!this.options.disableFlash
-    });
+    return this.transport.isSupported();
   };
 
   /** Launches a connection attempt and returns a strategy runner.
@@ -1684,7 +1702,7 @@
    * @return {Object} strategy runner
    */
   prototype.connect = function(minPriority, callback) {
-    if (!this.transport.isSupported()) {
+    if (!this.isSupported()) {
       return failAttempt(new Pusher.Errors.UnsupportedStrategy(), callback);
     } else if (this.priority < minPriority) {
       return failAttempt(new Pusher.Errors.TransportPriorityTooLow(), callback);
@@ -1761,7 +1779,7 @@
   };
 
   function failAttempt(error, callback) {
-    new Pusher.Timer(0, function() {
+    Pusher.Util.defer(function() {
       callback(error);
     });
     return {
@@ -1812,6 +1830,7 @@
     this.key = key;
     this.state = "new";
     this.timeline = options.timeline;
+    this.activityTimeout = options.activityTimeout;
     this.id = this.timeline.generateUniqueID();
 
     this.options = {
@@ -1871,7 +1890,7 @@
       this.socket = this.createSocket(url);
     } catch (e) {
       var self = this;
-      new Pusher.Timer(0, function() {
+      Pusher.Util.defer(function() {
         self.onError(e);
         self.changeState("closed");
       });
@@ -1925,10 +1944,6 @@
     }
   };
 
-  prototype.requestPing = function() {
-    this.emit("ping_request");
-  };
-
   /** @protected */
   prototype.onOpen = function() {
     this.changeState("open");
@@ -2056,18 +2071,19 @@
    * @param {Object} environment
    * @returns {Boolean}
    */
-  FlashTransport.isSupported = function(environment) {
-    if (environment && environment.disableFlash) {
-      return false;
-    }
+  FlashTransport.isSupported = function() {
     try {
       return Boolean(new ActiveXObject('ShockwaveFlash.ShockwaveFlash'));
     } catch (e) {
-      return Boolean(
-        navigator &&
-        navigator.mimeTypes &&
-        navigator.mimeTypes["application/x-shockwave-flash"] !== undefined
-      );
+      try {
+        return Boolean(
+          navigator &&
+          navigator.mimeTypes &&
+          navigator.mimeTypes["application/x-shockwave-flash"] !== undefined
+        );
+      } catch(e) {
+        return false;
+      }
     }
   };
 
@@ -2261,39 +2277,29 @@
     this.transport = transport;
     this.minPingDelay = options.minPingDelay;
     this.maxPingDelay = options.maxPingDelay;
-    this.pingDelay = null;
+    this.pingDelay = undefined;
   }
   var prototype = AssistantToTheTransportManager.prototype;
 
   prototype.createConnection = function(name, priority, key, options) {
-    var connection = this.transport.createConnection(
+    var self = this;
+
+    var options = Pusher.Util.extend({}, options, {
+      activityTimeout: self.pingDelay
+    });
+    var connection = self.transport.createConnection(
       name, priority, key, options
     );
 
-    var self = this;
     var openTimestamp = null;
-    var pingTimer = null;
 
     var onOpen = function() {
       connection.unbind("open", onOpen);
-
-      openTimestamp = Pusher.Util.now();
-      if (self.pingDelay) {
-        pingTimer = setInterval(function() {
-          if (pingTimer) {
-            connection.requestPing();
-          }
-        }, self.pingDelay);
-      }
-
       connection.bind("closed", onClosed);
+      openTimestamp = Pusher.Util.now();
     };
     var onClosed = function(closeEvent) {
       connection.unbind("closed", onClosed);
-      if (pingTimer) {
-        clearInterval(pingTimer);
-        pingTimer = null;
-      }
 
       if (closeEvent.code === 1002 || closeEvent.code === 1003) {
         // we don't want to use transports not obeying the protocol
@@ -2312,8 +2318,8 @@
     return connection;
   };
 
-  prototype.isSupported = function(environment) {
-    return this.manager.isAlive() && this.transport.isSupported(environment);
+  prototype.isSupported = function() {
+    return this.manager.isAlive() && this.transport.isSupported();
   };
 
   Pusher.AssistantToTheTransportManager = AssistantToTheTransportManager;
@@ -2364,6 +2370,23 @@
     sockjs: Pusher.SockJSTransport
   };
 
+  var UnsupportedStrategy = {
+    isSupported: function() {
+      return false;
+    },
+    connect: function(_, callback) {
+      var deferred = Pusher.Util.defer(function() {
+        callback(new Pusher.Errors.UnsupportedStrategy());
+      });
+      return {
+        abort: function() {
+          deferred.ensureAborted();
+        },
+        forceMinPriority: function() {}
+      };
+    }
+  };
+
   // DSL bindings
 
   function returnWithOriginalContext(f) {
@@ -2386,19 +2409,31 @@
       if (!transportClass) {
         throw new Pusher.Errors.UnsupportedTransport(type);
       }
-      var transportOptions = Pusher.Util.extend({}, {
-        key: context.key,
-        encrypted: context.encrypted,
-        timeline: context.timeline,
-        disableFlash: context.disableFlash,
-        ignoreNullOrigin: context.ignoreNullOrigin
-      }, options);
-      if (manager) {
-        transportClass = manager.getAssistant(transportClass);
-      }
-      var transport = new Pusher.TransportStrategy(
-        name, priority, transportClass, transportOptions
-      );
+
+      var enabled =
+        (!context.enabledTransports ||
+          Pusher.Util.arrayIndexOf(context.enabledTransports, name) !== -1) &&
+        (!context.disabledTransports ||
+          Pusher.Util.arrayIndexOf(context.disabledTransports, name) === -1) &&
+        (name !== "flash" || context.disableFlash !== true);
+
+      var transport;
+      if (enabled) {
+        transport = new Pusher.TransportStrategy(
+          name,
+          priority,
+          manager ? manager.getAssistant(transportClass) : transportClass,
+          Pusher.Util.extend({
+            key: context.key,
+            encrypted: context.encrypted,
+            timeline: context.timeline,
+            ignoreNullOrigin: context.ignoreNullOrigin
+          }, options)
+        );
+      } else {
+        transport = UnsupportedStrategy;
+      }
+
       var newContext = context.def(context, name, transport)[1];
       newContext.transports = context.transports || {};
       newContext.transports[name] = transport;
@@ -2515,7 +2550,7 @@
   /**
    * Provides functions for handling Pusher protocol-specific messages.
    */
-  Protocol = {};
+  var Protocol = {};
 
   /**
    * Decodes a message in a Pusher format.
@@ -2572,7 +2607,11 @@
     message = this.decodeMessage(message);
 
     if (message.event === "pusher:connection_established") {
-      return { action: "connected", id: message.data.socket_id };
+      return {
+        action: "connected",
+        id: message.data.socket_id,
+        activityTimeout: message.data.activity_timeout * 1000
+      };
     } else if (message.event === "pusher:error") {
       // From protocol 6 close codes are sent only once, so this only
       // happens when connection does not support close codes
@@ -2669,6 +2708,7 @@
 
     this.id = id;
     this.transport = transport;
+    this.activityTimeout = transport.activityTimeout;
     this.bindListeners();
   }
   var prototype = Connection.prototype;
@@ -2744,9 +2784,6 @@
         self.emit('message', message);
       }
     };
-    var onPingRequest = function() {
-      self.emit("ping_request");
-    };
     var onError = function(error) {
       self.emit("error", { type: "WebSocketError", error: error });
     };
@@ -2764,12 +2801,10 @@
     var unbindListeners = function() {
       self.transport.unbind("closed", onClosed);
       self.transport.unbind("error", onError);
-      self.transport.unbind("ping_request", onPingRequest);
       self.transport.unbind("message", onMessage);
     };
 
     self.transport.bind("message", onMessage);
-    self.transport.bind("ping_request", onPingRequest);
     self.transport.bind("error", onError);
     self.transport.bind("closed", onClosed);
   };
@@ -2829,7 +2864,8 @@
         var result = Pusher.Protocol.processHandshake(m);
         if (result.action === "connected") {
           self.finish("connected", {
-            connection: new Pusher.Connection(result.id, self.transport)
+            connection: new Pusher.Connection(result.id, self.transport),
+            activityTimeout: result.activityTimeout
           });
         } else {
           self.finish(result.action, { error: result.error });
@@ -2884,8 +2920,9 @@
    * - initialized - initial state, never transitioned to
    * - connecting - connection is being established
    * - connected - connection has been fully established
-   * - disconnected - on requested disconnection or before reconnecting
+   * - disconnected - on requested disconnection
    * - unavailable - after connection timeout or when there's no network
+   * - failed - when the connection strategy is not supported
    *
    * Options:
    * - unavailableTimeout - time to transition to unavailable state
@@ -2913,16 +2950,12 @@
 
     Pusher.Network.bind("online", function() {
       self.timeline.info({ netinfo: "online" });
-      if (self.state === "unavailable") {
-        self.connect();
+      if (self.state === "connecting" || self.state === "unavailable") {
+        self.retryIn(0);
       }
     });
     Pusher.Network.bind("offline", function() {
       self.timeline.info({ netinfo: "offline" });
-      if (self.shouldRetry()) {
-        self.disconnect();
-        self.updateState("unavailable");
-      }
     });
 
     this.updateStrategy();
@@ -2937,42 +2970,16 @@
    * to find events emitted on connection attempts.
    */
   prototype.connect = function() {
-    var self = this;
-
-    if (self.connection) {
-      return;
-    }
-    if (self.state === "connecting") {
+    if (this.connection || this.runner) {
       return;
     }
-
-    if (!self.strategy.isSupported()) {
-      self.updateState("failed");
+    if (!this.strategy.isSupported()) {
+      this.updateState("failed");
       return;
     }
-    if (Pusher.Network.isOnline() === false) {
-      self.updateState("unavailable");
-      return;
-    }
-
-    self.updateState("connecting");
-
-    var callback = function(error, handshake) {
-      if (error) {
-        self.runner = self.strategy.connect(0, callback);
-      } else {
-        if (handshake.action === "error") {
-          self.timeline.error({ handshakeError: handshake.error });
-        } else {
-          // we don't support switching connections yet
-          self.runner.abort();
-          self.handshakeCallbacks[handshake.action](handshake);
-        }
-      }
-    };
-    self.runner = self.strategy.connect(0, callback);
-
-    self.setUnavailableTimer();
+    this.updateState("connecting");
+    this.startConnecting();
+    this.setUnavailableTimer();
   };
 
   /** Sends raw data.
@@ -3004,24 +3011,52 @@
 
   /** Closes the connection. */
   prototype.disconnect = function() {
+    this.disconnectInternally();
+    this.updateState("disconnected");
+  };
+
+  prototype.isEncrypted = function() {
+    return this.encrypted;
+  };
+
+  /** @private */
+  prototype.startConnecting = function() {
+    var self = this;
+    var callback = function(error, handshake) {
+      if (error) {
+        self.runner = self.strategy.connect(0, callback);
+      } else {
+        if (handshake.action === "error") {
+          self.timeline.error({ handshakeError: handshake.error });
+        } else {
+          self.abortConnecting(); // we don't support switching connections yet
+          self.handshakeCallbacks[handshake.action](handshake);
+        }
+      }
+    };
+    self.runner = self.strategy.connect(0, callback);
+  };
+
+  /** @private */
+  prototype.abortConnecting = function() {
     if (this.runner) {
       this.runner.abort();
+      this.runner = null;
     }
+  };
+
+  /** @private */
+  prototype.disconnectInternally = function() {
+    this.abortConnecting();
     this.clearRetryTimer();
     this.clearUnavailableTimer();
     this.stopActivityCheck();
-    this.updateState("disconnected");
-    // we're in disconnected state, so closing will not cause reconnecting
     if (this.connection) {
-      this.connection.close();
-      this.abandonConnection();
+      var connection = this.abandonConnection();
+      connection.close();
     }
   };
 
-  prototype.isEncrypted = function() {
-    return this.encrypted;
-  };
-
   /** @private */
   prototype.updateStrategy = function() {
     this.strategy = this.options.getStrategy({
@@ -3039,7 +3074,7 @@
       self.emit("connecting_in", Math.round(delay / 1000));
     }
     self.retryTimer = new Pusher.Timer(delay || 0, function() {
-      self.disconnect();
+      self.disconnectInternally();
       self.connect();
     });
   };
@@ -3048,6 +3083,7 @@
   prototype.clearRetryTimer = function() {
     if (this.retryTimer) {
       this.retryTimer.ensureAborted();
+      this.retryTimer = null;
     }
   };
 
@@ -3076,7 +3112,7 @@
     if (!this.connection.supportsPing()) {
       var self = this;
       self.activityTimer = new Pusher.Timer(
-        self.options.activityTimeout,
+        self.activityTimeout,
         function() {
           self.send_event('pusher:ping', {});
           // wait for pong response
@@ -3084,7 +3120,7 @@
             self.options.pongTimeout,
             function() {
               self.timeline.error({ pong_timed_out: self.options.pongTimeout });
-              self.connection.close();
+              self.retryIn(0);
             }
           );
         }
@@ -3111,9 +3147,6 @@
       ping: function() {
         self.send_event('pusher:pong', {});
       },
-      ping_request: function() {
-        self.send_event('pusher:ping', {});
-      },
       error: function(error) {
         // just emit error to user - socket will already be closed by browser
         self.emit("error", { type: "WebSocketError", error: error });
@@ -3132,11 +3165,15 @@
     var self = this;
     return Pusher.Util.extend({}, errorCallbacks, {
       connected: function(handshake) {
+        self.activityTimeout = Math.min(
+          self.options.activityTimeout,
+          handshake.activityTimeout,
+          handshake.connection.activityTimeout || Infinity
+        );
         self.clearUnavailableTimer();
         self.setConnection(handshake.connection);
         self.socket_id = self.connection.id;
-        self.timeline.info({ socket_id: self.socket_id });
-        self.updateState("connected");
+        self.updateState("connected", { socket_id: self.socket_id });
       }
     });
   };
@@ -3189,19 +3226,18 @@
     for (var event in this.connectionCallbacks) {
       this.connection.unbind(event, this.connectionCallbacks[event]);
     }
+    var connection = this.connection;
     this.connection = null;
+    return connection;
   };
 
   /** @private */
   prototype.updateState = function(newState, data) {
     var previousState = this.state;
-
     this.state = newState;
-    // Only emit when the state changes
     if (previousState !== newState) {
       Pusher.debug('State changed', previousState + ' -> ' + newState);
-
-      this.timeline.info({ state: newState });
+      this.timeline.info({ state: newState, params: data });
       this.emit('state_change', { previous: previousState, current: newState });
       this.emit(newState, data);
     }
@@ -3546,6 +3582,14 @@
     return this.channels[name];
   };
 
+  /** Returns a list of all channels
+   *
+   * @return {Array}
+   */
+  prototype.all = function(name) {
+    return Pusher.Util.values(this.channels);
+  };
+
   /** Finds a channel by its name.
    *
    * @param {String} name

data/features/support/application/views/index.erb

@@ -13,7 +13,7 @@
   <ul></ul>
 </section>
 
-<script src="/javascripts/vendor/pusher-2.1.3.js"></script>
+<script src="/javascripts/vendor/pusher-2.1.5.js"></script>
 <script>
 window.addEventListener("DOMContentLoaded", function() {
   // Create the client instance using the PusherFake server.

data/lib/pusher-fake.rb

@@ -16,7 +16,7 @@ require "pusher-fake/webhook"
 
 module PusherFake
   # The current version string.
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 
   # Call this method to modify the defaults.
   #

data/spec/spec_helper.rb

@@ -8,5 +8,5 @@ end
 
 RSpec.configure do |config|
   config.mock_with :mocha
-  config.include(BartenderHelper)
+  config.include(ConfigurationHelper)
 end

data/spec/support/have_configuration_option_matcher.rb

@@ -1,4 +1,4 @@
-module BartenderHelper
+module ConfigurationHelper
   class ConfigurationOption
     def initialize(option)
       @option = option

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Tristan Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +120,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: 1.3.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: 1.3.10
 - !ruby/object:Gem::Dependency
   name: pusher
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +148,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +204,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.7.2
+        version: 0.8.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.7.2
+        version: 0.8.7.3
 description: A fake Pusher server for development and testing.
 email: hello@tristandunn.com
 executables: []
@@ -236,7 +242,7 @@ files:
 - features/step_definitions/navigation_steps.rb
 - features/step_definitions/presence_steps.rb
 - features/step_definitions/webhook_steps.rb
-- features/support/application/public/javascripts/vendor/pusher-2.1.3.js
+- features/support/application/public/javascripts/vendor/pusher-2.1.5.js
 - features/support/application/views/index.erb
 - features/support/application.rb
 - features/support/coveralls.rb
@@ -279,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A fake Pusher server for development and testing.
@@ -297,7 +303,7 @@ test_files:
 - features/step_definitions/navigation_steps.rb
 - features/step_definitions/presence_steps.rb
 - features/step_definitions/webhook_steps.rb
-- features/support/application/public/javascripts/vendor/pusher-2.1.3.js
+- features/support/application/public/javascripts/vendor/pusher-2.1.5.js
 - features/support/application/views/index.erb
 - features/support/application.rb
 - features/support/coveralls.rb