pusher-fake 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f413e0d2160087979e4a64e2992838e859af116c
-  data.tar.gz: e5934708af8aeb405202c768e279efe6bfdd7745
+  metadata.gz: 62beea93e9ce28262adbb1c518dc08339653a1ab
+  data.tar.gz: eb3e058b54e30f0c5c0bf16ec34997e20a1d279d
 SHA512:
-  metadata.gz: 708cb5fb273ee79db74468d93b1db7bfdf0e2aa66862f202c66bf7157a7a2edee3d92566d07e79f8fda057cbcb8b31228bc27a1893216b272917f3360ca9df62
-  data.tar.gz: b7985a06e57aacc32c9900fb450853b1e351678c80e2751d05ebfed8fe788ab0a2012d152dd87e11751355658dc58e3b356f329818c603b7a39308bde322c7b6
+  metadata.gz: f4f120392332c62301f21506c155e339bedf2ef35ee9dc9a301f9ee020332d72e51d8281b4a036a8e026d77e9d4a6c5b15b414085ba10a96fe9bce00d5af3856
+  data.tar.gz: cc290d61c303374212512c59570f1e2b4d469b92343fb0bfc804b4e754bf35ccccba9cb819f7276cd474b26ab581e3fa925a3e7f75ed2d03f2442d6b92056995

data/lib/pusher-fake.rb

@@ -6,7 +6,7 @@ require "thin"
 
 module PusherFake
   # The current version string.
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 
   autoload :Channel,       "pusher-fake/channel"
   autoload :Configuration, "pusher-fake/configuration"

data/lib/pusher-fake/configuration.rb

@@ -30,6 +30,10 @@ module PusherFake
 
     # Instantiated from {PusherFake.configuration}. Sets the defaults.
     def initialize
+      reset!
+    end
+
+    def reset!
       self.app_id   = "PUSHER_APP_ID"
       self.key      = "PUSHER_API_KEY"
       self.logger   = STDOUT.to_io
@@ -47,8 +51,7 @@ module PusherFake
     def to_options(options = {})
       options.merge(
         wsHost: socket_options[:host],
-        wsPort: socket_options[:port],
-        enabledTransports: ["ws"]
+        wsPort: socket_options[:port]
       )
     end
 

data/lib/pusher-fake/support/base.rb

@@ -1,3 +1,15 @@
+if Pusher.app_id.nil?
+  warn("Warning: `Pusher.app_id` is not set. Should be set before including PusherFake.")
+end
+
+if Pusher.key.nil?
+  warn("Warning: `Pusher.key` is not set. Should be set before including PusherFake.")
+end
+
+if Pusher.secret.nil?
+  warn("Warning: `Pusher.secret` is not set. Should be set before including PusherFake.")
+end
+
 # Use the same API key and secret as the live version.
 PusherFake.configure do |configuration|
   configuration.app_id = Pusher.app_id

data/spec/lib/pusher-fake/configuration_spec.rb

@@ -38,12 +38,6 @@ describe PusherFake::Configuration, "#to_options" do
     expect(options).to include(wsPort: subject.socket_options[:port])
   end
 
-  it "only enables the WebSocket transport" do
-    options = subject.to_options
-
-    expect(options).to include(enabledTransports: ["ws"])
-  end
-
   it "supports passing custom options" do
     options = subject.to_options(custom: "option")
 

data/spec/support/application/public/javascripts/vendor/{pusher-2.2.4.js → pusher-3.0.0.js}

@@ -1,11 +1,39 @@
 /*!
- * Pusher JavaScript Library v2.2.4
+ * Pusher JavaScript Library v3.0.0
  * http://pusher.com/
  *
  * Copyright 2014, Pusher
  * Released under the MIT licence.
  */
 
