Exclude messages from being sent to specified socket_id

stevegraham · May 12, 2015 · a5e9ffb · a5e9ffb
1 parent f93234c
commit a5e9ffb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/lib/slanger/api_server.rb b/lib/slanger/api_server.rb
@@ -26,7 +26,7 @@ class ApiServer < Sinatra::Base
       data = JSON.parse(request.body.read.tap{ |s| s.force_encoding('utf-8')})
 
       # Send event to each channel
-      data["channels"].each { |channel| publish(channel, data['name'], data['data']) }
+      data["channels"].each { |channel| publish(channel, data['name'], data['data'], data['socket_id']) }
 
       status 202
       return {}.to_json
@@ -41,12 +41,12 @@ class ApiServer < Sinatra::Base
       return {}.to_json
     end
 
-    def payload(channel, event, data)
+    def payload(channel, event, data, socket_id)
       {
         event:     event,
         data:      data,
         channel:   channel,
-        socket_id: params[:socket_id]
+        socket_id: socket_id
       }.select { |_,v| v }.to_json
     end
 
@@ -57,8 +57,8 @@ def authenticate
         authenticate { |key| Signature::Token.new key, Slanger::Config.secret }
     end
 
-    def publish(channel, event, data)
-      Slanger::Redis.publish(channel, payload(channel, event, data))
+    def publish(channel, event, data, socket_id)
+      Slanger::Redis.publish(channel, payload(channel, event, data, socket_id))
     end
   end
 end
diff --git a/spec/integration/channel_spec.rb b/spec/integration/channel_spec.rb
@@ -22,6 +22,24 @@
         last_event: 'an_event', last_data: { some: "Mit Raben Und Wölfen" }.to_json
     end
 
+    it 'does not send message to excluded sockets' do
+      messages = em_stream do |websocket, messages|
+        case messages.length
+        when 1
+          websocket.callback { websocket.send({ event: 'pusher:subscribe', data: { channel: 'MY_CHANNEL'} }.to_json) }
+        when 2
+          socket_id = JSON.parse(messages.first["data"])["socket_id"]
+          Pusher['MY_CHANNEL'].trigger 'not_excluded_socket_event', { some: "Mit Raben Und Wölfen" }
+          Pusher['MY_CHANNEL'].trigger 'excluded_socket_event', { some: "Mit Raben Und Wölfen" }, socket_id
+        when 3
+          EM.stop
+        end
+     end
+
+      messages.should have_attributes connection_established: true, id_present: true,
+        last_event: 'not_excluded_socket_event', last_data: { some: "Mit Raben Und Wölfen" }.to_json
+    end
+
     it 'enforces one subcription per channel, per socket' do
       messages = em_stream do |websocket, messages|
         case messages.length