pgbus 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 562d32e977685559437bdb1d3817fd02feb4fd9485b9101241a64d25d37162b1
-  data.tar.gz: eeacf0de199bfdc49c5b68523c5bbae7b1eff7970637742f3ec3e4391e4a3b06
+  metadata.gz: 8f659edeb84f108e166ae2ea981e5eb3e4fabfde1542769a777d9d707aba349d
+  data.tar.gz: 2abf0072cdc0f414670367e4a59881003285c43f895618d1ec63b1b7fca5e27a
 SHA512:
-  metadata.gz: a06cdb8eeecef32d6fa024f1fadac4f8c22758a11c91b1e9f5b00266869ea92b068c58a239a543c9409375d7155a59a5ec05f17cad59d7a23a49c90ecf74d7cd
-  data.tar.gz: e2a941feb09d3462bb9a83cda9b48821cf93649b53e9e7305af4a3b43b95bccca7690f40ebcb42857c4b9118ebeb592bcfacc317302e3a71b39be1c4f78493aa
+  metadata.gz: c527aa3c60ae917b2589cd23b99f14348fa4eef752ae004b2ffc3a90d248e5c09bc68ee06ddfde3d335c469192dd821551b56bb9b6fb259f6f1b961a61567d9e
+  data.tar.gz: 6f66d58dfe49bca18d3b3a1379e2c458c75954cec3c7fb1ddd23fcfa05e495b00db4d3646d42e32e40b202135e5bb7e51a18d6287ab897e7605fd87250c93391

data/lib/pgbus/streams/broadcastable_override.rb

@@ -36,17 +36,23 @@ module Pgbus
         broadcast_action_to
       ].freeze
 
+      # pgbus-specific broadcast options that Turbo's own broadcast helpers
+      # don't understand. We pull them out of kwargs (so they never reach
+      # turbo-rails' renderer) and thread them to broadcast_stream_to via
+      # thread-locals, mirroring the original durable: shim.
+      PGBUS_BROADCAST_OPTS = %i[durable exclude visible_to event].freeze
+
       BROADCAST_METHODS.each do |method_name|
         define_method(method_name) do |*streamables, **kwargs|
-          durable = kwargs.delete(:durable)
-          with_pgbus_durable(durable) { super(*streamables, **kwargs) }
+          opts = extract_pgbus_broadcast_opts(kwargs)
+          with_pgbus_broadcast_opts(**opts) { super(*streamables, **kwargs) }
         end
       end
 
       BROADCAST_ACTION_METHODS.each do |method_name|
         define_method(method_name) do |*streamables, action:, **kwargs|
-          durable = kwargs.delete(:durable)
-          with_pgbus_durable(durable) { super(*streamables, action: action, **kwargs) }
+          opts = extract_pgbus_broadcast_opts(kwargs)
+          with_pgbus_broadcast_opts(**opts) { super(*streamables, action: action, **kwargs) }
         end
       end
 
@@ -121,14 +127,41 @@ module Pgbus
 
       private
 
-      def with_pgbus_durable(value)
-        return yield if value.nil?
+      def extract_pgbus_broadcast_opts(kwargs)
+        PGBUS_BROADCAST_OPTS.each_with_object({}) do |key, opts|
+          opts[key] = kwargs.delete(key) if kwargs.key?(key)
+        end
+      end
+
+      # Set the pgbus broadcast thread-locals for the duration of the block,
+      # restoring previous values afterwards (nested/concurrent-safe). Only
+      # keys actually passed are touched, so unrelated outer broadcasts keep
+      # their values.
+      def with_pgbus_broadcast_opts(durable: :__unset__, exclude: :__unset__, visible_to: :__unset__, event: :__unset__)
+        previous = {}
+        set = lambda do |tl_key, value|
+          next if value == :__unset__
+
+          previous[tl_key] = Thread.current[tl_key]
+          Thread.current[tl_key] = value
+        end
+
+        set.call(:pgbus_broadcast_durable, durable)
+        set.call(:pgbus_broadcast_exclude, exclude)
+        set.call(:pgbus_broadcast_visible_to, visible_to)
+        set.call(:pgbus_broadcast_event, event)
 
-        previous = Thread.current[:pgbus_broadcast_durable]
-        Thread.current[:pgbus_broadcast_durable] = value
         yield
       ensure
-        Thread.current[:pgbus_broadcast_durable] = previous unless value.nil?
+        previous.each { |tl_key, value| Thread.current[tl_key] = value }
+      end
+
+      # Kept for backward compatibility — the class-level durable callbacks
+      # (broadcasts_to with durable:) and any external callers may still use it.
+      def with_pgbus_durable(value, &)
+        return yield if value.nil?
+
+        with_pgbus_broadcast_opts(durable: value, &)
       end
     end
   end

data/lib/pgbus/streams/turbo_broadcastable.rb

@@ -42,7 +42,12 @@ module Pgbus
                   else
                     override
                   end
-        Pgbus.stream(name, durable: durable).broadcast(content)
+        Pgbus.stream(name, durable: durable).broadcast(
+          content,
+          exclude: Thread.current[:pgbus_broadcast_exclude],
+          visible_to: Thread.current[:pgbus_broadcast_visible_to],
+          event: Thread.current[:pgbus_broadcast_event]
+        )
       end
     end
 

data/lib/pgbus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pgbus
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Mikael Henriksson