turbo-rails 2.0.12 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f9f669cb290390a1aca4dcd931f7093015589bac81c52967b8d1f7d85395c1c
-  data.tar.gz: 3780446727e49460f9449980dd76854f3b07d378deee3cf135fdb1cc010b4238
+  metadata.gz: e17d560cb33067c997c6cde1542866e726ab04635888c8f03e5c1617eb715939
+  data.tar.gz: adc7f9fb8409841348540ac39f68b1c0dd964d2ad2fa3bd98b14bdb83c92df95
 SHA512:
-  metadata.gz: 04556e82e807fd37e4f4ae53937fe957d878c30e622811a1daf01b955e8ffada2023eb034437b767598619aa20423897bc1867ade55ee9b86a0bf94d3ee2c24e
-  data.tar.gz: aaeeb9a5043418f033bf848fde0b203c157dc9c7f640941d5bb2d69ae6f1e3e9fe624bcee604c331e944e6bcaf09079d0dc6ad09b1dcd66a87b30ddb6b16a0a0
+  metadata.gz: 4d840efa50eb5ffad82cd4aaf6965a8c1e764072df5a884138162fc2a72eef6fef2ad00f16bcc8867d765c8c6eae5edeb1f983baef251ce81fc342930495deea
+  data.tar.gz: d66318b79505d8439adbae704a387740026d87f09d9b126d10db03d6d518d741c6b08de3bbadd568e9226cc245fbf213b999cfe5467ea16f8fb7b183b88e341a

data/README.md

@@ -182,7 +182,7 @@ import "@hotwired/turbo-rails"
 
 You can watch [the video introduction to Hotwire](https://hotwired.dev/#screencast), which focuses extensively on demonstrating Turbo in a Rails demo. Then you should familiarize yourself with [Turbo handbook](https://turbo.hotwired.dev/handbook/introduction) to understand Drive, Frames, and Streams in-depth. Finally, dive into the code documentation by starting with [`Turbo::FramesHelper`](https://github.com/hotwired/turbo-rails/blob/main/app/helpers/turbo/frames_helper.rb), [`Turbo::StreamsHelper`](https://github.com/hotwired/turbo-rails/blob/main/app/helpers/turbo/streams_helper.rb), [`Turbo::Streams::TagBuilder`](https://github.com/hotwired/turbo-rails/blob/main/app/models/turbo/streams/tag_builder.rb), and [`Turbo::Broadcastable`](https://github.com/hotwired/turbo-rails/blob/main/app/models/concerns/turbo/broadcastable.rb).
 
-Note that in development, the default Action Cable adapter is the single-process `async` adapter. This means that turbo updates are only broadcast within that same process. So you can't start `bin/rails console` and trigger Turbo broadcasts and expect them to show up in a browser connected to a server running in a separate `bin/dev` or `bin/rails server` process. Instead, you should use the web-console when needing to manaually trigger Turbo broadcasts inside the same process. Add "console" to any action or "<%= console %>" in any view to make the web console appear.  
+Note that in development, the default Action Cable adapter is the single-process `async` adapter. This means that turbo updates are only broadcast within that same process. So you can't start `bin/rails console` and trigger Turbo broadcasts and expect them to show up in a browser connected to a server running in a separate `bin/dev` or `bin/rails server` process. Instead, you should use the web-console when needing to manually trigger Turbo broadcasts inside the same process. Add "console" to any action or "<%= console %>" in any view to make the web console appear.  
 
 ### RubyDoc Documentation
 

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

@@ -38,8 +38,6 @@ module Turbo::Streams::Broadcasts
   end
 
   def broadcast_action_to(*streamables, action:, target: nil, targets: nil, attributes: {}, **rendering)
-    attributes.deep_symbolize_keys! if RUBY_VERSION < "3"
-
     broadcast_stream_to(*streamables, content: turbo_stream_action_tag(
       action, target: target, targets: targets, template: render_broadcast_action(rendering), **attributes)
     )
@@ -70,8 +68,10 @@ module Turbo::Streams::Broadcasts
   end
 
   def broadcast_refresh_later_to(*streamables, request_id: Turbo.current_request_id, **opts)
+    stream_name = stream_name_from(streamables)
+
     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).to_str # Sidekiq requires job arguments to be valid JSON types, such as String
+      Turbo::Streams::BroadcastStreamJob.perform_later stream_name, 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
 

data/app/controllers/turbo/frames/frame_request.rb

@@ -23,7 +23,6 @@ module Turbo::Frames::FrameRequest
   included do
     layout -> { "turbo_rails/frame" if turbo_frame_request? }
     etag { :frame if turbo_frame_request? }
-    before_action { flash.keep if turbo_frame_request? }
 
     helper_method :turbo_frame_request?, :turbo_frame_request_id
   end

data/app/helpers/turbo/streams/action_helper.rb

@@ -22,12 +22,7 @@ module Turbo::Streams::ActionHelper
   #   message = Message.find(1)
   #   turbo_stream_action_tag "remove", target: [message, :special]
   #   # => <turbo-stream action="remove" target="special_message_1"></turbo-stream>
-  def turbo_stream_action_tag(action, attributes = {})
-    attributes.deep_symbolize_keys! if RUBY_VERSION < "3"
-
-    target = attributes.delete(:target)
-    targets = attributes.delete(:targets)
-    template = attributes.delete(:template)
+  def turbo_stream_action_tag(action, target: nil, targets: nil, template: nil, **attributes)
     template = action.to_sym.in?(%i[ remove refresh ]) ? "" : tag.template(template.to_s.html_safe)
 
     if target = convert_to_turbo_stream_dom_id(target)
@@ -44,7 +39,7 @@ module Turbo::Streams::ActionHelper
   #   turbo_stream_refresh_tag
   #   # => <turbo-stream action="refresh"></turbo-stream>
   def turbo_stream_refresh_tag(request_id: Turbo.current_request_id, **attributes)
-    turbo_stream_action_tag(:refresh, attributes.with_defaults({ "request-id": request_id }.compact))
+    turbo_stream_action_tag(:refresh, "request-id": request_id.presence, **attributes)
   end
 
   private

data/app/models/concerns/turbo/broadcastable.rb

@@ -286,7 +286,7 @@ module Turbo::Broadcastable
   #
   #   # sends <turbo-stream action="update" method="morph" target="clearance_5"><template><div id="clearance_5">Other partial</div></template></turbo-stream>
   #   # to the stream named "identity:2:clearances"
-  #   # clearance.broadcast_update_to examiner.identity, :clearances, attributes: { method: :morph }, partial: "clearances/other_partial", locals: { a: 1 }
+  #   clearance.broadcast_update_to examiner.identity, :clearances, attributes: { method: :morph }, partial: "clearances/other_partial", locals: { a: 1 }
   def broadcast_update_to(*streamables, **rendering)
     Turbo::StreamsChannel.broadcast_update_to(*streamables, **extract_options_and_add_target(rendering, target: self)) unless suppressed_turbo_broadcasts?
   end
@@ -508,7 +508,7 @@ module Turbo::Broadcastable
       self.class.broadcast_target_default
     end
 
-    def extract_options_and_add_target(rendering, target: broadcast_target_default)
+    def extract_options_and_add_target(rendering = {}, target: broadcast_target_default)
       broadcast_rendering_with_defaults(rendering).tap do |options|
         options[:target] = target if !options.key?(:target) && !options.key?(:targets)
       end
@@ -518,7 +518,7 @@ module Turbo::Broadcastable
       options.tap do |o|
         # Add the current instance into the locals with the element name (which is the un-namespaced name)
         # as the key. This parallels how the ActionView::ObjectRenderer would create a local variable.
-        o[:locals] = (o[:locals] || {}).reverse_merge!(model_name.element.to_sym => self).compact
+        o[:locals] = (o[:locals] || {}).reverse_merge(model_name.element.to_sym => self).compact
 
         if o[:html] || o[:partial]
           return o

data/app/models/turbo/streams/tag_builder.rb

@@ -240,8 +240,8 @@ class Turbo::Streams::TagBuilder
   #
   #   turbo_stream.refresh request_id: "abc123"
   #   # => <turbo-stream action="refresh" request-id="abc123"></turbo-stream>
-  def refresh(**options)
-    turbo_stream_refresh_tag(**options)
+  def refresh(...)
+    turbo_stream_refresh_tag(...)
   end
 
   # Send an action of the type <tt>name</tt> to <tt>target</tt>. Options described in the concrete methods.
@@ -267,6 +267,8 @@ class Turbo::Streams::TagBuilder
         content.render_in(@view_context, &block)
       when content
         allow_inferred_rendering ? (render_record(content) || content) : content
+      when block_given? && (rendering.key?(:partial) || rendering.key?(:layout))
+        @view_context.render(formats: [ :html ], layout: rendering[:partial], **rendering, &block)
       when block_given?
         @view_context.capture(&block)
       when rendering.any?

data/app/views/layouts/turbo_rails/frame.html.erb

@@ -1,5 +1,6 @@
 <html>
   <head>
+    <%= csrf_meta_tags %>
     <%= yield :head %>
   </head>
   <body>

data/lib/turbo/engine.rb

@@ -164,7 +164,7 @@ module Turbo
       ActiveSupport.on_load(:action_dispatch_system_test_case) do
         app.config.turbo.test_connect_after_actions.map do |method|
           class_eval <<~RUBY, __FILE__, __LINE__ + 1
-            def #{method}(*args, &block)                          # def visit(*args, &block)
+            def #{method}(...)                                    # def visit(...)
               super.tap { connect_turbo_cable_stream_sources }    #   super.tap { connect_turbo_cable_stream_sources }
             end                                                   # end
           RUBY

data/lib/turbo/system_test_helper.rb

@@ -51,8 +51,8 @@ module Turbo::SystemTestHelper
   #
   # In addition to the filters listed above, accepts any valid Capybara global
   # filter option.
-  def assert_turbo_cable_stream_source(*args, &block)
-    assert_selector(:turbo_cable_stream_source, *args, &block)
+  def assert_turbo_cable_stream_source(...)
+    assert_selector(:turbo_cable_stream_source, ...)
   end
 
   # Asserts that a `<turbo-cable-stream-source>` element is absent from the
@@ -75,8 +75,8 @@ module Turbo::SystemTestHelper
   #
   # In addition to the filters listed above, accepts any valid Capybara global
   # filter option.
-  def assert_no_turbo_cable_stream_source(*args, &block)
-    assert_no_selector(:turbo_cable_stream_source, *args, &block)
+  def assert_no_turbo_cable_stream_source(...)
+    assert_no_selector(:turbo_cable_stream_source, ...)
   end
 
   Capybara.add_selector :turbo_cable_stream_source do

data/lib/turbo/version.rb

@@ -1,3 +1,3 @@
 module Turbo
-  VERSION = "2.0.12"
+  VERSION = "2.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.14
 platform: ruby
 authors:
 - Sam Stephenson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-02 00:00:00.000000000 Z
+date: 2025-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.1.0
 description:
 email: david@loudthinking.com
 executables: []
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="