pusher_rails 0.2.0 → 0.2.2

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+v0.2.2
+======
+- Upgraded to pusher.js 1.12.0
+- Upgraded to backpusher.js 0.0.2
+
+v0.2.1
+======
+- Upgraded to pusher-gem 0.9.2
+
 v0.2.0
 ======
 - Upgraded to pusher-gem 0.9.1

data/README.md

@@ -2,9 +2,9 @@
 =====================
 
 Adds:
-- [pusher-gem v0.9.1](https://github.com/pusher/pusher-gem/tree/v0.9.1)
-- [pusher.js v1.11.0](https://github.com/pusher/pusher-js/tree/v1.11.0)
-- [backpusher.js](https://github.com/pusher/backpusher/commit/e61c9d7a761fcb48f312416408d1bf4ed418735b#diff-1)
+- [pusher-gem v0.9.2](https://github.com/pusher/pusher-gem/tree/v0.9.2)
+- [pusher.js v1.12.0](https://github.com/pusher/pusher-js/tree/v1.12.0)
+- [backpusher.js](https://github.com/pusher/backpusher)
 
 This pulls in the *pusher-gem* as well as adding *pusher.js* and *backpusher.js* to the assets pipeline of your Rails 3.1+ app.
 
@@ -21,16 +21,16 @@ Licenses
 ========
 
     /*!
-     * Pusher JavaScript Library v1.11.0
+     * Pusher JavaScript Library v1.12.0
      * http://pusherapp.com/
      *
      * Copyright 2011, Pusher
      * Released under the MIT licence.
      */
 
-     //     Backpusher.js 0.0.1
-     //     (c) 2011 Pusher.
-     //     Backpusher may be freely distributed under the MIT license.
-     //     For all details and documentation:
-     //     http://github.com/pusher/backpusher
+    //     Backpusher.js 0.0.2
+    //     (c) 2011-2012 Pusher.
+    //     Backpusher may be freely distributed under the MIT license.
+    //     For all details and documentation:
+    //     http://github.com/pusher/backpusher
 

data/pusher_rails.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'pusher_rails'
-  s.version       = '0.2.0'
+  s.version       = '0.2.2'
   s.platform      = Gem::Platform::RUBY
   s.authors       = ["David Grandinetti"]
   s.email         = ["dave@wegoto12.com"]
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.description   = 'Adds pusher.js/backpusher.js to the asset pipeline and pusher-gem to to your app.'
   s.homepage      = 'https://github.com/dbgrandi/pusher_rails'
 
-  s.add_dependency "pusher", "~> 0.9.1"
+  s.add_dependency "pusher", "~> 0.9.2"
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]

data/vendor/assets/javascripts/backpusher.js

@@ -1,5 +1,5 @@
-//     Backpusher.js 0.0.1
-//     (c) 2011 Pusher.
+//     Backpusher.js 0.0.2
+//     (c) 2011-2012 Pusher.
 //     Backpusher may be freely distributed under the MIT license.
 //     For all details and documentation:
 //     http://github.com/pusher/backpusher
@@ -92,65 +92,17 @@
     }
   };
 
-  // Map from CRUD to HTTP for our default `Backbone.sync` implementation.
-  var methodMap = {
-    'create': 'POST',
-    'update': 'PUT',
-    'delete': 'DELETE',
-    'read'  : 'GET'
-  };
-
+  // Add socket ID to every Backbone.sync request
+  var origBackboneSync = Backbone.sync;
   Backbone.sync = function(method, model, options) {
-    var type = methodMap[method];
-
-    // Default JSON-request options.
-    var params = _.extend({
-      type:         type,
-      dataType:     'json'
-    }, options);
-
-    if (!(model && model.url)) {
-      throw new Error("A 'url' property or function must be specified");
-    }
-
-    if (!params.url) {
-      params.url = _.isFunction(model.url) ? model.url() : model.url;
-      params.url += '?socket_id=' + Backbone.pusher_socket_id;
-    }
-
-    // Ensure that we have the appropriate request data.
-    if (!params.data && model && (method == 'create' || method == 'update')) {
-      params.contentType = 'application/json';
-      params.data = JSON.stringify(model.toJSON());
-    }
-
-    // For older servers, emulate JSON by encoding the request into an HTML-form.
-    if (Backbone.emulateJSON) {
-      params.contentType = 'application/x-www-form-urlencoded';
-      params.data        = params.data ? {model : params.data} : {};
-    }
-
-    // For older servers, emulate HTTP by mimicking the HTTP method with `_method`
-    // And an `X-HTTP-Method-Override` header.
-    if (Backbone.emulateHTTP) {
-      if (type === 'PUT' || type === 'DELETE') {
-        if (Backbone.emulateJSON) params.data._method = type;
-        params.type = 'POST';
-        params.beforeSend = function(xhr) {
-          xhr.setRequestHeader('X-HTTP-Method-Override', type);
-        };
-      }
-    }
-
-    // Don't process data on a non-GET request.
-    if (params.type !== 'GET' && !Backbone.emulateJSON) {
-      params.processData = false;
-    }
+    options.headers = _.extend(
+      { 'X-Pusher-Socket-ID': Backbone.pusher_socket_id },
+      options.headers
+    );
 
-    // Make the request.
-    return $.ajax(params);
+    return origBackboneSync(method, model, options);
   };
 
   // Export:
   exports.Backpusher = Backpusher;
-})((typeof exports !== 'undefined' ? exports : this));
+})((typeof exports !== 'undefined' ? exports : this));

data/vendor/assets/javascripts/pusher.js

@@ -1,206 +1,211 @@
 /*!
- * Pusher JavaScript Library v1.11.0
+ * Pusher JavaScript Library v1.12.0
  * http://pusherapp.com/
  *
  * Copyright 2011, Pusher
  * Released under the MIT licence.
  */
 
-if (Function.prototype.scopedTo === undefined) {
-  Function.prototype.scopedTo = function(context, args) {
-    var f = this;
-    return function() {
-      return f.apply(context, Array.prototype.slice.call(args || [])
-        .concat(Array.prototype.slice.call(arguments)));
+;(function() {
+  if (Function.prototype.scopedTo === undefined) {
+    Function.prototype.scopedTo = function(context, args) {
+      var f = this;
+      return function() {
+        return f.apply(context, Array.prototype.slice.call(args || [])
+                       .concat(Array.prototype.slice.call(arguments)));
+      };
     };
-  };
-}
-
-var Pusher = function(app_key, options) {
-  this.options = options || {};
-  this.key = app_key;
-  this.channels = new Pusher.Channels();
-  this.global_emitter = new Pusher.EventsDispatcher()
-
-  var self = this;
-
-  this.checkAppKey();
-
-  this.connection = new Pusher.Connection(this.key, this.options);
-
-  // Setup / teardown connection
-  this.connection
-    .bind('connected', function() {
-      self.subscribeAll();
-    })
-    .bind('message', function(params) {
-      var internal = (params.event.indexOf('pusher_internal:') === 0);
-      if (params.channel) {
-        var channel;
-        if (channel = self.channel(params.channel)) {
-          channel.emit(params.event, params.data);
+  }
+
+  var Pusher = function(app_key, options) {
+    this.options = options || {};
+    this.key = app_key;
+    this.channels = new Pusher.Channels();
+    this.global_emitter = new Pusher.EventsDispatcher()
+
+    var self = this;
+
+    this.checkAppKey();
+
+    this.connection = new Pusher.Connection(this.key, this.options);
+
+    // Setup / teardown connection
+    this.connection
+      .bind('connected', function() {
+        self.subscribeAll();
+      })
+      .bind('message', function(params) {
+        var internal = (params.event.indexOf('pusher_internal:') === 0);
+        if (params.channel) {
+          var channel;
+          if (channel = self.channel(params.channel)) {
+            channel.emit(params.event, params.data);
+          }
         }
-      }
-      // Emit globaly [deprecated]
-      if (!internal) self.global_emitter.emit(params.event, params.data);
-    })
-    .bind('disconnected', function() {
-      self.channels.disconnect();
-    })
-    .bind('error', function(err) {
-      Pusher.warn('Error', err);
-    });
+        // Emit globaly [deprecated]
+        if (!internal) self.global_emitter.emit(params.event, params.data);
+      })
+      .bind('disconnected', function() {
+        self.channels.disconnect();
+      })
+      .bind('error', function(err) {
+        Pusher.warn('Error', err);
+      });
 
-  Pusher.instances.push(this);
+    Pusher.instances.push(this);
 
-  if (Pusher.isReady) self.connect();
-};
-Pusher.instances = [];
-Pusher.prototype = {
-  channel: function(name) {
-    return this.channels.find(name);
-  },
+    if (Pusher.isReady) self.connect();
+  };
+  Pusher.instances = [];
+  Pusher.prototype = {
+    channel: function(name) {
+      return this.channels.find(name);
+    },
 
-  connect: function() {
-    this.connection.connect();
-  },
+    connect: function() {
+      this.connection.connect();
+    },
 
-  disconnect: function() {
-    this.connection.disconnect();
-  },
+    disconnect: function() {
+      this.connection.disconnect();
+    },
 
-  bind: function(event_name, callback) {
-    this.global_emitter.bind(event_name, callback);
-    return this;
-  },
+    bind: function(event_name, callback) {
+      this.global_emitter.bind(event_name, callback);
+      return this;
+    },
 
-  bind_all: function(callback) {
-    this.global_emitter.bind_all(callback);
-    return this;
-  },
+    bind_all: function(callback) {
+      this.global_emitter.bind_all(callback);
+      return this;
+    },
 
-  subscribeAll: function() {
-    var channel;
-    for (channel in this.channels.channels) {
-      if (this.channels.channels.hasOwnProperty(channel)) {
-        this.subscribe(channel);
+    subscribeAll: function() {
+      var channel;
+      for (channelName in this.channels.channels) {
+        if (this.channels.channels.hasOwnProperty(channelName)) {
+          this.subscribe(channelName);
+        }
       }
-    }
-  },
+    },
 
-  subscribe: function(channel_name) {
-    var self = this;
-    var channel = this.channels.add(channel_name, this);
-    if (this.connection.state === 'connected') {
-      channel.authorize(this, function(err, data) {
-        if (err) {
-          channel.emit('pusher:subscription_error', data);
-        } else {
-          self.send_event('pusher:subscribe', {
-            channel: channel_name,
-            auth: data.auth,
-            channel_data: data.channel_data
-          });
-        }
-      });
-    }
-    return channel;
-  },
+    subscribe: function(channel_name) {
+      var self = this;
+      var channel = this.channels.add(channel_name, this);
+
+      if (this.connection.state === 'connected') {
+        channel.authorize(this.connection.socket_id, this.options, function(err, data) {
+          if (err) {
+            channel.emit('pusher:subscription_error', data);
+          } else {
+            self.send_event('pusher:subscribe', {
+              channel: channel_name,
+              auth: data.auth,
+              channel_data: data.channel_data
+            });
+          }
+        });
+      }
+      return channel;
+    },
 
-  unsubscribe: function(channel_name) {
-    this.channels.remove(channel_name);
-    if (this.connection.state === 'connected') {
-      this.send_event('pusher:unsubscribe', {
-        channel: channel_name
-      });
-    }
-  },
+    unsubscribe: function(channel_name) {
+      this.channels.remove(channel_name);
+      if (this.connection.state === 'connected') {
+        this.send_event('pusher:unsubscribe', {
+          channel: channel_name
+        });
+      }
+    },
 
-  send_event: function(event_name, data, channel) {
-    return this.connection.send_event(event_name, data, channel);
-  },
+    send_event: function(event_name, data, channel) {
+      return this.connection.send_event(event_name, data, channel);
+    },
 
-  checkAppKey: function() {
-    if(this.key === null || this.key === undefined) {
-      Pusher.warn('Warning', 'You must pass your app key when you instantiate Pusher.');
-    }
-  }
-};
-
-Pusher.Util = {
-  extend: function extend(target, extensions) {
-    for (var property in extensions) {
-      if (extensions[property] && extensions[property].constructor &&
-        extensions[property].constructor === Object) {
-        target[property] = extend(target[property] || {}, extensions[property]);
-      } else {
-        target[property] = extensions[property];
+    checkAppKey: function() {
+      if(this.key === null || this.key === undefined) {
+        Pusher.warn('Warning', 'You must pass your app key when you instantiate Pusher.');
       }
     }
-    return target;
-  },
-
-  stringify: function stringify() {
-    var m = ["Pusher"]
-    for (var i = 0; i < arguments.length; i++){
-      if (typeof arguments[i] === "string") {
-        m.push(arguments[i])
-      } else {
-        if (window['JSON'] == undefined) {
-          m.push(arguments[i].toString());
+  };
+
+  Pusher.Util = {
+    extend: function extend(target, extensions) {
+      for (var property in extensions) {
+        if (extensions[property] && extensions[property].constructor &&
+            extensions[property].constructor === Object) {
+          target[property] = extend(target[property] || {}, extensions[property]);
         } else {
-          m.push(JSON.stringify(arguments[i]))
+          target[property] = extensions[property];
         }
       }
-    };
-    return m.join(" : ")
-  },
-
-  arrayIndexOf: function(array, item) { // MSIE doesn't have array.indexOf
-    var nativeIndexOf = Array.prototype.indexOf;
-    if (array == null) return -1;
-    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item);
-    for (i = 0, l = array.length; i < l; i++) if (array[i] === item) return i;
-    return -1;
-  }
-};
-
-// To receive log output provide a Pusher.log function, for example
-// Pusher.log = function(m){console.log(m)}
-Pusher.debug = function() {
-  if (!Pusher.log) return
-  Pusher.log(Pusher.Util.stringify.apply(this, arguments))
-}
-Pusher.warn = function() {
-  if (window.console && window.console.warn) {
-    window.console.warn(Pusher.Util.stringify.apply(this, arguments));
-  } else {
+      return target;
+    },
+
+    stringify: function stringify() {
+      var m = ["Pusher"]
+      for (var i = 0; i < arguments.length; i++){
+        if (typeof arguments[i] === "string") {
+          m.push(arguments[i])
+        } else {
+          if (window['JSON'] == undefined) {
+            m.push(arguments[i].toString());
+          } else {
+            m.push(JSON.stringify(arguments[i]))
+          }
+        }
+      };
+      return m.join(" : ")
+    },
+
+    arrayIndexOf: function(array, item) { // MSIE doesn't have array.indexOf
+      var nativeIndexOf = Array.prototype.indexOf;
+      if (array == null) return -1;
+      if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item);
+      for (i = 0, l = array.length; i < l; i++) if (array[i] === item) return i;
+      return -1;
+    }
+  };
+
+  // To receive log output provide a Pusher.log function, for example
+  // Pusher.log = function(m){console.log(m)}
+  Pusher.debug = function() {
     if (!Pusher.log) return
-    Pusher.log(Pusher.Util.stringify.apply(this, arguments));
+    Pusher.log(Pusher.Util.stringify.apply(this, arguments))
   }
-};
-
-// Pusher defaults
-Pusher.VERSION = '1.11.0';
-
-Pusher.host = 'ws.pusherapp.com';
-Pusher.ws_port = 80;
-Pusher.wss_port = 443;
-Pusher.channel_auth_endpoint = '/pusher/auth';
-Pusher.cdn_http = 'http://js.pusher.com/'
-Pusher.cdn_https = 'https://d3dy5gmtp8yhk7.cloudfront.net/'
-Pusher.dependency_suffix = '';
-Pusher.channel_auth_transport = 'ajax';
-Pusher.activity_timeout = 120000;
-Pusher.pong_timeout = 30000;
-
-Pusher.isReady = false;
-Pusher.ready = function() {
-  Pusher.isReady = true;
-  for (var i = 0, l = Pusher.instances.length; i < l; i++) {
-    Pusher.instances[i].connect();
-  }
-};
+  Pusher.warn = function() {
+    if (window.console && window.console.warn) {
+      window.console.warn(Pusher.Util.stringify.apply(this, arguments));
+    } else {
+      if (!Pusher.log) return
+      Pusher.log(Pusher.Util.stringify.apply(this, arguments));
+    }
+  };
+
+  // Pusher defaults
+  Pusher.VERSION = '1.12.0';
+
+  Pusher.host = 'ws.pusherapp.com';
+  Pusher.ws_port = 80;
+  Pusher.wss_port = 443;
+  Pusher.channel_auth_endpoint = '/pusher/auth';
+  Pusher.cdn_http = 'http://js.pusher.com/'
+  Pusher.cdn_https = 'https://d3dy5gmtp8yhk7.cloudfront.net/'
+  Pusher.dependency_suffix = '';
+  Pusher.channel_auth_transport = 'ajax';
+  Pusher.activity_timeout = 120000;
+  Pusher.pong_timeout = 30000;
+
+  Pusher.isReady = false;
+  Pusher.ready = function() {
+    Pusher.isReady = true;
+    for (var i = 0, l = Pusher.instances.length; i < l; i++) {
+      Pusher.instances[i].connect();
+    }
+  };
+
+  this.Pusher = Pusher;
+}).call(this);
 
 ;(function() {
 /* Abstract event binding
@@ -230,7 +235,7 @@ Example:
     this.callbacks[event_name].push(callback);
     return this;// chainable
   };
-  
+
   EventsDispatcher.prototype.unbind = function(eventName, callback) {
     if(this.callbacks[eventName]) {
       var index = Pusher.Util.arrayIndexOf(this.callbacks[eventName], callback);
@@ -307,6 +312,11 @@ Example:
     var stateCallbacks = this.stateActions;
 
     if (prevState && (Pusher.Util.arrayIndexOf(this.transitions[prevState], nextState) == -1)) {
+      this.emit('invalid_transition_attempt', {
+        oldState: prevState,
+        newState: nextState
+      });
+
       throw new Error('Invalid transition [' + prevState + ' to ' + nextState + ']');
     }
 
@@ -350,6 +360,7 @@ Example:
     A little bauble to interface with window.navigator.onLine,
     window.ononline and window.onoffline.  Easier to mock.
   */
+
   var NetInfo = function() {
     var self = this;
     Pusher.EventsDispatcher.call(this);
@@ -376,7 +387,7 @@ Example:
   };
 
   Pusher.Util.extend(NetInfo.prototype, Pusher.EventsDispatcher.prototype);
-  
+
   this.Pusher.NetInfo = NetInfo;
 }).call(this);
 
@@ -431,7 +442,7 @@ Example:
     this.netInfo.bind('online', function(){
       if (self._machine.is('waiting')) {
         self._machine.transition('connecting');
-        triggerStateChange('connecting');
+        updateState('connecting');
       }
     });
 
@@ -452,8 +463,6 @@ Example:
 
     // define the state machine that runs the connection
     this._machine = new Pusher.Machine('initialized', machineTransitions, {
-
-      // TODO: Use the constructor for this.
       initializedPre: function() {
         self.compulsorySecure = self.options.encrypted;
 
@@ -469,16 +478,18 @@ Example:
           self.emit('connecting_in', self.connectionWait);
         }
 
-        if (self.netInfo.isOnLine() === false || self.connectionAttempts > 4){
-          triggerStateChange('unavailable');
+        if (self.netInfo.isOnLine() && self.connectionAttempts <= 4) {
+          updateState('connecting');
         } else {
-          triggerStateChange('connecting');
+          updateState('unavailable');
         }
 
-        if (self.netInfo.isOnLine() === true) {
+        // When in the unavailable state we attempt to connect, but don't
+        // broadcast that fact
+        if (self.netInfo.isOnLine()) {
           self._waitingTimer = setTimeout(function() {
             self._machine.transition('connecting');
-          }, self.connectionWait);
+          }, connectionDelay());
         }
       },
 
@@ -491,7 +502,7 @@ Example:
         // state even when offline.
         if (self.netInfo.isOnLine() === false) {
           self._machine.transition('waiting');
-          triggerStateChange('unavailable');
+          updateState('unavailable');
 
           return;
         }
@@ -513,6 +524,7 @@ Example:
 
       connectingExit: function() {
         clearTimeout(self._connectingTimer);
+        self.socket.onopen = undefined; // unbind to avoid open events that are no longer relevant
       },
 
       connectingToWaiting: function() {
@@ -538,6 +550,7 @@ Example:
 
       openExit: function() {
         clearTimeout(self._openTimer);
+        self.socket.onmessage = undefined; // unbind to avoid messages that are no longer relevant
       },
 
       openToWaiting: function() {
@@ -556,17 +569,18 @@ Example:
         self.socket.onclose = transitionToWaiting;
 
         resetConnectionParameters(self);
+        self.connectedAt = new Date().getTime();
 
         resetActivityCheck();
       },
 
       connectedPost: function() {
-        triggerStateChange('connected');
+        updateState('connected');
       },
 
       connectedExit: function() {
         stopActivityCheck();
-        triggerStateChange('disconnected');
+        updateState('disconnected');
       },
 
       impermanentlyClosingPost: function() {
@@ -591,8 +605,12 @@ Example:
       },
 
       failedPre: function() {
-        triggerStateChange('failed');
+        updateState('failed');
         Pusher.debug('WebSockets are not available in this browser.');
+      },
+
+      permanentlyClosedPost: function() {
+        updateState('disconnected');
       }
     });
 
@@ -633,7 +651,11 @@ Example:
         protocol = 'wss://';
       }
 
-      return protocol + Pusher.host + ':' + port + '/app/' + key + '?client=js&version=' + Pusher.VERSION;
+      var flash = (Pusher.TransportType === "flash") ? "true" : "false";
+
+      return protocol + Pusher.host + ':' + port + '/app/' + key + '?protocol=5&client=js'
+        + '&version=' + Pusher.VERSION
+        + '&flash=' + flash;
     }
 
     // callback for close and retry.  Used on timeouts.
@@ -657,6 +679,25 @@ Example:
       if (self._activityTimer) { clearTimeout(self._activityTimer); }
     }
 
+    // Returns the delay before the next connection attempt should be made
+    //
+    // This function guards against attempting to connect more frequently than
+    // once every second
+    //
+    function connectionDelay() {
+      var delay = self.connectionWait;
+      if (delay === 0) {
+        if (self.connectedAt) {
+          var t = 1000;
+          var connectedFor = new Date().getTime() - self.connectedAt;
+          if (connectedFor < t) {
+            delay = t - connectedFor;
+          }
+        }
+      }
+      return delay;
+    }
+
     /*-----------------------------------------------
       WebSocket Callbacks
       -----------------------------------------------*/
@@ -666,28 +707,40 @@ Example:
       self._machine.transition('open');
     };
 
+    function handleCloseCode(code, message) {
+      // first inform the end-developer of this error
+      self.emit('error', {type: 'PusherError', data: {code: code, message: message}});
+
+      if (code === 4000) {
+        // SSL only app
+        self.compulsorySecure = true;
+        self.connectionSecure = true;
+        self.options.encrypted = true;
+
+        self._machine.transition('impermanentlyClosing')
+      } else if (code < 4100) {
+        // Permentently close connection
+        self._machine.transition('permanentlyClosing')
+      } else if (code < 4200) {
+        // Backoff before reconnecting
+        self.connectionWait = 1000;
+        self._machine.transition('waiting')
+      } else if (code < 4300) {
+        // Reconnect immediately
+        self._machine.transition('impermanentlyClosing')
+      } else {
+        // Unknown error
+        self._machine.transition('permanentlyClosing')
+      }
+    }
+
     function ws_onMessageOpen(event) {
       var params = parseWebSocketEvent(event);
       if (params !== undefined) {
         if (params.event === 'pusher:connection_established') {
           self._machine.transition('connected', params.data.socket_id);
         } else if (params.event === 'pusher:error') {
-          // first inform the end-developer of this error
-          self.emit('error', {type: 'PusherError', data: params.data});
-
-          switch (params.data.code) {
-            case 4000:
-              Pusher.warn(params.data.message);
-
-              self.compulsorySecure = true;
-              self.connectionSecure = true;
-              self.options.encrypted = true;
-              break;
-            case 4001:
-              // App not found by key - close connection
-              self._machine.transition('permanentlyClosing');
-              break;
-          }
+          handleCloseCode(params.data.code, params.data.message)
         }
       }
     }
@@ -753,19 +806,21 @@ Example:
       self._machine.transition('impermanentlyClosing');
     }
 
-    function triggerStateChange(newState, data) {
-      // avoid emitting and changing the state
-      // multiple times when it's the same.
-      if (self.state === newState) return;
-
+    // Updates the public state information exposed by connection
+    //
+    // This is distinct from the internal state information used by _machine
+    // to manage the connection
+    //
+    function updateState(newState, data) {
       var prevState = self.state;
-
       self.state = newState;
 
-      Pusher.debug('State changed', prevState + ' -> ' + newState);
-
-      self.emit('state_change', {previous: prevState, current: newState});
-      self.emit(newState, data);
+      // Only emit when the state changes
+      if (prevState !== newState) {
+        Pusher.debug('State changed', prevState + ' -> ' + newState);
+        self.emit('state_change', {previous: prevState, current: newState});
+        self.emit(newState, data);
+      }
     }
   };
 
@@ -785,14 +840,24 @@ Example:
     }
     // user re-opening connection after closing it
     else if(this._machine.is("permanentlyClosed")) {
+      resetConnectionParameters(this);
       this._machine.transition('waiting');
     }
   };
 
   Connection.prototype.send = function(data) {
     if (this._machine.is('connected')) {
-      this.socket.send(data);
-      return true;
+      // Bug in iOS (reproduced in 5.0.1) Mobile Safari:
+      // 1. Open page/tab, connect WS, get some data.
+      // 2. Switch tab or close Mobile Safari and wait for WS connection to get closed (probably by server).
+      // 3. Switch back to tab or open Mobile Safari and Mobile Safari crashes.
+      // The problem is that WS tries to send data on closed WS connection before it realises it is closed.
+      // The timeout means that by the time the send happens, the WS readyState correctly reflects closed state.
+      var self = this;
+      setTimeout(function() {
+        self.socket.send(data);
+      }, 0);
+      return true; // only a reflection of fact that WS thinks it is open - could get returned before some lower-level failure.
     } else {
       return false;
     }
@@ -823,185 +888,151 @@ Example:
   this.Pusher.Connection = Connection;
 }).call(this);
 
