cable_room 0.1.2 → 0.3.0

data/lib/cable_room/room_member.rb

@@ -28,11 +28,6 @@ module CableRoom
         }
       end
 
-      if blk
-        raise ArgumentError, "Cannot specify both a block and `on_opened:`" if kwargs[:on_opened]
-        kwargs[:on_opened] = blk
-      end
-
       as = respond_to?(:current_user) ? current_user : nil if as == :not_given
 
       if as
@@ -40,7 +35,7 @@ module CableRoom
         kwargs[:extra][:as] = as
       end
 
-      RoomMembership.new(self, room_class, room_key, **kwargs)
+      RoomMembership.new(self, room_class, room_key, **kwargs, &blk)
     end
 
     def ping_room_memberships
@@ -61,7 +56,9 @@ module CableRoom
       on_closed: nil,
       on_opened: nil,
       on_message: nil,
-      extra: nil
+      tags: [],
+      extra: nil,
+      &preconfigure
     )
       @token = SecureRandom.hex(16)
       @has_left = false
@@ -75,6 +72,7 @@ module CableRoom
       @on_closed = on_closed
       @on_message = on_message
 
+      @tags = Array(tags).map(&:to_sym)
       @extra = extra
 
       @cable_channel._room_memberships << self
@@ -89,7 +87,22 @@ module CableRoom
         handle_received_message(message)
       end
 
-      transmit_member_joined
+      # Listen to user-specific channel
+      if extra && extra[:as]
+        stream_port(extra[:as]) do |message|
+          handle_received_message(message)
+        end
+      end
+
+      @tags.each do |tag|
+        stream_port(tag) do |message|
+          handle_received_message(message)
+        end
+      end
+
+      preconfigure&.call(self)
+
+      transmit_port_connected
 
       maybe_provision_room
     end
@@ -107,7 +120,7 @@ module CableRoom
     def ping!
       return if left?
 
-      self << { type: 'member_ping' }
+      self << { type: 'port_ping' }
       maybe_provision_room
     end
 
@@ -116,7 +129,7 @@ module CableRoom
 
       close_streamed_ports!
       @cable_channel._room_memberships.delete(self)
-      self << { type: 'member_left' }
+      self << { type: 'port_disconnected' }
       @has_left = true
       @on_closed&.call(self)
     end
@@ -139,7 +152,7 @@ module CableRoom
 
       case message['type']
       when 'room_opened'
-        transmit_member_joined
+        transmit_port_connected
         @on_opened&.call(self)
       when 'room_closed'
         @on_closed&.call(self)
@@ -153,8 +166,11 @@ module CableRoom
 
     private
 
-    def transmit_member_joined
-      msg = { type: 'member_joined' }
+    def transmit_port_connected
+      msg = {
+        type: 'port_connected',
+        tags: @tags,
+      }
       msg[:extra] = ::ActiveJob::Arguments.serialize([@extra]) if @extra
       self << msg
     end

data/lib/cable_room/version.rb

@@ -1,3 +1,3 @@
 module CableRoom
-  VERSION = "0.1.2".freeze
+  VERSION = "0.3.0".freeze
 end