qs 0.5.0 → 0.6.0

data/test/unit/worker_tests.rb

@@ -0,0 +1,152 @@
+require 'assert'
+require 'qs/worker'
+
+require 'dat-worker-pool/worker'
+require 'much-plugin'
+require 'qs/daemon'
+require 'qs/daemon_data'
+require 'qs/logger'
+require 'qs/queue_item'
+require 'test/support/client_spy'
+
+module Qs::Worker
+
+  class UnitTests < Assert::Context
+    include DatWorkerPool::Worker::TestHelpers
+
+    desc "Qs::Worker"
+    setup do
+      @worker_class = Class.new{ include Qs::Worker }
+    end
+    subject{ @worker_class }
+
+    should "use much-plugin" do
+      assert_includes MuchPlugin, Qs::Worker
+    end
+
+    should "be a dat-worker-pool worker" do
+      assert_includes DatWorkerPool::Worker, subject
+    end
+
+  end
+
+  class InitTests < UnitTests
+    desc "when init"
+    setup do
+      @ph_spy = nil
+      Assert.stub(Qs::PayloadHandler, :new) do |*args|
+        @ph_spy = PayloadHandlerSpy.new(*args)
+      end
+
+      @daemon_data      = Qs::DaemonData.new
+      @client_spy       = ClientSpy.new
+      @worker_available = Qs::Daemon::WorkerAvailable.new
+      @queue_item       = Qs::QueueItem.new(Factory.string, Factory.string)
+
+      @worker_params = {
+        :qs_daemon_data      => @daemon_data,
+        :qs_client           => @client_spy,
+        :qs_worker_available => @worker_available,
+        :qs_logger           => Qs::NullLogger.new
+      }
+      @runner = test_runner(@worker_class, :params => @worker_params)
+    end
+    subject{ @runner }
+
+    should "build and run a payload handler when it processes a queue item" do
+      subject.work(@queue_item)
+
+      assert_not_nil @ph_spy
+      assert_equal @daemon_data, @ph_spy.daemon_data
+      assert_equal @queue_item,  @ph_spy.queue_item
+      assert_true @ph_spy.run_called
+    end
+
+    should "signal that a worker is available when it becomes available" do
+      signal_called = false
+      Assert.stub(@worker_available, :signal){ signal_called = true }
+
+      subject.make_available
+      assert_true signal_called
+    end
+
+    should "requeue a queue item if an error occurs before its started" do
+      exception = Factory.exception
+      @queue_item.started = false
+      subject.error(exception, @queue_item)
+
+      call = @client_spy.calls.last
+      assert_equal :prepend, call.command
+      assert_equal @queue_item.queue_redis_key, call.args.first
+      assert_equal @queue_item.encoded_payload, call.args.last
+    end
+
+    should "not requeue a queue item if an error occurs after its started" do
+      exception = Factory.exception
+      @queue_item.started = true
+      subject.error(exception, @queue_item)
+
+      assert_empty @client_spy.calls
+    end
+
+    should "do nothing if not passed a queue item" do
+      assert_nothing_raised{ subject.error(Factory.exception) }
+      assert_empty @client_spy.calls
+    end
+
+  end
+
+  class TestHelpersTests < UnitTests
+    desc "TestHelpers"
+    setup do
+      @context_class = Class.new{ include TestHelpers }
+      @context = @context_class.new
+    end
+    subject{ @context }
+
+    should have_imeths :test_runner
+
+    should "mixin dat-worker-pool's worker test helpers" do
+      assert_includes DatWorkerPool::Worker::TestHelpers, @context_class
+    end
+
+    should "super worker params needed to run a qs worker" do
+      runner = @context.test_runner(@worker_class)
+      worker_params = runner.dwp_runner.worker_params
+
+      assert_instance_of Qs::DaemonData, worker_params[:qs_daemon_data]
+      assert_instance_of Qs::TestClient, worker_params[:qs_client]
+      exp = Qs::Daemon::WorkerAvailable
+      assert_instance_of exp, worker_params[:qs_worker_available]
+      assert_instance_of Qs::NullLogger, worker_params[:qs_logger]
+    end
+
+    should "allow providing custom worker params for running a qs worker" do
+      @params = {
+        :qs_daemon_data      => Factory.string,
+        :qs_client           => Factory.string,
+        :qs_worker_available => Factory.string,
+        :qs_logger           => Factory.string
+      }
+      runner = @context.test_runner(@worker_class, :params => @params)
+
+      assert_equal @params, runner.dwp_runner.worker_params
+    end
+
+  end
+
+  class PayloadHandlerSpy
+    attr_reader :daemon_data, :queue_item, :run_called
+
+    def initialize(daemon_data, queue_item)
+      @daemon_data = daemon_data
+      @queue_item  = queue_item
+      @run_called  = false
+    end
+
+    def run
+      @run_called = true
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qs
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-09-08 00:00:00 Z
+date: 2015-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -24,11 +24,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 0
-        - 5
-        version: "0.5"
+        - 6
+        version: "0.6"
   type: :runtime
   name: dat-worker-pool
   version_requirements: *id001
