proletariat 0.0.6 → 0.1.0

data/lib/proletariat/tasks.rb

@@ -7,7 +7,7 @@ namespace :proletariat do
   task run: :environment do
     STDOUT.sync = true
 
-    Proletariat.run!
+    Proletariat.run
 
     at_exit { Proletariat.stop }
 

data/lib/proletariat/testing/expectation_guarantor.rb

@@ -22,17 +22,15 @@ module Proletariat
         @counters    = []
         @subscribers = []
 
-        expectations.each do |expectation|
-          queue_config = generate_queue_config_for_topic(expectation.topics)
-          counter = MessageCounter.new(expectation.quantity)
+        expectations.each_with_index do |expectation, i|
+          config = generate_queue_config_for_topic(expectation.topics)
+          suffix = "_#{i}_#{object_id}"
+          counter = MessageCounter.spawn!("c#{suffix}", expectation.quantity)
           counters << counter
-          subscribers << Subscriber.new(counter, queue_config)
+          subscribers << Subscriber.spawn!("s#{suffix}", counter, config, Drop)
         end
 
         @block = block
-        @noop = true if expectations.length == 0
-
-        run_subscribers
       end
 
       # Public: Execute the blocks and waits for the expectations to be met.
@@ -44,13 +42,7 @@ module Proletariat
 
         return nil if noop
 
-        timer = 0.0
-
-        until passed?
-          fail MessageTimeoutError if timer > MESSAGE_TIMEOUT
-          sleep MESSAGE_CHECK_INTERVAL
-          timer += MESSAGE_CHECK_INTERVAL
-        end
+        wait!
 
         nil
       ensure
@@ -66,9 +58,6 @@ module Proletariat
       # Internal: Returns an array of MessageCounter instances.
       attr_reader :counters
 
-      # Internal: Returns true if there aren't any expectations.
-      attr_reader :noop
-
       # Internal: Returns an array of Subscriber instances.
       attr_reader :subscribers
 
@@ -82,30 +71,43 @@ module Proletariat
       # Returns false if one or more counters are not satisfied.
       def passed?
         counters
-          .map(&:expected_messages_received?)
+          .map { |c| c.ask!(:expected_messages_received?) }
           .reduce { |a, e| a && e }
       end
 
-      # Internal: Starts each subscriber.
+      # Internal: Returns true if there aren't any expectations.
+      def noop
+        subscribers.length == 0
+      end
+
+      # Internal: Stops each subscriber.
       #
       # Returns nil.
-      def run_subscribers
-        subscribers.each { |subscriber| subscriber.run! }
+      def stop_subscribers
+        subscribers.each { |subscriber| subscriber << :terminate! }
 
         nil
       end
 
-      # Internal: Stops each subscriber.
+      # Internal: Sleeps the thread at regular intervals until the expectation
+      #           is passed.
       #
-      # Returns nil.
-      def stop_subscribers
-        subscribers.each { |subscriber| subscriber.stop }
+      # Returns nil if expectation passes within timeout.
+      # Raises MessageTimeoutError if expectation does not pass within timeout.
+      def wait!
+        timer = 0.0
+
+        until passed?
+          fail MessageTimeoutError if timer > MESSAGE_TIMEOUT
+          sleep MESSAGE_CHECK_INTERVAL
+          timer += MESSAGE_CHECK_INTERVAL
+        end
 
         nil
       end
 
       # Internal: Counts incoming messages to test expection satisfaction.
-      class MessageCounter
+      class MessageCounter < Actor
         # Public: Creates a new MessageCounter instance.
         #
         # expected - The number of messages expected.
@@ -130,10 +132,14 @@ module Proletariat
         # headers     - Hash of message headers.
         #
         # Returns a future-like object holding an :ok Symbol.
-        def post?(message, routing_key, headers)
-          self.count = count + 1
-
-          Concurrent::Future.new { :ok }
+        def work(message)
+          if message.is_a?(Message)
+            self.count = count + 1
+
+            Concurrent::IVar.new(:ok)
+          else
+            expected_messages_received?
+          end
         end
 
         private

data/lib/proletariat/version.rb

@@ -1,4 +1,4 @@
 # Public: Adds a constant for the current version number.
 module Proletariat
-  VERSION = '0.0.6'
+  VERSION = '0.1.0'
 end

data/lib/proletariat/worker.rb

@@ -3,43 +3,14 @@ require 'proletariat/concerns/logging'
 module Proletariat
   # Public: Handles messages for Background processing. Subclasses should
   #         overwrite the #work method.
-  class Worker
+  class Worker < PoolableActor
     include Concerns::Logging
 
