render_turbo_stream 0.1.40 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1d7e23e79f3d7f68a39cd3b9163020515231012283068dd777ed5544f8ad5db
-  data.tar.gz: 38428bc23917c1c9ea1643381a2034605b5ece0ab69f8768297e2f876e3e6720
+  metadata.gz: 262075083599385cfe9bf300a909ae3dd0feee5f7ba32691a3024260307301c5
+  data.tar.gz: 71629066a9d7dfd6a2fab896e63011d23a8b735539cda0afb21eec2a4807d571
 SHA512:
-  metadata.gz: 5a1f7456bd103ce669d356d8c7abd9af013cd7c38cb25c34d5bd5e3461343ede8ead6f271dfbaec69ef42aaac22f34f481dadac2ce04303cfa8f446ea8bada72
-  data.tar.gz: d247dd8be9882db553478062ba937757e5e657264f4a49eab8d642c363cc54eeeca1933290548503c7c6a0a4f38a75409c596e7c03f152a4d019a7ec5047f527
+  metadata.gz: ae1caa61d33da5504bc562eabd139d1c0566b4ac7a23989603e4225464b7e41a6e423e67e2141255f0488698ca08ac65533cf1e87013a734362b0404f48e0705
+  data.tar.gz: e95004ea0010b2c4ee433208b36250ad47fd4dd48646f962bfa4a0cd966deb5421fc95dbb82d6ff8759ed09b5da14dab3808976895bf64270203f6902755a29e

data/README.md

@@ -58,19 +58,15 @@ look like this:
 
 ```ruby
 
-def create
-  @customer = Customer.new(customer_params)
-
+def update
   turbo_stream_save(
-    @customer.save,
+    @customer.update(customer_params),
     redirect_on_success_to: edit_customer_path(@customer)
   )
-
 end
 ```
 
-This will set a status, generate a flash message and perform `stream_partials`, which could result in something like
-this:
+This will set a status, generate a flash message and perform `stream_partials`, which could result in something like this:
 
 ```ruby
 stream_partials(
@@ -101,7 +97,7 @@ stream_partial(
 
 ## Testing
 
-For system testing we have Capybara. This works great and is necessary for javascript and backend combined apps, but it
+For system testing there is Capybara. This works great and is necessary for javascript and backend combined apps, but it
 is good practice to break tests into smaller pieces.
 
 For the much faster request-level tests, there are some helpers:
@@ -122,38 +118,24 @@ RSpec.describe "Articles", type: :request do
 
     post articles_path(params: invalid_params)
 
-    # ----- BASIC -----
-
-    # Exactly which partials were rendered to which ids
-    expect(
-      partials_once(
-        { partial: 'layouts/flash', id: 'flash-box' },
-        { partial: 'articles/form', id: 'form' })
-    ).to be_truthy
-
-    # ----- MORE OPTIONS -----
-
-    # partial_response (singular) returns false unless partial responded exactly one time, otherwise the content in nokogiri format: https://nokogiri.org/tutorials/searching_a_xml_html_document.html#basic-searching
-    r = partial_response(id: 'flash-box')
-    expect(r.css('div.text-content').first.inner_html).to include('Article could not be created')
-
-    # same, but based on path by which partial is rendered to
-    r = partial_response(partial: 'layouts/flash')
-    expect(r.css('div.text-content').first.inner_html).to include('Article could not be created')
-
-    # COUNTS
-
-    # Check how many times a specific ID has been responded to.
-    expect(partials_responses(id: 'flash-box').length).to eq(1)
-
-    # Same with partials
-    expect(partials_responses(partial: 'layouts/flash').length).to eq(1)
-
     # partials_log: developer information about what the renderer did, and strings to copy and paste into test commands
     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)
+
+    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)
+
+    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)
+    #=> 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
 ```
 
@@ -174,29 +156,33 @@ includes the plugin and has tests done by rspec/request and capybara.
 
 ## Parameters for turbo_stream_save
 
-`save_action` (first parameter, boolean) true if successful
-
-`redirect_on_success_to:` path for redirection in case of success, if nil: no redirection.
-
-`success_message:` custom message if action is successful
-
-`error_message:` custom message if action has failed
-
-`object:` default: object (e.g. @customer) is derived from controller name
-
-`id:` html-ID for the object that is replaced by turbo_stream, if nil: no partial is rendered
-
-`partial:` default: 'form', assumes `controller_path`/_form
-
-`locals:` locals for the partial, as hash
-
-`replace_on_success:` array of hashes: `[{ id: nil, partial: '', locals: {} }]`
-
-`replace_on_error:` array of hashes: `[{ id: nil, partial: '', locals: {} }]`
-
-`add_flash_notices:` additional alerts for the case of failure, example: `["custom-success-message"]`
-
-`add_flash_alerts:` additional alerts for the case of success, example: `["custom-error-message"]`
+    save_action,
+    redirect_on_success_to: nil,
+    object: nil, # object used in save_action, example: @customer
+    id: 'form', # 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
+    streams_on_success: [
+      {
+        id: nil,
+        partial: 'form',
+        locals: {},
+        action: 'replace'
+      }
+    ], # additional partials that should be rendered if save_action succeeded
+    streams_on_error: [
+      {
+        id: nil,
+        partial: 'form',
+        locals: {},
+        action: 'replace'
+      }
+    ], # additional partials that should be rendered if save_action failed
+    add_flash_alerts: [], #=> array of strings
+    add_flash_notices: [], #=> array of strings
+    flashes_on_success: [], #=> array of strings
+    flashes_on_error: [] #=> array of strings
 
 ## Requirements
 

data/lib/render_turbo_stream/test/request_helpers.rb