-Pusher.Channels = function() {
-  this.channels = {};
-};
+;(function() {
+  Pusher.Channels = function() {
+    this.channels = {};
+  };
 
-Pusher.Channels.prototype = {
-  add: function(channel_name, pusher) {
-    var existing_channel = this.find(channel_name);
-    if (!existing_channel) {
-      var channel = Pusher.Channel.factory(channel_name, pusher);
-      this.channels[channel_name] = channel;
-      return channel;
-    } else {
-      return existing_channel;
-    }
-  },
+  Pusher.Channels.prototype = {
+    add: function(channel_name, pusher) {
+      var existing_channel = this.find(channel_name);
+      if (!existing_channel) {
+        var channel = Pusher.Channel.factory(channel_name, pusher);
+        this.channels[channel_name] = channel;
+        return channel;
+      } else {
+        return existing_channel;
+      }
+    },
 
-  find: function(channel_name) {
-    return this.channels[channel_name];
-  },
+    find: function(channel_name) {
+      return this.channels[channel_name];
+    },
 
-  remove: function(channel_name) {
-    delete this.channels[channel_name];
-  },
+    remove: function(channel_name) {
+      delete this.channels[channel_name];
+    },
 
-  disconnect: function () {
-    for(var channel_name in this.channels){
-      this.channels[channel_name].disconnect()
+    disconnect: function () {
+      for(var channel_name in this.channels){
+        this.channels[channel_name].disconnect()
+      }
     }
-  }
-};
-
-Pusher.Channel = function(channel_name, pusher) {
-  var self = this;
-  Pusher.EventsDispatcher.call(this, function(event_name, event_data) {
-    Pusher.debug('No callbacks on ' + channel_name + ' for ' + event_name);
-  });
-
-  this.pusher = pusher;
-  this.name = channel_name;
-  this.subscribed = false;
-
-  this.bind('pusher_internal:subscription_succeeded', function(data) {
-    self.onSubscriptionSucceeded(data);
-  });
-};
-
-Pusher.Channel.prototype = {
-  // inheritable constructor
-  init: function() {},
-  disconnect: function() {},
-
-  onSubscriptionSucceeded: function(data) {
-    this.subscribed = true;
-    this.emit('pusher:subscription_succeeded');
-  },
-
-  authorize: function(pusher, callback){
-    callback(false, {}); // normal channels don't require auth
-  },
-
-  trigger: function(event, data) {
-    return this.pusher.send_event(event, data, this.name);
-  }
-};
+  };
 
-Pusher.Util.extend(Pusher.Channel.prototype, Pusher.EventsDispatcher.prototype);
+  Pusher.Channel = function(channel_name, pusher) {
+    var self = this;
+    Pusher.EventsDispatcher.call(this, function(event_name, event_data) {
+      Pusher.debug('No callbacks on ' + channel_name + ' for ' + event_name);
+    });
 
+    this.pusher = pusher;
+    this.name = channel_name;
+    this.subscribed = false;
 
+    this.bind('pusher_internal:subscription_succeeded', function(data) {
+      self.onSubscriptionSucceeded(data);
+    });
+  };
 
-Pusher.auth_callbacks = {};
+  Pusher.Channel.prototype = {
+    // inheritable constructor
+    init: function() {},
+    disconnect: function() {
+      this.subscribed = false;
+      this.emit("pusher_internal:disconnected");
+    },
 
-Pusher.authorizers = {
-  ajax: function(pusher, callback){
-    var self = this, xhr;
+    onSubscriptionSucceeded: function(data) {
+      this.subscribed = true;
+      this.emit('pusher:subscription_succeeded');
+    },
 
-    if (Pusher.XHR) {
-      xhr = new Pusher.XHR();
-    } else {
-      xhr = (window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"));
-    }
+    authorize: function(socketId, options, callback){
+      return callback(false, {}); // normal channels don't require auth
+    },
 
-    xhr.open("POST", Pusher.channel_auth_endpoint, true);
-    xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded")
-    xhr.onreadystatechange = function() {
-      if (xhr.readyState == 4) {
-        if (xhr.status == 200) {
-          var data, parsed = false;
+    trigger: function(event, data) {
+      return this.pusher.send_event(event, data, this.name);
+    }
+  };
 
-          try {
-            data = JSON.parse(xhr.responseText);
-            parsed = true;
-          } catch (e) {
-            callback(true, 'JSON returned from webapp was invalid, yet status code was 200. Data was: ' + xhr.responseText);
-          }
+  Pusher.Util.extend(Pusher.Channel.prototype, Pusher.EventsDispatcher.prototype);
 
-          if (parsed) { // prevents double execution.
-            callback(false, data);
-          }
-        } else {
-          Pusher.warn("Couldn't get auth info from your webapp", status);
-          callback(true, xhr.status);
+  Pusher.Channel.PrivateChannel = {
+    authorize: function(socketId, options, callback){
+      var self = this;
+      var authorizer = new Pusher.Channel.Authorizer(this, Pusher.channel_auth_transport, options);
+      return authorizer.authorize(socketId, function(err, authData) {
+        if(!err) {
+          self.emit('pusher_internal:authorized', authData);
         }
-      }
-    };
-    xhr.send('socket_id=' + encodeURIComponent(pusher.connection.socket_id) + '&channel_name=' + encodeURIComponent(self.name));
-  },
-  jsonp: function(pusher, callback){
-    var qstring = 'socket_id=' + encodeURIComponent(pusher.connection.socket_id) + '&channel_name=' + encodeURIComponent(this.name);
-    var script = document.createElement("script");
-    // Hacked wrapper.
-    Pusher.auth_callbacks[this.name] = function(data) {
-      callback(false, data);
-    };
-    var callback_name = "Pusher.auth_callbacks['" + this.name + "']";
-    script.src = Pusher.channel_auth_endpoint+'?callback='+encodeURIComponent(callback_name)+'&'+qstring;
-    var head = document.getElementsByTagName("head")[0] || document.documentElement;
-    head.insertBefore( script, head.firstChild );
-  }
-};
 
-Pusher.Channel.PrivateChannel = {
-  authorize: function(pusher, callback){
-    Pusher.authorizers[Pusher.channel_auth_transport].scopedTo(this)(pusher, callback);
-  }
-};
-
-Pusher.Channel.PresenceChannel = {
-  init: function(){
-    this.bind('pusher_internal:member_added', function(data){
-      var member = this.members.add(data.user_id, data.user_info);
-      this.emit('pusher:member_added', member);
-    }.scopedTo(this))
-
-    this.bind('pusher_internal:member_removed', function(data){
-      var member = this.members.remove(data.user_id);
-      if (member) {
-        this.emit('pusher:member_removed', member);
-      }
-    }.scopedTo(this))
-  },
+        callback(err, authData);
+      });
+    }
+  };
 
-  disconnect: function(){
-    this.members.clear();
-  },
+  Pusher.Channel.PresenceChannel = {
+    init: function(){
+      this.members = new Members(this); // leeches off channel events
+    },
 
-  onSubscriptionSucceeded: function(data) {
-    this.members._members_map = data.presence.hash;
-    this.members.count = data.presence.count;
-    this.subscribed = true;
+    onSubscriptionSucceeded: function(data) {
+      this.subscribed = true;
+      // We override this because we want the Members obj to be responsible for
+      // emitting the pusher:subscription_succeeded.  It will do this after it has done its work.
+    }
+  };
 
-    this.emit('pusher:subscription_succeeded', this.members);
-  },
+  var Members = function(channel) {
+    var self = this;
 
-  members: {
-    _members_map: {},
-    count: 0,
+    var reset = function() {
+      this._members_map = {};
+      this.count = 0;
+      this.me = null;
+    };
+    reset.call(this);
+
+    channel.bind('pusher_internal:authorized', function(authorizedData) {
+      var channelData = JSON.parse(authorizedData.channel_data);
+      channel.bind("pusher_internal:subscription_succeeded", function(subscriptionData) {
+        self._members_map = subscriptionData.presence.hash;
+        self.count = subscriptionData.presence.count;
+        self.me = self.get(channelData.user_id);
+        channel.emit('pusher:subscription_succeeded', self);
+      });
+    });
 
-    each: function(callback) {
-      for(var i in this._members_map) {
-        callback({
-          id: i,
-          info: this._members_map[i]
-        });
+    channel.bind('pusher_internal:member_added', function(data) {
+      if(self.get(data.user_id) === null) { // only incr if user_id does not already exist
+        self.count++;
       }
-    },
 
-    add: function(id, info) {
-      this._members_map[id] = info;
-      this.count++;
-      return this.get(id);
-    },
+      self._members_map[data.user_id] = data.user_info;
+      channel.emit('pusher:member_added', self.get(data.user_id));
+    });
 
-    remove: function(user_id) {
-      var member = this.get(user_id);
-      if (member) {
-        delete this._members_map[user_id];
-        this.count--;
+    channel.bind('pusher_internal:member_removed', function(data) {
+      var member = self.get(data.user_id);
+      if(member) {
+        delete self._members_map[data.user_id];
+        self.count--;
+        channel.emit('pusher:member_removed', member);
+      }
+    });
+
+    channel.bind('pusher_internal:disconnected', function() {
+      reset.call(self);
+    });
+  };
+
+  Members.prototype = {
+    each: function(callback) {
+      for(var i in this._members_map) {
+        callback(this.get(i));
       }
-      return member;
     },
 
     get: function(user_id) {
@@ -1013,27 +1044,114 @@ Pusher.Channel.PresenceChannel = {
       } else { // have never heard of this user
         return null;
       }
+    }
+  };
+
+  Pusher.Channel.factory = function(channel_name, pusher){
+    var channel = new Pusher.Channel(channel_name, pusher);
+    if (channel_name.indexOf('private-') === 0) {
+      Pusher.Util.extend(channel, Pusher.Channel.PrivateChannel);
+    } else if (channel_name.indexOf('presence-') === 0) {
+      Pusher.Util.extend(channel, Pusher.Channel.PrivateChannel);
+      Pusher.Util.extend(channel, Pusher.Channel.PresenceChannel);
+    };
+    channel.init();
+    return channel;
+  };
+}).call(this);
+;(function() {
+  Pusher.Channel.Authorizer = function(channel, type, options) {
+    this.channel = channel;
+    this.type = type;
+
+    this.authOptions = (options || {}).auth || {};
+  };
+
+  Pusher.Channel.Authorizer.prototype = {
+    composeQuery: function(socketId) {
+      var query = '&socket_id=' + encodeURIComponent(socketId)
+        + '&channel_name=' + encodeURIComponent(this.channel.name);
+
+      for(var i in this.authOptions.params) {
+        query += "&" + encodeURIComponent(i) + "=" + encodeURIComponent(this.authOptions.params[i]);
+      }
+
+      return query;
     },
 
-    clear: function() {
-      this._members_map = {};
-      this.count = 0;
+    authorize: function(socketId, callback) {
+      return Pusher.authorizers[this.type].call(this, socketId, callback);
     }
-  }
-};
-
-Pusher.Channel.factory = function(channel_name, pusher){
-  var channel = new Pusher.Channel(channel_name, pusher);
-  if (channel_name.indexOf('private-') === 0) {
-    Pusher.Util.extend(channel, Pusher.Channel.PrivateChannel);
-  } else if (channel_name.indexOf('presence-') === 0) {
-    Pusher.Util.extend(channel, Pusher.Channel.PrivateChannel);
-    Pusher.Util.extend(channel, Pusher.Channel.PresenceChannel);
   };
-  channel.init();
-  return channel;
-};
 
+
+  Pusher.auth_callbacks = {};
+  Pusher.authorizers = {
+    ajax: function(socketId, callback){
+      var self = this, xhr;
+
+      if (Pusher.XHR) {
+        xhr = new Pusher.XHR();
+      } else {
+        xhr = (window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"));
+      }
+
+      xhr.open("POST", Pusher.channel_auth_endpoint, true);
+
+      // add request headers
+      xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded")
+      for(var headerName in this.authOptions.headers) {
+        xhr.setRequestHeader(headerName, this.authOptions.headers[headerName]);
+      }
+
+      xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+          if (xhr.status == 200) {
+            var data, parsed = false;
+
+            try {
+              data = JSON.parse(xhr.responseText);
+              parsed = true;
+            } catch (e) {
+              callback(true, 'JSON returned from webapp was invalid, yet status code was 200. Data was: ' + xhr.responseText);
+            }
+
+            if (parsed) { // prevents double execution.
+              callback(false, data);
+            }
+          } else {
+            Pusher.warn("Couldn't get auth info from your webapp", xhr.status);
+            callback(true, xhr.status);
+          }
+        }
+      };
+
+      xhr.send(this.composeQuery(socketId));
+      return xhr;
+    },
+
+    jsonp: function(socketId, callback){
+      if(this.authOptions.headers !== undefined) {
+        Pusher.warn("Warn", "To send headers with the auth request, you must use AJAX, rather than JSONP.");
+      }
+
+      var script = document.createElement("script");
+      // Hacked wrapper.
+      Pusher.auth_callbacks[this.channel.name] = function(data) {
+        callback(false, data);
+      };
+
+      var callback_name = "Pusher.auth_callbacks['" + this.channel.name + "']";
+      script.src = Pusher.channel_auth_endpoint
+        + '?callback='
+        + encodeURIComponent(callback_name)
+        + this.composeQuery(socketId);
+
+      var head = document.getElementsByTagName("head")[0] || document.documentElement;
+      head.insertBefore( script, head.firstChild );
+    }
+  };
+}).call(this);
 var _require = (function () {
 
   var handleScriptLoaded;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pusher
-  requirement: &70209654617200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70209654617200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: Adds pusher.js/backpusher.js to the asset pipeline and pusher-gem to
   to your app.
 email:
@@ -57,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Pusher integration for Rails 3.1+