Setup better finalizer (stimulusreflex#116)

* Setup better finalizer SEE: https://www.mikeperham.com/2010/02/24/the-trouble-with-ruby-finalizers/ Resolves stimulusreflex#113 * Add some defensive programming
gl3n91 · Apr 12, 2022 · 41a47b2 · 41a47b2
1 parent 1dfa318
commit 41a47b2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/lib/cable_ready/channel.rb b/lib/cable_ready/channel.rb
@@ -4,14 +4,19 @@ module CableReady
   class Channel
     attr_reader :identifier, :enqueued_operations
 
+    def self.finalizer_for(identifier)
+      proc {
+        channel = CableReady.config.observers.find { |o| o.try(:identifier) == identifier }
+        CableReady.config.delete_observer channel if channel
+      }
+    end
+
     def initialize(identifier)
       @identifier = identifier
       reset
       CableReady.config.operation_names.each { |name| add_operation_method name }
-
-      config_observer = self
-      CableReady.config.add_observer config_observer, :add_operation_method
-      ObjectSpace.define_finalizer self, -> { CableReady.config.delete_observer config_observer }
+      CableReady.config.add_observer self, :add_operation_method
+      ObjectSpace.define_finalizer self, self.class.finalizer_for(identifier)
     end
 
     def broadcast(clear: true)

diff --git a/lib/cable_ready/config.rb b/lib/cable_ready/config.rb
@@ -16,6 +16,10 @@ def initialize
       @operation_names = Set.new(default_operation_names)
     end
 
+    def observers
+      @observer_peers&.keys || []
+    end
+
     def operation_names
       @operation_names.to_a
     end