pusher-fake 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d164bb85fcc0e139fada900d4703abb1340319cc595cb31d4add51d90f4b5ac3
-  data.tar.gz: 55d1cfda30b76adca304332495d9e5cab16c788bf07d15aa8e85b6be695ed11a
+  metadata.gz: 791394d448a74ca4961e1fba348d729cec78707e9c06e502cd83d65778eb2e5d
+  data.tar.gz: f32b3aab29485d672566ae06c7d670b5cbe3607e7e32c5a09baeffa156c14df3
 SHA512:
-  metadata.gz: 7d8eee35e30bd8e6ec013d4cb9b196beb542c4fa4b3802defa4a26dde91cc18db64801133cbbe922b7475d0fa3c030d5f9660217375d6d49df38353698a0bf96
-  data.tar.gz: 9d8fa2e40e6c5dc158df21df74dcafca0f358a876163e9eab844d00c43ac67eb8cd5786e2955797449926b842c21462133fa57848ab4b4f6d96c9199252499b6
+  metadata.gz: e8df1c937ba729cc693f7d1a666573934155c7b0dc06b9708e38f8a78030efe9a7e2efc69b2a4dac7197f68c94fe96eb62a3a006d5f3d5690b00b7cd41b3aad2
+  data.tar.gz: 0db82d0635bb6958fae833c131813e6ef6eed51c7ef7835d9370322531a83957b543ce99ea2972aa55feecce4655ed5b3d54e7772aa1efb495653b726831f623

data/lib/pusher-fake.rb

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

data/lib/pusher-fake/channel.rb

@@ -5,13 +5,13 @@ module PusherFake
     autoload :Private,  "pusher-fake/channel/private"
     autoload :Presence, "pusher-fake/channel/presence"
 
-    class << self
-      # Name matcher for private channels.
-      PRIVATE_CHANNEL_MATCHER  = /\Aprivate-/
+    # Prefix for private channels.
+    PRIVATE_CHANNEL_PREFIX = "private-".freeze
 
-      # Name matcher for presence channels.
-      PRESENCE_CHANNEL_MATCHER = /\Apresence-/
+    # Prefix for presence channels.
+    PRESENCE_CHANNEL_PREFIX = "presence-".freeze
 
+    class << self
       # @return [Hash] Cache of existing channels.
       attr_writer :channels
 
@@ -58,10 +58,9 @@ module PusherFake
       # @param [String] name The name of the channel.
       # @return [Class] The class to use for the channel.
       def class_for(name)
-        case name
-        when PRIVATE_CHANNEL_MATCHER
+        if name.start_with?(PRIVATE_CHANNEL_PREFIX)
           Private
-        when PRESENCE_CHANNEL_MATCHER
+        elsif name.start_with?(PRESENCE_CHANNEL_PREFIX)
           Presence
         else
           Public

data/lib/pusher-fake/configuration.rb

@@ -4,6 +4,9 @@ module PusherFake
     # @return [String] The Pusher Applicaiton ID. (Defaults to +PUSHER_APP_ID+.)
     attr_reader :app_id
 
+    # @return [Boolean] Disable the client statistics. (Defaults to +true+.)
+    attr_accessor :disable_stats
+
     # @return [String] The Pusher API key. (Defaults to +PUSHER_API_KEY+.)
     attr_accessor :key
 
@@ -49,6 +52,7 @@ module PusherFake
       self.verbose  = false
       self.webhooks = []
 
+      self.disable_stats  = true
       self.socket_options = { host: "127.0.0.1", port: available_port }
       self.web_options    = { host: "127.0.0.1", port: available_port }
     end
@@ -58,9 +62,10 @@ module PusherFake
     # @param [Hash] options Custom options for Pusher client.
     def to_options(options = {})
       options.merge(
-        wsHost:  socket_options[:host],
-        wsPort:  socket_options[:port],
-        cluster: "us-east-1"
+        wsHost:       socket_options[:host],
+        wsPort:       socket_options[:port],
+        cluster:      "us-east-1",
+        disableStats: disable_stats
       )
     end
 

data/lib/pusher-fake/connection.rb

@@ -1,8 +1,8 @@
 module PusherFake
   # A client connection.
   class Connection
-    # Name matcher for client events.
-    CLIENT_EVENT_MATCHER = /\Aclient-(.+)\z/
+    # Prefix for client events.
+    CLIENT_EVENT_PREFIX = "client-".freeze
 
     # @return [EventMachine::WebSocket::Connection] Socket for the connection.
     attr_reader :socket
@@ -53,7 +53,7 @@ module PusherFake
 
       PusherFake.log("RECV #{id}: #{message}")
 
-      if event =~ CLIENT_EVENT_MATCHER
+      if event.start_with?(CLIENT_EVENT_PREFIX)
         process_trigger(event, message)
       else
         process_event(event, message)

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

@@ -9,8 +9,6 @@ module PusherFake
       CHANNEL_USER_COUNT_ERROR = "Cannot retrieve the user count unless the " \
                                  "channel is a presence channel".freeze
 
-      PRESENCE_PREFIX_MATCHER = /\Apresence-/
-
       REQUEST_PATHS = {
         %r{\A/apps/:id/batch_events\z}           => :batch_events,
         %r{\A/apps/:id/events\z}                 => :events,
@@ -68,11 +66,9 @@ module PusherFake
       def self.channel(name, request)
         count = request.params["info"].to_s.split(",").include?("user_count")
 
-        if count && name !~ PRESENCE_PREFIX_MATCHER
-          raise CHANNEL_USER_COUNT_ERROR
-        end
+        raise CHANNEL_USER_COUNT_ERROR if invalid_channel_to_count?(name, count)
 
-        channel     = PusherFake::Channel.channels[name]
+        channel     = Channel.channels[name]
         connections = channel ? channel.connections : []
 
         result = { occupied: connections.any? }
@@ -92,7 +88,7 @@ module PusherFake
         count  = request.params["info"].to_s.split(",").include?("user_count")
         prefix = request.params["filter_by_prefix"].to_s
 
-        raise CHANNEL_FILTER_ERROR if count && prefix !~ PRESENCE_PREFIX_MATCHER
+        raise CHANNEL_FILTER_ERROR if invalid_channel_to_count?(prefix, count)
 
         PusherFake::Channel
           .channels
@@ -143,6 +139,12 @@ module PusherFake
         { users: users || [] }
       end
 
+      # @return [Boolean]
+      def self.invalid_channel_to_count?(name, includes_count)
+        includes_count && !name.start_with?(Channel::PRESENCE_CHANNEL_PREFIX)
+      end
+      private_class_method :invalid_channel_to_count?
+
       # Emit an event with data to the requested channel(s).
       #
       # @param [Hash] event The raw event JSON.

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

@@ -1,6 +1,11 @@
 require "spec_helper"
 
 describe PusherFake::Configuration do
+  it do
+    expect(subject).to have_configuration_option(:disable_stats)
+      .with_default(true)
+  end
+
   it do
     expect(subject).to have_configuration_option(:key)
       .with_default("PUSHER_API_KEY")
@@ -59,6 +64,12 @@ describe PusherFake::Configuration, "#app_id=" do
 end
 
 describe PusherFake::Configuration, "#to_options" do
+  it "includes disable_stats as disableStats" do
+    options = subject.to_options
+
+    expect(options).to include(disableStats: subject.disable_stats)
+  end
+
   it "includes the socket host as wsHost" do
     options = subject.to_options
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Tristan Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,42 +128,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.58.2
+        version: 0.60.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.58.2
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.29.0
+        version: 1.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.29.0
+        version: 1.30.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement