sanford 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: c5f1accf3673547ce360de7dc566185944279d95
-  data.tar.gz: 6d78cbc59f1a1adf3689d4f23bfc273e3f8ce30e
+  data.tar.gz: 2d39dcf06279924cb91e044fb914714e6a7efae1
+  metadata.gz: 332f6d1e003e14abd4c20eb30b1d9168b4e86404
 SHA512: 
-  metadata.gz: 00d138998988e74f24bedbd9af813ce3d50fa7ef0ae290e7755c3c2b91030280134d1e486d3a14e8d904823998aea003b123f3b1bdeb7ab1b7f7f9b95f63a609
-  data.tar.gz: f318a74e317f3826c2c4315a476a486a1645b154a0388a40dbf75d5cead44a9ee62d1fa86dd79c25965d881e33941ad35d530828f2e551172da9df4b8c73d841
+  data.tar.gz: 88c2e5e40a390a2aab63fd231b95007125a65756f3e00d6ad018f06a96875c300dffb3b725d8285140aca7d06025d41edf7fcadf36920befa8871aeff4111f41
+  metadata.gz: a4887a0f928f25f4ca8e29024dd21f00007e4a10059332f621b17758d4c3a8cce3138dbfa4a34bc4a6ced7c48e4a85146e7004ee0f853dcd128701d7f7139e62

data/lib/sanford/connection_handler.rb

@@ -51,7 +51,7 @@ module Sanford
         error.set_backtrace(exception.backtrace)
         self.handle_exception(error, @server_data, processed_service)
         raise exception
-      rescue StandardError => exception
+      rescue *Sanford::ErrorHandler::STANDARD_ERROR_CLASSES => exception
         self.handle_exception(exception, @server_data, processed_service)
       ensure
         self.write_response(processed_service)
@@ -62,7 +62,7 @@ module Sanford
     def write_response(processed_service)
       begin
         @connection.write_data processed_service.response.to_hash
-      rescue StandardError => exception
+      rescue *Sanford::ErrorHandler::STANDARD_ERROR_CLASSES => exception
         processed_service = self.handle_exception(
           exception,
           @server_data,

data/lib/sanford/error_handler.rb

@@ -1,9 +1,15 @@
+require 'dat-worker-pool/worker'
 require 'sanford-protocol'
 
 module Sanford
 
   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)
@@ -24,7 +30,7 @@ module Sanford
         result = nil
         begin
           result = error_proc.call(@exception, @context)
-        rescue StandardError => proc_exception
+        rescue *STANDARD_ERROR_CLASSES => proc_exception
           @exception = proc_exception
         end
         response ||= response_from_proc(result)

data/lib/sanford/version.rb

@@ -1,3 +1,3 @@
 module Sanford
-  VERSION = "0.18.1"
+  VERSION = "0.18.2"
 end

data/sanford.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency("assert", ["~> 2.16.1"])
 
-  gem.add_dependency("dat-tcp",          ["~> 0.8.1"])
+  gem.add_dependency("dat-tcp",          ["~> 0.8.2"])
   gem.add_dependency("much-plugin",      ["~> 0.2.0"])
   gem.add_dependency("sanford-protocol", ["~> 0.12.0"])
 end

data/test/support/factory.rb

@@ -1,4 +1,5 @@
 require 'assert/factory'
+require 'sanford/error_handler'
 
 module Factory
   extend Assert::Factory
@@ -12,6 +13,10 @@ module Factory
     exception
   end
 
+  def self.sanford_std_error(message = nil)
+    self.exception(Sanford::ErrorHandler::STANDARD_ERROR_CLASSES.sample, message)
+  end
+
   def self.protocol_response
     Sanford::Protocol::Response.new(
       [Factory.integer(999), Factory.text],

data/test/unit/connection_handler_tests.rb

@@ -86,7 +86,7 @@ class Sanford::ConnectionHandler
 
   class RunWithExceptionSetupTests < InitTests
     setup do
-      @route_exception = Factory.exception
+      @route_exception = Factory.sanford_std_error
       Assert.stub(@route, :run){ raise @route_exception }
       Assert.stub(Sanford::ErrorHandler, :new) do |*args|
         @error_handler_spy = ErrorHandlerSpy.new(*args)
@@ -265,7 +265,7 @@ class Sanford::ConnectionHandler
     def initialize(exception, context_hash)
       @passed_exception = exception
       @context_hash     = context_hash
-      @exception        = Factory.exception
+      @exception        = Factory.sanford_std_error
       @response         = Factory.protocol_response
       @run_called       = false
     end

data/test/unit/error_handler_tests.rb

@@ -9,7 +9,7 @@ class Sanford::ErrorHandler
   class UnitTests < Assert::Context
     desc "Sanford::ErrorHandler"
     setup do
-      @exception   = Factory.exception
+      @exception   = Factory.sanford_std_error
       @server_data = Sanford::ServerData.new
       @request     = Sanford::Protocol::Request.new(Factory.string, {
         Factory.string => Factory.string
@@ -160,7 +160,7 @@ class Sanford::ErrorHandler
   class RunWithGenericErrorTests < RunWithNoResponseFromErrorProcSetupTests
     desc "but with a generic error"
     setup do
-      @exception = Factory.exception
+      @exception = Factory.sanford_std_error
 
       @handler  = @handler_class.new(@exception, @context_hash)
       @response = @handler.run
@@ -178,7 +178,7 @@ class Sanford::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.sanford_std_error(@error_proc_spies.index(spy).to_s)
         spy.raise_exception = exception
         exception
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sanford
 version: !ruby/object:Gem::Version 
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors: 
 - Collin 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
@@ -29,7 +29,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency