pusher-fake 1.6.0 → 1.7.0

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe PusherFake::Server, ".start" do
-  subject { PusherFake::Server }
+  subject { described_class }
 
   before do
     allow(subject).to receive(:start_web_server).and_return(nil)
@@ -18,7 +18,7 @@ describe PusherFake::Server, ".start" do
   it "starts the socket web server when run yields" do
     subject.start
 
-    expect(subject).to_not have_received(:start_web_server)
+    expect(subject).not_to have_received(:start_web_server)
 
     allow(EventMachine).to receive(:run).and_yield
 
@@ -30,7 +30,7 @@ describe PusherFake::Server, ".start" do
   it "starts the socket server when run yields" do
     subject.start
 
-    expect(subject).to_not have_received(:start_socket_server)
+    expect(subject).not_to have_received(:start_socket_server)
 
     allow(EventMachine).to receive(:run).and_yield
 
@@ -41,13 +41,24 @@ describe PusherFake::Server, ".start" do
 end
 
 describe PusherFake::Server, ".start_socket_server" do
-  let(:data)          { double }
-  let(:socket)        { double(:socket, onopen: nil, onmessage: nil, onclose: nil) }
-  let(:options)       { configuration.socket_options }
-  let(:connection)    { double(:connection, establish: nil, process: nil) }
-  let(:configuration) { double(:configuration, socket_options: { host: "192.168.0.1", port: 8080 }) }
+  subject { described_class }
 
-  subject { PusherFake::Server }
+  let(:data)    { double }
+  let(:options) { configuration.socket_options }
+
+  let(:configuration) do
+    instance_double(PusherFake::Configuration,
+                    socket_options: { host: "192.168.0.1", port: 8080 })
+  end
+
+  let(:connection) do
+    instance_double(PusherFake::Connection, establish: nil, process: nil)
+  end
+
+  let(:socket) do
+    instance_double(EventMachine::WebSocket::Connection,
+                    onopen: nil, onmessage: nil, onclose: nil)
+  end
 
   before do
     allow(PusherFake).to receive(:configuration).and_return(configuration)
@@ -69,10 +80,6 @@ describe PusherFake::Server, ".start_socket_server" do
   end
 
   it "creates a connection with the provided socket when onopen yields" do
-    subject.start_socket_server
-
-    expect(PusherFake::Connection).to_not have_received(:new)
-
     allow(socket).to receive(:onopen).and_yield
 
     subject.start_socket_server
@@ -81,10 +88,6 @@ describe PusherFake::Server, ".start_socket_server" do
   end
 
   it "establishes the connection when onopen yields" do
-    subject.start_socket_server
-
-    expect(connection).to_not have_received(:establish)
-
     allow(socket).to receive(:onopen).and_yield
 
     subject.start_socket_server
@@ -93,10 +96,6 @@ describe PusherFake::Server, ".start_socket_server" do
   end
 
   it "defines a message callback on the socket when onopen yields" do
-    subject.start_socket_server
-
-    expect(socket).to_not have_received(:onmessage)
-
     allow(socket).to receive(:onopen).and_yield
 
     subject.start_socket_server
@@ -106,11 +105,6 @@ describe PusherFake::Server, ".start_socket_server" do
 
   it "triggers process on the connection when onmessage yields" do
     allow(socket).to receive(:onopen).and_yield
-
-    subject.start_socket_server
-
-    expect(connection).to_not have_received(:process)
-
     allow(socket).to receive(:onmessage).and_yield(data)
 
     subject.start_socket_server
@@ -119,10 +113,6 @@ describe PusherFake::Server, ".start_socket_server" do
   end
 
   it "defines a close callback on the socket when onopen yields" do
-    subject.start_socket_server
-
-    expect(socket).to_not have_received(:onclose)
-
     allow(socket).to receive(:onopen).and_yield
 
     subject.start_socket_server
@@ -132,11 +122,6 @@ describe PusherFake::Server, ".start_socket_server" do
 
   it "removes the connection from all channels when onclose yields" do
     allow(socket).to receive(:onopen).and_yield
-
-    subject.start_socket_server
-
-    expect(PusherFake::Channel).to_not have_received(:remove)
-
     allow(socket).to receive(:onclose).and_yield
 
     subject.start_socket_server
@@ -146,12 +131,16 @@ describe PusherFake::Server, ".start_socket_server" do
 end
 
 describe PusherFake::Server, ".start_web_server" do
-  let(:host)          { "192.168.0.1" }
-  let(:port)          { 8081 }
-  let(:server)        { double(:server, :start! => true, :ssl= => true) }
-  let(:configuration) { double(:configuration, web_options: { host: host, port: port, ssl: true }) }
+  subject { described_class }
+
+  let(:host)   { "192.168.0.1" }
+  let(:port)   { 8081 }
+  let(:server) { instance_double(Thin::Server, :start! => true, :ssl= => true) }
 
-  subject { PusherFake::Server }
+  let(:configuration) do
+    instance_double(PusherFake::Configuration,
+                    web_options: { host: host, port: port, ssl: true })
+  end
 
   before do
     allow(Thin::Server).to receive(:new).and_return(server)
@@ -168,7 +157,8 @@ describe PusherFake::Server, ".start_web_server" do
   it "creates the web server" do
     subject.start_web_server
 
-    expect(Thin::Server).to have_received(:new).with(host, port, PusherFake::Server::Application)
+    expect(Thin::Server).to have_received(:new)
+      .with(host, port, PusherFake::Server::Application)
   end
 
   it "assigns custom options to the server" do

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

@@ -1,16 +1,33 @@
 require "spec_helper"
 
 describe PusherFake::Webhook, ".trigger" do
-  subject { PusherFake::Webhook }
+  subject { described_class }
 
-  let(:data)          { { channel: "name" } }
-  let(:http)          { double(:http, post: true) }
-  let(:name)          { "channel_occupied" }
-  let(:digest)        { double(:digest) }
-  let(:payload)       { MultiJson.dump({ events: [data.merge(name: name)], time_ms: Time.now.to_i }) }
-  let(:webhooks)      { ["url"] }
-  let(:signature)     { "signature" }
-  let(:configuration) { double(:configuration, key: "key", secret: "secret", webhooks: webhooks) }
+  let(:data)      { { channel: "name" } }
+  let(:http)      { instance_double(EventMachine::HttpConnection, post: true) }
+  let(:name)      { "channel_occupied" }
+  let(:digest)    { instance_double(OpenSSL::Digest::SHA256) }
+  let(:webhooks)  { ["url"] }
+  let(:signature) { "signature" }
+
+  let(:configuration) do
+    instance_double(PusherFake::Configuration,
+                    key:      "key",
+                    secret:   "secret",
+                    webhooks: webhooks)
+  end
+
+  let(:headers) do
+    {
+      "Content-Type"       => "application/json",
+      "X-Pusher-Key"       => configuration.key,
+      "X-Pusher-Signature" => signature
+    }
+  end
+
+  let(:payload) do
+    MultiJson.dump(events: [data.merge(name: name)], time_ms: Time.now.to_i)
+  end
 
   before do
     allow(OpenSSL::HMAC).to receive(:hexdigest).and_return(signature)
@@ -30,20 +47,14 @@ describe PusherFake::Webhook, ".trigger" do
   it "creates a HTTP request for each webhook URL" do
     subject.trigger(name, data)
 
-    expect(EventMachine::HttpRequest).to have_received(:new).with(webhooks.first)
+    expect(EventMachine::HttpRequest).to have_received(:new)
+      .with(webhooks.first)
   end
 
   it "posts the payload to the webhook URL" do
     subject.trigger(name, data)
 
-    expect(http).to have_received(:post).with(
-      body: payload,
-      head: {
-        "Content-Type"       => "application/json",
-        "X-Pusher-Key"       => configuration.key,
-        "X-Pusher-Signature" => signature
-      }
-    )
+    expect(http).to have_received(:post).with(body: payload, head: headers)
   end
 
   it "logs sending the hook" do

data/spec/lib/pusher_fake_spec.rb

@@ -1,28 +1,28 @@
 require "spec_helper"
 
 describe PusherFake, ".configure" do
-  subject { PusherFake }
+  subject { described_class }
 
   it "yields the configuration" do
-    expect { |block|
+    expect do |block|
       subject.configure(&block)
-    }.to yield_with_args(subject.configuration)
+    end.to yield_with_args(subject.configuration)
   end
 end
 
 describe PusherFake, ".configuration" do
-  let(:configuration) { double }
+  subject { described_class }
 
-  subject { PusherFake }
+  let(:configuration) { double }
 
   before do
-    PusherFake.instance_variable_set("@configuration", nil)
+    described_class.instance_variable_set("@configuration", nil)
 
     allow(PusherFake::Configuration).to receive(:new).and_return(configuration)
   end
 
   after do
-    PusherFake.instance_variable_set("@configuration", nil)
+    described_class.instance_variable_set("@configuration", nil)
   end
 
   it "initializes a configuration object" do
@@ -43,33 +43,35 @@ describe PusherFake, ".configuration" do
 end
 
 describe PusherFake, ".javascript" do
-  let(:configuration) { subject.configuration }
+  subject { described_class }
 
-  subject { PusherFake }
+  let(:configuration) { subject.configuration }
 
   it "returns JavaScript setting the host and port to the configured options" do
-    arguments  = [configuration.key, configuration.to_options].map(&:to_json).join(",")
     javascript = subject.javascript
+    arguments  = [configuration.key, configuration.to_options]
+                 .map(&:to_json).join(",")
 
     expect(javascript).to eq("new Pusher(#{arguments})")
   end
 
   it "supports passing custom options" do
     options    = { custom: "option" }
-    arguments  = [configuration.key, configuration.to_options(options)].map(&:to_json).join(",")
     javascript = subject.javascript(options)
+    arguments  = [configuration.key, configuration.to_options(options)]
+                 .map(&:to_json).join(",")
 
     expect(javascript).to eq("new Pusher(#{arguments})")
   end
 end
 
 describe PusherFake, ".log" do
-  let(:logger)        { double(:logger, :<< => "") }
+  subject { described_class }
+
+  let(:logger)        { instance_double(Logger, :<< => "") }
   let(:message)       { "Hello world." }
   let(:configuration) { subject.configuration }
 
-  subject { PusherFake }
-
   before do
     configuration.logger = logger
   end
@@ -87,6 +89,6 @@ describe PusherFake, ".log" do
 
     subject.log(message)
 
-    expect(logger).to_not have_received(:<<)
+    expect(logger).not_to have_received(:<<)
   end
 end

data/spec/support/application.rb

@@ -1,31 +1,33 @@
 require "sinatra"
 require "tilt/erb"
 
-class Sinatra::Application
-  set :root,          Proc.new { File.join(File.dirname(__FILE__), "application") }
-  set :views,         Proc.new { File.join(root, "views") }
-  set :public_folder, Proc.new { File.join(root, "public") }
+module Sinatra
+  class Application
+    set :root,  proc { File.join(File.dirname(__FILE__), "application") }
+    set :views, proc { File.join(root, "views") }
 
-  disable :logging
+    disable :logging
 
-  get "/" do
-    erb :index
-  end
+    get "/" do
+      erb :index
+    end
 
-  post "/pusher/auth" do
-    channel  = Pusher[params[:channel_name]]
-    response = channel.authenticate(params[:socket_id], channel_data)
+    post "/pusher/auth" do
+      channel  = Pusher[params[:channel_name]]
+      response = channel.authenticate(params[:socket_id], channel_data)
 
-    MultiJson.dump(response)
-  end
+      MultiJson.dump(response)
+    end
 
-  protected
+    protected
 
-  def channel_data
-    return unless params[:channel_name] =~ /^presence-/
+    def channel_data
+      return unless params[:channel_name] =~ /^presence-/
 
-    { user_id:   params[:socket_id],
-      user_info: { name: "Alan Turing" }
-    }
+      {
+        user_id:   params[:socket_id],
+        user_info: { name: "Alan Turing" }
+      }
+    end
   end
 end

data/spec/support/application/public/javascripts/vendor/{pusher-3.1.0.js → pusher-3.2.1.js}

@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v3.1.0
+ * Pusher JavaScript Library v3.2.1
  * http://pusher.com/
  *
  * Copyright 2016, Pusher
@@ -154,9 +154,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	        }
 	    };
 	    Pusher.log = function (message) {
-	        var global = Function("return this")();
-	        if (Pusher.logToConsole && global.console && global.console.log) {
-	            global.console.log(message);
+	        if (Pusher.logToConsole && (window).console && (window).console.log) {
+	            (window).console.log(message);
 	        }
 	    };
 	    Pusher.getClientFeatures = function () {
@@ -191,6 +190,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	        this.global_emitter.bind(event_name, callback);
 	        return this;
 	    };
+	    Pusher.prototype.unbind = function (event_name, callback) {
+	        this.global_emitter.unbind(event_name, callback);
+	        return this;
+	    };
 	    Pusher.prototype.bind_all = function (callback) {
 	        this.global_emitter.bind_all(callback);
 	        return this;
@@ -298,9 +301,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	    getProtocol: function () {
 	        return this.getDocument().location.protocol;
 	    },
-	    getGlobal: function () {
-	        return window;
-	    },
 	    getAuthorizers: function () {
 	        return { ajax: xhr_auth_1["default"], jsonp: jsonp_auth_1["default"] };
 	    },
@@ -451,7 +451,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	"use strict";
 	var Defaults = {
-	    VERSION: "3.1.0",
+	    VERSION: "3.2.1",
 	    PROTOCOL: 7,
 	    host: 'ws.pusherapp.com',
 	    ws_port: 80,
@@ -601,13 +601,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	            args[_i - 0] = arguments[_i];
 	        }
 	        var message = collections_1.stringify.apply(this, arguments);
-	        var global = Function("return this")();
-	        if (global.console) {
-	            if (global.console.warn) {
-	                global.console.warn(message);
+	        if ((window).console) {
+	            if ((window).console.warn) {
+	                (window).console.warn(message);
 	            }
-	            else if (global.console.log) {
-	                global.console.log(message);
+	            else if ((window).console.log) {
+	                (window).console.log(message);
 	            }
 	        }
 	        if (pusher_1["default"].log) {
@@ -626,7 +625,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	"use strict";
 	var base64_1 = __webpack_require__(10);
 	var util_1 = __webpack_require__(11);
-	var global = Function("return this")();
 	function extend(target) {
 	    var sources = [];
 	    for (var _i = 1; _i < arguments.length; _i++) {
@@ -654,7 +652,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	            m.push(arguments[i]);
 	        }
 	        else {
-	            m.push(JSON.stringify(arguments[i]));
+	            m.push(safeJSONStringify(arguments[i]));
 	        }
 	    }
 	    return m.join(" : ");
@@ -702,7 +700,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.values = values;
 	function apply(array, f, context) {
 	    for (var i = 0; i < array.length; i++) {
-	        f.call(context || global, array[i], i, array);
+	        f.call(context || (window), array[i], i, array);
 	    }
 	}
 	exports.apply = apply;
@@ -772,7 +770,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	function encodeParamsObject(data) {
 	    return mapObject(data, function (value) {
 	        if (typeof value === "object") {
-	            value = JSON.stringify(value);
+	            value = safeJSONStringify(value);
 	        }
 	        return encodeURIComponent(base64_1["default"](value.toString()));
 	    });
@@ -786,29 +784,61 @@ return /******/ (function(modules) { // webpackBootstrap
 	    return query;
 	}
 	exports.buildQueryString = buildQueryString;
-	function safeJSONStringify(source) {
-	    var cache = [];
-	    var serialized = JSON.stringify(source, function (key, value) {
-	        if (typeof value === 'object' && value !== null) {
-	            if (cache.indexOf(value) !== -1) {
-	                return;
-	            }
-	            cache.push(value);
+	function decycleObject(object) {
+	    var objects = [], paths = [];
+	    return (function derez(value, path) {
+	        var i, name, nu;
+	        switch (typeof value) {
+	            case 'object':
+	                if (!value) {
+	                    return null;
+	                }
+	                for (i = 0; i < objects.length; i += 1) {
+	                    if (objects[i] === value) {
+	                        return { $ref: paths[i] };
+	                    }
+	                }
+	                objects.push(value);
+	                paths.push(path);
+	                if (Object.prototype.toString.apply(value) === '[object Array]') {
+	                    nu = [];
+	                    for (i = 0; i < value.length; i += 1) {
+	                        nu[i] = derez(value[i], path + '[' + i + ']');
+	                    }
+	                }
+	                else {
+	                    nu = {};
+	                    for (name in value) {
+	                        if (Object.prototype.hasOwnProperty.call(value, name)) {
+	                            nu[name] = derez(value[name], path + '[' + JSON.stringify(name) + ']');
+	                        }
+	                    }
+	                }
+	                return nu;
+	            case 'number':
+	            case 'string':
+	            case 'boolean':
+	                return value;
 	        }
-	        return value;
-	    });
-	    cache = null;
-	    return serialized;
+	    }(object, '$'));
+	}
+	exports.decycleObject = decycleObject;
+	function safeJSONStringify(source) {
+	    try {
+	        return JSON.stringify(source);
+	    }
+	    catch (e) {
+	        return JSON.stringify(decycleObject(source));
+	    }
 	}
 	exports.safeJSONStringify = safeJSONStringify;
 
 
 /***/ },
 /* 10 */
-/***/ function(module, exports) {
+/***/ function(module, exports, __webpack_require__) {
 
 	"use strict";
-	var global = Function("return this")();
 	function encode(s) {
 	    return btoa(utob(s));
 	}
@@ -845,7 +875,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    ];
 	    return chars.join('');
 	};
-	var btoa = global.btoa || function (b) {
+	var btoa = (window).btoa || function (b) {
 	    return b.replace(/[\s\S]{1,3}/g, cb_encode);
 	};
 
@@ -857,9 +887,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	"use strict";
 	var timers_1 = __webpack_require__(12);
 	var Util = {
-	    getGlobal: function () {
-	        return Function("return this")();
-	    },
 	    now: function () {
 	        if (Date.now) {
 	            return Date.now();
@@ -897,12 +924,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 	};
 	var abstract_timer_1 = __webpack_require__(13);
-	var global = Function("return this")();
 	function clearTimeout(timer) {
-	    global.clearTimeout(timer);
+	    (window).clearTimeout(timer);
 	}
 	function clearInterval(timer) {
-	    global.clearInterval(timer);
+	    (window).clearInterval(timer);
 	}
 	var OneOffTimer = (function (_super) {
 	    __extends(OneOffTimer, _super);
@@ -1458,7 +1484,6 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	"use strict";
 	var callback_registry_1 = __webpack_require__(24);
-	var global = Function("return this")();
 	var Dispatcher = (function () {
 	    function Dispatcher(failThrough) {
 	        this.callbacks = new callback_registry_1["default"]();
@@ -1489,7 +1514,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        var callbacks = this.callbacks.get(eventName);
 	        if (callbacks && callbacks.length > 0) {
 	            for (i = 0; i < callbacks.length; i++) {
-	                callbacks[i].fn.call(callbacks[i].context || global, data);
+	                callbacks[i].fn.call(callbacks[i].context || (window), data);
 	            }
 	        }
 	        else if (this.failThrough) {
@@ -3586,12 +3611,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        var onClosed = function () {
 	            unbindListeners();
 	            var serializedTransport;
-	            try {
-	                serializedTransport = JSON.stringify(transport);
-	            }
-	            catch (e) {
-	                serializedTransport = Collections.safeJSONStringify(transport);
-	            }
+	            serializedTransport = Collections.safeJSONStringify(transport);
 	            callback(new Errors.TransportClosed(serializedTransport));
 	        };
 	        var unbindListeners = function () {
@@ -3816,6 +3836,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	var util_1 = __webpack_require__(11);
 	var runtime_1 = __webpack_require__(2);
 	var sequential_strategy_1 = __webpack_require__(56);
+	var Collections = __webpack_require__(9);
 	var CachedStrategy = (function () {
 	    function CachedStrategy(strategy, transports, options) {
 	        this.strategy = strategy;
@@ -3900,7 +3921,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    var storage = runtime_1["default"].getLocalStorage();
 	    if (storage) {
 	        try {
-	            storage[getTransportCacheKey(encrypted)] = JSON.stringify({
+	            storage[getTransportCacheKey(encrypted)] = Collections.safeJSONStringify({
 	                timestamp: util_1["default"].now(),
 	                transport: transport,
 	                latency: latency