turbo-rails 2.0.9 → 2.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6,7 +6,7 @@ module Turbo::Streams::Broadcasts
6
6
  include Turbo::Streams::ActionHelper
7
7
 
8
8
  def broadcast_remove_to(*streamables, **opts)
9
- broadcast_action_to(*streamables, action: :remove, **opts)
9
+ broadcast_action_to(*streamables, action: :remove, render: false, **opts)
10
10
  end
11
11
 
12
12
  def broadcast_replace_to(*streamables, **opts)
@@ -38,10 +38,9 @@ module Turbo::Streams::Broadcasts
38
38
  end
39
39
 
40
40
  def broadcast_action_to(*streamables, action:, target: nil, targets: nil, attributes: {}, **rendering)
41
- broadcast_stream_to(*streamables, content: turbo_stream_action_tag(action, target: target, targets: targets, template:
42
- rendering.delete(:content) || rendering.delete(:html) || (rendering[:render] != false && rendering.any? ? render_format(:html, **rendering) : nil),
43
- **attributes
44
- ))
41
+ broadcast_stream_to(*streamables, content: turbo_stream_action_tag(
42
+ action, target: target, targets: targets, template: render_broadcast_action(rendering), **attributes)
43
+ )
45
44
  end
46
45
 
47
46
  def broadcast_replace_later_to(*streamables, **opts)
@@ -70,7 +69,7 @@ module Turbo::Streams::Broadcasts
70
69
 
71
70
  def broadcast_refresh_later_to(*streamables, request_id: Turbo.current_request_id, **opts)
72
71
  refresh_debouncer_for(*streamables, request_id: request_id).debounce do
73
- Turbo::Streams::BroadcastStreamJob.perform_later stream_name_from(streamables), content: turbo_stream_refresh_tag(request_id: request_id, **opts)
72
+ 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
74
73
  end
75
74
  end
76
75
 
@@ -111,4 +110,16 @@ module Turbo::Streams::Broadcasts
111
110
  def render_format(format, **rendering)
112
111
  ApplicationController.render(formats: [ format ], **rendering)
113
112
  end
113
+
114
+ def render_broadcast_action(rendering)
115
+ content = rendering.delete(:content)
116
+ html = rendering.delete(:html)
117
+ render = rendering.delete(:render)
118
+
119
+ if render == false
120
+ nil
121
+ else
122
+ content || html || (render_format(:html, **rendering) if rendering.present?)
123
+ end
124
+ end
114
125
  end
@@ -1,20 +1,23 @@
1
1
  # Turbo is built to work with native navigation principles and present those alongside what's required for the web. When you
2
- # have Turbo Native clients running (see the Turbo iOS and Turbo Android projects for details), you can respond to native
3
- # requests with three dedicated responses: <tt>recede</tt>, <tt>resume</tt>, <tt>refresh</tt>.
2
+ # have Hotwire Native clients running (see the Hotwire Native iOS and Hotwire Native Android projects for details),
3
+ # you can respond to native requests with three dedicated responses: <tt>recede</tt>, <tt>resume</tt>, <tt>refresh</tt>.
4
4
  #
5
- # turbo-android handles these actions automatically. You are required to implement the handling on your own for turbo-ios.
5
+ # Hotwire Native Android and Hotwire Native iOS handle these actions automatically.
6
6
  module Turbo::Native::Navigation
7
7
  extend ActiveSupport::Concern
8
8
 
9
9
  included do
10
- helper_method :turbo_native_app?
10
+ helper_method :hotwire_native_app?, :turbo_native_app?
11
11
  end
12
12
 
13
- # Turbo Native applications are identified by having the string "Turbo Native" as part of their user agent.
14
- def turbo_native_app?
15
- request.user_agent.to_s.match?(/Turbo Native/)
13
+ # Hotwire Native applications are identified by having the string "Hotwire Native" as part of their user agent.
14
+ # Legacy Turbo Native applications use the "Turbo Native" string.
15
+ def hotwire_native_app?
16
+ request.user_agent.to_s.match?(/(Turbo|Hotwire) Native/)
16
17
  end
17
-
18
+
19
+ alias_method :turbo_native_app?, :hotwire_native_app?
20
+
18
21
  # 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.
19
22
  def recede_or_redirect_to(url, **options)
20
23
  turbo_native_action_or_redirect url, :recede, :to, options
data/lib/turbo/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Turbo
2
- VERSION = "2.0.9"
2
+ VERSION = "2.0.11"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: turbo-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.9
4
+ version: 2.0.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sam Stephenson
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2024-09-18 00:00:00.000000000 Z
13
+ date: 2024-10-15 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: actionpack
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
110
110
  - !ruby/object:Gem::Version
111
111
  version: '0'
112
112
  requirements: []
113
- rubygems_version: 3.5.16
113
+ rubygems_version: 3.5.11
114
114
  signing_key:
115
115
  specification_version: 4
116
116
  summary: The speed of a single-page web application without having to write any JavaScript.