@@ -0,0 +1,52 @@
+module RenderTurboStream
+  module Test
+    module RequestHelpers
+
+      # count of rendered partials
+      # count rendering different partials (example: «customer/form»)
+      # doesnt check how often a specific partial is rendered
+
+      def partials_count
+        RenderTurboStream::Libs.partials_count(response)
+      end
+
+
+
+      # log as helper for the developer to see which flash is set and which partials are rendered to wich ids
+      def partials_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
+      end
+
+
+      # Returns the path to which turbo_stream.redirect_to would be applied.
+      def turbo_redirect_to
+        expect(response.status).to eq(302)
+        r = JSON.parse(response.body)
+        r['redirected_to']
+      end
+
+
+      def partial_response(partial, id: nil, count: 1, &block)
+        RenderTurboStream::Libs.partial_response(response, partial, id, count, &block )
+      end
+
+    end
+  end
+end

data/lib/render_turbo_stream/version.rb

@@ -1,3 +1,3 @@
 module RenderTurboStream
-  VERSION = "0.1.40"
+  VERSION = "0.1.42"
 end

data/lib/render_turbo_stream.rb

@@ -1,7 +1,7 @@
 require "render_turbo_stream/version"
 require "render_turbo_stream/railtie"
 require 'render_turbo_stream/engine'
-require 'render_turbo_stream/request_test_helpers'
+require 'render_turbo_stream/test/request_helpers'
 
 module RenderTurboStream
 
@@ -191,4 +191,69 @@ module RenderTurboStream
       ]
     )
   end
+
+  class Libs
+    def self.all_responses(response)
+      e = Nokogiri::HTML(response.body).search('#rendered-partials').first
+      JSON.parse(e.inner_html)
+    end
+
+    # if partial is one word, its checked against the last behind the slash, example: 'articles/form' matches 'form'
+
+    def self.select_responses(response, partial, id)
+      all = all_responses(response)
+
+      all.select do |a|
+        partial_matched = if !partial.present?
+                            false
+                          elsif partial.include?('/')
+                            a['partial'] == partial
+                          else
+                            a['partial'].split('/').last == partial
+                          end
+        id_matched = if !id.present?
+                       false
+                     else
+                       a['id'] == id
+                     end
+        partial_matched || id_matched
+      end
+
+    end
+
+    def self.partials_count(response)
+      all = all_responses(response)
+      part = []
+      all.each do |p|
+        _p = p['partial']
+        unless part.include?(_p)
+          part.push(_p)
+        end
+      end
+      part.length
+    end
+
+    def self.partial_response(response, partial, id, count, &block)
+      responses = select_responses(response, partial, id)
+      if block_given?
+
+        success = false
+
+        responses.each do |r|
+          parsed = Nokogiri::HTML(r['html_response'])
+          r = yield parsed
+          success = true if r.present?
+        end
+        success
+
+      else
+        if count
+          responses.length == count
+        else
+          nil
+        end
+      end
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: render_turbo_stream
 version: !ruby/object:Gem::Version
-  version: 0.1.40
+  version: 0.1.42
 platform: ruby
 authors:
 - christian
@@ -43,7 +43,7 @@ files:
 - lib/render_turbo_stream.rb
 - lib/render_turbo_stream/engine.rb
 - lib/render_turbo_stream/railtie.rb
-- lib/render_turbo_stream/request_test_helpers.rb
+- lib/render_turbo_stream/test/request_helpers.rb
 - lib/render_turbo_stream/version.rb
 - lib/tasks/render_turbo_stream_tasks.rake
 homepage: https://gitlab.com/sedl/renderturbostream

data/lib/render_turbo_stream/request_test_helpers.rb

@@ -1,80 +0,0 @@
-module RenderTurboStream
-  module RequestTestHelpers
-
-    # returns false if partial is rendered cero or multiple times
-    # response can be searched by nokogiri https://nokogiri.org/tutorials/searching_a_xml_html_document.html#basic-searching
-    def partial_response(id: nil, partial: nil)
-      res = partials_responses(id: id, partial: partial)
-      if res.length != 1
-        false
-      else
-        res.first
-      end
-    end
-
-    # like partial_response, but returns an array with length of how many times partial was rendered
-    #
-
-    def partials_responses(id: nil, partial: nil)
-      ary = partials_attributes
-      if id && partial
-        res = ary.select { |a| a['partial'] == partial && a['id'] == id }
-      elsif id
-        res = ary.select { |a| a['id'] == id }
-      elsif partial
-        res = ary.select { |a| a['partial'] == partial }
-      else
-        raise 'missing parameter'
-      end
-      res.map { |r| Nokogiri::HTML(r['html_response']) }
-    end
-
-    # count of rendered partials
-    # count rendering different partials (example: «customer/form»)
-    # doesnt check how often a specific partial is rendered
-
-    def partials_count
-      partials = []
-      partials_attributes.each do |p|
-        unless partials.include?(p[:partial])
-          partials.push(p[:partial])
-        end
-      end
-      partials.length
-    end
-
-    # returns an array of hashes with the attributes used to call partials and the response (html as string) from the partial.
-    def partials_attributes
-      e = Nokogiri::HTML(response.body).search('#rendered-partials').first
-      JSON.parse(e.inner_html)
-    end
-
-    # Returns the path to which turbo_stream.redirect_to would be applied.
-    def turbo_redirect_to
-      expect(response.status).to eq(302)
-      r = JSON.parse(response.body)
-      r['redirected_to']
-    end
-
-    # log as helper for the developer to see which flash is set and which partials are rendered to wich ids
-    def partials_log
-      r = []
-      if response.status == 302
-        r.push("redirect to #{turbo_redirect_to}")
-      else
-        partials_attributes.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
-    end
-  end
-end