actioncable 8.0.2.1 → 8.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 787990f48bdb2bb0cfe03b4f8437271d96e93884415167c4197a774723abe6c8
-  data.tar.gz: e072ddd51101c454118f1a32f53a020f040157082c9108105ca0f7792908b73e
+  metadata.gz: 23d628c9902e296471a081c1fd0781d562485649067e725dd85f2d13aeb1ab77
+  data.tar.gz: ad44df73a5681b4ecaeeee4d4831107da2da833210c78e9f86ad1bf11195d920
 SHA512:
-  metadata.gz: 007c6f4f2e4a8f587a1ae0af0277ecbd8d302c26a2238ff3aefdf21d78561930466bc3cc2dfa2aa021adb6bdb41cfbd27114ebec21969092738c0f479a5476f6
-  data.tar.gz: 692aa818a0fe2a2b4066c61e0e27a69fd920a76c1d936b1c9c3d507a8cf06cdd3d226f6a1c747ef4a0c5c603d70a3b20eae8fd8bed656c3ec9e28f3496672941
+  metadata.gz: 1197007dc525dbdaece760efafe54b6b5bf7eb4c30f37b4b899aeaf0e0bbf8fe7598b9c391ca0efa2f0b9f4f70703cce154126f09b151e2bbbac0a5c62ee75e1
+  data.tar.gz: 41338ae8f3611fffe437dc6a9f1f215bc1e03b8a0515ad7feaed8a28db96a67d5c7454b845b8e9637a2d61ba2d2aa7143fa3918feaaa9629b167fd63ee6719b0

data/CHANGELOG.md

@@ -1,52 +1,11 @@
-## Rails 8.0.2.1 (August 13, 2025) ##
+## Rails 8.1.0.beta1 (September 04, 2025) ##
 
-*   No changes.
+*   Allow passing composite channels to `ActionCable::Channel#stream_for` – e.g. `stream_for [ group, group.owner ]`
 
+    *hey-leon*
 
-## Rails 8.0.2 (March 12, 2025) ##
+*   Allow setting nil as subscription connection identifier for Redis.
 
-*   No changes.
+    *Nguyen Nguyen*
 
-
-## Rails 8.0.2 (March 12, 2025) ##
-
-*   No changes.
-
-
-## Rails 8.0.1 (December 13, 2024) ##
-
-*   Ensure the Postgresql adapter always use a dedicated connection even during system tests.
-
-    Fix an issue with the Action Cable Postgresql adapter causing deadlock or various weird
-    pg client error during system tests.
-
-    *Jean Boussier*
-
-
-## Rails 8.0.0.1 (December 10, 2024) ##
-
-*   No changes.
-
-
-## Rails 8.0.0 (November 07, 2024) ##
-
-*   No changes.
-
-
-## Rails 8.0.0.rc2 (October 30, 2024) ##
-
-*   No changes.
-
-
-## Rails 8.0.0.rc1 (October 19, 2024) ##
-
-*   No changes.
-
-
-## Rails 8.0.0.beta1 (September 26, 2024) ##
-
-*   Add an `identifier` to the event payload for the ActiveSupport::Notification `transmit_subscription_confirmation.action_cable` and `transmit_subscription_rejection.action_cable`.
-
-    *Keith Schacht*
-
-Please check [7-2-stable](https://github.com/rails/rails/blob/7-2-stable/actioncable/CHANGELOG.md) for previous changes.
+Please check [8-0-stable](https://github.com/rails/rails/blob/8-0-stable/actioncable/CHANGELOG.md) for previous changes.

data/README.md

@@ -19,6 +19,6 @@ Bug reports for the Ruby on \Rails project can be filed here:
 
 * https://github.com/rails/rails/issues
 
-Feature requests should be discussed on the rails-core mailing list here:
+Feature requests should be discussed on the rubyonrails-core forum here:
 
 * https://discuss.rubyonrails.org/c/rubyonrails-core

data/lib/action_cable/channel/base.rb

@@ -165,6 +165,7 @@ module ActionCable
 
         @reject_subscription = nil
         @subscription_confirmation_sent = nil
+        @unsubscribed = false
 
         delegate_connection_identifiers
       end
@@ -200,11 +201,16 @@ module ActionCable
       # cleanup with callbacks. This method is not intended to be called directly by
       # the user. Instead, override the #unsubscribed callback.
       def unsubscribe_from_channel # :nodoc:
+        @unsubscribed = true
         run_callbacks :unsubscribe do
           unsubscribed
         end
       end
 
+      def unsubscribed? # :nodoc:
+        @unsubscribed
+      end
+
       private
         # Called once a consumer has become a subscriber of the channel. Usually the
         # place to set up any streams you want this channel to be sending to the

data/lib/action_cable/channel/broadcasting.rb

@@ -10,19 +10,19 @@ module ActionCable
       extend ActiveSupport::Concern
 
       module ClassMethods
-        # Broadcast a hash to a unique broadcasting for this `model` in this channel.
-        def broadcast_to(model, message)
-          ActionCable.server.broadcast(broadcasting_for(model), message)
+        # Broadcast a hash to a unique broadcasting for this array of `broadcastables` in this channel.
+        def broadcast_to(broadcastables, message)
+          ActionCable.server.broadcast(broadcasting_for(broadcastables), message)
         end
 
         # Returns a unique broadcasting identifier for this `model` in this channel:
         #
         #     CommentsChannel.broadcasting_for("all") # => "comments:all"
         #
-        # You can pass any object as a target (e.g. Active Record model), and it would
+        # You can pass an array of objects as a target (e.g. Active Record model), and it would
         # be serialized into a string under the hood.
-        def broadcasting_for(model)
-          serialize_broadcasting([ channel_name, model ])
+        def broadcasting_for(broadcastables)
+          serialize_broadcasting([ channel_name ] + Array(broadcastables))
         end
 
         private

data/lib/action_cable/channel/streams.rb

@@ -88,6 +88,8 @@ module ActionCable
       # callback. Defaults to `coder: nil` which does no decoding, passes raw
       # messages.
       def stream_from(broadcasting, callback = nil, coder: nil, &block)
+        return if unsubscribed?
+
         broadcasting = String(broadcasting)
 
         # Don't send the confirmation until pubsub#subscribe is successful
@@ -106,15 +108,15 @@ module ActionCable
         end
       end
 
-      # Start streaming the pubsub queue for the `model` in this channel. Optionally,
+      # Start streaming the pubsub queue for the `broadcastables` in this channel. Optionally,
       # you can pass a `callback` that'll be used instead of the default of just
       # transmitting the updates straight to the subscriber.
       #
       # Pass `coder: ActiveSupport::JSON` to decode messages as JSON before passing to
       # the callback. Defaults to `coder: nil` which does no decoding, passes raw
       # messages.
-      def stream_for(model, callback = nil, coder: nil, &block)
-        stream_from(broadcasting_for(model), callback || block, coder: coder)
+      def stream_for(broadcastables, callback = nil, coder: nil, &block)
+        stream_from(broadcasting_for(broadcastables), callback || block, coder: coder)
       end
 
       # Unsubscribes streams from the named `broadcasting`.

data/lib/action_cable/connection/stream_event_loop.rb

@@ -68,6 +68,7 @@ module ActionCable
             @nio ||= NIO::Selector.new
 
             @executor ||= Concurrent::ThreadPoolExecutor.new(
+              name: "ActionCable-streamer",
               min_threads: 1,
               max_threads: 10,
               max_queue: 0,

data/lib/action_cable/gem_version.rb

@@ -10,9 +10,9 @@ module ActionCable
 
   module VERSION
     MAJOR = 8
-    MINOR = 0
-    TINY  = 2
-    PRE   = "1"
+    MINOR = 1
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_cable/server/broadcasting.rb

@@ -21,10 +21,12 @@ module ActionCable
     #     ActionCable.server.broadcast \
     #       "web_notifications_1", { title: "New things!", body: "All that's fit for print" }
     #
-    #     # Client-side CoffeeScript, which assumes you've already requested the right to send web notifications:
-    #     App.cable.subscriptions.create "WebNotificationsChannel",
-    #       received: (data) ->
-    #         new Notification data['title'], body: data['body']
+    #     # Client-side JavaScript, which assumes you've already requested the right to send web notifications:
+    #     App.cable.subscriptions.create("WebNotificationsChannel", {
+    #       received: function(data) {
+    #         new Notification(data['title'], { body: data['body'] })
+    #       }
+    #     })
     module Broadcasting
       # Broadcast a hash directly to a named `broadcasting`. This will later be JSON
       # encoded.

data/lib/action_cable/server/worker.rb

@@ -20,7 +20,7 @@ module ActionCable
 
       def initialize(max_size: 5)
         @executor = Concurrent::ThreadPoolExecutor.new(
-          name: "ActionCable",
+          name: "ActionCable-server",
           min_threads: 1,
           max_threads: max_size,
           max_queue: 0,

data/lib/action_cable/subscription_adapter/base.rb

@@ -29,7 +29,8 @@ module ActionCable
       end
 
       def identifier
-        @server.config.cable[:id] ||= "ActionCable-PID-#{$$}"
+        @server.config.cable[:id] = "ActionCable-PID-#{$$}" unless @server.config.cable.key?(:id)
+        @server.config.cable[:id]
       end
     end
   end

data/lib/action_cable/subscription_adapter/redis.rb

@@ -164,7 +164,7 @@ module ActionCable
                 begin
                   conn = @adapter.redis_connection_for_subscriptions
                   listen conn
-                rescue ConnectionError
+                rescue *CONNECTION_ERRORS
                   reset
                   if retry_connecting?
                     when_connected { resubscribe }
@@ -210,7 +210,7 @@ module ActionCable
             end
 
             if ::Redis::VERSION < "5"
-              ConnectionError = ::Redis::BaseConnectionError
+              CONNECTION_ERRORS = [::Redis::BaseConnectionError].freeze
 
               class SubscribedClient
                 def initialize(raw_client)
@@ -244,7 +244,12 @@ module ActionCable
                 SubscribedClient.new(conn._client)
               end
             else
-              ConnectionError = RedisClient::ConnectionError
+              CONNECTION_ERRORS = [
+                ::Redis::BaseConnectionError,
+
+                # Some older versions of redis-rb sometime leak underlying exceptions
+                RedisClient::ConnectionError,
+              ].freeze
 
               def extract_subscribed_client(conn)
                 conn

data/lib/rails/generators/channel/channel_generator.rb

@@ -59,17 +59,17 @@ module Rails
         def create_channel_javascript_file
           channel_js_path = File.join("app/javascript/channels", class_path, "#{file_name}_channel")
           js_template "javascript/channel", channel_js_path
-          gsub_file "#{channel_js_path}.js", /\.\/consumer/, "channels/consumer" unless using_js_runtime?
+          gsub_file "#{channel_js_path}.js", /\.\/consumer/, "channels/consumer" if using_importmap?
         end
 
         def import_channels_in_javascript_entrypoint
           append_to_file "app/javascript/application.js",
-            using_js_runtime? ? %(import "./channels"\n) : %(import "channels"\n)
+            using_importmap? ? %(import "channels"\n) : %(import "./channels"\n)
         end
 
         def import_channel_in_javascript_entrypoint
           append_to_file "app/javascript/channels/index.js",
-            using_js_runtime? ? %(import "./#{file_name}_channel"\n) : %(import "channels/#{file_name}_channel"\n)
+            using_importmap? ? %(import "channels/#{file_name}_channel"\n) : %(import "./#{file_name}_channel"\n)
         end
 
         def install_javascript_dependencies
@@ -105,7 +105,7 @@ pin_all_from "app/javascript/channels", under: "channels"
         end
 
         def using_bun?
-          # Cannot assume bun.lockb has been generated yet so we look for a file known to
+          # Cannot assume Bun lockfile has been generated yet so we look for a file known to
           # be generated by the jsbundling-rails gem
           @using_bun ||= using_js_runtime? && root.join("bun.config.js").exist?
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actioncable
 version: !ruby/object:Gem::Version
-  version: 8.0.2.1
+  version: 8.1.0.beta1
 platform: ruby
 authors:
 - Pratik Naik
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: 8.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: 8.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: 8.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.2.1
+        version: 8.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: nio4r
   requirement: !ruby/object:Gem::Requirement
@@ -153,10 +153,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v8.0.2.1/actioncable/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v8.0.2.1/
+  changelog_uri: https://github.com/rails/rails/blob/v8.1.0.beta1/actioncable/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v8.1.0.beta1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v8.0.2.1/actioncable
+  source_code_uri: https://github.com/rails/rails/tree/v8.1.0.beta1/actioncable
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: