render_turbo_stream 4.4.0 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cfb040091b3e5fcee2eb48a126e707316ff2e88f56d5375cf491df3ec7008af
-  data.tar.gz: 0deefe1b7acb1528606695a512eaa596fc6d31c4874807398484213e22eef7e0
+  metadata.gz: f51ba85d359e9d879308ec309dbbf5ef7a8794fd56dc0046358d409c5ac35910
+  data.tar.gz: 34c7a35b5e35718dffffbdf413c3aa83056b8d23114887562b704713942b9a01
 SHA512:
-  metadata.gz: c7c1f91debd98ecede2af7bdab72cebea1218d2a47f80c5eb2e27872f54b9c93668ab37ad34721836f8f65b65c6a8fe06a175e666aff3b60c870f3a0449b50a0
-  data.tar.gz: 10e8f7ba4a595c97db9762747938e456e3c57df9bdaebcb44daa50f293c3f93bbfc5051f7739709577fb3281328d9f6c719481091fa66f3a769600be024ec35e
+  metadata.gz: 53b0e5e43f71d9737d9ccd0ee5559da2c82511940ddf716e673df31b0ba848a0a1e72a4cf1a22f40d339d592436102e465297f7e953f9b825218216c02970f23
+  data.tar.gz: 413575d69259ac12cf7ca07ca8cee548dfdd84405577bb89501f14cfcf443eaa7aed22b0537e6c8879683dae42297f075a10e8e2f3818d18eb595a910ab6a7e0

data/app/views/render_turbo_stream.turbo_stream.erb

@@ -1,28 +1,29 @@
 <% error = false %>
-<% control = [] %>
+<% tests = [] %>
 <% streams = local_assigns[:streams] %>
 <% streams.each do |args| %>
 
 
   <% if args.is_a?(Array) %>
 
-    <% ctl = "turbo_stream.#{args.first}, #{args[1..-1].join(', ')}" %>
+    <% test = { type: 'stream-command', array: args, action: args.first } %>
     <%= turbo_stream.send args.first, *(args[1..-1]) %>
 
 
   <% else %>
-    <% ctl = { partial: args[:partial], target_id: args[:target_id], action: args[:action] } %>
-
 
     <% locals = args[:locals]&.symbolize_keys %>
 
     <% if args[:partial].present? %>
       <% rendered_html = render(partial: args[:partial], locals: locals, formats: [:html]) %>
+      <% test = { partial: args[:partial], type: 'stream-partial' } %>
     <% else %>
       <% rendered_html = render(template: args[:template], locals: locals, formats: [:html]) %>
+      <% test = { template: args[:template], type: 'stream-template' } %>
     <% end %>
 
 
+
     <% unless args[:target].present? %>
       <% args[:target] = RenderTurboStream::Libs.fetch_arguments_from_rendered_string(rendered_html)[:target] %>
       <% if args[:target].present? %>
@@ -31,11 +32,12 @@
         <% raise "No target specified by arguments and no target found inside the rendered #{args[:partial].present? ? "partial: #{args[:partial]}" : "template: #{args[:template]}"}: «#{rendered_html}»" %>
       <% end %>
     <% end %>
+    <% test = test.merge(action: args[:action], html_response: rendered_html, target: args[:target] ) %>
 
 
     <% target_id = RenderTurboStream::Libs.target_to_target_id(args[:target]) %>
 
-    <% info = { target_id: args[:target_id], partial: args[:partial], locals: args[:locals] } %>
+    <%# info = { target_id: args[:target_id], partial: args[:partial], locals: args[:locals] } %>
 
 
     <% if args[:action].present? %>
@@ -51,13 +53,16 @@
     <% end %>
   <% end %>
 
-  <% control.push(ctl) %>
+  <% tests.push(test) %>
 
 <% end %>
 
 <% if error %>
   <% Rails.logger.error("  RENDER TURBO STREAM HAD ERRORS, REPEATING WHOLE ARRAY: ") %>
-  <% control.each do |c| %>
-    <% Rails.logger.error("    #{c}") %>
+  <% tests.each do |t| %>
+    <% Rails.logger.error("    #{t}") %>
   <% end %>
 <% end %>
+<% if Rails.env.test? %>
+  <% RenderTurboStream::Test::Request::Libs.set_test_responses(response, tests) %>
+<% end %>

data/lib/render_turbo_stream/channel.rb

@@ -1,43 +1,45 @@
-class Channel
-
-  def initialize(channel, partial: nil, template: nil, target_id: nil, action: :replace)
-    @channel = channel
-    @partial = partial
-    @template = template
-    @target_id = target_id
-    @action = action
-    @test_responses = []
-  end
-
-  def target_id=(target_id)
-    @target_id = target_id
-  end
+module RenderTurboStream
+  class Channel
+
+    def initialize(channel, partial: nil, template: nil, target_id: nil, action: :replace)
+      @channel = channel
+      @partial = partial
+      @template = template
+      @target_id = target_id
+      @action = action
+      @test_responses = []
+    end
+
+    def target_id=(target_id)
+      @target_id = target_id
+    end
+
+    def action=(action)
+      @action = action
+    end
+
+    def send(locals: {})
+      libs = RenderTurboStream::ChannelLibs.new
+      libs.render_to_channel(
+        @channel,
+        RenderTurboStream::Libs.target_id_to_target(@target_id),
+        @action,
+        template: @template,
+        partial: @partial,
+        locals: locals
+      )
+      @test_responses = libs.test_responses
+    end
+
+    def test_responses
+      @test_responses
+    end
+
+    private
+
+    def validate_params
+      raise 'Arguments partial and template cannot both be specified' if @partial && @template
+    end
 
-  def action=(action)
-    @action = action
   end
-
-  def send(locals: {})
-    libs = RenderTurboStream::ChannelLibs.new
-    libs.render_to_channel(
-      @channel,
-      RenderTurboStream::Libs.target_id_to_target(@target_id),
-      @action,
-      template: @template,
-      partial: @partial,
-      locals: locals
-    )
-    @test_responses = libs.test_responses
-  end
-
-  def test_responses
-    @test_responses
-  end
-
-  private
-
-  def validate_params
-    raise 'Arguments partial and template cannot both be specified' if @partial && @template
-  end
-
 end

data/lib/render_turbo_stream/channel_controller_helpers.rb

@@ -88,7 +88,7 @@ module RenderTurboStream
         partial: _partial,
         locals: loc
       )
-      RenderTurboStream::Libs.set_test_responses(response, libs.test_responses)
+      RenderTurboStream::Test::Request::Libs.set_test_responses(response, libs.test_responses)
 
       res
     end
@@ -132,7 +132,7 @@ module RenderTurboStream
     def action_to_channel(channel, command, arguments)
       libs = RenderTurboStream::ChannelLibs.new
       r = libs.action_to_channel(channel, command, arguments)
-      RenderTurboStream::Libs.set_test_responses(response, libs.test_responses)
+      RenderTurboStream::Test::Request::Libs.set_test_responses(response, libs.test_responses)
       r
     end
 
@@ -209,7 +209,7 @@ module RenderTurboStream
           "authenticated_user_#{helpers.current_user.id}",
           turbo_actions
         )
-        RenderTurboStream::Libs.set_test_responses(response, libs.test_responses)
+        RenderTurboStream::Test::Request::Libs.set_test_responses(response, libs.test_responses)
       end
 
       if save_action && if_success_redirect_to.present?

data/lib/render_turbo_stream/controller_helpers.rb

@@ -118,7 +118,7 @@ module RenderTurboStream
           Rails.logger.debug("  • Send actions through Turbo::StreamsChannel")
           c_libs = RenderTurboStream::ChannelLibs.new
           c_libs.send_actions_to_channel("authenticated_user_#{helpers.current_user.id}", streams)
-          set_test_responses(c_libs.test_responses)
+          RenderTurboStream::Test::Request::Libs.set_test_responses(response, c_libs.test_responses)
         else
           flash[:alert] = flashes[:alerts]
           flash[:notice] = flashes[:notices]
@@ -177,12 +177,16 @@ module RenderTurboStream
         Rails.logger.debug("  • Stream => #{cmd}")
       end
 
-      if request.format.to_sym == :turbo_stream
+
+
+
+      #if request.format.to_sym == :turbo_stream
         render template: 'render_turbo_stream', locals: { streams: ary }, layout: false, formats: :turbo_stream
-      else
-        Rails.logger.debug("  • Render Turbo Stream RENDERING AS HTML because request.format => #{request.format}")
-        render template: 'render_turbo_stream_request_test', locals: { streams: ary }, layout: false, formats: :html
-      end
+      # else
+      #   Rails.logger.debug("  • Render Turbo Stream RENDERING AS HTML because request.format => #{request.format}")
+      #   render template: 'render_turbo_stream_request_test', locals: { streams: ary }, layout: false, formats: :html
+      # end
+
 
     end
 
@@ -190,23 +194,5 @@ module RenderTurboStream
       render_turbo_stream([{ partial: partial, locals: locals, id: id, action: action }])
     end
 
-
-    def set_test_responses(test_responses)
-      if Rails.env.test?
-        h = response.headers.to_h
-        i = 1
-        test_responses.each do |test_response|
-          loop do
-            k = "turbo-response-test-#{i}"
-            unless h.keys.include?(k)
-              response.headers[k] = test_response.to_json
-              break
-            end
-            i += 1
-          end
-        end
-      end
-    end
-
   end
 end

data/lib/render_turbo_stream/libs.rb

@@ -99,22 +99,5 @@ module RenderTurboStream
       end
     end
 
-    def self.set_test_responses(response, test_responses)
-      if Rails.env.test?
-        h = response.headers.to_h
-        i = 1
-        test_responses.each do |test_response|
-          loop do
-            k = "turbo-response-test-#{i}"
-            unless h.keys.include?(k)
-              response.headers[k] = test_response.to_json
-              break
-            end
-            i += 1
-          end
-        end
-      end
-    end
-
   end
 end

data/lib/render_turbo_stream/test/request/libs.rb

@@ -7,10 +7,26 @@ module RenderTurboStream
           @response = response
         end
 
+        def self.set_test_responses(response, test_responses)
+          if Rails.env.test?
+            h = response.headers.to_h
+            i = 1
+            test_responses.each do |test_response|
+              loop do
+                k = "turbo-response-test-#{i}"
+                unless h.keys.include?(k)
+                  response.headers[k] = test_response.to_json
+                  break
+                end
+                i += 1
+              end
+            end
+          end
+        end
+
         def all_turbo_responses
 
-          e = Nokogiri::HTML(@response.body).search('#rendered-partials').first
-          res = (e.present? ? JSON.parse(e.inner_html) : [])
+          res = []
           @response.headers.each do |k, v|
             next unless k.match(/^turbo-response-test-[\d]+$/)
             h = JSON.parse(v)

data/lib/render_turbo_stream/version.rb

@@ -1,3 +1,3 @@
 module RenderTurboStream
-  VERSION = "4.4.0"
+  VERSION = "4.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: render_turbo_stream
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.2
 platform: ruby
 authors:
 - christian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -46,7 +46,6 @@ files:
 - app/views/render_turbo_stream.turbo_stream.erb
 - app/views/render_turbo_stream_command.html.erb
 - app/views/render_turbo_stream_empty_template.html.erb
-- app/views/render_turbo_stream_request_test.html.erb
 - db/migrate/20230616070450_create_render_turbo_stream_options.rb
 - lib/render_turbo_stream.rb
 - lib/render_turbo_stream/channel.rb

data/app/views/render_turbo_stream_request_test.html.erb

@@ -1,41 +0,0 @@
-<% rendered_partials = [] %>
-
-
-<% streams.each do |s| %>
-
-  <% if s.is_a?(Array) %>
-    <% attr_id = RenderTurboStream::Test::Request::Libs.first_arg_is_html_id(s.first) %>
-    <% h = { array: s, type: 'stream-command', action: s.first } %>
-    <% h[:target] = "##{s.second[0] == '#' ? s.second[1..-1] : s.second}" if attr_id %>
-    <% rendered_partials.push(h) %>
-  <% else %>
-
-
-    <% locals = s[:locals]&.symbolize_keys %>
-    <% if s[:partial].present? %>
-      <% html = (render partial: s[:partial], locals: locals, formats: [:html]) %>
-    <% else %>
-      <% html = (render template: s[:template], locals: locals, formats: [:html]) %>
-    <% end %>
-
-
-
-    <% unless s[:target].present? %>
-      <% s[:target] = RenderTurboStream::Libs.fetch_arguments_from_rendered_string(html)[:target] %>
-      <% if !s[:target].present? && html.present? %>
-        <% raise "No target specified by arguments and no target found inside the rendered #{s[:partial].present? ? "partial: #{s[:partial]}" : "template: #{s[:template]}"}: «#{html}»" %>
-      <% end %>
-    <% end %>
-
-
-
-    <% s[:target] = s[:target] %>
-    <% s.delete(:id) %>
-    <% rendered_partials.push({ html_response: html, type: 'stream-partial' }.merge(s)) %>
-  <% end %>
-
-
-<% end %>
-
-<%= content_tag :div, rendered_partials.to_json, id: 'rendered-partials' %>
-