render_turbo_stream 4.0.2 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35750e37d2f65c71588b62ebcd0b7986d0e0012bd8674808dd0149f81b5ee967
-  data.tar.gz: 3937766529f3c5418b29895196c5a8acbb1bfeecf0e6464faf7c310d1a5ac097
+  metadata.gz: b5298cf405518f297f86cdd2581e39d618e3f750046335d425d5187035352380
+  data.tar.gz: 2cd649610255db9ca104884a472521f19af864f3f4f14eae5a2f55628f8b94ea
 SHA512:
-  metadata.gz: c0cd96285c1d01d203b5afd33094f4be26606c40e70bab2161a36202219f713f273ae97534dc35bf722b5fe7091e034b68028c0f2f9513e20b3346d45c3f1b67
-  data.tar.gz: ebdbca94432c7e14d01e93729e8d9361d5ffacba0ea90b20148d22882e2e7bd248dda610d8a840db6cfecdddffbe94eaa139f7527e432079fc8231525a709541
+  metadata.gz: 6a26003bfecef2adfd2b5cf263b06ce0106601e4c9893d25d3ab28d004ed7422324107c3d2f318047bb8b5b52a69e8887a36399a8bcec02761292480042b9eeb
+  data.tar.gz: 79810dadb98ec80ba893744767c7000b14f7bb98652c052d9ccfe8ee807ba17fc87045015c451521223aaebd51f924deef49e18546a6c04e11d143edaf2a3c36

data/README.md

@@ -8,8 +8,6 @@ Defining templates like `(create|update).turbo_stream.haml` is a heavy mix of lo
 
 For `:replace` actions, responses must be wrapped inside a `turbo_frame_tag` with a matching `target_id`. The gem will regex the content and wrap it by a `turbo_frame_tag` if necessary but not present. This way the matching `target_id` is only defined in one place. This check only happens on the first call after restarting the application in production and on every call if precompile assets is set to true in configs.
 
-If the turbo stream action is `:replace' and the content is not wrapped by `turbo_frame_tag', the gem will wrap it. So the partial content is checked by regex. This check only happens on the first call after restarting the application in production and on every call if precompile assets is set to true in configs.
-
 There are many different ways to handle **redirects** since turbo. Some details are handled here.
 
 Execute [turbo_power](https://github.com/marcoroth/turbo_power) commands such as adding a css class to an html element, can be sent directly from the controller.

data/app/views/render_turbo_stream.turbo_stream.erb

@@ -13,13 +13,16 @@
 
   <% else %>
     <% ctl = { partial: args[:partial], target_id: args[:target_id], action: args[:action] } %>
+
+    <% target_id = RenderTurboStream::Libs.target_to_target_id(args[:target]) %>
+
     <% info = { target_id: args[:target_id], partial: args[:partial], locals: args[:locals] } %>
 
 
 
     <% if args[:action].present? %>
       <% Rails.logger.debug("  • render-turbo-stream #{args[:action].upcase} => #{info}") %>
-      <%= turbo_stream.send args[:action].to_sym, RenderTurboStream::Libs.target_to_target_id(args[:target]) do %>
+      <%= turbo_stream.send args[:action].to_sym, target_id do %>
         <% if RenderTurboStream::CheckTemplate.new(partial: args[:partial], action: args[:action]).add_turbo_frame_tag? %>
           <%= turbo_frame_tag RenderTurboStream::Libs.target_to_target_id(args[:target]) do %>
             <%= render args[:partial], locals: args[:locals]&.symbolize_keys %>

data/lib/render_turbo_stream/check_template.rb

@@ -1,8 +1,6 @@
 module RenderTurboStream
   class CheckTemplate
 
-    AUTO_ADD_TURBO_FRAME_TAG_ON_ACTION = [:replace]
-
     def initialize(partial: nil, template: nil, available_instance_variables: nil, action: nil)
       if !partial && !template
         raise 'missing attribute partial xor template'
@@ -69,7 +67,8 @@ module RenderTurboStream
         end
       end
 
-      if stack_level == 1 && AUTO_ADD_TURBO_FRAME_TAG_ON_ACTION.include?(@action.to_sym)
+      conf = Rails.configuration.x.render_turbo_stream.auto_wrap_for_actions
+      if stack_level == 1 && conf.present? && conf.include?(@action.to_sym)
         unless _code.match(/(turbo_frame_tag|turbo-frame)/)
           @result[:add_turbo_frame_tag] = true
         end

data/lib/render_turbo_stream/controller_channel_helpers.rb

@@ -137,8 +137,8 @@ module RenderTurboStream
 
       if_success_redirect_to: nil, # does a regular redirect. Works if you are inside a turbo_frame and just want to redirect inside that frame BUT CANNOT STREAM OTHERS ACTIONS ON THE SAME RESPONSE https://github.com/rails/rails/issues/48056
 
-      if_success: nil, # hash for a partial to render or array with actions (as array) or hashes for partials within
-      if_error: nil, # additional partials that should be rendered if save_action failed
+      if_success_add: nil, # hash for a partial to render or array with actions (as array) or hashes for partials within
+      if_error_add: nil, # additional partials that should be rendered if save_action failed
       add: [], # additional streams
 
       if_success_notices: nil, # array of strings, override default generated flash generation in the case of success
@@ -171,8 +171,8 @@ module RenderTurboStream
       )[:turbo_actions]
 
       turbo_actions += libs.additional_actions(
-        if_success,
-        if_error,
+        if_success_add,
+        if_error_add,
         add
       )
 

data/lib/render_turbo_stream/controller_helpers.rb

@@ -17,8 +17,8 @@ module RenderTurboStream
       action: 'replace', # options: append, prepend
       locals: {}, # locals used by the target_id
 
-      if_success: nil, # hash for a partial to render or array with actions (as array) or hashes for partials within
-      if_error: nil, # additional partials that should be rendered if save_action failed
+      if_success_add: nil, # hash for a partial to render or array with actions (as array) or hashes for partials within
+      if_error_add: nil, # additional partials that should be rendered if save_action failed
       add: [], # additional streams
 
       if_success_notices: nil, # array of strings, override default generated flash generation in the case of success
@@ -55,12 +55,12 @@ module RenderTurboStream
         if_error_alerts,
         add_notices,
         add_alerts,
-        )
+      )
       streams += flashes[:turbo_actions]
 
       streams += libs.additional_actions(
-        if_success,
-        if_error,
+        if_success_add,
+        if_error_add,
         add
       )
 
@@ -124,7 +124,11 @@ module RenderTurboStream
         elsif pr.is_a?(Hash)
           props = pr.symbolize_keys
           r = props
-          r[:target] = RenderTurboStream::Libs.target_id_to_target(props[:target_id]) if props[:target_id].present?
+          if props[:target_id].present?
+            r[:target] = RenderTurboStream::Libs.target_id_to_target(props[:target_id])
+          else
+            r[:target] = props[:target]
+          end
           raise "Missing attribute :target in #{props}" if !props[:target].present?
           r.delete(:target_id)
           r[:action] = (props[:action].present? ? props[:action] : :replace)
@@ -150,7 +154,7 @@ module RenderTurboStream
 
     # renders a partial to turbo_stream
 
-    def stream_partial( target_id, partial: nil, action: :replace, locals: {} )
+    def stream_partial(target_id, partial: nil, action: :replace, locals: {})
       render_turbo_stream(
         [
           {

data/lib/render_turbo_stream/controller_libs.rb

@@ -89,9 +89,9 @@ module RenderTurboStream
       { turbo_actions: turbo_actions, alerts: alerts, notices: notices }
     end
 
-    def additional_actions( if_success, if_error, add )
+    def additional_actions( if_success_add, if_error_add, add )
 
-      (@save_action ? make_actions(if_success) : make_actions(if_error)) + make_actions(add)
+      (@save_action ? make_actions(if_success_add) : make_actions(if_error_add)) + make_actions(add)
 
     end
 
@@ -127,7 +127,7 @@ module RenderTurboStream
     private
 
     # streamline actions to array
-    # valid inputs for if_success or if_error or add
+    # valid inputs for if_success_add or if_error_add or add
     # [:add_css_class, ...]
     # [[:add_css_class, ..], ..]
     # {target_id: '..', ..}

data/lib/render_turbo_stream/version.rb

@@ -1,3 +1,3 @@
 module RenderTurboStream
-  VERSION = "4.0.2"
+  VERSION = "4.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: render_turbo_stream
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.4
 platform: ruby
 authors:
 - christian