pusher-fake 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6f3eacabe00d510d5ad31f3796c821a0b34de364
-  data.tar.gz: c144fc964da7577d3244f08f3c36f648302c8e4f
+SHA256:
+  metadata.gz: d164bb85fcc0e139fada900d4703abb1340319cc595cb31d4add51d90f4b5ac3
+  data.tar.gz: 55d1cfda30b76adca304332495d9e5cab16c788bf07d15aa8e85b6be695ed11a
 SHA512:
-  metadata.gz: 4dda368dd7c7c488399ce316e7eac7c8e90e0da213c8b96009aef2fc01e997ebfebddd8fd7fe8acae6413953427b31a3d0ee5106e5f0f491f4f4031dc80f7e81
-  data.tar.gz: 535020b68c34f77dac67828bef623d3ca76f9bb72139bd4290cc644d31e6e380b2248074c502c8f89c46b737e1df74b3b4cc6d29ba24c2667f8366d144c81aa6
+  metadata.gz: 7d8eee35e30bd8e6ec013d4cb9b196beb542c4fa4b3802defa4a26dde91cc18db64801133cbbe922b7475d0fa3c030d5f9660217375d6d49df38353698a0bf96
+  data.tar.gz: 9d8fa2e40e6c5dc158df21df74dcafca0f358a876163e9eab844d00c43ac67eb8cd5786e2955797449926b842c21462133fa57848ab4b4f6d96c9199252499b6

data/bin/pusher-fake

@@ -50,3 +50,5 @@ raise OptionParser::MissingArgument.new("--key")    if Pusher.key.nil?
 raise OptionParser::MissingArgument.new("--secret") if Pusher.secret.nil?
 
 PusherFake::Server.start
+
+# rubocop:enable Metrics/BlockLength, Metrics/LineLength

data/lib/pusher-fake.rb

@@ -1,5 +1,3 @@
-# rubocop:disable Naming/FileName
-
 require "em-http-request"
 require "em-websocket"
 require "multi_json"
@@ -9,7 +7,7 @@ require "thin"
 # A Pusher fake.
 module PusherFake
   # The current version string.
-  VERSION = "1.9.0".freeze
+  VERSION = "1.10.0".freeze
 
   autoload :Channel,       "pusher-fake/channel"
   autoload :Configuration, "pusher-fake/configuration"

data/lib/pusher-fake/configuration.rb

@@ -2,7 +2,7 @@ module PusherFake
   # Configuration class.
   class Configuration
     # @return [String] The Pusher Applicaiton ID. (Defaults to +PUSHER_APP_ID+.)
-    attr_accessor :app_id
+    attr_reader :app_id
 
     # @return [String] The Pusher API key. (Defaults to +PUSHER_API_KEY+.)
     attr_accessor :key
@@ -34,6 +34,13 @@ module PusherFake
       reset!
     end
 
+    # Assign the application ID, ensuring it's a string.
+    #
+    # @params [Integer|String] id The application ID.
+    def app_id=(id)
+      @app_id = id.to_s
+    end
+
     def reset!
       self.app_id   = "PUSHER_APP_ID"
       self.key      = "PUSHER_API_KEY"

data/lib/pusher-fake/server/application.rb

@@ -28,7 +28,7 @@ module PusherFake
         response = response_for(request)
 
         Rack::Response.new(MultiJson.dump(response)).finish
-      rescue => error # rubocop:disable Lint/RescueWithoutErrorClass
+      rescue StandardError => error
         Rack::Response.new(error.message, 400).finish
       end
 
@@ -143,8 +143,6 @@ module PusherFake
         { users: users || [] }
       end
 
-      private_class_method
-
       # Emit an event with data to the requested channel(s).
       #
       # @param [Hash] event The raw event JSON.
@@ -158,6 +156,7 @@ module PusherFake
           channel.emit(event["name"], data, socket_id: event["socket_id"])
         end
       end
+      private_class_method :send_event
       # rubocop:enable Style/RescueModifier
     end
   end

data/spec/features/server/webhooks_spec.rb

@@ -1,5 +1,3 @@
-# rubocop:disable Style/GlobalVars
-
 require "spec_helper"
 
 feature "Receiving event webhooks" do
@@ -8,6 +6,10 @@ feature "Receiving event webhooks" do
   let(:presence_channel) { "presence-room-1" }
 
   before do
+    events.clear
+
+    PusherFake.configuration.webhooks = ["http://127.0.0.1:8082"]
+
     connect
     connect_as(other_user)
   end
@@ -15,11 +17,11 @@ feature "Receiving event webhooks" do
   scenario "occupying a channel" do
     subscribe_to(channel)
 
-    expect($events).to include_event("channel_occupied", "channel" => channel)
+    expect(events).to include_event("channel_occupied", "channel" => channel)
 
     subscribe_to_as(channel, other_user)
 
-    expect($events.size).to eq(1)
+    expect(events.size).to eq(1)
   end
 
   scenario "vacating a channel" do
@@ -28,24 +30,24 @@ feature "Receiving event webhooks" do
 
     unsubscribe_from(channel)
 
-    expect($events.size).to eq(1)
+    expect(events.size).to eq(1)
 
     unsubscribe_from_as(channel, other_user)
 
-    expect($events).to include_event("channel_vacated", "channel" => channel)
+    expect(events).to include_event("channel_vacated", "channel" => channel)
   end
 
   scenario "subscribing to a presence channel" do
     subscribe_to(presence_channel)
 
-    expect($events).to include_event(
+    expect(events).to include_event(
       "member_added",
       "channel" => presence_channel, "user_id" => user_id
     )
 
     subscribe_to_as(presence_channel, other_user)
 
-    expect($events).to include_event(
+    expect(events).to include_event(
       "member_added",
       "channel" => presence_channel, "user_id" => user_id(other_user)
     )
@@ -57,19 +59,27 @@ feature "Receiving event webhooks" do
 
     unsubscribe_from(presence_channel)
 
-    expect($events).to include_event("member_added",
-                                     "channel" => presence_channel,
-                                     "user_id" => user_id)
+    expect(events).to include_event("member_added",
+                                    "channel" => presence_channel,
+                                    "user_id" => user_id)
 
     unsubscribe_from_as(presence_channel, other_user)
 
-    expect($events).to include_event("member_added",
-                                     "channel" => presence_channel,
-                                     "user_id" => user_id(other_user))
+    expect(events).to include_event("member_added",
+                                    "channel" => presence_channel,
+                                    "user_id" => user_id(other_user))
   end
 
   protected
 
+  def events
+    sleep(1)
+
+    WebhookHelper.mutex.synchronize do
+      WebhookHelper.events
+    end
+  end
+
   def include_event(event, options = {})
     include(options.merge("name" => event))
   end

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

@@ -36,21 +36,21 @@ describe PusherFake::Channel, ".factory" do
     end
   end
 
-  context "for a public channel" do
+  context "with a public channel" do
     let(:name)          { "channel" }
     let(:channel_class) { PusherFake::Channel::Public }
 
     it_behaves_like "a channel factory"
   end
 
-  context "for a private channel" do
+  context "with a private channel" do
     let(:name)          { "private-channel" }
     let(:channel_class) { PusherFake::Channel::Private }
 
     it_behaves_like "a channel factory"
   end
 
-  context "for a presence channel" do
+  context "with a presence channel" do
     let(:name)          { "presence-channel" }
     let(:channel_class) { PusherFake::Channel::Presence }
 

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

@@ -2,32 +2,32 @@ require "spec_helper"
 
 describe PusherFake::Configuration do
   it do
-    is_expected.to have_configuration_option(:key)
+    expect(subject).to have_configuration_option(:key)
       .with_default("PUSHER_API_KEY")
   end
 
   it do
-    is_expected.to have_configuration_option(:logger)
+    expect(subject).to have_configuration_option(:logger)
       .with_default(STDOUT.to_io)
   end
 
   it do
-    is_expected.to have_configuration_option(:verbose)
+    expect(subject).to have_configuration_option(:verbose)
       .with_default(false)
   end
 
   it do
-    is_expected.to have_configuration_option(:webhooks)
+    expect(subject).to have_configuration_option(:webhooks)
       .with_default([])
   end
 
   it do
-    is_expected.to have_configuration_option(:app_id)
+    expect(subject).to have_configuration_option(:app_id)
       .with_default("PUSHER_APP_ID")
   end
 
   it do
-    is_expected.to have_configuration_option(:secret)
+    expect(subject).to have_configuration_option(:secret)
       .with_default("PUSHER_API_SECRET")
   end
 
@@ -48,6 +48,16 @@ describe PusherFake::Configuration do
   end
 end
 
+describe PusherFake::Configuration, "#app_id=" do
+  subject { described_class.new }
+
+  it "converts value to a string" do
+    subject.app_id = 1_337
+
+    expect(subject.app_id).to eq("1337")
+  end
+end
+
 describe PusherFake::Configuration, "#to_options" do
   it "includes the socket host as wsHost" do
     options = subject.to_options

data/spec/lib/pusher-fake/server/application_spec.rb

@@ -48,6 +48,23 @@ shared_examples_for "an API request" do
   end
 end
 
+describe PusherFake::Server::Application, ".call, with a numeric ID" do
+  it_behaves_like "an API request" do
+    let(:id)   { Time.now.to_i }
+    let(:path) { "/apps/#{id}/events" }
+
+    before do
+      PusherFake.configuration.app_id = id
+
+      allow(subject).to receive(:events).and_return(hash)
+    end
+
+    after do
+      PusherFake.configuration.app_id = "PUSHER_APP_ID"
+    end
+  end
+end
+
 describe PusherFake::Server::Application, ".call, for triggering events" do
   it_behaves_like "an API request" do
     let(:id)   { PusherFake.configuration.app_id }

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require "bundler/setup"
 
 Bundler.require(:default, :development)
 
-Dir[File.expand_path("../support/**/*.rb", __FILE__)].each do |file|
+Dir[File.expand_path("support/**/*.rb", __dir__)].each do |file|
   require file
 end
 

data/spec/support/application/public/javascripts/vendor/{pusher-4.2.1.js → pusher-4.2.2.js}

@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v4.2.1
+ * Pusher JavaScript Library v4.2.2
  * https://pusher.com/
  *
  * Copyright 2017, Pusher
@@ -89,7 +89,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        var _this = this;
 	        checkAppKey(app_key);
 	        options = options || {};
-	        if (!options.cluster) {
+	        if (!options.cluster && !(options.wsHost || options.httpHost)) {
 	            var suffix = url_store_1["default"].buildLogSuffix("javascriptQuickStart");
 	            logger_1["default"].warn("You should always specify a cluster when connecting. " + suffix);
 	        }
@@ -476,11 +476,12 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	"use strict";
 	var Defaults = {
-	    VERSION: "4.2.1",
+	    VERSION: "4.2.2",
 	    PROTOCOL: 7,
 	    host: 'ws.pusherapp.com',
 	    ws_port: 80,
 	    wss_port: 443,
+	    ws_path: '',
 	    sockjs_host: 'sockjs.pusher.com',
 	    sockjs_http_port: 80,
 	    sockjs_https_port: 443,
@@ -629,7 +630,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	            args[_i - 0] = arguments[_i];
 	        }
 	        var message = collections_1.stringify.apply(this, arguments);
-	        if ((window).console) {
+	        if (pusher_1["default"].log) {
+	            pusher_1["default"].log(message);
+	        }
+	        else if ((window).console) {
 	            if ((window).console.warn) {
 	                (window).console.warn(message);
 	            }
@@ -637,9 +641,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	                (window).console.log(message);
 	            }
 	        }
-	        if (pusher_1["default"].log) {
-	            pusher_1["default"].log(message);
-	        }
 	    }
 	};
 	exports.__esModule = true;
@@ -1339,7 +1340,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 	exports.ws = {
 	    getInitial: function (key, params) {
-	        return getGenericURL("ws", params, getGenericPath(key, "flash=false"));
+	        var path = (params.httpPath || "") + getGenericPath(key, "flash=false");
+	        return getGenericURL("ws", params, path);
 	    }
 	};
 	exports.http = {
@@ -1725,7 +1727,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	    return [
 	        [":def", "ws_options", {
 	                hostUnencrypted: config.wsHost + ":" + config.wsPort,
-	                hostEncrypted: config.wsHost + ":" + config.wssPort
+	                hostEncrypted: config.wsHost + ":" + config.wssPort,
+	                httpPath: config.wsPath
 	            }],
 	        [":def", "wss_options", [":extend", ":ws_options", {
 	                    encrypted: true
@@ -4153,6 +4156,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        wsHost: defaults_1["default"].host,
 	        wsPort: defaults_1["default"].ws_port,
 	        wssPort: defaults_1["default"].wss_port,
+	        wsPath: defaults_1["default"].ws_path,
 	        httpHost: defaults_1["default"].sockjs_host,
 	        httpPort: defaults_1["default"].sockjs_http_port,
 	        httpsPort: defaults_1["default"].sockjs_https_port,

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

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

data/spec/support/capybara.rb

@@ -6,4 +6,5 @@ Capybara.register_driver :poltergeist do |app|
 end
 
 Capybara.app = Sinatra::Application
+Capybara.server = :webrick
 Capybara.default_driver = :poltergeist

data/spec/support/webhooks.rb

@@ -1,4 +1,12 @@
-# rubocop:disable Style/GlobalVars
+class WebhookHelper
+  def self.events
+    @events ||= []
+  end
+
+  def self.mutex
+    @mutex ||= Mutex.new
+  end
+end
 
 thread = Thread.new do
   # Not explicitly requiring Thin::Server occasionally results in
@@ -12,7 +20,9 @@ thread = Thread.new do
       webhook = Pusher::WebHook.new(request)
 
       if webhook.valid?
-        $events.concat(webhook.events)
+        WebhookHelper.mutex.synchronize do
+          WebhookHelper.events.concat(webhook.events)
+        end
       end
 
       Rack::Response.new.finish
@@ -26,11 +36,3 @@ thread = Thread.new do
 end
 
 at_exit { thread.exit }
-
-RSpec.configure do |config|
-  config.before 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.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Tristan Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.18.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.18.1
 - !ruby/object:Gem::Dependency
   name: pusher
   requirement: !ruby/object:Gem::Requirement
@@ -100,84 +100,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.2.1
+        version: 12.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.2.1
+        version: 12.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.58.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.58.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.29.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.29.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 0.9.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 0.9.16
 description: A fake Pusher server for development and testing.
 email: hello@tristandunn.com
 executables:
@@ -220,7 +220,7 @@ files:
 - spec/lib/pusher_fake_spec.rb
 - spec/spec_helper.rb
 - spec/support/application.rb
-- spec/support/application/public/javascripts/vendor/pusher-4.2.1.js
+- spec/support/application/public/javascripts/vendor/pusher-4.2.2.js
 - spec/support/application/views/index.erb
 - spec/support/capybara.rb
 - spec/support/coveralls.rb
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A fake Pusher server for development and testing.
@@ -270,7 +270,7 @@ test_files:
 - spec/support/application.rb
 - spec/support/pusher_fake.rb
 - spec/support/matchers/have_configuration_option.rb
-- spec/support/application/public/javascripts/vendor/pusher-4.2.1.js
+- spec/support/application/public/javascripts/vendor/pusher-4.2.2.js
 - spec/support/application/views/index.erb
 - spec/support/coveralls.rb
 - spec/support/helpers/connect.rb