pusher-fake 0.8.0 → 0.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1a0baacfdc962376a761f7cae9a985206c7f342b
+  data.tar.gz: 3437e5854d08159a3bcb9ca3444330e359dfc973
+SHA512:
+  metadata.gz: 87dd985dcb991ca210d6b8a6fa84f45b869fee5c4898cf4810f925fd71c1c45d02148928e1e3c5b1ceebef94deaf0959312b05fc5777366c4da1b0f7c649cda8
+  data.tar.gz: 91110daa9de7f58e8888672b6ac86fda72802083fc504d92dbb662900d9a97ac9b73087a8c47a265942da6923ee380b29acbebf185d5f6f31fbd8ee1c2a1c63e

data/features/step_definitions/client_steps.rb

@@ -19,10 +19,3 @@ Then "I should be connected" do
     state == "connected"
   end
 end
-
-Then "I should not be connected" do
-  timeout_after(5) do
-    state = page.evaluate_script("Pusher.instance.connection.state")
-    state == "unavailable"
-  end
-end

data/features/support/application/public/javascripts/vendor/{pusher-2.0.4.js → pusher-2.0.5.js}

@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.0.4
+ * Pusher JavaScript Library v2.0.5
  * http://pusherapp.com/
  *
  * Copyright 2013, Pusher
@@ -28,7 +28,7 @@
       return new Pusher.Timeline(self.key, self.sessionID, {
         features: Pusher.Util.getClientFeatures(),
         params: self.options.timelineParams || {},
-        limit: 25,
+        limit: 50,
         level: Pusher.Timeline.INFO,
         version: Pusher.VERSION
       });
@@ -99,13 +99,16 @@
   };
 
   Pusher.warn = function() {
-    if (window.console && window.console.warn) {
-      window.console.warn(Pusher.Util.stringify.apply(this, arguments));
-    } else {
-      if (!Pusher.log) {
-        return;
+    var message = Pusher.Util.stringify.apply(this, arguments);
+    if (window.console) {
+      if (window.console.warn) {
+        window.console.warn(message);
+      } else if (window.console.log) {
+        window.console.log(message);
       }
-      Pusher.log(Pusher.Util.stringify.apply(this, arguments));
+    }
+    if (Pusher.log) {
+      Pusher.log(message);
     }
   };
 
@@ -500,7 +503,7 @@
 }).call(this);
 
 ;(function() {
-  Pusher.VERSION = '2.0.4';
+  Pusher.VERSION = '2.0.5';
   Pusher.PROTOCOL = 6;
 
   // WS connection parameters
@@ -1328,7 +1331,11 @@
   function flushTransportInfo() {
     var storage = Pusher.Util.getLocalStorage();
     if (storage && storage.pusherTransport) {
-      delete storage.pusherTransport;
+      try {
+        delete storage.pusherTransport;
+      } catch(e) {
+        storage.pusherTransport = undefined;
+      }
     }
   }
 
@@ -1600,13 +1607,14 @@
     var transport = this.transport.createConnection(
       this.name, this.priority, this.options.key, this.options
     );
+    var handshake = null;
 
     var onInitialized = function() {
       transport.unbind("initialized", onInitialized);
       transport.connect();
     };
     var onOpen = function() {
-      var handshake = new Pusher.Handshake(transport, function(result) {
+      handshake = new Pusher.Handshake(transport, function(result) {
         connected = true;
         unbindListeners();
         callback(null, result);
@@ -1642,15 +1650,22 @@
           return;
         }
         unbindListeners();
-        transport.close();
+        if (handshake) {
+          handshake.close();
+        } else {
+          transport.close();
+        }
       },
       forceMinPriority: function(p) {
         if (connected) {
           return;
         }
         if (self.priority < p) {
-          // TODO close transport in a nicer way
-          transport.close();
+          if (handshake) {
+            handshake.close();
+          } else {
+            transport.close();
+          }
         }
       }
     };
@@ -2606,6 +2621,7 @@
     if (channel) {
       message.channel = channel;
     }
+    Pusher.debug('Event sent', message);
     return this.send(Pusher.Protocol.encodeMessage(message));
   };
 
@@ -2716,17 +2732,18 @@
   }
   var prototype = Handshake.prototype;
 
+  prototype.close = function() {
+    this.unbindListeners();
+    this.transport.close();
+  };
+
   /** @private */
   prototype.bindListeners = function() {
     var self = this;
 
-    var unbindListeners = function() {
-      self.transport.unbind("message", onMessage);
-      self.transport.unbind("closed", onClosed);
-    };
+    self.onMessage = function(m) {
+      self.unbindListeners();
 
-    var onMessage = function(m) {
-      unbindListeners();
       try {
         var result = Pusher.Protocol.processHandshake(m);
         if (result.action === "connected") {
@@ -2742,16 +2759,23 @@
         self.transport.close();
       }
     };
-    var onClosed = function(closeEvent) {
-      unbindListeners();
+
+    self.onClosed = function(closeEvent) {
+      self.unbindListeners();
 
       var action = Pusher.Protocol.getCloseAction(closeEvent) || "backoff";
       var error = Pusher.Protocol.getCloseError(closeEvent);
       self.finish(action, { error: error });
     };
 
-    self.transport.bind("message", onMessage);
-    self.transport.bind("closed", onClosed);
+    self.transport.bind("message", self.onMessage);
+    self.transport.bind("closed", self.onClosed);
+  };
+
+  /** @private */
+  prototype.unbindListeners = function() {
+    this.transport.unbind("message", this.onMessage);
+    this.transport.unbind("closed", this.onClosed);
   };
 
   /** @private */
@@ -2807,11 +2831,13 @@
     var self = this;
 
     Pusher.Network.bind("online", function() {
+      self.timeline.info({ netinfo: "online" });
       if (self.state === "unavailable") {
         self.connect();
       }
     });
     Pusher.Network.bind("offline", function() {
+      self.timeline.info({ netinfo: "offline" });
       if (self.shouldRetry()) {
         self.disconnect();
         self.updateState("unavailable");
@@ -2932,7 +2958,8 @@
   /** @private */
   prototype.retryIn = function(delay) {
     var self = this;
-    this.retryTimer = new Pusher.Timer(delay || 0, function() {
+    self.timeline.info({ action: "retry", delay: delay });
+    self.retryTimer = new Pusher.Timer(delay || 0, function() {
       self.disconnect();
       self.connect();
     });
@@ -3036,21 +3063,31 @@
   /** @private */
   prototype.buildErrorCallbacks = function() {
     var self = this;
+
+    function withErrorEmitted(callback) {
+      return function(result) {
+        if (result.error) {
+          self.emit("error", { type: "WebSocketError", error: result.error });
+        }
+        callback(result);
+      };
+    }
+
     return {
-      ssl_only: function() {
+      ssl_only: withErrorEmitted(function() {
         self.encrypted = true;
         self.updateStrategy();
         self.retryIn(0);
-      },
-      refused: function() {
+      }),
+      refused: withErrorEmitted(function() {
         self.disconnect();
-      },
-      backoff: function() {
+      }),
+      backoff: withErrorEmitted(function() {
         self.retryIn(1000);
-      },
-      retry: function() {
+      }),
+      retry: withErrorEmitted(function() {
         self.retryIn(0);
-      }
+      })
     };
   };
 
@@ -3083,6 +3120,7 @@
     if (previousState !== newState) {
       Pusher.debug('State changed', previousState + ' -> ' + newState);
 
+      this.timeline.info({ state: newState });
       this.emit('state_change', { previous: previousState, current: newState });
       this.emit(newState, data);
     }
@@ -3328,8 +3366,8 @@
 
   Pusher.Channel.Authorizer.prototype = {
     composeQuery: function(socketId) {
-      var query = '&socket_id=' + encodeURIComponent(socketId)
-        + '&channel_name=' + encodeURIComponent(this.channel.name);
+      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]);
@@ -3343,6 +3381,7 @@
     }
   };
 
+  var nextAuthCallbackID = 1;
 
   Pusher.auth_callbacks = {};
   Pusher.authorizers = {
@@ -3358,7 +3397,7 @@
       xhr.open("POST", Pusher.channel_auth_endpoint, true);
 
       // add request headers
-      xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded")
+      xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
       for(var headerName in this.authOptions.headers) {
         xhr.setRequestHeader(headerName, this.authOptions.headers[headerName]);
       }
@@ -3394,17 +3433,20 @@
         Pusher.warn("Warn", "To send headers with the auth request, you must use AJAX, rather than JSONP.");
       }
 
+      var callbackName = nextAuthCallbackID.toString();
+      nextAuthCallbackID++;
+
       var script = document.createElement("script");
       // Hacked wrapper.
-      Pusher.auth_callbacks[this.channel.name] = function(data) {
+      Pusher.auth_callbacks[callbackName] = 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 callback_name = "Pusher.auth_callbacks['" + callbackName + "']";
+      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 );

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

@@ -13,7 +13,7 @@
   <ul></ul>
 </section>
 
-<script src="/javascripts/vendor/pusher-2.0.4.js"></script>
+<script src="/javascripts/vendor/pusher-2.0.5.js"></script>
 <script>
 window.addEventListener("DOMContentLoaded", function() {
   // Use the PusherFake server.

data/features/support/coveralls.rb

@@ -0,0 +1,3 @@
+require "coveralls"
+
+Coveralls.wear_merged!

data/lib/pusher-fake.rb

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

data/spec/support/coveralls.rb

@@ -0,0 +1,3 @@
+require "coveralls"
+
+Coveralls.wear_merged!

metadata

@@ -1,84 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 0.8.0
-  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors:
 - Tristan Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -94,39 +83,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.6.7
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: pusher
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -134,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -142,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -150,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -158,23 +153,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -182,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -190,23 +181,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -214,7 +202,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -249,9 +236,10 @@ 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.0.4.js
+- features/support/application/public/javascripts/vendor/pusher-2.0.5.js
 - features/support/application/views/index.erb
 - features/support/application.rb
+- features/support/coveralls.rb
 - features/support/environment.rb
 - features/support/pusher-fake.rb
 - features/support/timing.rb
@@ -268,37 +256,31 @@ files:
 - spec/lib/pusher-fake/webhook_spec.rb
 - spec/lib/pusher_fake_spec.rb
 - spec/spec_helper.rb
+- spec/support/coveralls.rb
 - spec/support/have_configuration_option_matcher.rb
 homepage: https://github.com/tristandunn/pusher-fake
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4438089056312273430
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4438089056312273430
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A fake Pusher server for development and testing.
 test_files:
 - features/channel.feature
@@ -314,9 +296,10 @@ 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.0.4.js
+- features/support/application/public/javascripts/vendor/pusher-2.0.5.js
 - features/support/application/views/index.erb
 - features/support/application.rb
+- features/support/coveralls.rb
 - features/support/environment.rb
 - features/support/pusher-fake.rb
 - features/support/timing.rb
@@ -333,5 +316,6 @@ test_files:
 - spec/lib/pusher-fake/webhook_spec.rb
 - spec/lib/pusher_fake_spec.rb
 - spec/spec_helper.rb
+- spec/support/coveralls.rb
 - spec/support/have_configuration_option_matcher.rb
 has_rdoc: