render_turbo_stream 4.3.4 → 4.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de051d73d56102cedd1c2a29e0794041dbe3cd18577300002005ac050eb085e4
-  data.tar.gz: 0224b8f893ecb5408f917b4fe201650b54a815bab020fc3a549cc869da9615a6
+  metadata.gz: 50b66f69ea709549c4533179701f90c46ab72be3f94f122f1b88bf14bc2e904b
+  data.tar.gz: 24cfb4ca73c7250583d1eb38bf85c83d22381eb7ef06a201ac54d413cc3f4c51
 SHA512:
-  metadata.gz: f756884588c93fcf1052cfcb358fb69e7d996b746aa79d8cf3b134a91037e6acc3ea34253184491b3383a79bf87c2e8b046a4b67b70db950bb1182e41f8c49ca
-  data.tar.gz: 23bcf3db97515ace21d9f84fde860941326db0001c9388e44cb152a08f6288c64e72e949d884fd9be9f06ba3fc8cfe4a2ce9231f877ecc0c8536642e228c65b5
+  metadata.gz: 7d377ad2e7c8d8a6445aba275dde712fc68687ead0c330467d5c5d14eb68889645e6dc6cfbe20cfdbdb2804a34dade175c7eac20e92c900d2b8c7ae50584fe3b
+  data.tar.gz: e2919553ed95baa2f4d9dca401552b656db4001bda833378f5c37a1a14d856eaa4d07c2eca2adf956fef1bb20b1f7d42143e51fa0aa420883e01335b8b96f336

data/README.md

@@ -109,7 +109,7 @@ The Rails team has integrated `ActionCable` as `Turbo::StreamsChannel` into `Tur
 
 ```ruby
 
-def update
+def create
   turbo_stream_save(
     @article.update(article_params),
     if_success_redirect_to: articles_path,
@@ -118,6 +118,8 @@ def update
 end
 ```
 
+Note that if you want to redirect to show path, but the save action fails, `article_path(@article)` would throw an error. For this, the arguments `if_success_turbo_redirect_to` and `if_success_redirect_to` accept procs that are evaluated only on success. So your line would look like this `if_success_redirect_to: ->{article_path(@article)}`.
+
 Assuming we want to build a form that works within a turbo-frame, including flash messages and redirects, we have to build all that inside a `turbo-frame`, and, within that we need a target-id, that must not be a turbo-frame. For that, there is a helper:
 
 ```haml

data/app/views/render_turbo_stream.turbo_stream.erb

@@ -28,7 +28,7 @@
       <% if args[:target].present? %>
         <% Rails.logger.debug("  • Target #{args[:target]} found in #{args[:partial]}") %>
       <% else %>
-        <% raise 'No target specified by arguments and no target found inside the rendered partial' %>
+        <% raise "No target specified by arguments and no target found inside the rendered #{args[:partial].present? ? "partial: #{args[:partial]}" : "template: #{args[:template]}"}" %>
       <% end %>
     <% end %>
 

data/app/views/render_turbo_stream_request_test.html.erb

@@ -23,7 +23,7 @@
     <% unless s[:target].present? %>
       <% s[:target] = RenderTurboStream::Libs.fetch_arguments_from_rendered_string(html)[:target] %>
       <% unless s[:target].present? %>
-        <% raise 'No target specified by arguments and no target found inside the rendered partial' %>
+        <% raise "No target specified by arguments and no target found inside the rendered #{s[:partial].present? ? "partial: #{s[:partial]}" : "template: #{s[:template]}"}" %>
       <% end %>
     <% end %>
 

data/lib/render_turbo_stream/controller_helpers.rb

@@ -9,8 +9,8 @@ module RenderTurboStream
       save_action,
       object: nil, # object used in save_action, example: @customer
 
-      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_turbo_redirect_to: nil, # does a full page redirect (break out of all frames by turbo_power redirect)
+      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. Value can be given as block like "->{article_path(@article)}"
+      if_success_turbo_redirect_to: nil, # does a full page redirect (break out of all frames by turbo_power redirect). Value can be given as block like "->{article_path(@article)}"
 
       target_id: nil, # IF NIL: the gem grabs inside the rendered content for turbo-frame tag or turbo-target (element from helper of this gem) tag and takes the id from there.
       partial: nil, # if nil: the gem renders the default template by turbo-stream
@@ -82,15 +82,23 @@ module RenderTurboStream
         Rails.logger.debug("  • Successful saved && Redirect by «turbo_redirect_to»")
         Rails.logger.debug("  • Set flash[:alert] => #{flashes[:alerts]}") if flashes[:alerts].present?
         Rails.logger.debug("  • Set flash[:notice] => #{flashes[:notices]}") if flashes[:notices].present?
+
+        if if_success_turbo_redirect_to.is_a?(Proc)
+          redirect_path = if_success_turbo_redirect_to.call
+        else
+          redirect_path = if_success_turbo_redirect_to
+        end
+
         render_turbo_stream([
                               [
                                 :redirect_to,
-                                if_success_turbo_redirect_to
+                                redirect_path
                               ]
                             ])
 
       elsif save_action && if_success_redirect_to.present?
         response.status = 303
+
         if allow_channel
           Rails.logger.debug("  • Send actions through Turbo::StreamsChannel")
           c_libs = RenderTurboStream::ChannelLibs.new(response)
@@ -103,7 +111,11 @@ module RenderTurboStream
           Rails.logger.debug("  • Set flash[:notice] => #{flashes[:notices]}") if flashes[:notices].present?
           Rails.logger.debug("  • Could not send #{streams.length} actions => #{streams}")
         end
-        redirect_to if_success_redirect_to
+        if if_success_redirect_to.is_a?(Proc)
+          redirect_to if_success_redirect_to.call
+        else
+          redirect_to if_success_redirect_to
+        end
 
       else
         Rails.logger.debug("  • Respond by TurboStream in #{streams.length} #{'action'.pluralize(streams.length)}")

data/lib/render_turbo_stream/libs.rb

@@ -69,7 +69,7 @@ module RenderTurboStream
                   ['new', _id.class.to_s.downcase]
               ).join('-')
             else
-              raise("target_id / argument ID: Only String or object with method :id accepted")
+              _id.to_s
             end
           end +
             [

data/lib/render_turbo_stream/version.rb

@@ -1,3 +1,3 @@
 module RenderTurboStream
-  VERSION = "4.3.4"
-end
+  VERSION = "4.3.6"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: render_turbo_stream
 version: !ruby/object:Gem::Version
-  version: 4.3.4
+  version: 4.3.6
 platform: ruby
 authors:
 - christian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-17 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails