render_turbo_stream 4.3.15 → 4.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 134824095a6baf570e7a0702b435773c623cae537059ee6883dc141cb9a15237
-  data.tar.gz: 31aba69f008b047d5ab1234f621b3bc5d1858c8808fb644bb2d59eaf63766b19
+  metadata.gz: 91ec62a537df4902f5adcf7caf65a6b6a098365d2c983cda574a2d9ab1ffd22e
+  data.tar.gz: 28b80ad8d49000bc97b8b4fb0d66e1810befd61f0812aeb00712f8836d2dca3d
 SHA512:
-  metadata.gz: 0cc9bc72db795c128ede596635e5a9b303033e58d2b6f791767eb3d3d1c720ab23e307dcd0cf2b9a41667a24f33ca4d8509e3594854a14cd456b56de539ddbd4
-  data.tar.gz: 3dd2fe010267ee08a0f1b82f350310a4b6dc53e5c5e93912d464b3f4420787e2c2cf93ddb684221540a4b49a6ed87604f9eb766d1a42ce5428aed9508db3e9a4
+  metadata.gz: 343b599092acb9ccb1dc2f046175af02a6771696f0883f573b9f5f99e3891ff86fe6064510e761a05deba57feb814d0a473da61f8842eea0ea4642fc16d33996
+  data.tar.gz: ea135fc6460784cf9a2a7c5f738fe37e639e23645577b53b5e761443ca20bca141167eb6d68a8adcf466b7f90e4c4caea8aef55ba4838c3f29b9231670fd7139

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)
@@ -202,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

@@ -111,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

@@ -3,7 +3,11 @@ module RenderTurboStream
 
     def self.target_id_to_target(target_id)
       if target_id.present?
+        if target_id[0] == '#'
+          target_id
+          else
         "##{target_id}"
+        end
       else
         nil
       end

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.15"
+  VERSION = "4.3.17"
 end

metadata

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