From cf426a7ee680e8cd30a4b5afccf7e140537836f4 Mon Sep 17 00:00:00 2001
From: "Mike A. Owens" <mike@filespanker.com>
Date: Mon, 24 Aug 2015 13:35:59 -0400
Subject: Use ActiveSupport::Callbacks for Channel subscription callbacks.

 * Rely on AS::Callbacks for callback handling.
 * Add before_subscribe, after_subscribe, before_unsubscribe and
   after_unsubscribe convenience methods
 * alias on_subscribe and on_unsubscribe to after_subscribe and
   after_unsubscribe, respectively.
 * Remove `subscribed` and `unsubscribed` from the callback chain:
   these methods are now executed as the subject of the callbacks.
 * Update portions of ActionCable to use the more specific
   callback names.
---
 lib/action_cable/channel/base.rb | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'lib/action_cable/channel/base.rb')

diff --git a/lib/action_cable/channel/base.rb b/lib/action_cable/channel/base.rb
index 2f1b4a187d..171558e371 100644
--- a/lib/action_cable/channel/base.rb
+++ b/lib/action_cable/channel/base.rb
@@ -71,9 +71,6 @@ module ActionCable
       include Naming
       include Broadcasting
 
-      on_subscribe   :subscribed
-      on_unsubscribe :unsubscribed
-
       attr_reader :params, :connection
       delegate :logger, to: :connection
 
@@ -138,7 +135,9 @@ module ActionCable
       # Called by the cable connection when its cut so the channel has a chance to cleanup with callbacks.
       # This method is not intended to be called directly by the user. Instead, overwrite the #unsubscribed callback.
       def unsubscribe_from_channel
-        run_unsubscribe_callbacks
+        run_callbacks :unsubscribe do
+          unsubscribed
+        end
         logger.info "#{self.class.name} unsubscribed"
       end
 
@@ -176,7 +175,9 @@ module ActionCable
 
         def subscribe_to_channel
           logger.info "#{self.class.name} subscribing"
-          run_subscribe_callbacks
+          run_callbacks :subscribe do
+            subscribed
+          end
         end
 
 
@@ -205,14 +206,6 @@ module ActionCable
             end
           end
         end
-
-        def run_subscribe_callbacks
-          self.class.on_subscribe_callbacks.each { |callback| send(callback) }
-        end
-
-        def run_unsubscribe_callbacks
-          self.class.on_unsubscribe_callbacks.each { |callback| send(callback) }
-        end
     end
   end
 end
-- 
cgit v1.2.3


From 351a663e57f2f20b3cd43b9ed751430665463659 Mon Sep 17 00:00:00 2001
From: Diego Ballona <root@dballona.com>
Date: Sat, 31 Oct 2015 18:50:54 -0200
Subject: Fixing subscription callbacks

---
 lib/action_cable/channel/base.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'lib/action_cable/channel/base.rb')

diff --git a/lib/action_cable/channel/base.rb b/lib/action_cable/channel/base.rb
index 7607b5ad59..2d528dfdbf 100644
--- a/lib/action_cable/channel/base.rb
+++ b/lib/action_cable/channel/base.rb
@@ -143,7 +143,9 @@ module ActionCable
       # Called by the cable connection when its cut so the channel has a chance to cleanup with callbacks.
       # This method is not intended to be called directly by the user. Instead, overwrite the #unsubscribed callback.
       def unsubscribe_from_channel
-        _run_unsubscribe_callbacks { unsubscribed }
+        run_callbacks :unsubscribe do
+          unsubscribed
+        end
       end
 
 
@@ -192,7 +194,9 @@ module ActionCable
 
 
         def subscribe_to_channel
-          _run_subscribe_callbacks { subscribed }
+          run_callbacks :subscribe do
+            subscribed
+          end
           transmit_subscription_confirmation unless defer_subscription_confirmation?
         end
 
@@ -227,7 +231,6 @@ module ActionCable
           unless subscription_confirmation_sent?
             logger.info "#{self.class.name} is transmitting the subscription confirmation"
             connection.transmit ActiveSupport::JSON.encode(identifier: @identifier, type: SUBSCRIPTION_CONFIRMATION_INTERNAL_MESSAGE)
-
             @subscription_confirmation_sent = true
           end
         end
-- 
cgit v1.2.3