turbo-rails 2.0.10 → 2.0.12

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

@@ -38,8 +38,10 @@ 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: render_broadcast_action(rendering), **attributes
+    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)
     )
   end
 

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

@@ -23,6 +23,7 @@ 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/controllers/turbo/native/navigation.rb

@@ -1,20 +1,23 @@
 # Turbo is built to work with native navigation principles and present those alongside what's required for the web. When you
-# have Turbo Native clients running (see the Turbo iOS and Turbo Android projects for details), you can respond to native
-# requests with three dedicated responses: <tt>recede</tt>, <tt>resume</tt>, <tt>refresh</tt>.
+# have Hotwire Native clients running (see the Hotwire Native iOS and Hotwire Native Android projects for details),
+# you can respond to native requests with three dedicated responses: <tt>recede</tt>, <tt>resume</tt>, <tt>refresh</tt>.
 #
-# turbo-android handles these actions automatically. You are required to implement the handling on your own for turbo-ios.
+# Hotwire Native Android and Hotwire Native iOS handle these actions automatically.
 module Turbo::Native::Navigation
   extend ActiveSupport::Concern
 
   included do
-    helper_method :turbo_native_app?
+    helper_method :hotwire_native_app?, :turbo_native_app?
   end
 
-  # Turbo Native applications are identified by having the string "Turbo Native" as part of their user agent.
-  def turbo_native_app?
-    request.user_agent.to_s.match?(/Turbo Native/)
+  # Hotwire Native applications are identified by having the string "Hotwire Native" as part of their user agent.
+  # Legacy Turbo Native applications use the "Turbo Native" string.
+  def hotwire_native_app?
+    request.user_agent.to_s.match?(/(Turbo|Hotwire) Native/)
   end
-  
+
+  alias_method :turbo_native_app?, :hotwire_native_app?
+
   # Tell the Turbo Native app to dismiss a modal (if presented) or pop a screen off of the navigation stack. Otherwise redirect to the given URL if Turbo Native is not present.
   def recede_or_redirect_to(url, **options)
     turbo_native_action_or_redirect url, :recede, :to, options

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

@@ -22,7 +22,12 @@ 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, target: nil, targets: nil, template: nil, **attributes)
+  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)
     template = action.to_sym.in?(%i[ remove refresh ]) ? "" : tag.template(template.to_s.html_safe)
 
     if target = convert_to_turbo_stream_dom_id(target)
@@ -39,7 +44,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, **{ "request-id": request_id }.compact, **attributes)
+    turbo_stream_action_tag(:refresh, attributes.with_defaults({ "request-id": request_id }.compact))
   end
 
   private

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

@@ -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

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(...)
-    turbo_stream_refresh_tag(...)
+  def refresh(**options)
+    turbo_stream_refresh_tag(**options)
   end
 
   # Send an action of the type <tt>name</tt> to <tt>target</tt>. Options described in the concrete methods.

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}(...)                                    # def visit(...)
+            def #{method}(*args, &block)                          # def visit(*args, &block)
               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(...)
-    assert_selector(:turbo_cable_stream_source, ...)
+  def assert_turbo_cable_stream_source(*args, &block)
+    assert_selector(:turbo_cable_stream_source, *args, &block)
   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(...)
-    assert_no_selector(:turbo_cable_stream_source, ...)
+  def assert_no_turbo_cable_stream_source(*args, &block)
+    assert_no_selector(:turbo_cable_stream_source, *args, &block)
   end
 
   Capybara.add_selector :turbo_cable_stream_source do

data/lib/turbo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.12
 platform: ruby
 authors:
 - Sam Stephenson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-22 00:00:00.000000000 Z
+date: 2025-03-02 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.16
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: The speed of a single-page web application without having to write any JavaScript.