pusher_rails 0.2.2 → 0.2.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.2.3
+======
+- Upgraded to pusher.js 1.12.1
+- Upgraded to pusher-gem 0.9.3
+
 v0.2.2
 ======
 - Upgraded to pusher.js 1.12.0

data/README.md

@@ -2,8 +2,8 @@
 =====================
 
 Adds:
-- [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)
+- [pusher-gem v0.9.3](https://github.com/pusher/pusher-gem/tree/v0.9.3)
+- [pusher.js v1.12.1](https://github.com/pusher/pusher-js/tree/v1.12.1)
 - [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,7 +21,7 @@ Licenses
 ========
 
     /*!
-     * Pusher JavaScript Library v1.12.0
+     * Pusher JavaScript Library v1.12.1
      * http://pusherapp.com/
      *
      * Copyright 2011, Pusher

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.2'
+  s.version       = '0.2.3'
   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.2"
+  s.add_dependency "pusher", "~> 0.9.3"
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]

data/vendor/assets/javascripts/pusher.js

@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v1.12.0
+ * Pusher JavaScript Library v1.12.1
  * http://pusherapp.com/
  *
  * Copyright 2011, Pusher
@@ -183,7 +183,7 @@
   };
 
   // Pusher defaults
-  Pusher.VERSION = '1.12.0';
+  Pusher.VERSION = '1.12.1';
 
   Pusher.host = 'ws.pusherapp.com';
   Pusher.ws_port = 80;
@@ -399,11 +399,11 @@ Example:
     'waiting': ['connecting', 'permanentlyClosed'],
     'connecting': ['open', 'permanentlyClosing', 'impermanentlyClosing', 'waiting'],
     'open': ['connected', 'permanentlyClosing', 'impermanentlyClosing', 'waiting'],
-    'connected': ['permanentlyClosing', 'impermanentlyClosing', 'waiting'],
+    'connected': ['permanentlyClosing', 'waiting'],
     'impermanentlyClosing': ['waiting', 'permanentlyClosing'],
     'permanentlyClosing': ['permanentlyClosed'],
     'permanentlyClosed': ['waiting'],
-    'failed': ['permanentlyClosing']
+    'failed': ['permanentlyClosed']
   };
 
 
@@ -507,8 +507,6 @@ Example:
           return;
         }
 
-        // removed: if not closed, something is wrong that we should fix
-        // if(self.socket !== undefined) self.socket.close();
         var url = formatURL(self.key, self.connectionSecure);
         Pusher.debug('Connecting', url);
         self.socket = new Pusher.Transport(url);
@@ -519,7 +517,7 @@ Example:
         self.socket.onerror = ws_onError;
 
         // allow time to get ws_onOpen, otherwise close socket and try again
-        self._connectingTimer = setTimeout(TransitionToImpermanentClosing, self.openTimeout);
+        self._connectingTimer = setTimeout(TransitionToImpermanentlyClosing, self.openTimeout);
       },
 
       connectingExit: function() {
@@ -545,7 +543,7 @@ Example:
         self.socket.onclose = transitionToWaiting;
 
         // allow time to get connected-to-Pusher message, otherwise close socket, try again
-        self._openTimer = setTimeout(TransitionToImpermanentClosing, self.connectedTimeout);
+        self._openTimer = setTimeout(TransitionToImpermanentlyClosing, self.connectedTimeout);
       },
 
       openExit: function() {
@@ -659,7 +657,7 @@ Example:
     }
 
     // callback for close and retry.  Used on timeouts.
-    function TransitionToImpermanentClosing() {
+    function TransitionToImpermanentlyClosing() {
       self._machine.transition('impermanentlyClosing');
     }
 
@@ -717,7 +715,7 @@ Example:
         self.connectionSecure = true;
         self.options.encrypted = true;
 
-        self._machine.transition('impermanentlyClosing')
+        TransitionToImpermanentlyClosing();
       } else if (code < 4100) {
         // Permentently close connection
         self._machine.transition('permanentlyClosing')
@@ -727,7 +725,7 @@ Example:
         self._machine.transition('waiting')
       } else if (code < 4300) {
         // Reconnect immediately
-        self._machine.transition('impermanentlyClosing')
+        TransitionToImpermanentlyClosing();
       } else {
         // Unknown error
         self._machine.transition('permanentlyClosing')
@@ -796,14 +794,9 @@ Example:
       self._machine.transition('waiting');
     }
 
-    function ws_onError() {
-      self.emit('error', {
-        type: 'WebSocketError'
-      });
-
-      // note: required? is the socket auto closed in the case of error?
-      self.socket.close();
-      self._machine.transition('impermanentlyClosing');
+    function ws_onError(error) {
+      // just emit error to user - socket will already be closed by browser
+      self.emit('error', { type: 'WebSocketError', error: error });
     }
 
     // Updates the public state information exposed by connection
@@ -877,7 +870,7 @@ Example:
   Connection.prototype.disconnect = function() {
     if (this._machine.is('permanentlyClosed')) return;
 
-    if (this._machine.is('waiting')) {
+    if (this._machine.is('waiting') || this._machine.is('failed')) {
       this._machine.transition('permanentlyClosed');
     } else {
       this._machine.transition('permanentlyClosing');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pusher
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
 description: Adds pusher.js/backpusher.js to the asset pipeline and pusher-gem to
   to your app.
 email:
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Pusher integration for Rails 3.1+