-    # Public: Logs the 'online' status of the worker.
-    #
-    # Returns nil.
-    def started
-      log_info 'Now online'
-
-      nil
-    end
-
-    # Public: Logs the 'offline' status of the worker.
-    #
-    # Returns nil.
-    def stopped
-      log_info 'Now offline'
-
-      nil
-    end
-
-    # Public: Logs the 'shutting down' status of the worker.
+    # Internal: Handles the Actor mailbox. Delegates work to #work.
     #
-    # Returns nil.
-    def stopping
-      log_info 'Attempting graceful shutdown.'
-
-      nil
-    end
-
-    # Public: Handles an incoming message to perform background work.
-    #
-    # message - The incoming message.
-    #
-    # Raises NotImplementedError unless implemented in subclass.
-    def work(message, routing_key, headers)
-      fail NotImplementedError
+    # message - A Message to send.
+    def actor_work(message)
+      work message.body, message.to, message.headers if message.is_a?(Message)
     end
 
     # Public: Helper method to ease accessing the logger from within #work.
@@ -81,8 +52,50 @@ module Proletariat
       nil
     end
 
+    # Public: Logs the 'online' status of the worker.
+    #
+    # Returns nil.
+    def started
+      log_info 'Now online'
+
+      nil
+    end
+
+    # Public: Logs the 'offline' status of the worker.
+    #
+    # Returns nil.
+    def stopped
+      log_info 'Now offline'
+
+      nil
+    end
+
+    # Public: Handles an incoming message to perform background work.
+    #
+    # message     - The incoming message.
+    # routing_key - The incoming message's routing key.
+    # headers     - The incoming message's headers.
+    #
+    # Raises NotImplementedError unless implemented in subclass.
+    def work(message, routing_key, headers)
+      fail NotImplementedError
+    end
+
+    # Public: Use #actor_work to handle the actor mailbox.
+    def work_method
+      :actor_work
+    end
+
     # Internal: Class methods on Worker to provide configuration DSL.
     module ConfigurationMethods
+      def exception_handler(value = nil)
+        if value
+          @exception_handler = value
+        else
+          @exception_handler || :exponential_backoff
+        end
+      end
+
       # Public: A configuration method for adding a routing key to be used when
       #         binding this worker type's queue to an exchange.
       #

data/proletariat.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'rspec', '3.0.0.beta1'
+  s.add_development_dependency 'rspec', '3.1.0'
   s.add_development_dependency 'rubocop'
 
-  s.add_runtime_dependency 'concurrent-ruby', '~> 0.6.1'
-  s.add_runtime_dependency 'bunny', '~> 1.3.1'
+  s.add_runtime_dependency 'concurrent-ruby', '~> 0.7'
+  s.add_runtime_dependency 'bunny', '~> 1.6.3'
 end

data/spec/lib/proletariat_spec.rb

@@ -30,7 +30,7 @@ class PongWorker < Proletariat::Worker
 
   def work(message, routing_key, headers)
     if self.class.fail_mode == true
-      fail 'Error' unless headers['failures'] == 2
+      fail 'Error' unless headers['x-death'] && headers['x-death'].length == 2
     end
 
     self.class.ponged = true
@@ -46,36 +46,47 @@ end
 describe Proletariat do
   before do
     Proletariat.configure do
+      config.exchange_name  = 'proletariat-test-suite'
       config.logger         = Logger.new('/dev/null')
+      config.test_mode!
       config.worker_classes = [PingWorker, PongWorker]
     end
 
     PongWorker.fail_mode = false
 
-    Proletariat.purge
-    Proletariat.run!
-    sleep 2
+    Proletariat.run
+
+    sleep 1
   end
 
   after do
     Proletariat.stop
-    Proletariat.purge
+
     PingWorker.pinged = false
     PongWorker.ponged = false
+
+    sleep 0.5
   end
 
   it 'should roughly work' do
     Proletariat.publish 'ping', ''
-    sleep 5
+    sleep 1
 
     expect(PingWorker.pinged).to be_truthy
     expect(PongWorker.ponged).to be_truthy
   end
 
+  it 'should purge between tests' do
+    sleep 1
+
+    expect(PingWorker.pinged).to be_falsey
+    expect(PongWorker.ponged).to be_falsey
+  end
+
   it 'should work in error conditions' do
     PongWorker.fail_mode = true
     Proletariat.publish 'ping', ''
-    sleep 10
+    sleep 15
 
     expect(PingWorker.pinged).to be_truthy
     expect(PongWorker.ponged).to be_truthy

data/spec/lib/testing/expectation_guarantor_spec.rb

@@ -18,38 +18,6 @@ module Proletariat
           end
         end
       end
-
-      describe '#post?' do
-        class FakeBlockTaker
-          attr_reader :block
-
-          def initialize(&block)
-            @block = block
-          end
-        end
-
-        before do
-          stub_const 'Concurrent::Future', FakeBlockTaker
-        end
-
-        it 'should increment the count' do
-          counter = ExpectationGuarantor::MessageCounter.new(1)
-          counter.post?('message', 'key', {})
-          expect(counter.expected_messages_received?).to be_truthy
-        end
-
-        it 'should return a future containing :ok' do
-          counter = ExpectationGuarantor::MessageCounter.new(1)
-          expect(Concurrent::Future).to receive(:new)
-          counter.post?('message', 'key', {})
-        end
-
-        it 'should ensure the returned future contains :ok' do
-          counter = ExpectationGuarantor::MessageCounter.new(1)
-          future = counter.post?('message', 'key', {})
-          expect(future.block.call).to eq :ok
-        end
-      end
     end
   end
 end

data/spec/lib/worker_spec.rb

@@ -1,8 +1,13 @@
+require 'concurrent'
+require 'proletariat/concurrency/actor_common'
+require 'proletariat/concurrency/poolable_actor'
 require 'proletariat/worker'
 
 module Proletariat
   describe Worker do
-    let(:logger) { double.as_null_object }
+    let(:balancer) { double.as_null_object }
+    let(:logger)   { double.as_null_object }
+    let(:worker)   { Worker.new(balancer) }
 
     before do
       allow(Proletariat).to receive(:logger).and_return(logger)
@@ -11,27 +16,20 @@ module Proletariat
     describe '#started' do
       it 'should log status' do
         expect(logger).to receive(:info).with /online/
-        Worker.new.started
+        worker.started
       end
     end
 
     describe '#stopped' do
       it 'should log status' do
         expect(logger).to receive(:info).with /offline/
-        Worker.new.stopped
-      end
-    end
-
-    describe '#stopping' do
-      it 'should log status' do
-        expect(logger).to receive(:info).with /graceful shutdown/
-        Worker.new.stopping
+        worker.stopped
       end
     end
 
     describe '#work' do
       it 'should raise NotImplementedError' do
-        expect { Worker.new.work('message', 'key', {}) }.to \
+        expect { worker.work('message', 'key', {}) }.to \
           raise_exception NotImplementedError
       end
     end
@@ -40,13 +38,13 @@ module Proletariat
       context 'when message is provided' do
         it 'should log the message directly' do
           expect(logger).to receive(:info).with 'message to log'
-          Worker.new.log 'message to log'
+          worker.log 'message to log'
         end
       end
 
       context 'when no message is provided' do
         it 'should return the logger instance' do
-          expect(Worker.new.log).to eq logger
+          expect(worker.log).to eq logger
         end
       end
     end
@@ -54,12 +52,12 @@ module Proletariat
     describe '#publish' do
       it 'should forward the message to the publisher' do
         expect(Proletariat).to receive(:publish).with('topic', 'message', {})
-        Worker.new.publish 'topic', 'message', {}
+        worker.publish 'topic', 'message', {}
       end
 
       it 'should have a blank default message' do
         expect(Proletariat).to receive(:publish).with('topic', '', {})
-        Worker.new.publish 'topic'
+        worker.publish 'topic'
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proletariat
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Sebastian Edwards
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.6.3
 description: Lightweight background processing powered by RabbitMQ
 email:
 - me@sebastianedwards.co.nz
@@ -84,10 +84,15 @@ files:
 - lib/proletariat.rb
 - lib/proletariat/concerns/logging.rb
 - lib/proletariat/concurrency/actor.rb
-- lib/proletariat/concurrency/supervisor.rb
+- lib/proletariat/concurrency/actor_common.rb
+- lib/proletariat/concurrency/poolable_actor.rb
 - lib/proletariat/configuration.rb
 - lib/proletariat/cucumber.rb
+- lib/proletariat/exception_handler.rb
+- lib/proletariat/exception_handler/drop.rb
+- lib/proletariat/exception_handler/exponential_backoff.rb
 - lib/proletariat/manager.rb
+- lib/proletariat/message.rb
 - lib/proletariat/publisher.rb
 - lib/proletariat/queue_config.rb
 - lib/proletariat/runner.rb
@@ -103,7 +108,6 @@ files:
 - proletariat.gemspec
 - spec/lib/configuration_spec.rb
 - spec/lib/proletariat_spec.rb
-- spec/lib/publisher_spec.rb
 - spec/lib/queue_config_spec.rb
 - spec/lib/testing/expectation_guarantor_spec.rb
 - spec/lib/testing/expectation_spec.rb
@@ -128,14 +132,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Lightweight background processing powered by RabbitMQ
 test_files:
 - spec/lib/configuration_spec.rb
 - spec/lib/proletariat_spec.rb
-- spec/lib/publisher_spec.rb
 - spec/lib/queue_config_spec.rb
 - spec/lib/testing/expectation_guarantor_spec.rb
 - spec/lib/testing/expectation_spec.rb