@@ -50,6 +50,21 @@ dependencies:
   prerelease: false
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  type: :runtime
+  name: much-plugin
+  version_requirements: *id003
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,10 +76,10 @@ dependencies:
         version: "1.1"
   type: :runtime
   name: ns-options
-  version_requirements: *id003
+  version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -76,10 +91,10 @@ dependencies:
         version: "1.2"
   type: :runtime
   name: SystemTimer
-  version_requirements: *id004
+  version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,22 +106,22 @@ dependencies:
         version: "2.15"
   type: :development
   name: assert
-  version_requirements: *id005
+  version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 7
         segments: 
-        - 2
         - 3
-        version: "2.3"
+        - 0
+        version: "3.0"
   type: :development
   name: scmd
-  version_requirements: *id006
+  version_requirements: *id007
   prerelease: false
 description: Define message queues. Process jobs and events. Profit.
 email: 
@@ -121,7 +136,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bench/config.qs
@@ -142,11 +157,9 @@ files:
 - lib/qs/error_handler.rb
 - lib/qs/event.rb
 - lib/qs/event_handler.rb
-- lib/qs/event_handler_test_helpers.rb
 - lib/qs/io_pipe.rb
 - lib/qs/job.rb
 - lib/qs/job_handler.rb
-- lib/qs/job_handler_test_helpers.rb
 - lib/qs/logger.rb
 - lib/qs/message.rb
 - lib/qs/message_handler.rb
@@ -162,10 +175,12 @@ files:
 - lib/qs/runner.rb
 - lib/qs/test_runner.rb
 - lib/qs/version.rb
+- lib/qs/worker.rb
 - log/.gitkeep
 - qs.gemspec
 - test/helper.rb
 - test/support/app_daemon.rb
+- test/support/client_spy.rb
 - test/support/config.qs
 - test/support/config_files/empty.qs
 - test/support/config_files/invalid.qs
@@ -173,6 +188,7 @@ files:
 - test/support/config_invalid_run.qs
 - test/support/config_no_run.qs
 - test/support/factory.rb
+- test/support/message_handler.rb
 - test/support/pid_file_spy.rb
 - test/support/runner_spy.rb
 - test/system/daemon_tests.rb
@@ -186,11 +202,9 @@ files:
 - test/unit/dispatch_job_tests.rb
 - test/unit/dispatcher_queue_tests.rb
 - test/unit/error_handler_tests.rb
-- test/unit/event_handler_test_helpers_tests.rb
 - test/unit/event_handler_tests.rb
 - test/unit/event_tests.rb
 - test/unit/io_pipe_tests.rb
-- test/unit/job_handler_test_helper_tests.rb
 - test/unit/job_handler_tests.rb
 - test/unit/job_tests.rb
 - test/unit/logger_tests.rb
@@ -208,6 +222,7 @@ files:
 - test/unit/route_tests.rb
 - test/unit/runner_tests.rb
 - test/unit/test_runner_tests.rb
+- test/unit/worker_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/qs
 licenses: 
@@ -238,13 +253,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Define message queues. Process jobs and events. Profit.
 test_files: 
 - test/helper.rb
 - test/support/app_daemon.rb
+- test/support/client_spy.rb
 - test/support/config.qs
 - test/support/config_files/empty.qs
 - test/support/config_files/invalid.qs
@@ -252,6 +268,7 @@ test_files:
 - test/support/config_invalid_run.qs
 - test/support/config_no_run.qs
 - test/support/factory.rb
+- test/support/message_handler.rb
 - test/support/pid_file_spy.rb
 - test/support/runner_spy.rb
 - test/system/daemon_tests.rb
@@ -265,11 +282,9 @@ test_files:
 - test/unit/dispatch_job_tests.rb
 - test/unit/dispatcher_queue_tests.rb
 - test/unit/error_handler_tests.rb
-- test/unit/event_handler_test_helpers_tests.rb
 - test/unit/event_handler_tests.rb
 - test/unit/event_tests.rb
 - test/unit/io_pipe_tests.rb
-- test/unit/job_handler_test_helper_tests.rb
 - test/unit/job_handler_tests.rb
 - test/unit/job_tests.rb
 - test/unit/logger_tests.rb
@@ -287,3 +302,4 @@ test_files:
 - test/unit/route_tests.rb
 - test/unit/runner_tests.rb
 - test/unit/test_runner_tests.rb
+- test/unit/worker_tests.rb

data/lib/qs/event_handler_test_helpers.rb

@@ -1,17 +0,0 @@
-require 'qs/test_runner'
-
-module Qs::EventHandler
-
-  module TestHelpers
-
-    def test_runner(handler_class, args = nil)
-      Qs::EventTestRunner.new(handler_class, args)
-    end
-
-    def test_handler(handler_class, args = nil)
-      test_runner(handler_class, args).handler
-    end
-
-  end
-
-end

data/lib/qs/job_handler_test_helpers.rb

@@ -1,17 +0,0 @@
-require 'qs/test_runner'
-
-module Qs::JobHandler
-
-  module TestHelpers
-
-    def test_runner(handler_class, args = nil)
-      Qs::JobTestRunner.new(handler_class, args)
-    end
-
-    def test_handler(handler_class, args = nil)
-      test_runner(handler_class, args).handler
-    end
-
-  end
-
-end

data/test/unit/event_handler_test_helpers_tests.rb

@@ -1,55 +0,0 @@
-require 'assert'
-require 'qs/event_handler_test_helpers'
-
-require 'qs/event_handler'
-require 'qs/test_runner'
-require 'test/support/runner_spy'
-
-module Qs::EventHandler::TestHelpers
-
-  class UnitTests < Assert::Context
-    desc "Qs::TestHelpers"
-    setup do
-      @test_helpers = Qs::EventHandler::TestHelpers
-    end
-    subject{ @test_helpers }
-
-  end
-
-  class MixinTests < UnitTests
-    desc "as a mixin"
-    setup do
-      @handler_class = Class.new
-      @args = { Factory.string => Factory.string }
-
-      @runner_spy = nil
-      Assert.stub(Qs::EventTestRunner, :new) do |*args|
-        @runner_spy = RunnerSpy.new(*args)
-      end
-
-      context_class = Class.new{ include Qs::EventHandler::TestHelpers }
-      @context = context_class.new
-    end
-    subject{ @context }
-
-    should have_imeths :test_runner, :test_handler
-
-    should "build an event test runner for a given handler using `test_runner`" do
-      result = subject.test_runner(@handler_class, @args)
-
-      assert_not_nil @runner_spy
-      assert_equal @handler_class, @runner_spy.handler_class
-      assert_equal @args, @runner_spy.args
-      assert_equal @runner_spy, result
-    end
-
-    should "return an initialized handler instance using `test_handler`" do
-      result = subject.test_handler(@handler_class, @args)
-
-      assert_not_nil @runner_spy
-      assert_equal @runner_spy.handler, result
-    end
-
-  end
-
-end

data/test/unit/job_handler_test_helper_tests.rb

@@ -1,55 +0,0 @@
-require 'assert'
-require 'qs/job_handler_test_helpers'
-
-require 'qs/job_handler'
-require 'qs/test_runner'
-require 'test/support/runner_spy'
-
-module Qs::JobHandler::TestHelpers
-
-  class UnitTests < Assert::Context
-    desc "Qs::TestHelpers"
-    setup do
-      @test_helpers = Qs::JobHandler::TestHelpers
-    end
-    subject{ @test_helpers }
-
-  end
-
-  class MixinTests < UnitTests
-    desc "as a mixin"
-    setup do
-      @handler_class = Class.new
-      @args = { Factory.string => Factory.string }
-
-      @runner_spy = nil
-      Assert.stub(Qs::JobTestRunner, :new) do |*args|
-        @runner_spy = RunnerSpy.new(*args)
-      end
-
-      context_class = Class.new{ include Qs::JobHandler::TestHelpers }
-      @context = context_class.new
-    end
-    subject{ @context }
-
-    should have_imeths :test_runner, :test_handler
-
-    should "build a job test runner for a given handler using `test_runner`" do
-      result = subject.test_runner(@handler_class, @args)
-
-      assert_not_nil @runner_spy
-      assert_equal @handler_class, @runner_spy.handler_class
-      assert_equal @args, @runner_spy.args
-      assert_equal @runner_spy, result
-    end
-
-    should "return an initialized handler instance using `test_handler`" do
-      result = subject.test_handler(@handler_class, @args)
-
-      assert_not_nil @runner_spy
-      assert_equal @runner_spy.handler, result
-    end
-
-  end
-
-end