render_turbo_stream 0.1.43 → 0.1.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7105e78e4f7d96782d8bb94cdddefdb3698c68855cd16155dd575660095fa83
-  data.tar.gz: ff253ad1317fe42d6c3c617c7c2bb23933c5101330bcf9d3710cd06d6ae09a97
+  metadata.gz: 30eb2a0495b25d67ff59b2194b7b54cf20c8d0f813ade47a6809616d13231ba3
+  data.tar.gz: a934e1be22f6610a10fd16ce642a5601d8ef11224bfd1a9d70f1f1d471a83d71
 SHA512:
-  metadata.gz: df9dd9941005c649c125778ca0c2d35ba4672f5bb742457040fe16513db1078ab34bc140b859400336aa79cce70e4695ba5a8f91bbd185209535867a2cd9da23
-  data.tar.gz: 6ef0ec59e35da7fcac18c697bc06c70ca3247107891a9ce02c1ba2f3987d34c439ef97cc18fa5591b7dae441a435a7a0c275e8e4e9ab7d62b548d9da41570762
+  metadata.gz: c12cc64cbf409f74a7bf8f2faf6c6aa63fbe063a0bca4d8ec5939fea06b77011f873633e71daa44d6ef518f70686e382a115ac9c0da6b426413fb8665486c770
+  data.tar.gz: e6f689292afcc93064d1a67ee5d13a1bcd68a85cfb2b21a600624e5224585c4d5db7d6b21232ee30716924d5de82255ed321cab0a8ccf0d65c048aa7c9228325

data/README.md

@@ -32,11 +32,11 @@ spec/rails_helper.rb
 
 ```ruby
 RSpec.configure do |config|
-  config.include RenderTurboStream::RequestTestHelpers, type: :request
+  config.include RenderTurboStream::Test::RequestHelpers, type: :request
 end
 ```
 
-Redirection
+**Redirection**
 
 For redirection to work, you must follow the installation steps
 from [turbo_power](https://github.com/marcoroth/turbo_power).
@@ -122,18 +122,24 @@ RSpec.describe "Articles", type: :request do
     expect(partials_log.join('')).to include('Article could not be created')
     expect(partials_log.join('')).to include('layouts/flash')
 
-    expect(partials_count).to eq(2)
-    #=> 2 partials in total: form, flash, no matter how many times each is rendered (example «flash»: a flash partial can be rendered several times)
+    # THERE ARE 3 COUNTS
 
-    expect(partial_response('form')).to eq(true)
-    expect(partial_response('layouts/flash')).to eq(true)
-    expect(partial_response('flash', id: 'flash-wrapper', count: 1)).to eq(true)
-    #=> id is the ID that turbo-stream pointed to (for replace/append/... an item)
+    # A) Number of partials: "form" and "flash" are 2 partials
+    
+    expect(partials_count).to eq(2)
 
-    expect(partial_response('flash'){|r|r.inner_html.include?('Article could not be created')}).to eq(true)
-    expect(partial_response('flash'){|r|r.css('div').inner_html.include?('Article could not be created')}).to eq(true)
+    # B) Total count of responses per partial (1 => is default)
+    
+    expect(partial_response_count('articles/form', total: 1, id: 'form')).to be_truthy
+    # id is the html id to which turbo-stream is pointing.
+
+    # C) If a block is given: the number of matching responses returned by "partial_response_count".
+    
+    expect(partial_response_count('flash'){|r|r.inner_html.include?('Article could not be created')}).to eq(1)
+    # result is either nil (if 0 matched) or a integer >= 1
+    
+    expect(partial_response_count('flash'){|r|r.css('div').inner_html.include?('Article could not be created')}).to eq(1)
     #=> you can use the validators of nokogiri, check: https://nokogiri.org/tutorials/parsing_an_html_xml_document.html
-    #=> if a partial was rendered more than once: at least one response must match
   end
 
 end

data/app/views/render_turbo_stream_partials.html.erb

@@ -2,7 +2,7 @@
 
 <% streams.each do |s| %>
 
-  <% html = (render s[:partial], locals: s[:locals], formats: [:html]) %>
+  <% html = (render s[:partial], locals: s[:locals].symbolize_keys, formats: [:html]) %>
 
   <% rendered_partials.push({ html_response: html }.merge(s)) %>
 

data/app/views/render_turbo_stream_partials.turbo_stream.erb

@@ -17,21 +17,21 @@
     <% ctl[:action] = :replace %>
     <% Rails.logger.debug("  • render-turbo-stream REPLACE => #{info}") %>
     <%= turbo_stream.replace s[:id] do %>
-      <%= render s[:partial], locals: s[:locals] %>
+      <%= render s[:partial], locals: s[:locals].symbolize_keys %>
     <% end %>
 
   <% elsif s[:action].to_sym == :prepend %>
     <% ctl[:action] = :prepend %>
     <% Rails.logger.debug("  • render-turbo-stream PREPEND => #{info}") %>
     <%= turbo_stream.prepend s[:id] do %>
-      <%= render s[:partial], locals: s[:locals] %>
+      <%= render s[:partial], locals: s[:locals].symbolize_keys %>
     <% end %>
 
   <% elsif s[:action].to_sym == :append %>
     <% ctl[:action] = :append %>
     <% Rails.logger.debug("  • render-turbo-stream APPEND => #{info}") %>
     <%= turbo_stream.prepend s[:id] do %>
-      <%= render s[:partial], locals: s[:locals] %>
+      <%= render s[:partial], locals: s[:locals].symbolize_keys %>
     <% end %>
 
   <% else %>

data/lib/render_turbo_stream/test/request_helpers.rb

@@ -43,8 +43,8 @@ module RenderTurboStream
       end
 
 
-      def partial_response(partial, id: nil, count: 1, &block)
-        RenderTurboStream::Libs.partial_response(response, partial, id, count, &block )
+      def partial_response_count(partial, id: nil, total: 1, &block)
+        RenderTurboStream::Libs.partial_response_count(response, partial, id, total, &block )
       end
 
     end

data/lib/render_turbo_stream/version.rb

@@ -1,3 +1,3 @@
 module RenderTurboStream
-  VERSION = "0.1.43"
+  VERSION = "0.1.45"
 end

data/lib/render_turbo_stream.rb

@@ -216,7 +216,7 @@ module RenderTurboStream
                      else
                        a['id'] == id
                      end
-        partial_matched || id_matched
+        partial_matched && (id.present? ? id_matched : true)
       end
 
     end
@@ -233,26 +233,22 @@ module RenderTurboStream
       part.length
     end
 
-    def self.partial_response(response, partial, id, count, &block)
+    def self.partial_response_count(response, partial, id, total, &block)
       responses = select_responses(response, partial, id)
-      if block_given?
 
-        success = false
-
-        responses.each do |r|
+      if total && responses.count != total
+        false
+      elsif block_given?
+        res = responses.select do |r|
           parsed = Nokogiri::HTML(r['html_response'])
           r = yield parsed
-          success = true if r.present?
-        end
-        success
-
+          r.present?
+        end.length
+        (res == 0 ? nil : res)
       else
-        if count
-          responses.length == count
-        else
-          nil
-        end
+        responses.length
       end
+
     end
 
   end

metadata

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