+// Uses Node, AMD or browser globals to create a module. This example creates
+// a global even when AMD is used. This is useful if you have some scripts
+// that are loaded by an AMD loader, but they still want access to globals.
+// If you do not need to export a global for the AMD case,
+// see returnExports.js.
+
+// If you want something that will work in other stricter CommonJS environments,
+// or if you need to create a circular dependency, see commonJsStrictGlobal.js
+
+// Defines a module "Pusher".
+
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define([], function () {
+      return (root.Pusher = factory());
+    });
+  } else if (typeof exports === 'object') {
+    // Node. Does not work with strict CommonJS, but
+    // only CommonJS-like enviroments that support module.exports,
+    // like Node.
+    module.exports = factory();
+  } else {
+    // Browser globals
+    root.Pusher = factory();
+  }
+}(this, function () {
+
 ;(function() {
   function Pusher(app_key, options) {
     checkAppKey(app_key);
@@ -74,7 +102,7 @@
           channel.handleEvent(params.event, params.data);
         }
       }
-      // Emit globaly [deprecated]
+      // Emit globally [deprecated]
       if (!internal) {
         self.global_emitter.emit(params.event, params.data);
       }
@@ -188,7 +216,7 @@
 
   prototype.unsubscribe = function(channel_name) {
     var channel = this.channels.remove(channel_name);
-    if (this.connection.state === 'connected') {
+    if (channel && this.connection.state === 'connected') {
       channel.unsubscribe();
     }
   };
@@ -573,10 +601,6 @@
       return document;
     },
 
-    getNavigator: function() {
-      return navigator;
-    },
-
     getLocalStorage: function() {
       try {
         return window.localStorage;
@@ -588,7 +612,7 @@
     getClientFeatures: function() {
       return Pusher.Util.keys(
         Pusher.Util.filterObject(
-          { "ws": Pusher.WSTransport, "flash": Pusher.FlashTransport },
+          { "ws": Pusher.WSTransport },
           function (t) { return t.isSupported({}); }
         )
       );
@@ -626,7 +650,7 @@
 }).call(this);
 
 ;(function() {
-  Pusher.VERSION = '2.2.4';
+  Pusher.VERSION = '3.0.0';
   Pusher.PROTOCOL = 7;
 
   // DEPRECATED: WS connection parameters
@@ -700,7 +724,6 @@
 
       [":def_transport", "ws", "ws", 3, ":ws_options", ":ws_manager"],
       [":def_transport", "wss", "ws", 3, ":wss_options", ":ws_manager"],
-      [":def_transport", "flash", "flash", 2, ":ws_options", ":ws_manager"],
       [":def_transport", "sockjs", "sockjs", 1, ":sockjs_options"],
       [":def_transport", "xhr_streaming", "xhr_streaming", 1, ":sockjs_options", ":streaming_manager"],
       [":def_transport", "xdr_streaming", "xdr_streaming", 1, ":sockjs_options", ":streaming_manager"],
@@ -709,7 +732,6 @@
 
       [":def", "ws_loop", [":sequential", ":timeouts", ":ws"]],
       [":def", "wss_loop", [":sequential", ":timeouts", ":wss"]],
-      [":def", "flash_loop", [":sequential", ":timeouts", ":flash"]],
       [":def", "sockjs_loop", [":sequential", ":timeouts", ":sockjs"]],
 
       [":def", "streaming_loop", [":sequential", ":timeouts",
@@ -746,13 +768,8 @@
           [":first_connected",
             [":if", [":is_supported", ":ws"],
               wsStrategy,
-            [":if", [":is_supported", ":flash"], [
-              ":best_connected_ever",
-              ":flash_loop",
-              [":delayed", 2000, [":http_fallback_loop"]]
-            ], [
               ":http_fallback_loop"
-            ]]]
+            ]
           ]
         ]
       ]
@@ -1980,12 +1997,6 @@
         return getGenericURL("ws", params, getGenericPath(key, "flash=false"));
       }
     },
-    /** URL scheme for Flash. Same as WebSocket, but with a flash parameter. */
-    flash: {
-      getInitial: function(key, params) {
-        return getGenericURL("ws", params, getGenericPath(key, "flash=true"));
-      }
-    },
     /** SockJS URL scheme. Supplies the path separately from the initial URL. */
     sockjs: {
       getInitial: function(key, params) {
@@ -2078,10 +2089,6 @@
       transport: self.name + (self.options.encrypted ? "s" : "")
     }));
 
-    if (self.hooks.beforeInitialize) {
-      self.hooks.beforeInitialize.call(self);
-    }
-
     if (self.hooks.isInitialized()) {
       self.changeState("initialized");
     } else if (self.hooks.file) {
@@ -2344,45 +2351,6 @@
     }
   });
 
-  /** Flash transport using the WebSocket protocol. */
-  Pusher.FlashTransport = new Pusher.Transport({
-    file: "flashfallback",
-    urls: Pusher.URLSchemes.flash,
-    handlesActivityChecks: false,
-    supportsPing: false,
-
-    isSupported: function() {
-      try {
-        return Boolean(new ActiveXObject('ShockwaveFlash.ShockwaveFlash'));
-      } catch (e1) {
-        try {
-          var nav = Pusher.Util.getNavigator();
-          return Boolean(
-            nav &&
-            nav.mimeTypes &&
-            nav.mimeTypes["application/x-shockwave-flash"] !== undefined
-          );
-        } catch (e2) {
-          return false;
-        }
-      }
-    },
-    beforeInitialize: function() {
-      if (window.WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR === undefined) {
-        window.WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR = true;
-      }
-      window.WEB_SOCKET_SWF_LOCATION =
-        Pusher.Dependencies.getRoot({ encrypted: this.options.encrypted }) +
-        "/WebSocketMain.swf";
-    },
-    isInitialized: function() {
-      return window.FlashWebSocket !== undefined;
-    },
-    getSocket: function(url) {
-      return new FlashWebSocket(url);
-    }
-  });
-
   /** SockJS transport. */
   Pusher.SockJSTransport = new Pusher.Transport({
     file: "sockjs",
@@ -2609,7 +2577,6 @@
 
   var transports = {
     ws: Pusher.WSTransport,
-    flash: Pusher.FlashTransport,
     sockjs: Pusher.SockJSTransport,
     xhr_streaming: Pusher.XHRStreamingTransport,
     xdr_streaming: Pusher.XDRStreamingTransport,
@@ -2665,8 +2632,7 @@
         (!context.enabledTransports ||
           Pusher.Util.arrayIndexOf(context.enabledTransports, name) !== -1) &&
         (!context.disabledTransports ||
-          Pusher.Util.arrayIndexOf(context.disabledTransports, name) === -1) &&
-        (name !== "flash" || context.disableFlash !== true);
+          Pusher.Util.arrayIndexOf(context.disabledTransports, name) === -1);
 
       var transport;
       if (enabled) {
@@ -4013,3 +3979,6 @@
     }
   };
 }).call(this);
+
+return Pusher;
+}));

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

@@ -13,7 +13,7 @@
   <ul></ul>
 </section>
 
-<script src="/javascripts/vendor/pusher-2.2.4.js"></script>
+<script src="/javascripts/vendor/pusher-3.0.0.js"></script>
 <script>
   Pusher.instance = <%= PusherFake.javascript %>;
   Pusher.instance.connection.bind("state_change", function(states) {

data/spec/support/capybara.rb

@@ -3,8 +3,6 @@ require "capybara/rspec"
 Capybara.app = Sinatra::Application
 Capybara.default_driver = :webkit
 
-Capybara.register_driver(:webkit) do |application|
-  Capybara::Webkit::Driver.new(application).tap do |driver|
-    driver.block_unknown_urls
-  end
+Capybara::Webkit.configure do |config|
+  config.block_unknown_urls
 end

data/spec/support/pusher-fake.rb

@@ -1,5 +1,8 @@
+require "thin/server"
+
 RSpec.configure do |config|
   config.before(:each, type: :feature) do
+    PusherFake.configuration.reset!
     PusherFake.configuration.web_options.tap do |options|
       Pusher.url = "http://PUSHER_API_KEY:PUSHER_API_SECRET@#{options[:host]}:#{options[:port]}/apps/PUSHER_APP_ID"
     end

data/spec/support/webhooks.rb

@@ -1,9 +1,3 @@
-RSpec.configure do |config|
-  config.before(:each) do
-    $events = []
-  end
-end
-
 Thread.new do
   # Not explicitly requiring Thin::Server occasionally results in
   # Thin::Server.start not being defined.
@@ -31,4 +25,10 @@ end.tap do |thread|
   at_exit { thread.exit }
 end
 
-PusherFake.configuration.webhooks = ["http://127.0.0.1:8082"]
+RSpec.configure do |config|
+  config.before(:each) do
+    $events = []
+
+    PusherFake.configuration.webhooks = ["http://127.0.0.1:8082"]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Tristan Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -72,70 +72,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: pusher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.5
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.5
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.4.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.4.7
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,7 @@ files:
 - spec/lib/pusher_fake_spec.rb
 - spec/spec_helper.rb
 - spec/support/application.rb
-- spec/support/application/public/javascripts/vendor/pusher-2.2.4.js
+- spec/support/application/public/javascripts/vendor/pusher-3.0.0.js
 - spec/support/application/views/index.erb
 - spec/support/capybara.rb
 - spec/support/coveralls.rb
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A fake Pusher server for development and testing.
@@ -245,7 +245,7 @@ test_files:
 - spec/lib/pusher-fake/webhook_spec.rb
 - spec/lib/pusher_fake_spec.rb
 - spec/spec_helper.rb
-- spec/support/application/public/javascripts/vendor/pusher-2.2.4.js
+- spec/support/application/public/javascripts/vendor/pusher-3.0.0.js
 - spec/support/application/views/index.erb
 - spec/support/application.rb
 - spec/support/capybara.rb