turbo-rails 2.0.8 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4727e6617dc1c23ff57cb213e98eb3fd3aa11a364451d10622034c9514cb658a
-  data.tar.gz: d20337dc3363beb18a4c5ef1b57cef22643ba2d654294daa84ce7a447645dc55
+  metadata.gz: 94572dc49b27a9dd77578b4bb4083732609943d5b9f850331fba2eab3fae1b8c
+  data.tar.gz: 6a18b6efad308fe32226a7db8e18e03df9125dcddc447b98fcbffb1ddd334697
 SHA512:
-  metadata.gz: 32987a0bdfce8ac6a2050e7190293f5eddabf9e6349b9d228a557153d27adda86d760dcdf4fdcd3ccc00a8fd8ccb9ed945101898d6c4636cba8289835ea89ed1
-  data.tar.gz: c5382c8d5504679799bdb22c30b73b0f057ac4c1ab818d386a23da0925e2f743f4c5f630fc33c6c9795394ef0f4fef199d661343cc1664e2156edc081ee885b0
+  metadata.gz: 693a6e202e6b831141985389536f23b93a2c019e96e7de54f050407fd6f25a4082a13ba0c4a3fce3e747ae895a9d0ad5851ba0cbc68acf5c254c4a57b6dd6b36
+  data.tar.gz: 1ee3bcbd690330b8c602532151eacc86cdb9d442649638189daa887432183df027d3a054d4c999aeb59a6aae4de5164e9fa00fa5b62e0848874ddc95878df938

data/app/channels/turbo/streams/broadcasts.rb

@@ -6,7 +6,7 @@ module Turbo::Streams::Broadcasts
   include Turbo::Streams::ActionHelper
 
   def broadcast_remove_to(*streamables, **opts)
-    broadcast_action_to(*streamables, action: :remove, **opts)
+    broadcast_action_to(*streamables, action: :remove, render: false, **opts)
   end
 
   def broadcast_replace_to(*streamables, **opts)
@@ -38,10 +38,9 @@ module Turbo::Streams::Broadcasts
   end
 
   def broadcast_action_to(*streamables, action:, target: nil, targets: nil, attributes: {}, **rendering)
-    broadcast_stream_to(*streamables, content: turbo_stream_action_tag(action, target: target, targets: targets, template:
-      rendering.delete(:content) || rendering.delete(:html) || (rendering[:render] != false && rendering.any? ? render_format(:html, **rendering) : nil),
-      **attributes
-    ))
+    broadcast_stream_to *streamables, content: turbo_stream_action_tag(
+      action, target: target, targets: targets, template: render_broadcast_action(rendering), **attributes
+    )
   end
 
   def broadcast_replace_later_to(*streamables, **opts)
@@ -70,7 +69,7 @@ module Turbo::Streams::Broadcasts
 
   def broadcast_refresh_later_to(*streamables, request_id: Turbo.current_request_id, **opts)
     refresh_debouncer_for(*streamables, request_id: request_id).debounce do
-      Turbo::Streams::BroadcastStreamJob.perform_later stream_name_from(streamables), content: turbo_stream_refresh_tag(request_id: request_id, **opts)
+      Turbo::Streams::BroadcastStreamJob.perform_later stream_name_from(streamables), content: turbo_stream_refresh_tag(request_id: request_id, **opts).to_str # Sidekiq requires job arguments to be valid JSON types, such as String
     end
   end
 
@@ -111,4 +110,16 @@ module Turbo::Streams::Broadcasts
     def render_format(format, **rendering)
       ApplicationController.render(formats: [ format ], **rendering)
     end
+
+    def render_broadcast_action(rendering)
+      content = rendering.delete(:content)
+      html    = rendering.delete(:html)
+      render  = rendering.delete(:render)
+
+      if render == false
+        nil
+      else
+        content || html || (render_format(:html, **rendering) if rendering.present?)
+      end
+    end
 end

data/lib/turbo/engine.rb

@@ -92,8 +92,8 @@ module Turbo
     end
 
     initializer "turbo.broadcastable" do
-      ActiveSupport.on_load(:active_job) do
-        ActiveSupport.on_load(:active_record) do
+      ActiveSupport.on_load(:active_record) do
+        if defined?(ActiveJob)
           include Turbo::Broadcastable
         end
       end
@@ -123,9 +123,9 @@ module Turbo
         include Turbo::TestAssertions
       end
 
-      ActiveSupport.on_load(:active_job) do
-        ActiveSupport.on_load(:action_cable) do
-          ActiveSupport.on_load(:active_support_test_case) do
+      ActiveSupport.on_load(:action_cable) do
+        ActiveSupport.on_load(:active_support_test_case) do
+          if defined?(ActiveJob)
             require "turbo/broadcastable/test_helper"
             include Turbo::Broadcastable::TestHelper
           end

data/lib/turbo/version.rb

@@ -1,3 +1,3 @@
 module Turbo
-  VERSION = "2.0.8"
+  VERSION = "2.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.10
 platform: ruby
 authors:
 - Sam Stephenson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: The speed of a single-page web application without having to write any JavaScript.