pusher-fake 0.3.0 → 0.4.0

data/features/channel_trigger.feature

@@ -49,7 +49,7 @@ Feature: Triggering events on a channel
     Given I am subscribed to the "private-chat" channel
     And Bob is subscribed to the "private-chat" channel
     When I trigger the "client-message" event on the "private-chat" channel
-    Then I should receive a "client-message" event on the "private-chat" channel
+    Then I should not receive a "client-message" event on the "private-chat" channel
     And Bob should receive a "client-message" event on the "private-chat" channel
 
   Scenario: Client triggers a client event on a previously subscribed private channel
@@ -82,3 +82,10 @@ Feature: Triggering events on a channel
       | private-chat-2 |
     Then I should receive a "message" event on the "private-chat-1" channel
     And Bob should receive a "message" event on the "private-chat-2" channel
+
+  Scenario: Server triggers an event and excludes a client by socket ID
+    Given I am subscribed to the "chat" channel
+    And Bob is subscribed to the "chat" channel
+    When a "message" event is triggered on the "chat" channel, ignoring Bob
+    Then I should receive a "message" event on the "chat" channel
+    And Bob should not receive a "message" event on the "chat" channel

data/features/step_definitions/event_steps.rb

@@ -2,6 +2,17 @@ When %{a "$event" event is triggered on the "$channel" channel} do |event, chann
   Pusher.trigger(channel, event, {})
 end
 
+When %{a "$event" event is triggered on the "$channel" channel, ignoring $name} do |event, channel, name|
+  name      = nil if name == "me"
+  socket_id = nil
+
+  using_session(name) do
+    socket_id = page.evaluate_script("Pusher.instance.connection.socket_id")
+  end
+
+  Pusher.trigger(channel, event, {}, socket_id: socket_id)
+end
+
 When %{a "$event" event is triggered on the following channels:} do |event, table|
   channels = table.hashes.collect { |hash| hash["name"] }
 

data/lib/pusher-fake.rb

@@ -16,7 +16,7 @@ require "pusher-fake/webhook"
 
 module PusherFake
   # The current version string.
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 
   # Call this method to modify the defaults.
   #

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

@@ -27,8 +27,10 @@ module PusherFake
       #
       # @param [String] event The event name.
       # @param [Hash] data The event data.
-      def emit(event, data)
+      def emit(event, data, options = {})
         connections.each do |connection|
+          next if connection.socket.object_id == options[:socket_id]
+
           connection.emit(event, data, name)
         end
       end

data/lib/pusher-fake/connection.rb

@@ -47,7 +47,7 @@ module PusherFake
         return unless channel.is_a?(Channel::Private)
         return unless channel.includes?(self)
 
-        channel.emit(event, data)
+        channel.emit(event, data, socket_id: socket.object_id)
       end
     end
   end

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

@@ -11,7 +11,7 @@ module PusherFake
         event   = MultiJson.load(request.body.read)
 
         event["channels"].each do |channel|
-          Channel.factory(channel).emit(event["name"], event["data"])
+          Channel.factory(channel).emit(event["name"], event["data"], socket_id: event["socket_id"])
         end
 
         Rack::Response.new("{}").finish

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

@@ -52,9 +52,11 @@ describe PusherFake::Channel, "#emit" do
   let(:data)         { stub }
   let(:name)         { "name" }
   let(:event)        { "event" }
+  let(:socket_1)     { stub }
+  let(:socket_2)     { stub }
   let(:connections)  { [connection_1, connection_2] }
-  let(:connection_1) { stub(emit: nil) }
-  let(:connection_2) { stub(emit: nil) }
+  let(:connection_1) { stub(emit: nil, socket: socket_1) }
+  let(:connection_2) { stub(emit: nil, socket: socket_2) }
 
   subject { PusherFake::Channel::Public.new(name) }
 
@@ -67,6 +69,12 @@ describe PusherFake::Channel, "#emit" do
     connection_1.should have_received(:emit).with(event, data, name)
     connection_2.should have_received(:emit).with(event, data, name)
   end
+
+  it "ignores connection if socket_id matches the connections socket object_id" do
+    subject.emit(event, data, socket_id: socket_2.object_id)
+    connection_1.should have_received(:emit).with(event, data, name)
+    connection_2.should have_received(:emit).never
+  end
 end
 
 describe PusherFake::Channel, "#includes?" do

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

@@ -145,7 +145,7 @@ describe PusherFake::Connection, "#process, with a client event" do
   it "emits the event to the channel when the connection is in the channel" do
     channel.stubs(includes?: true)
     subject.process(json)
-    channel.should have_received(:emit).with(event, data)
+    channel.should have_received(:emit).with(event, data, socket_id: subject.socket.object_id)
   end
 
   it "does not emit the event to the channel when the channel is not private" do

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

@@ -5,12 +5,13 @@ describe PusherFake::Server::Application, ".call" do
   let(:data)        { mock }
   let(:json)        { mock }
   let(:name)        { "event-name" }
-  let(:event)       { { "channels" => channels, "name" => name, "data" => data } }
+  let(:event)       { { "channels" => channels, "name" => name, "data" => data, "socket_id" => socket_id } }
   let(:request)     { stub(body: body) }
   let(:channels)    { ["channel-1", "channel-2"] }
   let(:response)    { mock }
   let(:channel_1)   { stub(emit: true) }
   let(:channel_2)   { stub(emit: true) }
+  let(:socket_id)   { stub }
   let(:environment) { mock }
 
   subject { PusherFake::Server::Application }
@@ -45,8 +46,8 @@ describe PusherFake::Server::Application, ".call" do
 
   it "emits the event to the channels" do
     subject.call(environment)
-    channel_1.should have_received(:emit).with(name, data)
-    channel_2.should have_received(:emit).with(name, data)
+    channel_1.should have_received(:emit).with(name, data, socket_id: socket_id)
+    channel_2.should have_received(:emit).with(name, data, socket_id: socket_id)
   end
 
   it "creates a Rack response with an empty JSON object" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -279,7 +279,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4186586164521781753
+      hash: 422324926089299174
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4186586164521781753
+      hash: 422324926089299174
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23