qs 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 110c7cbf5c19120501d4dfae9f332e428363aff3
-  metadata.gz: 053fda8d651bb4509a99537ef8b8edb906a80acd
+  metadata.gz: d8323a541fe5820763e01fd9bc86e1ce69e5c64d
+  data.tar.gz: 5470362402e0cab14f67f96005001d61c62925c0
 SHA512: 
-  data.tar.gz: 6c145c40e72aecad5c87b33709a3a3aa097a07a4bd08a17819d23965efd36fdbe46312a01fd638f346e4e34a2c7cc4c2ab85af7a9951083e97aae68f93527624
-  metadata.gz: 56bff595f01f50dba796e2b436b842376188d3c031ab6cb88395bb7cc41e04250217c04ef5eedc78ba221586795045ba8e6b739816cbe65d89cb01dacd9607ab
+  metadata.gz: 1d6d9367d3e72939e184a40271e5a413bd15f695d7e28ad5efe5d08fc92f80409e5e6c4a2e9701b999633a97d793af63622aeaa4857ea2011bd7b7582aac68fd
+  data.tar.gz: 05df115c14aa8d118b5c9582d25eca88f6008c13ab84c42009d7ed022b84fd027113f0708cf6c68ad92d8a7e115ca6f140b3c60247d7fda6c196d6add4f848a4

data/lib/qs/error_handler.rb

@@ -1,9 +1,15 @@
+require 'dat-worker-pool/worker'
 require 'qs/queue'
 
 module Qs
 
   class ErrorHandler
 
+    # these are standard error classes that we rescue and run through any
+    # configured error procs; use the same standard error classes that
+    # dat-worker-pool rescues
+    STANDARD_ERROR_CLASSES = DatWorkerPool::Worker::STANDARD_ERROR_CLASSES
+
     attr_reader :exception, :context, :error_procs
 
     def initialize(exception, context_hash)
@@ -21,7 +27,7 @@ module Qs
       @error_procs.each do |error_proc|
         begin
           error_proc.call(@exception, @context)
-        rescue StandardError => proc_exception
+        rescue *STANDARD_ERROR_CLASSES => proc_exception
           @exception = proc_exception
         end
       end

data/lib/qs/payload_handler.rb

@@ -50,7 +50,7 @@ module Qs
         handle_exception(error, daemon_data, queue_item)
       end
       raise exception
-    rescue StandardError => exception
+    rescue *Qs::ErrorHandler::STANDARD_ERROR_CLASSES => exception
       handle_exception(exception, daemon_data, queue_item)
     end
 

data/lib/qs/version.rb

@@ -1,3 +1,3 @@
 module Qs
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/qs.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("assert", ["~> 2.16.1"])
   gem.add_development_dependency("scmd",   ["~> 3.0.2"])
 
-  gem.add_dependency("dat-worker-pool", ["~> 0.6.1"])
+  gem.add_dependency("dat-worker-pool", ["~> 0.6.3"])
   gem.add_dependency("hella-redis",     ["~> 0.3.1"])
   gem.add_dependency("much-plugin",     ["~> 0.2.0"])
   gem.add_dependency("much-timeout",    ["~> 0.1.0"])

data/test/support/factory.rb

@@ -1,5 +1,6 @@
 require 'assert/factory'
 require 'qs/dispatch_job'
+require 'qs/error_handler'
 require 'qs/job'
 require 'qs/event'
 
@@ -15,6 +16,10 @@ module Factory
     exception
   end
 
+  def self.qs_std_error(message = nil)
+    self.exception(Qs::ErrorHandler::STANDARD_ERROR_CLASSES.sample, message)
+  end
+
   def self.message(params = nil)
     self.send([:job, :event].sample, params)
   end

data/test/unit/error_handler_tests.rb

@@ -9,7 +9,7 @@ class Qs::ErrorHandler
   class UnitTests < Assert::Context
     desc "Qs::ErrorHandler"
     setup do
-      @exception       = Factory.exception
+      @exception       = Factory.qs_std_error
       @daemon_data     = Qs::DaemonData.new
       @queue_redis_key = Qs::Queue::RedisKey.new(Factory.string)
       @context_hash    = {
@@ -24,6 +24,11 @@ class Qs::ErrorHandler
     end
     subject{ @handler_class }
 
+    should "know its standard error classes" do
+      exp = DatWorkerPool::Worker::STANDARD_ERROR_CLASSES
+      assert_equal exp, subject::STANDARD_ERROR_CLASSES
+    end
+
   end
 
   class InitSetupTests < UnitTests
@@ -79,7 +84,7 @@ class Qs::ErrorHandler
     desc "and run with error procs that throw exceptions"
     setup do
       @proc_exceptions = @error_proc_spies.reverse.map do |spy|
-        exception = Factory.exception(RuntimeError, @error_proc_spies.index(spy).to_s)
+        exception = Factory.qs_std_error(@error_proc_spies.index(spy).to_s)
         spy.raise_exception = exception
         exception
       end

data/test/unit/payload_handler_tests.rb

@@ -77,7 +77,7 @@ class Qs::PayloadHandler
 
   class RunWithExceptionSetupTests < InitTests
     setup do
-      @route_exception = Factory.exception
+      @route_exception = Factory.qs_std_error
       Assert.stub(@route_spy, :run){ raise @route_exception }
       Assert.stub(Qs::ErrorHandler, :new) do |*args|
         @error_handler_spy = ErrorHandlerSpy.new(*args)
@@ -186,7 +186,7 @@ class Qs::PayloadHandler
   class LoggingJobErrorTests < LoggingJobSetupTests
     desc "that errors while being processed"
     setup do
-      @route_exception = Factory.exception
+      @route_exception = Factory.qs_std_error
       Assert.stub(@route_spy, :run){ raise @route_exception }
 
       @payload_handler.run
@@ -260,7 +260,7 @@ class Qs::PayloadHandler
   class LoggingEventErrorTests < LoggingEventSetupTests
     desc "that errors while being processed"
     setup do
-      @route_exception = Factory.exception
+      @route_exception = Factory.qs_std_error
       Assert.stub(@route_spy, :run){ raise @route_exception }
 
       @payload_handler.run
@@ -294,7 +294,7 @@ class Qs::PayloadHandler
       @message = Factory.message
       setup_for_message(@message)
 
-      Assert.stub(Qs::Payload, :deserialize){ raise Factory.exception }
+      Assert.stub(Qs::Payload, :deserialize){ raise Factory.qs_std_error }
 
       @payload_handler = @handler_class.new(@daemon_data, @queue_item)
       @payload_handler.run
@@ -430,7 +430,7 @@ class Qs::PayloadHandler
     def initialize(exception, context_hash)
       @passed_exception = exception
       @context_hash     = context_hash
-      @exception        = Factory.exception
+      @exception        = Factory.qs_std_error
       @run_called       = false
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: qs
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-06-15 00:00:00 Z
+date: 2016-06-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -39,7 +39,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.1
+        version: 0.6.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency