render_turbo_stream 1.4.3 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 740e9df76f8c575bc3a993c3bc3ad524d70e1a4593c21906ca41d16dc426399b
-  data.tar.gz: 6ea17ebf4b85712130b3b5289cecffcf76d043cb6d1638bfa68f27c7d1aa7494
+  metadata.gz: 0c77fc6dda3c5b3edc629f63a7f572835b1e6c5c4e22cd7708eb9d5dd4be99db
+  data.tar.gz: 83552375772d2a578a39fbca51b0ef586b47eb4eafc9de7a949a00472f61c78a
 SHA512:
-  metadata.gz: 4dd54e9153f44bc4e6104132d75f1b7ad9613569f8f2c49c5b0a44711aacb6eac92c0c77a82bec52b82491b3450010fcffc581221340d5510c0f87bcf2650b74
-  data.tar.gz: e337836ec7353f535236f6e9aac1b7aa4c514d3eb370464bfb6cc7499f32b41c3501c89146a864781b15ba6145d2849439fb91564676f9a0b3a2b197ea686455
+  metadata.gz: 9d6e8e06675b08dc65465da8424c918bb65757a2d8fa053ea5b6d9dc98bb452bdc152c350c08f80a762c0ab9c08d5afbdf7bf6aa3b65b4fe60a80bf4a8f197f7
+  data.tar.gz: ab8b0e8d42d0957e632881148b28f29e67c3380dc4e61191c54697c7a255d03b463d213bb494b780cc948be941da017d17a23b8758f6caa5d26e9b499b693ed4

data/README.md

@@ -8,6 +8,8 @@ And build it dynamically: Most [turbo_power](https://github.com/marcoroth/turbo_
 
 ATTENTION: This plugin is in a early state.
 
+Hope it helps you.
+
 An overview of how we design a rails-7 application with turbo
 is [published on dev.to](https://dev.to/chmich/rails-7-vite-wrapping-up-1pia).
 
@@ -78,7 +80,7 @@ A comprehensive tutorial on turbo and how to check that it is working properly c
 def update
   turbo_stream_save(
     @customer.update(customer_params),
-    redirect_on_success_to: edit_customer_path(@customer),
+    turbo_redirect_on_success_to: edit_customer_path(@customer),
   )
 end
 ```
@@ -101,7 +103,7 @@ render_turbo_stream(
 )
 ```
 
-The `stream_partial` method is nothing else than a singular of `render_turbo_stream`.
+The `stream_partial` method is just for rendering a partial alone.
 
 ```ruby
 stream_partial(
@@ -129,9 +131,6 @@ render_turbo_stream(
       :add_css_class,
       '#colored-element',
       'red'
-    ],
-    [
-      
     ]
   ]
 )
@@ -139,12 +138,36 @@ render_turbo_stream(
 
 Under the hood, inside a `*.turbo_stream.erb` template, it does the following: `= turbo_stream.send args.first, *(args[1..-1])`
 
+**WORKAROUND for redirects inside frame**
+
+Suppose you have a CRUD controller that should do all its actions inside a turbo frame. Classic redirect_to, along with a Flash message, would raise "Render and/or redirect were called multiple times in this action". See [issue] (https://gitlab.com/sedl/renderturbostream/-/issues/3).
+
+You can handle this by reloading the parent frame's src attribute. The code might look like this:
+
+```ruby
+def update
+    @car = Car.find(params['id'])
+    turbo_stream_save(
+      @car.update(car_params),
+      streams_on_success: [
+        [
+          :turbo_frame_set_src,
+          'cars-box',
+          cars_path
+        ]
+      ]
+    )
+  end
+
+```
+
 **Parameters for turbo_stream_save**
 
     save_action,
-    redirect_on_success_to: nil,
+    redirect_on_success_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
+    turbo_redirect_on_success_to: nil, # does a full page redirect (break out of all frames by turbo_power redirect)
     object: nil, # object used in save_action, example: @customer
-    id: 'form', # if nil: no partial is rendered
+    id: nil, # if nil: no partial is rendered
     partial: nil, # example: 'customers/form' default: "#{controller_path}/#{id}"
     action: 'replace', # options: append, prepend
     locals: {}, # locals used by the partial
@@ -251,6 +274,17 @@ For more detailed testing of partials, there are view tests.
 Testing the plugin itself: There is a [quick-and-dirty app](https://gitlab.com/sedl/renderturbostream_railsapp) which
 includes the plugin and has tests done by rspec/request and capybara.
 
+## More Configs
+
+On test helpers, the marker for a turbo-stream target is in most cases the id of the target element. This is true for the standard turbo-stream functions. On `turbo_power` it is the same in most cases. `RenderTurboStream::Libs.first_attr_is_html_id()` checks for which methods this is true. You can override this:
+
+```ruby
+config.x.render_turbo_stream.first_attribute_is_html_id = %[replace append prepend turbo_frame_set_src]
+```
+
+This setting is relevant for testing helpers.
+
+
 ## Contributing
 
 Contribution welcome.

data/app/views/render_turbo_stream.html.erb

@@ -1,13 +1,19 @@
 <% rendered_partials = [] %>
 
+
 <% streams.each do |s| %>
 
   <% if s.is_a?(Array) %>
-    <% rendered_partials.push({ command: "turbo_stream.#{s.first}, #{s[1..-1].join(', ')}", method: s.first, attributes: s[1..-1] }) %>
+    <% attr_id = RenderTurboStream::Libs.first_attr_is_html_id(s.first) %>
+    <% h = { attributes: s, type: 'command' } %>
+    <% h[:target] = "##{s.second}" if attr_id %>
+    <% rendered_partials.push(h) %>
   <% else %>
     <% html = (render s[:partial], locals: s[:locals]&.symbolize_keys, formats: [:html]) %>
     <% s.delete(:partial) %>
-    <% rendered_partials.push({ html_response: html }.merge(s)) %>
+    <% s[:target] = "##{s[:id]}" %>
+    <% s.delete(:id) %>
+    <% rendered_partials.push({ html_response: html, type: 'partial' }.merge(s)) %>
   <% end %>
 
 

data/app/views/render_turbo_stream.turbo_stream.erb

@@ -7,7 +7,7 @@
   <% if args.is_a?(Array) %>
 
     <% ctl = "turbo_stream.#{args.first}, #{args[1..-1].join(', ')}" %>
-    <% Rails.logger.error("  RENDER TURBO STREAM => #{ctl}") %>
+    <% Rails.logger.debug("  RENDER TURBO STREAM => #{ctl}") %>
     <%= turbo_stream.send args.first, *(args[1..-1]) %>
 
 

data/lib/render_turbo_stream/test/request_helpers.rb

@@ -4,24 +4,7 @@ module RenderTurboStream
 
       # log as helper for the developer to see which flash is set and which partials are rendered to wich ids
       def streams_log
-        all_responses = RenderTurboStream::Libs.all_responses(response)
-        r = []
-        if response.status == 302
-          r.push("redirect to #{turbo_redirect_to}")
-        else
-          all_responses.map do |a|
-            str = [
-              a['action'],
-              'id',
-              "«#{a['id']}»",
-              'by partial',
-              "«#{a['partial']}»",
-              (a['locals'].present? ? "locals: «#{a['locals']}»" : nil)
-            ].compact.join(' ')
-            r.push(str)
-          end
-        end
-        r
+        RenderTurboStream::Libs.all_responses(response)
       end
 
       # Returns the path to which turbo_stream.redirect_to would be applied.
@@ -29,11 +12,13 @@ module RenderTurboStream
         resps = RenderTurboStream::Libs.all_responses(response)
         url = nil
         resps.each do |r|
-          if r['method'] == 'redirect_to'
-            if url
-              url = 'ERROR: REDIRECT CALLED MORE THAN ONCE'
-            else
-              url = r['attributes'].first
+          if r['type'] == 'command'
+            if r['attributes'].first == 'redirect_to'
+              if url
+                url = 'ERROR: REDIRECT CALLED MORE THAN ONCE'
+              else
+                url = r['attributes'].second
+              end
             end
           end
         end
@@ -66,6 +51,50 @@ module RenderTurboStream
       def stream_targets_count
         stream_targets.length
       end
+
+      # Returns false if a given action such as "replace" (for: turbo_stream.replace) is not performed exactly once on a given target id. Otherwise, it returns an array of attributes that were used to call the function.
+      # For stream actions, this only works if the given action has the HTML-ID as its first element.
+      def stream_action_once(action, id)
+        all_responses = RenderTurboStream::Libs.all_responses(response)
+        counts = {}
+        res = nil
+        all_responses.each do |r|
+
+          if r['type'] == 'command'
+            act = r['attributes'].first
+            is_id = RenderTurboStream::Libs.first_attr_is_html_id(act)
+            if action.to_s == act && is_id && r['attributes'].second == id.to_s
+              k = [act, r['attributes'].second].join('-')
+              counts[k] ||= 0
+              counts[k] += 1
+              if counts[k] == 1
+                res = r['attributes']
+              else
+                res = false
+              end
+            end
+
+          elsif r['type'] == 'partial'
+
+            act = r['action']
+            is_id = r['target'][0] == '#'
+            _id = r['target'][1..-1]
+            if action.to_s == act && is_id && _id == id.to_s
+              k = [act, _id].join('-')
+              counts[k] ||= 0
+              counts[k] += 1
+              if counts[k] == 1
+                res = [act, id, { locals: r['locals'] }]
+              else
+                res = false
+              end
+            end
+
+          end
+        end
+        res
+      end
+
     end
   end
 end

data/lib/render_turbo_stream/test/rspec_request_helpers.rb

@@ -2,22 +2,30 @@ module RenderTurboStream
   module Test
     module RspecRequestHelpers
 
-
       # expect status 200 and a each one time response to given ids
 
       def expect_successful_saved(*ids)
         responses = RenderTurboStream::Libs.all_responses(response)
-        counts = {}
+        id_counts = {}
         responses.each do |r|
-          counts[r['id']] ||= 0
-          counts[r['id']] +=1
+          if r['target'].is_a?(Array)
+            r['target'].each do |t|
+              id = (t[0] == '#' ? t[1..-1] : t)
+              id_counts[t.to_s] ||= 0
+              id_counts[t.to_s] += 1
+            end
+          else
+            id = (r['target'][0] == '#' ? r['target'][1..-1] : r['target'])
+            id_counts[id] ||= 0
+            id_counts[id] += 1
+          end
         end
 
         expect(response.status).to eq(200)
-        expect(counts.keys.length).to eq(ids.length)
+        expect(id_counts.keys.length).to eq(ids.length)
         ids.each do |id|
-          expect(counts.key?(id)).to be_truthy
-          expect(counts[id]).to eq(1)
+          expect(id_counts.key?(id)).to be_truthy
+          expect(id_counts[id]).to eq(1)
         end
       end
 

data/lib/render_turbo_stream/version.rb

@@ -1,3 +1,3 @@
 module RenderTurboStream
-  VERSION = "1.4.3"
+  VERSION = "1.4.5"
 end

data/lib/render_turbo_stream.rb

@@ -8,10 +8,10 @@ module RenderTurboStream
 
   def turbo_stream_save(
     save_action,
-    redirect_on_success_to: nil, # does a regular redirect. Works if you are inside a turbo_frame and just want to redirect inside that frame
+    redirect_on_success_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
     turbo_redirect_on_success_to: nil, # does a full page redirect (break out of all frames by turbo_power redirect)
     object: nil, # object used in save_action, example: @customer
-    id: 'form', # if nil: no partial is rendered
+    id: nil, # if nil: no partial is rendered
     partial: nil, # example: 'customers/form' default: "#{controller_path}/#{id}"
     action: 'replace', # options: append, prepend
     locals: {}, # locals used by the partial
@@ -43,11 +43,19 @@ module RenderTurboStream
 
     #== Streams / Partials
 
-    streams = [(id ? { id: id, partial: partial, locals: locals, action: action } : nil)]
+    streams = (id ? [id: id, partial: partial, locals: locals, action: action] : [])
 
     if save_action
       response.status = 200
-      streams += streams_on_success.select { |s| s[:id].present? }
+      Rails.logger.debug('start loop')
+      streams_on_success.each do |s|
+        Rails.logger.debug('inside loop')
+        if s.is_a?(Array)
+          streams.push(s)
+        elsif s.is_a?(Hash) && s[:id].present?
+          streams.push(s)
+        end
+      end
     else
       response.status = :unprocessable_entity
       streams += streams_on_error.select { |s| s[:id].present? }
@@ -135,9 +143,9 @@ module RenderTurboStream
                           ])
     elsif save_action && redirect_on_success_to.present?
       response.status = 302
-      flash.now[:alert] = flash_alerts
-      flash.now[:notice] = flash_notices
-      render_turbo_stream(streams)
+      flash[:alert] = flash_alerts
+      flash[:notice] = flash_notices
+      # render_turbo_stream(streams)
       redirect_to redirect_on_success_to
 
     else
@@ -151,7 +159,9 @@ module RenderTurboStream
 
     ary = []
     array.each do |pr|
-      if pr.is_a?(Hash)
+      if !pr.present?
+        a = 1
+      elsif pr.is_a?(Hash)
         props = pr.symbolize_keys
         part = (props[:partial].present? ? props[:partial] : props[:id]).gsub('-', '_')
         partial = (part.to_s.include?('/') ? part : [controller_path, part].join('/'))
@@ -204,7 +214,7 @@ module RenderTurboStream
 
       all.select do |a|
         if id.present?
-          a['id'] == id
+          a['target'] == "##{id}"
         else
           false
         end
@@ -213,15 +223,19 @@ module RenderTurboStream
     end
 
     def self.stream_targets(response)
-      all = all_responses(response)
-      ids = []
-      all.each do |p|
-        _p = p['id']
-        unless ids.include?(_p)
-          ids.push(_p)
+      responses = all_responses(response)
+      targets = []
+      responses.each do |r|
+        if r['target'].is_a?(Array)
+          r['target'].each do |t|
+            targets.push(t) unless targets.include?(t)
+          end
+        else
+          targets.push(r['target']) unless targets.include?(r['target'])
         end
       end
-      ids
+
+      targets
     end
 
     def self.stream_target_response_count(response, id, total, &block)
@@ -242,5 +256,41 @@ module RenderTurboStream
 
     end
 
+    # on most methods the first attribute is the target.
+    # This method checks for that
+    # it includes the methods from turbo-power
+    # used for test helpers
+    def self.first_attr_is_html_id(method)
+      config = Rails.configuration.x.render_turbo_stream.first_attribute_is_html_id
+      default = [
+        :graft,
+        :morph,
+        :inner_html,
+        :insert_adjacent_text,
+        :outer_html,
+        :text_content,
+        :add_css_class,
+        :remove_attribute,
+        :remove_css_class,
+        :set_attribute,
+        :set_dataset_attribute,
+        :set_property,
+        :set_style,
+        :set_styles,
+        :set_value,
+        :dispatch_event,
+        :reset_form,
+        :clear_storage,
+        :scroll_into_view,
+        :set_focus,
+        :turbo_frame_reload,
+        :turbo_frame_set_src,
+        :replace,
+        :append,
+        :prepend
+      ]
+      (config.present? ? config : default).map{|m|m.to_sym}.include?(method.to_sym)
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: render_turbo_stream
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.5
 platform: ruby
 authors:
 - christian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-24 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,7 +38,6 @@ files:
 - README.md
 - Rakefile
 - app/controllers/render_turbo_stream/application_controller.rb
-- app/views/_render_turbo_stream.turbo_stream.erb
 - app/views/render_turbo_stream.html.erb
 - app/views/render_turbo_stream.turbo_stream.erb
 - lib/render_turbo_stream.rb
@@ -73,5 +72,6 @@ requirements: []
 rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
-summary: Render partials, run javascript like redirect by controller. With test helpers.
+summary: Render partials and execute javascript directly from the controller. With
+  test helpers.
 test_files: []

data/app/views/_render_turbo_stream.turbo_stream.erb

@@ -1,49 +0,0 @@
-<% error = false %>
-<% control = [] %>
-<% streams = local_assigns[:streams] %>
-<% streams.each do |args| %>
-
-
-  <% if args.is_a?(Array) %>
-
-    <% ctl = "turbo_stream.#{args.first}, #{args[1..-1].join(', ')}" %>
-
-    <% if args.last.is_a?(Proc) %>
-      <% Rails.logger.error("  RENDER TURBO STREAM BLOCK => #{ctl}") %>
-      <%#= turbo_stream.replace 'form' do %>
-        <%#= render partial: 'articles/form' %>
-      <%# end %>
-      <%= turbo_stream.send args.first, *(args[1..-2]) { args.last.call } %>
-    <% else %>
-      <% Rails.logger.error("  RENDER TURBO POWER => #{ctl}") %>
-      <%= turbo_stream.send args.first, *(args[1..-1]) %>
-    <% end %>
-
-  <% else %>
-    <% ctl = { partial: args[:partial], id: args[:id], action: args[:action] } %>
-    <% info = { id: args[:id], partial: args[:partial], locals: args[:locals] } %>
-    <% if !args[:action].present? %>
-      <% Rails.logger.error("  ERROR RENDER TURBO STREAM => MISSING ACTION => #{args}") %>
-      <% error = true %>
-
-    <% elsif args[:action].present? %>
-      <% Rails.logger.debug("  • render-turbo-stream #{args[:action].upcase} => #{info}") %>
-      <%= turbo_stream.send args[:action].to_sym, args[:id] do %>
-        <%= render args[:partial], locals: args[:locals]&.symbolize_keys %>
-      <% end %>
-
-    <% else %>
-      <% Rails.logger.error("  ERROR RENDER TURBO STREAM => NOTHING DONE! => #{args}") %>
-    <% end %>
-  <% end %>
-
-  <% control.push(ctl) %>
-
-<% end %>
-
-<% if error %>
-  <% Rails.logger.error("  RENDER TURBO STREAM HAD ERRORS, REPEATING WHOLE ARRAY: ") %>
-  <% control.each do |c| %>
-    <% Rails.logger.error("    #{c}") %>
-  <% end %>
-<% end %>