pusher-fake 2.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce88691f316170560d4faec1f2fccd98b5904fc80a1e8037dd9f2de483e01b27
-  data.tar.gz: 811565f2ddea342eb5faa9d85b97ed03e4122f44ce9ea30770ae8ce2df960ffd
+  metadata.gz: 9d87ee628168fd524b482569791802df7bb50695dc7cfc4f74164587b3a195df
+  data.tar.gz: dec3b6f7071488cf6add4418fe6e9a8a18c0b778edcc2298b22e529e9f3ad3eb
 SHA512:
-  metadata.gz: 7f8c708e354d2b470834e2c8b9ade9b3390e31f0c4674aaf8da5780464b7c15c3bfb63975a981ec58c876eeac5eeab8634c733e0deae61c81b89e1e0ca232e4d
-  data.tar.gz: 6379b91591ea2bac3ed912055b920dd2c9788698122d98629e59c3e17c4b82c8aab41148a8fe821c4357cdc45098cfb9972334456d345fa6ba0cacd4ab080af8
+  metadata.gz: f2ca4fc45b9710725d542a7c73324b7a995b36d896c72fb7561f5cd3544b548a26f07438896530ce60e4a1689be4bbe99cc77361747f4779b3f77b38900f9ad3
+  data.tar.gz: fc90fef11fb8d9d0838f3597521610a77822f3ebd84ed82554ac8dbe3098f91b6c94afdb699c8c41e47d758ecac1ea38abdb1a1a89a26e56a8753a1758bb7aff

data/lib/pusher-fake/channel/presence.rb

@@ -36,9 +36,7 @@ module PusherFake
       #
       # @return [Hash] Hash containing presence information.
       def subscription_data
-        hash = Hash[
-          members.map { |_, member| [member[:user_id], member[:user_info]] }
-        ]
+        hash = members.to_h { |_, member| [member[:user_id], member[:user_info]] }
 
         { presence: { hash: hash, count: members.size } }
       end

data/lib/pusher-fake/configuration.rb

@@ -49,7 +49,7 @@ module PusherFake
     def reset!
       self.app_id   = "PUSHER_APP_ID"
       self.key      = "PUSHER_API_KEY"
-      self.logger   = $stdout.to_io
+      self.logger   = standard_out_io
       self.secret   = "PUSHER_API_SECRET"
       self.verbose  = false
       self.webhooks = []
@@ -81,5 +81,13 @@ module PusherFake
         socket.close
       end
     end
+
+    def standard_out_io
+      if $stdout.respond_to?(:to_io)
+        $stdout.to_io
+      else
+        $stdout
+      end
+    end
   end
 end

data/lib/pusher-fake/connection.rb

@@ -20,10 +20,10 @@ module PusherFake
     #
     # @return [Integer] The object ID of the socket.
     def id
-      parts = socket.object_id.to_s.split("")
+      parts = socket.object_id.to_s.chars
       parts = parts.each_slice((parts.length / 2.0).ceil).to_a
 
-      [parts.first.join(""), parts.last.join("")].join(".")
+      [parts.first.join, parts.last.join].join(".")
     end
 
     # Emit an event to the connection.

data/lib/pusher-fake/server.rb

@@ -54,15 +54,6 @@ module PusherFake
       def configuration
         PusherFake.configuration
       end
-
-      # Return a hash of options for the socket server based on
-      # the configuration.
-      #
-      # @return [Hash] The socket server configuration options.
-      def socket_server_options
-        { host: configuration.socket_host,
-          port: configuration.socket_port }
-      end
     end
   end
 end

data/lib/pusher-fake.rb

@@ -9,7 +9,7 @@ require "thin"
 # A Pusher fake.
 module PusherFake
   # The current version string.
-  VERSION = "2.2.0"
+  VERSION = "4.0.0"
 
   autoload :Channel,       "pusher-fake/channel"
   autoload :Configuration, "pusher-fake/configuration"

data/spec/features/api/channels_spec.rb

@@ -48,13 +48,13 @@ feature "Requesting channel API endpoint" do
   end
 
   scenario "channel, with no occupants" do
-    expect(channel[:occupied]).to eq(false)
+    expect(channel[:occupied]).to be(false)
   end
 
   scenario "channel, with an occupant" do
     subscribe_to(channel_name)
 
-    expect(channel[:occupied]).to eq(true)
+    expect(channel[:occupied]).to be(true)
   end
 
   scenario "channel, with info attributes" do
@@ -62,7 +62,7 @@ feature "Requesting channel API endpoint" do
 
     result = Pusher.get("/channels/#{presence_name}", info: "user_count")
 
-    expect(result[:occupied]).to eq(true)
+    expect(result[:occupied]).to be(true)
     expect(result[:user_count]).to eq(1)
   end
 

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

@@ -53,6 +53,25 @@ describe PusherFake::Configuration do
   it "defaults socket and web ports to different values" do
     expect(subject.socket_options[:port]).not_to eq(subject.web_options[:port])
   end
+
+  context "with StringIO as standard out" do
+    let(:io) { StringIO.new }
+
+    around do |example|
+      original = $stdout
+      $stdout  = io # rubocop:disable RSpec/ExpectOutput
+
+      example.run
+
+      $stdout = original # rubocop:disable RSpec/ExpectOutput
+    end
+
+    it "assigns standard out to the logger" do
+      subject.reset!
+
+      expect(subject.logger).to eq(io)
+    end
+  end
 end
 
 describe PusherFake::Configuration, "#app_id=" do

data/spec/lib/pusher_fake_spec.rb

@@ -18,13 +18,13 @@ describe PusherFake, ".configuration" do
   let(:configuration) { double }
 
   before do
-    described_class.instance_variable_set("@configuration", nil)
+    described_class.instance_variable_set(:@configuration, nil)
 
     allow(PusherFake::Configuration).to receive(:new).and_return(configuration)
   end
 
   after do
-    described_class.instance_variable_set("@configuration", nil)
+    described_class.instance_variable_set(:@configuration, nil)
   end
 
   it "initializes a configuration object" do

data/spec/spec_helper.rb

@@ -4,6 +4,19 @@ require "bundler/setup"
 
 Bundler.require(:default, :development)
 
+if ENV["CI"] || ENV["COVERAGE"]
+  require "simplecov"
+  require "simplecov-console"
+
+  SimpleCov.formatter = SimpleCov::Formatter::Console
+  SimpleCov.start do
+    add_filter("lib/pusher-fake/support")
+    add_filter("spec/support")
+    enable_coverage :branch
+    minimum_coverage line: 100, branch: 100
+  end
+end
+
 Dir[File.expand_path("support/**/*.rb", __dir__)].sort.each do |file|
   require file
 end

data/spec/support/application/public/javascripts/vendor/{pusher-7.0.0.js → pusher-7.0.6.js}

@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v7.0.0
+ * Pusher JavaScript Library v7.0.6
  * https://pusher.com/
  *
  * Copyright 2020, Pusher
@@ -388,7 +388,7 @@ exports.maxDecodedLength = function (length) {
 exports.decodedLength = function (s) {
     return stdCoder.decodedLength(s);
 };
-//# sourceMappingURL=base64.js.map
+
 
 /***/ }),
 /* 1 */
@@ -543,7 +543,7 @@ function decode(arr) {
     return chars.join("");
 }
 exports.decode = decode;
-//# sourceMappingURL=utf8.js.map
+
 
 /***/ }),
 /* 2 */
@@ -558,6 +558,7 @@ module.exports = __webpack_require__(3).default;
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+// ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
 // CONCATENATED MODULE: ./src/runtimes/web/dom/script_receiver_factory.ts
@@ -592,7 +593,7 @@ var ScriptReceivers = new ScriptReceiverFactory('_pusher_script_', 'Pusher.Scrip
 
 // CONCATENATED MODULE: ./src/core/defaults.ts
 var Defaults = {
-    VERSION: "7.0.0",
+    VERSION: "7.0.6",
     PROTOCOL: 7,
     wsPort: 80,
     wssPort: 443,
@@ -2332,6 +2333,7 @@ var channel_Channel = (function (_super) {
         this.subscriptionCancelled = false;
         this.authorize(this.pusher.connection.socket_id, function (error, data) {
             if (error) {
+                _this.subscriptionPending = false;
                 logger.error(error.toString());
                 _this.emit('pusher:subscription_error', Object.assign({}, {
                     type: 'AuthError',
@@ -4531,7 +4533,7 @@ var pusher_Pusher = (function () {
         }
         else {
             channel = this.channels.remove(channel_name);
-            if (channel && this.connection.state === 'connected') {
+            if (channel && channel.subscribed) {
                 channel.unsubscribe();
             }
         }

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

@@ -14,7 +14,7 @@
 </section>
 
 <script src="/javascripts/vendor/polyfill.min.js"></script>
-<script src="/javascripts/vendor/pusher-7.0.0.js"></script>
+<script src="/javascripts/vendor/pusher-7.0.6.js"></script>
 <script>
   Pusher.instance = <%= PusherFake.javascript %>;
   Pusher.instance.connection.bind("state_change", function(states) {

data/spec/support/capybara.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require "capybara/poltergeist"
 require "capybara/rspec"
 
-Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app, url_whitelist: [])
-end
-
 Capybara.app = Sinatra::Application
-Capybara.server = :webrick
-Capybara.default_driver = :poltergeist
+Capybara.server = :puma, { Silent: true }
+Capybara.default_driver = :selenium_chrome_headless
+
+# Ignore deprecation warning.
+Selenium::WebDriver.logger.ignore(:browser_options)

data/spec/support/pusher_fake.rb

@@ -7,7 +7,7 @@ RSpec.configure do |config|
     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"
+                   "#{options[:host]}:#{options[:port]}/apps/PUSHER_APP_ID"
     end
 
     @thread = Thread.new { PusherFake::Server.start }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Tristan Dunn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -67,131 +67,173 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.18.1
+        version: 3.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.18.1
+        version: 3.36.0
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.6.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.6.4
 - !ruby/object:Gem::Dependency
   name: pusher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: 1.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: 1.26.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.13.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.13.3
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.43.2
+        version: 2.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.43.2
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.25
+        version: 0.9.27
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.25
+        version: 0.9.27
 description: A fake Pusher server for development and testing.
 email: hello@tristandunn.com
 executables:
@@ -234,10 +276,9 @@ files:
 - spec/spec_helper.rb
 - spec/support/application.rb
 - spec/support/application/public/javascripts/vendor/polyfill.min.js
-- spec/support/application/public/javascripts/vendor/pusher-7.0.0.js
+- spec/support/application/public/javascripts/vendor/pusher-7.0.6.js
 - spec/support/application/views/index.erb
 - spec/support/capybara.rb
-- spec/support/coveralls.rb
 - spec/support/helpers/connect.rb
 - spec/support/helpers/event.rb
 - spec/support/helpers/subscription.rb
@@ -248,7 +289,8 @@ files:
 homepage: https://github.com/tristandunn/pusher-fake
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -257,47 +299,46 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A fake Pusher server for development and testing.
 test_files:
-- spec/spec_helper.rb
-- spec/features/server/event_spec.rb
-- spec/features/server/webhooks_spec.rb
 - spec/features/api/channels_spec.rb
 - spec/features/api/users_spec.rb
 - spec/features/client/connect_spec.rb
-- spec/features/client/presence_spec.rb
 - spec/features/client/event_spec.rb
+- spec/features/client/presence_spec.rb
 - spec/features/client/subscribe_spec.rb
-- spec/support/capybara.rb
-- spec/support/webhooks.rb
-- spec/support/application.rb
-- spec/support/pusher_fake.rb
-- spec/support/matchers/have_configuration_option.rb
-- spec/support/application/public/javascripts/vendor/pusher-7.0.0.js
+- spec/features/server/event_spec.rb
+- spec/features/server/webhooks_spec.rb
+- spec/lib/pusher-fake/channel/presence_spec.rb
+- spec/lib/pusher-fake/channel/private_spec.rb
+- spec/lib/pusher-fake/channel/public_spec.rb
+- spec/lib/pusher-fake/channel_spec.rb
+- spec/lib/pusher-fake/configuration_spec.rb
+- spec/lib/pusher-fake/connection_spec.rb
+- spec/lib/pusher-fake/server/application_spec.rb
+- spec/lib/pusher-fake/server_spec.rb
+- spec/lib/pusher-fake/webhook_spec.rb
+- spec/lib/pusher_fake_spec.rb
+- spec/spec_helper.rb
 - spec/support/application/public/javascripts/vendor/polyfill.min.js
+- spec/support/application/public/javascripts/vendor/pusher-7.0.6.js
 - spec/support/application/views/index.erb
-- spec/support/coveralls.rb
+- spec/support/application.rb
+- spec/support/capybara.rb
 - spec/support/helpers/connect.rb
-- spec/support/helpers/subscription.rb
 - spec/support/helpers/event.rb
+- spec/support/helpers/subscription.rb
 - spec/support/helpers/user.rb
-- spec/lib/pusher_fake_spec.rb
-- spec/lib/pusher-fake/webhook_spec.rb
-- spec/lib/pusher-fake/server_spec.rb
-- spec/lib/pusher-fake/configuration_spec.rb
-- spec/lib/pusher-fake/server/application_spec.rb
-- spec/lib/pusher-fake/channel/presence_spec.rb
-- spec/lib/pusher-fake/channel/public_spec.rb
-- spec/lib/pusher-fake/channel/private_spec.rb
-- spec/lib/pusher-fake/connection_spec.rb
-- spec/lib/pusher-fake/channel_spec.rb
+- spec/support/matchers/have_configuration_option.rb
+- spec/support/pusher_fake.rb
+- spec/support/webhooks.rb

data/spec/support/coveralls.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-if ENV["CI"]
-  require "coveralls"
-
-  Coveralls.wear_merged! do
-    add_filter "spec/"
-  end
-end