* sync with upstream

Ref c594ba4ffdb016c7b2a22055f41dfb2c4409594d

Author: palkan

.github/workflows/benchmark.yml

@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3
+          ruby-version: 3.4
           bundler-cache: true
       - name: Run benchmarks
         env:

.github/workflows/lint.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3
+          ruby-version: 3.4
           bundler-cache: true
       - name: Lint Ruby code with RuboCop
         run: |

.rubocop.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-minitest
   - rubocop-packaging
   - rubocop-performance
@@ -215,6 +215,9 @@ Layout/TrailingWhitespace:
 Style/RedundantPercentQ:
   Enabled: true
 
+Lint/NestedMethodDefinition:
+  Enabled: true
+
 Lint/AmbiguousOperator:
   Enabled: true
 
@@ -328,6 +331,9 @@ Style/OpenStructUse:
 Style/ArrayIntersect:
   Enabled: true
 
+Style/KeywordArgumentsMerging:
+  Enabled: true
+
 Performance/BindCall:
   Enabled: true
 
@@ -376,7 +382,7 @@ Performance/RedundantStringChars:
 Performance/StringInclude:
   Enabled: true
 
-Minitest/AssertPredicate:
+Minitest/AssertNil:
   Enabled: true
 
 Minitest/AssertRaisesWithRegexpArgument:

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## main
 
+- Sync with upstream (Rails 8.1.1).
+
 - Do not call `#subscribed` when subscription is rejected in a `before_subscribe` callback.
 
 ## 0.2.0

Rakefile

@@ -8,22 +8,28 @@ require "action_cable"
 
 task default: :test
 
-task :package
-
 ENV["RAILS_MINITEST_PLUGIN"] = "true"
 
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList["#{__dir__}/test/**/*_test.rb"]
   t.warning = true
   t.verbose = true
+  t.options = "--profile" if ENV["CI"]
   t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
 end
 
 namespace :test do
-  task :isolated do
+  task isolated: :railties do
     Dir.glob("test/**/*_test.rb").all? do |file|
       sh(Gem.ruby, "-w", "-Ilib:test", file)
     end || raise("Failures")
   end
+
+  task :railties do
+    # TODO: uncomment in rails/rails
+    # ["action_cable/engine"].all? do |railtie|
+    #   sh(Gem.ruby, "-r", railtie, "-e", "'OK'")
+    # end || raise("Failures")
+  end
 end

actioncable-next.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.summary     = "Next-gen version of Action Cable"
   s.description = "Next-gen version of Action Cable"
 
-  s.required_ruby_version = ">= 3.1.0"
+  s.required_ruby_version = ">= 3.2.0"
 
   s.license = "MIT"
 

lib/action_cable/channel/base.rb

@@ -2,7 +2,6 @@
 
 # :markup: markdown
 
-require "set"
 require "active_support/rescuable"
 require "active_support/parameter_filter"
 
@@ -133,7 +132,10 @@ def action_methods
               # Except for public instance methods of Base and its ancestors
               ActionCable::Channel::Base.public_instance_methods(true) +
               # Be sure to include shadowed public instance methods of this class
-              public_instance_methods(false)).uniq.map(&:to_s)
+              public_instance_methods(false) -
+              # Except the internal methods
+              internal_methods).uniq
+            methods.map!(&:name)
             methods.to_set
           end
         end
@@ -146,6 +148,10 @@ def clear_action_methods! # :doc:
             @action_methods = nil
           end
 
+          def internal_methods
+            super
+          end
+
           # Refresh the cached action_methods when a new action_method is added.
           def method_added(name) # :doc:
             super
@@ -166,6 +172,7 @@ def initialize(connection, identifier, params = {})
 
         @reject_subscription = nil
         @subscription_confirmation_sent = nil
+        @unsubscribed = false
 
         delegate_connection_identifiers
       end
@@ -201,11 +208,16 @@ def subscribe_to_channel
       # 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

lib/action_cable/channel/broadcasting.rb

@@ -10,19 +10,19 @@ module Broadcasting
       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

lib/action_cable/channel/callbacks.rb

@@ -39,6 +39,8 @@ module Callbacks
       extend  ActiveSupport::Concern
       include ActiveSupport::Callbacks
 
+      INTERNAL_METHODS = [:_run_subscribe_callbacks, :_run_unsubscribe_callbacks] # :nodoc:
+
       included do
         define_callbacks :subscribe
         define_callbacks :unsubscribe
@@ -70,6 +72,11 @@ def after_unsubscribe(*methods, &block)
           set_callback(:unsubscribe, :after, *methods, &block)
         end
         alias_method :on_unsubscribe, :after_unsubscribe
+
+        private
+          def internal_methods
+            INTERNAL_METHODS
+          end
       end
     end
   end

lib/action_cable/channel/streams.rb

@@ -88,6 +88,8 @@ module Streams
       # 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
@@ -104,15 +106,15 @@ def stream_from(broadcasting, callback = nil, coder: nil, &block)
         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, ...)
-        stream_from(broadcasting_for(model), ...)
+      def stream_for(broadcastables, ...)
+        stream_from(broadcasting_for(broadcastables), ...)
       end
 
       # Unsubscribes streams from the named `broadcasting`.