sucker_punch 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20820f3c865f6723365bbd709449442c7c28a9fc
-  data.tar.gz: 5cf7d98a219fa334f607968733807fb622e028ad
+  metadata.gz: d6ccd098769b0b630161eb92038c13e662a58786
+  data.tar.gz: 0a99540886529b095b99a745514b54cf49a75cf2
 SHA512:
-  metadata.gz: e8cee2c73f6ee889aa88585a445ac8d6515de5ca53eddbf17acfce3a00bb944702d6efc7d0342d4ddc38b04fc54c35a65d3c3277e14c640a569693d4262de176
-  data.tar.gz: 908e324fde84ae503789e00755f8c912812adc76406c72c1fd18991972dc677bf33032da68b9cdc2c8fe2d89c85a90c11401be7b60d2b8dfdaae39465b1e1297
+  metadata.gz: b9d74d6377d9abc828a43333460966ab7779499c75ece7fe78c68f9b1002572322da70754ed7032ccc963ceac797aa2cb7df0ac77a19b80e8ad13f559bb5001f
+  data.tar.gz: 83a79b2a2ecdb619f781d8dcb2b2e50d6cea08d3a34e134b1c13f29fa129b7e4e92eb671bf4fe43b37788386690bf9273fa85f3ccb3a795536238e17d3a289e7

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - jruby-19mode
   - rbx-2
   - 2.0.0
+  - 2.1.0
   - ruby-head
 matrix:
   allow_failures:

data/CHANGES.md

@@ -1,3 +1,10 @@
+1.6.0
+--------
+
+- Update to use Celluloid `0.17.2`
+- Removed the `SuckerPunch.clear_queues` method
+
+
 1.5.1
 --------
 

data/README.md

@@ -166,7 +166,7 @@ Full job data can be reported like this:
 ```Ruby
 def perform(all, my, arguments)
   ... your code ...
-rescue Exception
+rescue StandardError
   Airbrake.error($!, [self.class.name, all, my, arguments].inspect)
   raise
 end

data/lib/sucker_punch.rb

@@ -1,4 +1,4 @@
-require 'celluloid'
+require 'celluloid/current'
 require 'sucker_punch/core_ext'
 require 'sucker_punch/job'
 require 'sucker_punch/queue'
@@ -16,10 +16,6 @@ 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

@@ -3,7 +3,6 @@ require 'thread'
 module SuckerPunch
   class Queue
     attr_reader :klass
-    attr_accessor :pool
 
     DEFAULT_OPTIONS = { workers: 2 }
     PREFIX = "sucker_punch"
@@ -15,20 +14,8 @@ 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
       @mutex = Mutex.new
     end
 
@@ -40,7 +27,6 @@ module SuckerPunch
       @mutex.synchronize {
         unless registered?
           initialize_celluloid_pool(num_workers)
-          register_celluloid_pool
         end
       }
       self.class.find(klass)
@@ -58,11 +44,12 @@ module SuckerPunch
     private
 
     def initialize_celluloid_pool(num_workers)
-      self.pool = klass.send(:pool, { size: num_workers })
-    end
-
-    def register_celluloid_pool
-      Celluloid::Actor[name] = pool
+      pool_class = klass
+      pool_name = name
+      pool = Class.new(Celluloid::Supervision::Container) do
+        pool pool_class, as: pool_name, size: num_workers
+      end
+      pool.run!
     end
   end
 end

data/lib/sucker_punch/railtie.rb

@@ -3,9 +3,5 @@ module SuckerPunch
     initializer "sucker_punch.logger" do
       SuckerPunch.logger = Rails.logger
     end
-
-    config.to_prepare do
-      SuckerPunch.clear_queues
-    end
   end
 end

data/lib/sucker_punch/testing/inline.rb

@@ -1,13 +1,11 @@
 require 'sucker_punch'
-require "celluloid/proxies/abstract_proxy"
-require "celluloid/proxies/sync_proxy"
-require "celluloid/proxies/actor_proxy"
+require 'celluloid/proxy/abstract'
+require 'celluloid/proxy/sync'
+require 'celluloid/proxy/actor'
 
-module Celluloid
-  class CellProxy < SyncProxy
-    def async(method_name = nil, *args, &block)
-      self
-    end
+class Celluloid::Proxy::Cell < Celluloid::Proxy::Sync
+  def async(method_name = nil, *args, &block)
+    self
   end
 end
 

data/lib/sucker_punch/version.rb

@@ -1,3 +1,3 @@
 module SuckerPunch
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 end

data/spec/sucker_punch/queue_spec.rb

@@ -19,33 +19,7 @@ describe SuckerPunch::Queue 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
+      expect(queue.class).to eq Celluloid::Supervision::Container::Pool
     end
   end
 
@@ -53,12 +27,7 @@ describe SuckerPunch::Queue do
     let(:job) { FakeJob }
     let(:queue) { SuckerPunch::Queue.new(job) }
 
-    it "initializes a celluloid pool" do
-      queue.register
-      expect(queue.pool.class).to eq(Celluloid::PoolManager)
-    end
-
-    it "registers the pool with Celluloid" do
+    it "initializes and registers the pool with Celluloid" do
       expected_pool_name = "#{SuckerPunch::Queue::PREFIX}_fake_job".to_sym
 
       pool = queue.register

data/spec/sucker_punch_spec.rb

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

data/sucker_punch.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "pry"
 
-  gem.add_dependency "celluloid", "0.16.0"
+  gem.add_dependency "celluloid", "~> 0.17.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sucker_punch
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Brandon Hilkert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -56,16 +56,16 @@ dependencies:
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.2
 description: Asynchronous processing library for Ruby
 email:
 - brandonhilkert@gmail.com