Don't clear non-SuckerPunch actors from registry

lib/sucker_punch.rb

@@ -16,6 +16,10 @@ def self.logger=(logger)
   def self.exception_handler(&block)
     Celluloid.exception_handler(&block)
   end
+
+  def self.clear_queues
+    SuckerPunch::Queue.clear_all
+  end
 end
 
 require 'sucker_punch/railtie' if defined?(::Rails)

lib/sucker_punch/queue.rb

@@ -6,6 +6,7 @@ class Queue
     attr_accessor :pool
 
     DEFAULT_OPTIONS = { workers: 2 }
+    PREFIX = "sucker_punch"
     class MaxWorkersExceeded < StandardError; end
     class NotEnoughWorkers < StandardError; end
 
@@ -14,6 +15,17 @@ def self.find(klass)
       Celluloid::Actor[queue.name]
     end
 
+    def self.clear_all
+      Celluloid::Actor.all.each do |actor|
+        registered_name = actor.registered_name.to_s
+        matches = registered_name.match(PREFIX).to_a
+
+        if matches.any?
+          Celluloid::Actor.delete(registered_name)
+        end
+      end
+    end
+
     def initialize(klass)
       @klass = klass
       @pool = nil
@@ -39,7 +51,8 @@ def registered?
     end
 
     def name
-      klass.to_s.underscore.to_sym
+      klass_name = klass.to_s.underscore
+      "#{PREFIX}_#{klass_name}".to_sym
     end
 
     private

lib/sucker_punch/railtie.rb

@@ -5,7 +5,7 @@ class Railtie < ::Rails::Railtie
     end
 
     config.to_prepare do
-      Celluloid::Actor.clear_registry
+      SuckerPunch.clear_queues
     end
   end
 end

spec/sucker_punch/queue_spec.rb

@@ -15,14 +15,40 @@ def perform(name)
     Celluloid::Actor.clear_registry
   end
 
-  describe "#find" do
+  describe ".find" do
     it "returns the Celluloid Actor from the registry" do
       SuckerPunch::Queue.new(FakeJob).register
       queue = SuckerPunch::Queue.find(FakeJob)
       queue.class == Celluloid::PoolManager
     end
   end
 
+  describe ".clear_all" do
+   it "removes SuckerPunch actors from Celluloid registry" do
+     sucker_punch_actor_name = "#{SuckerPunch::Queue::PREFIX}_fake_job".to_sym
+     Celluloid::Actor[sucker_punch_actor_name] = FakeJob.new
+
+     SuckerPunch::Queue.clear_all
+
+     expect(Celluloid::Actor[sucker_punch_actor_name]).to be_nil
+   end
+
+    it "does not remove non-SuckerPunch actors from Celluloid registry" do
+      class ::OtherJob
+        include ::Celluloid
+        def self.pool(options); end
+        def perform; end
+      end
+      actor_name = :other_job
+      job = OtherJob.new
+      Celluloid::Actor[actor_name] = job
+
+      SuckerPunch::Queue.clear_all
+
+      expect(Celluloid::Actor[actor_name]).to eq job
+    end
+  end
+
   describe "#register" do
     let(:job) { FakeJob }
     let(:queue) { SuckerPunch::Queue.new(job) }
@@ -33,13 +59,19 @@ def perform(name)
     end
 
     it "registers the pool with Celluloid" do
+      expected_pool_name = "#{SuckerPunch::Queue::PREFIX}_fake_job".to_sym
+
       pool = queue.register
-      expect(Celluloid::Actor[:fake_job]).to eq(pool)
+
+      expect(Celluloid::Actor[expected_pool_name]).to eq(pool)
     end
 
     it "registers the pool with Celluloid and 3 workers" do
-      pool = queue.register(3)
-      expect(Celluloid::Actor[:fake_job].size).to eq(3)
+      expected_pool_name = "#{SuckerPunch::Queue::PREFIX}_fake_job"
+
+      queue.register(3)
+
+      expect(Celluloid::Actor[expected_pool_name].size).to eq(3)
     end
 
     context "when too many workers are specified" do

spec/sucker_punch_spec.rb

@@ -11,4 +11,14 @@
       SuckerPunch.logger = nil
     end
   end
+
+  describe '.clear_queues' do
+    it "clears SuckerPunch queues" do
+      allow(SuckerPunch::Queue).to receive(:clear_all)
+
+      SuckerPunch.clear_queues
+
+      expect(SuckerPunch::Queue).to have_received(:clear_all)
+    end
+  end
 end