sucker_punch 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 063fd2167ea7931708d817864a566519fed44bc4
-  data.tar.gz: 90c335d21c42d04a3b83ff4c58aa336dbdcff216
+  metadata.gz: dfa2c3188160d11c140e02f6935357ef0cdf8dc7
+  data.tar.gz: a9bfa22e4f43208aee4a6cc660db600d1be62c49
 SHA512:
-  metadata.gz: bdedb891160c8569ee0e022d4f4dbd501306cdc2e6f27dba368ca027a86fc13a147834438c392a1ab60b7f34716effb0c6fd8dfe548953f46e3dc239a62bccb0
-  data.tar.gz: 999af4061d5ec40a10bcc6efd65effacfea1565c17fcf8b736638af5504e0c234e686dd9ad3e81b4f7e9470afdbf83d2416fd5e741fe092f3def99e7d960c094
+  metadata.gz: eba72894093e01f2fd3900c548c14d4c68deec3da4f248ffc3577dceb99247ea9505f122d0c74fc419a34ee7d269a2368a7d7a91ce64a1a41dcbc7e873e1a0cb
+  data.tar.gz: 2ba835f123989034ec6a86f06ec0d5ec336991808e4c3c98b25f7d7afa7e82c8194b144d4fbc6829284b6321804e6b8f50c2252e25223e299b649c6dafdf66c7

data/CHANGES.md

@@ -1,3 +1,9 @@
+1.5.0
+--------
+
+- Allow number of workers to be up to and including 200
+- Don't clear out non-Sucker Punch Celluloid registry on boot [#113](https://github.com/brandonhilkert/sucker_punch/pull/113)
+
 1.4.0
 --------
 

data/README.md

@@ -145,6 +145,22 @@ SuckerPunch.logger # => #<Logger:0x007fa1f28b83f0>
 _Note: If Sucker Punch is being used within a Rails application, Sucker Punch's logger
 is set to Rails.logger by default._
 
+## Exceptions
+
+You can customize how to handle uncaught exceptions that are raised by your jobs.  
+
+For example, using Rails and the ExceptionNotification gem, add a new initializer `config/initializers/sucker_punch.rb`:
+
+```Ruby
+SuckerPunch.exception_handler { |ex| ExceptionNotifier.notify_exception(ex) }
+```
+
+Or, using Airbrake:
+
+```Ruby
+SuckerPunch.exception_handler { |ex| Airbrake.notify(ex) }
+```
+
 ## Testing
 
 Requiring this library causes your jobs to run everything inline. So a call to the following will actually be SYNCHRONOUS:

data/lib/sucker_punch.rb

@@ -16,6 +16,10 @@ module SuckerPunch
   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)

data/lib/sucker_punch/queue.rb

@@ -6,6 +6,7 @@ module SuckerPunch
     attr_accessor :pool
 
     DEFAULT_OPTIONS = { workers: 2 }
+    PREFIX = "sucker_punch"
     class MaxWorkersExceeded < StandardError; end
     class NotEnoughWorkers < StandardError; end
 
@@ -14,6 +15,17 @@ module SuckerPunch
       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
@@ -22,7 +34,7 @@ module SuckerPunch
 
     def register(num_workers = DEFAULT_OPTIONS[:workers])
       num_workers ||= DEFAULT_OPTIONS[:workers]
-      raise MaxWorkersExceeded if num_workers > 100
+      raise MaxWorkersExceeded if num_workers > 200
       raise NotEnoughWorkers if num_workers < 1
 
       @mutex.synchronize {
@@ -39,7 +51,8 @@ module SuckerPunch
     end
 
     def name
-      klass.to_s.underscore.to_sym
+      klass_name = klass.to_s.underscore
+      "#{PREFIX}_#{klass_name}".to_sym
     end
 
     private

data/lib/sucker_punch/railtie.rb

@@ -5,7 +5,7 @@ module SuckerPunch
     end
 
     config.to_prepare do
-      Celluloid::Actor.clear_registry
+      SuckerPunch.clear_queues
     end
   end
 end

data/lib/sucker_punch/version.rb

@@ -1,3 +1,3 @@
 module SuckerPunch
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/spec/sucker_punch/queue_spec.rb

@@ -15,7 +15,7 @@ describe SuckerPunch::Queue do
     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)
@@ -23,6 +23,32 @@ describe SuckerPunch::Queue do
     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,18 +59,24 @@ describe SuckerPunch::Queue do
     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
       it "raises a MaxWorkersExceeded exception" do
-        expect{ queue.register(101) }.to raise_error(SuckerPunch::Queue::MaxWorkersExceeded)
+        expect{ queue.register(201) }.to raise_error(SuckerPunch::Queue::MaxWorkersExceeded)
       end
     end
 

data/spec/sucker_punch_spec.rb

@@ -11,4 +11,14 @@ describe SuckerPunch do
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sucker_punch
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Brandon Hilkert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec