render_turbo_stream 4.3.14 → 4.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7cdf1b3f0af6bf441e0c0d08919985aaa0a83ef49671724860cdb8e6ff45521
-  data.tar.gz: 23e55905c875439a1203a970fca7a9f72bde401de75d886849ed604213d05db6
+  metadata.gz: ab40a8958c762e832bbc38ed03d5a615c8bf41f64c4fd582d09476e373a0fe70
+  data.tar.gz: 6863e35d57c45752ee48cb06a057431b9341c1f36d105c66b8f28cd3125a5c2a
 SHA512:
-  metadata.gz: 1bfed3d855085bbd4834b5cce5fa13351e3fac306082172b8cc78525c677515b66de762b2291b08c2c25321e5b7c2e52e245560e465e27bb8ff5154029307189
-  data.tar.gz: d7d0257d9b7210c5f1516cd7fee00765942d6222b32e4ec9338d4c2f452e2ffcce432a7242208045acd7c49fcffedcbdfe7ccabb979fb1b51c7da843fdc5b9db
+  metadata.gz: 0e0562b25a98b14b30a3e3a124546e5cba2c8f34e7829f82778549c132606fe34cc6546e9e3ddd92059474e421977684ef99f3c269ca87b36020be056eea1e8f
+  data.tar.gz: 85a5453b54b6df7c25333e20ff5bec62fa38758dca6a7e69f4afcf02eb580d5dc129c69588ebffe7c14edc626c493dd8748d657e9bf1d00cc2b5f7cd92ac90ab

data/lib/render_turbo_stream/channel_view_helpers.rb

@@ -3,7 +3,7 @@ module RenderTurboStream
 
     def channel_from_me
       if current_user
-        turbo_stream_from "authenticated-user-#{current_user.id}"
+        turbo_stream_from "authenticated_user_#{current_user.id}"
       else
         Rails.logger.debug("  • SKIP channel_from_me because not authenticated")
         nil
@@ -12,7 +12,7 @@ module RenderTurboStream
 
     def channel_from_authenticated_group(group)
       if current_user
-        turbo_stream_from "authenticated-group-#{group}"
+        turbo_stream_from "authenticated_group_#{group}"
       else
         Rails.logger.debug("  • SKIP channel_from_authenticated_group because not authenticated")
         nil

data/lib/render_turbo_stream/controller_channel_helpers.rb

@@ -2,7 +2,7 @@ module RenderTurboStream
   module ControllerChannelHelpers
 
     def render_to_all(target_id = nil, action = :replace, partial: nil, template: nil, locals: nil)
-      evaluate_instance_variables
+      #evaluate_instance_variables
       render_to_channel(
         'all',
         target_id,
@@ -26,8 +26,8 @@ module RenderTurboStream
       end
 
       render_to_channel(
-        "authenticated-user-#{helpers.current_user.id}",
-        RenderTurboStream::Libs.target_id_to_target(target_id),
+        "authenticated_user_#{helpers.current_user.id}",
+        target_id,
         action,
         partial: partial,
         locals: locals
@@ -47,8 +47,8 @@ module RenderTurboStream
       end
 
       render_to_channel(
-        "authenticated-group-#{group}",
-        RenderTurboStream::Libs.target_id_to_target(target_id),
+        "authenticated_group_#{group}",
+        target_id,
         action,
         partial: partial,
         locals: locals
@@ -76,7 +76,7 @@ module RenderTurboStream
         @render_cable_template_was_called = true
       end
 
-      evaluate_instance_variables
+      #evaluate_instance_variables
 
       libs = RenderTurboStream::ChannelLibs.new(response)
       libs.render_to_channel(
@@ -107,7 +107,7 @@ module RenderTurboStream
         return
       end
 
-      action_to_channel("authenticated-user-#{helpers.current_user.id}", action, arguments)
+      action_to_channel("authenticated_user_#{helpers.current_user.id}", action, arguments)
     end
 
     def action_to_authenticated_group(group, action, *arguments)
@@ -123,7 +123,7 @@ module RenderTurboStream
         return
       end
 
-      action_to_channel("authenticated-group-#{group}", action, arguments)
+      action_to_channel("authenticated_group_#{group}", action, arguments)
     end
 
     def action_to_channel(channel, command, arguments)
@@ -185,7 +185,11 @@ module RenderTurboStream
 
       if save_action
         if Rails.configuration.x.store_last_saved_object && object.id
-          session['last_saved_object'] = object.to_global_id
+          begin
+            session['last_saved_object'] = object.to_global_id
+          rescue
+            Rails.logger.debug("session['last_saved_object'] = ... failed. You may be in test environent?")
+          end
         end
       else
         RenderTurboStream::Libs.debug_save_errors(object, flash_controller_action_name)
@@ -198,7 +202,7 @@ module RenderTurboStream
       libs = RenderTurboStream::ChannelLibs.new(response)
       if (helpers.current_user.id rescue false)
         libs.send_actions_to_channel(
-          "authenticated-user-#{helpers.current_user.id}",
+          "authenticated_user_#{helpers.current_user.id}",
           turbo_actions,
           instance_variables: instance_variables
         )

data/lib/render_turbo_stream/controller_helpers.rb

@@ -67,7 +67,11 @@ module RenderTurboStream
 
       if save_action
         if Rails.configuration.x.store_last_saved_object && object.id
-          session['last_saved_object'] = object.to_global_id
+          begin
+            session['last_saved_object'] = object.to_global_id
+          rescue
+            Rails.logger.debug("session['last_saved_object'] = ... failed. You may be in test environent?")
+          end
         end
       else
         response.status = 422
@@ -107,7 +111,7 @@ module RenderTurboStream
         if allow_channel
           Rails.logger.debug("  • Send actions through Turbo::StreamsChannel")
           c_libs = RenderTurboStream::ChannelLibs.new(response)
-          c_libs.send_actions_to_channel("authenticated-user-#{helpers.current_user.id}", streams, @render_turbo_stream_evaluate_instance_variables)
+          c_libs.send_actions_to_channel("authenticated_user_#{helpers.current_user.id}", streams, @render_turbo_stream_evaluate_instance_variables)
         else
           flash[:alert] = flashes[:alerts]
           flash[:notice] = flashes[:notices]

data/lib/render_turbo_stream/libs.rb

@@ -2,7 +2,7 @@ module RenderTurboStream
   class Libs
 
     def self.target_id_to_target(target_id)
-      if target_id.present?
+      if target_id.present? && !target_id[0] == '#'
         "##{target_id}"
       else
         nil

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

@@ -7,7 +7,7 @@ module RenderTurboStream
 
         def assert_channel_to_me(user, target_id, action: nil, count: 1, &block)
 
-          channel = "authenticated-user-#{user.id}"
+          channel = "authenticated_user_#{user.id}"
 
           libs = RenderTurboStream::Test::Request::Libs.new(response)
 
@@ -21,7 +21,7 @@ module RenderTurboStream
 
         def assert_action_to_me(user, action, count: 1, &block)
 
-          channel = "authenticated-user-#{user.id}"
+          channel = "authenticated_user_#{user.id}"
 
           libs = RenderTurboStream::Test::Request::Libs.new(response)
 
@@ -37,7 +37,7 @@ module RenderTurboStream
 
         def assert_channel_to_authenticated_group(group, target_id, count: 1, &block)
 
-          channel = "authenticated-group-#{group}"
+          channel = "authenticated_group_#{group}"
 
           libs = RenderTurboStream::Test::Request::Libs.new(response)
 
@@ -51,7 +51,7 @@ module RenderTurboStream
 
         def assert_action_to_authenticated_group(group, action, count: 1, &block)
 
-          channel = "authenticated-group-#{group}"
+          channel = "authenticated_group_#{group}"
 
           libs = RenderTurboStream::Test::Request::Libs.new(response)
 

data/lib/render_turbo_stream/version.rb

@@ -1,3 +1,3 @@
 module RenderTurboStream
-  VERSION = "4.3.14"
+  VERSION = "4.3.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: render_turbo_stream
 version: !ruby/object:Gem::Version
-  version: 4.3.14
+  version: 4.3.16
 platform: ruby
 authors:
 - christian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-18 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails