pusher-fake 1.12.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fb8ba630f2ac529c445616e37b0aede14ebb36ea1698c8014e93f8cb235fb6e
-  data.tar.gz: 374f57795f1fe563a64d3abf9baa0eaf9debeecec203c49a5e8a4f5d155a9ed1
+  metadata.gz: '09cf8cbf09383dbf9ca8829c07e67da46721965a6e226e76205a92329c55b8a1'
+  data.tar.gz: 0b3d172aa3c5f86c507eab2a3c71177287145ae5b819b323a26c500e2c8ef423
 SHA512:
-  metadata.gz: 3cf72af652796b675ecfe0c9f0b930018d1e8381096d85e8296c7649503d5916f3282df9aca7aa3ffeb2e6dbdd968db3ad4c56d997c79be54d5f971144eb7aa3
-  data.tar.gz: 27c01757983cc5c3d07f6a728dddad2948636222ea580b64341dd7691e48aab023c60d43caefa89e4bf56c9c777b8397841d147ef59c363f1fe1f4d2469ec16c
+  metadata.gz: 246b183a6b21546e1395cdec4e76b1b95953cb9b151901e84602be7a6ef3ef49ec00a6aea663f6ba9761c8479e5bb9799ddab3e1b629e37d449acb9c2d04c19f
+  data.tar.gz: 71df4af1d1a72e6ca55d1e19bdef165a04decbac64968955b2efac70b9b0c2a66e338f2c9770b857f29d86c503bb269b70c7cd779ada8911d53d3304ee406020

data/bin/pusher-fake

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# rubocop:disable Metrics/BlockLength, Metrics/LineLength
+# frozen_string_literal: true
 
 require "optparse"
 require "pusher"
@@ -54,5 +54,3 @@ 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,3 +1,5 @@
+# frozen_string_literal: true
+
 require "em-http-request"
 require "em-websocket"
 require "multi_json"
@@ -7,7 +9,7 @@ require "thin"
 # A Pusher fake.
 module PusherFake
   # The current version string.
-  VERSION = "1.12.0".freeze
+  VERSION = "3.0.0"
 
   autoload :Channel,       "pusher-fake/channel"
   autoload :Configuration, "pusher-fake/configuration"

data/lib/pusher-fake/channel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PusherFake
   # Channel creation and management.
   module Channel
@@ -6,10 +8,10 @@ module PusherFake
     autoload :Presence, "pusher-fake/channel/presence"
 
     # Prefix for private channels.
-    PRIVATE_CHANNEL_PREFIX = "private-".freeze
+    PRIVATE_CHANNEL_PREFIX = "private-"
 
     # Prefix for presence channels.
-    PRESENCE_CHANNEL_PREFIX = "presence-".freeze
+    PRESENCE_CHANNEL_PREFIX = "presence-"
 
     class << self
       # @return [Hash] Cache of existing channels.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PusherFake
   module Channel
     # A presence channel.
@@ -34,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.map { |_, member| [member[:user_id], member[:user_info]] }.to_h
 
         { presence: { hash: hash, count: members.size } }
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PusherFake
   module Channel
     # A private channel.
@@ -38,7 +40,7 @@ module PusherFake
         configuration = PusherFake.configuration
 
         data      = [id, name, data].compact.map(&:to_s).join(":")
-        digest    = OpenSSL::Digest::SHA256.new
+        digest    = OpenSSL::Digest.new("SHA256")
         signature = OpenSSL::HMAC.hexdigest(digest, configuration.secret, data)
 
         "#{configuration.key}:#{signature}"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PusherFake
   module Channel
     # A public channel.

data/lib/pusher-fake/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PusherFake
   # Configuration class.
   class Configuration
@@ -47,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   = $stdout.to_io
       self.secret   = "PUSHER_API_SECRET"
       self.verbose  = false
       self.webhooks = []
@@ -65,6 +67,7 @@ module PusherFake
         wsHost:       socket_options[:host],
         wsPort:       socket_options[:port],
         cluster:      "us-east-1",
+        forceTLS:     false,
         disableStats: disable_stats
       )
     end

data/lib/pusher-fake/connection.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module PusherFake
   # A client connection.
   class Connection
     # Prefix for client events.
-    CLIENT_EVENT_PREFIX = "client-".freeze
+    CLIENT_EVENT_PREFIX = "client-"
 
     # @return [EventMachine::WebSocket::Connection] Socket for the connection.
     attr_reader :socket
@@ -18,10 +20,10 @@ module PusherFake
     #
     # @return [Integer] The object ID of the socket.
     def id
-      parts = socket.object_id.to_s.split("")
-      parts = parts.each_slice(parts.length / 2).to_a
+      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.
@@ -67,11 +69,12 @@ module PusherFake
     end
 
     def process_event(event, message)
-      if event == "pusher:subscribe"
+      case event
+      when "pusher:subscribe"
         channel_for(message).add(self, message[:data])
-      elsif event == "pusher:unsubscribe"
+      when "pusher:unsubscribe"
         channel_for(message).remove(self)
-      elsif event == "pusher:ping"
+      when "pusher:ping"
         emit("pusher:pong")
       end
     end

data/lib/pusher-fake/server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PusherFake
   # Socket and web server manager.
   module Server

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

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module PusherFake
   module Server
     # The fake web application.
     class Application
       CHANNEL_FILTER_ERROR = "user_count may only be requested for presence " \
                              "channels - please supply filter_by_prefix " \
-                             "begining with presence-".freeze
+                             "begining with presence-"
 
       CHANNEL_USER_COUNT_ERROR = "Cannot retrieve the user count unless the " \
-                                 "channel is a presence channel".freeze
+                                 "channel is a presence channel"
 
       REQUEST_PATHS = {
         %r{\A/apps/:id/batch_events\z}           => :batch_events,

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 %w(app_id key secret).each do |setting|
   next unless Pusher.public_send(setting).nil?
 
@@ -24,6 +26,6 @@ PusherFake.configuration.web_options.tap do |options|
 end
 
 # Start the fake socket and web servers.
-fork { PusherFake::Server.start }.tap do |id|
-  at_exit { Process.kill("KILL", id) }
+Thread.new { PusherFake::Server.start }.tap do |thread|
+  at_exit { Thread.kill(thread) }
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pusher-fake/support/base"
 
 # Reset channels between scenarios.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pusher-fake/support/base"
 
 # Reset channels between examples

data/lib/pusher-fake/webhook.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PusherFake
   # Webhook triggering.
   class Webhook
@@ -26,7 +28,7 @@ module PusherFake
       end
 
       def signature_for(payload)
-        digest = OpenSSL::Digest::SHA256.new
+        digest = OpenSSL::Digest.new("SHA256")
         secret = PusherFake.configuration.secret
 
         OpenSSL::HMAC.hexdigest(digest, secret, payload)

data/spec/features/api/channels_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 feature "Requesting channel API endpoint" do

data/spec/features/api/users_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 feature "Requesting user API endpoint" do

data/spec/features/client/connect_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 feature "Client connecting to the server" do

data/spec/features/client/event_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 feature "Client triggers a client event" do

data/spec/features/client/presence_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 feature "Client on a presence channel" do

data/spec/features/client/subscribe_spec.rb

@@ -1,12 +1,10 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 feature "Client subscribing to a channel" do
   before do
-    visit "/"
-
-    # rubocop:disable RSpec/ExpectInHook
-    expect(page).to have_content("Client connected.")
-    # rubocop:enable RSpec/ExpectInHook
+    connect
   end
 
   scenario "successfully subscribes to a channel" do
@@ -57,6 +55,12 @@ feature "Client subscribing to a channel" do
     page.execute_script("Helpers.subscribe(#{MultiJson.dump(channel)})")
   end
 
+  def connect
+    visit "/"
+
+    expect(page).to have_content("Client connected.")
+  end
+
   def override_socket_id(value)
     page.execute_script(
       "Pusher.instance.connection.socket_id = #{MultiJson.dump(value)};"

data/spec/features/server/event_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 feature "Server triggers event" do

data/spec/features/server/webhooks_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 feature "Receiving event webhooks" do

data/spec/lib/pusher-fake/channel/presence_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe PusherFake::Channel::Presence do

data/spec/lib/pusher-fake/channel/private_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe PusherFake::Channel::Private do
@@ -92,7 +94,7 @@ describe PusherFake::Channel::Private, "#authentication_for" do
   before do
     allow(PusherFake).to receive(:configuration).and_return(configuration)
     allow(OpenSSL::HMAC).to receive(:hexdigest).and_return(signature)
-    allow(OpenSSL::Digest::SHA256).to receive(:new).and_return(digest)
+    allow(OpenSSL::Digest).to receive(:new).with("SHA256").and_return(digest)
   end
 
   it "generates a signature" do
@@ -127,7 +129,7 @@ describe PusherFake::Channel::Private,
   before do
     allow(PusherFake).to receive(:configuration).and_return(configuration)
     allow(OpenSSL::HMAC).to receive(:hexdigest).and_return(signature)
-    allow(OpenSSL::Digest::SHA256).to receive(:new).and_return(digest)
+    allow(OpenSSL::Digest).to receive(:new).with("SHA256").and_return(digest)
   end
 
   it "generates a signature" do

data/spec/lib/pusher-fake/channel/public_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe PusherFake::Channel::Public do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe PusherFake::Channel, ".factory" do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe PusherFake::Configuration do
@@ -13,7 +15,7 @@ describe PusherFake::Configuration do
 
   it do
     expect(subject).to have_configuration_option(:logger)
-      .with_default(STDOUT.to_io)
+      .with_default($stdout.to_io)
   end
 
   it do
@@ -88,6 +90,12 @@ describe PusherFake::Configuration, "#to_options" do
     expect(options).to include(cluster: "us-east-1")
   end
 
+  it "disables the forceTLS option" do
+    options = subject.to_options
+
+    expect(options).to include(forceTLS: false)
+  end
+
   it "supports passing custom options" do
     options = subject.to_options(custom: "option")
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 shared_examples_for "#process" do
@@ -95,8 +97,8 @@ end
 describe PusherFake::Connection, "#id" do
   subject { described_class.new(socket) }
 
-  let(:id)     { "123.456" }
-  let(:socket) { instance_double(Object, object_id: 123_456) }
+  let(:id)     { "1234.567" }
+  let(:socket) { instance_double(Object, object_id: 1_234_567) }
 
   it "returns the object ID of the socket" do
     expect(subject.id).to eq(id)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 shared_examples_for "an API request" do
@@ -210,7 +212,7 @@ describe PusherFake::Server::Application, ".events" do
   let(:data)       { { "example" => "data" } }
   let(:name)       { "event-name" }
   let(:request)    { instance_double(Rack::Request, body: body) }
-  let(:channels)   { ["channel-1", "channel-2"] }
+  let(:channels)   { %w(channel-1 channel-2) }
   let(:channel_1)  { instance_double(PusherFake::Channel::Public, emit: true) }
   let(:channel_2)  { instance_double(PusherFake::Channel::Public, emit: true) }
   let(:data_json)  { data.to_json }
@@ -281,7 +283,7 @@ describe PusherFake::Server::Application, ".batch_events" do
   let(:data)       { { "example" => "data" } }
   let(:name)       { "event-name" }
   let(:request)    { instance_double(Rack::Request, body: body) }
-  let(:channels)   { ["channel-1", "channel-2"] }
+  let(:channels)   { %w(channel-1 channel-2) }
   let(:channel_1)  { instance_double(PusherFake::Channel::Public, emit: true) }
   let(:channel_2)  { instance_double(PusherFake::Channel::Public, emit: true) }
   let(:data_json)  { data.to_json }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe PusherFake::Server, ".start" do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe PusherFake::Webhook, ".trigger" do
@@ -31,7 +33,7 @@ describe PusherFake::Webhook, ".trigger" do
 
   before do
     allow(OpenSSL::HMAC).to receive(:hexdigest).and_return(signature)
-    allow(OpenSSL::Digest::SHA256).to receive(:new).and_return(digest)
+    allow(OpenSSL::Digest).to receive(:new).with("SHA256").and_return(digest)
     allow(EventMachine::HttpRequest).to receive(:new).and_return(http)
     allow(PusherFake).to receive(:log)
     allow(PusherFake).to receive(:configuration).and_return(configuration)