sucker_punch 1.0.0.beta → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d30899558c37fb7f4f048e63520446ab0713746e
-  data.tar.gz: d1d3aa2d0e641b78b30c17fc49f48ddab368cbb9
+  metadata.gz: f9d68b7c7b9b1609f465227f56920578ca0cd037
+  data.tar.gz: 561bf68629e9c4fc95b3156d29c168e081f85bcf
 SHA512:
-  metadata.gz: 2568a1953bedf82b39675ce6a4d55ec0d60266aaf5c6e5c7203b0ccd6cab8d4bdd9a5e393a4badd9e3bc6a4e75e7e320c8657ce548828c617da2b2b755d1e292
-  data.tar.gz: 4b9355da76ac828677c9081330e64c48b9c85618f466c4b3149afc47233e3b163b2b9a7871dbb9b781efe3abd3eb8d00e67d83d7bf3161997dfebffc0c620391
+  metadata.gz: 04688497fae792eb3bedd54c34261848632e18b956e2fe3fb539e4c9fee229a2c062745eede2f99359c3723b00eded0f065d4965597609a750125151f46d534a
+  data.tar.gz: 7b579b1302292f6d36848f7a805dbe47d4b0521892b8b892d8821b2cdf7d46497b5a42450dfdb9c07459fdd9db90ddeb63a2a622c00bc8bf4ab591055d900404

data/CHANGES.md

@@ -1,4 +1,9 @@
-1.0.0.pre
+1.0.0.beta2
+--------
+
+- Add `workers` method to job to specify number of Celluloid pool workers
+
+1.0.0.beta
 --------
 
 - Removed the need for a configuration initializer

data/README.md

@@ -86,6 +86,22 @@ class AwesomeJob
 end
 ```
 
+The number of workers that get created can be set from the Job using the `workers` method:
+
+
+```Ruby
+class LogJob
+  include SuckerPunch::Job
+  workers 4
+
+  def perform(event)
+    Log.new(event).track
+  end
+end
+```
+
+If the `workers` method is not set, it is by default set to 2.
+
 ## Logger
 
 ```Ruby

data/lib/sucker_punch/job.rb

@@ -5,15 +5,21 @@ module SuckerPunch
       base.extend(ClassMethods)
 
       base.class_eval do
+        @workers = SuckerPunch::Queue::DEFAULT_OPTIONS[:workers]
+
         def self.new
-          define_celluloid_pool(self)
+          define_celluloid_pool(self, @workers)
         end
       end
     end
 
     module ClassMethods
-      def define_celluloid_pool(klass)
-        SuckerPunch::Queue.new(klass).register
+      def workers(num)
+        @workers = num
+      end
+
+      def define_celluloid_pool(klass, workers)
+        SuckerPunch::Queue.new(klass).register(workers)
       end
     end
 

data/lib/sucker_punch/queue.rb

@@ -5,6 +5,8 @@ module SuckerPunch
     attr_reader :klass
     attr_accessor :pool
 
+    DEFAULT_OPTIONS = { workers: 2 }
+
     def self.find(klass)
       queue = self.new(klass)
       Celluloid::Actor[queue.name]
@@ -16,10 +18,10 @@ module SuckerPunch
       @mutex = Mutex.new
     end
 
-    def register
+    def register(workers = DEFAULT_OPTIONS[:workers] )
       @mutex.synchronize {
         unless registered?
-          initialize_celluloid_pool
+          initialize_celluloid_pool(workers)
           register_celluloid_pool
           register_queue_with_master_list
         end
@@ -37,8 +39,8 @@ module SuckerPunch
 
     private
 
-    def initialize_celluloid_pool
-      self.pool = klass.send(:pool)
+    def initialize_celluloid_pool(workers)
+      self.pool = klass.send(:pool, { size: workers })
     end
 
     def register_celluloid_pool

data/lib/sucker_punch/version.rb

@@ -1,3 +1,3 @@
 module SuckerPunch
-  VERSION = "1.0.0.beta"
+  VERSION = "1.0.0.beta2"
 end

data/spec/sucker_punch/job_spec.rb

@@ -4,6 +4,7 @@ describe SuckerPunch::Job do
   before :each do
     class ::FakeJob
       include SuckerPunch::Job
+      workers 4
 
       def perform(name)
         "response #{name}"
@@ -11,24 +12,31 @@ describe SuckerPunch::Job do
     end
   end
 
+  after :each do
+    Celluloid::Actor.clear_registry
+  end
+
   it "includes Celluloid into requesting class when included" do
     FakeJob.should respond_to(:pool)
   end
 
-  describe "#perform" do
-    context "when pool hasn't been created" do
-      it "creates pool and registers queue" do
-        expect(Celluloid::Actor[:fake_job]).to eq(nil)
-        expect(SuckerPunch::Queues.all).to eq([])
+  it "sets the pool size to 4" do
+    pool = FakeJob.new
+    expect(pool.size).to eq(4)
+  end
 
-        # Don't use #async here b/c of a race condition
-        # The expectation will run before the asynchronous
-        # job is executed
-        FakeJob.new.perform("test")
+  it "returns the same pool on each instantiation" do
+    pool = FakeJob.new
+    pool2 = FakeJob.new
+    expect(pool.thread).to eq(pool2.thread)
+  end
 
-        expect(Celluloid::Actor[:fake_job]).to be
-        expect(SuckerPunch::Queues.all).to eq([:fake_job])
-      end
+  describe "when pool hasn't been created" do
+    it "registers queue" do
+      queue = stub("queue")
+      SuckerPunch::Queue.stub(new: queue)
+      queue.should_receive(:register).with(4)
+      pool = FakeJob.new
     end
   end
 end

data/spec/sucker_punch/queue_spec.rb

@@ -33,6 +33,11 @@ describe SuckerPunch::Queue do
       expect(Celluloid::Actor[:fake_job]).to eq(pool)
     end
 
+    it "registers the pool with Celluloid" do
+      pool = queue.register(3)
+      expect(Celluloid::Actor[:fake_job].size).to eq(3)
+    end
+
     it "registers with master list of queues" do
       queue.register
       queues = SuckerPunch::Queues.all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sucker_punch
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Brandon Hilkert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec