sanford 0.6.1 → 0.6.2

data/lib/sanford/error_handler.rb

@@ -9,8 +9,8 @@ module Sanford
 
     def initialize(exception, host_data = nil, request = nil)
       @exception, @host_data, @request = exception, host_data, request
-      @keep_alive = @host_data ? @host_data.keep_alive : false
-      @error_proc = @host_data ? @host_data.error_proc : proc{ }
+      @keep_alive  = @host_data ? @host_data.keep_alive : false
+      @error_procs = @host_data ? @host_data.error_procs.reverse : []
     end
 
     # The exception that we are generating a response for can change in the case
@@ -20,12 +20,17 @@ module Sanford
     # server will respond and log based on the last exception that occurred.
 
     def run
-      begin
-        result = @error_proc.call(@exception, @host_data, @request)
-      rescue Exception => proc_exception
-        @exception = proc_exception
+      response = nil
+      @error_procs.each do |error_proc|
+        result = nil
+        begin
+          result = error_proc.call(@exception, @host_data, @request)
+        rescue Exception => proc_exception
+          @exception = proc_exception
+        end
+        response ||= self.response_from_proc(result)
       end
-      self.response_from_proc(result) || self.response_from_exception(@exception)
+      response || self.response_from_exception(@exception)
     end
 
     protected

data/lib/sanford/host.rb

@@ -26,7 +26,7 @@ module Sanford
       option :verbose_logging,                :default => true
       option :receives_keep_alive,            :default => false
       option :runner,                         :default => proc{ Sanford.config.runner }
-      option :error_proc,           Proc,     :default => proc{ }
+      option :error_procs,          Array,    :default => []
       option :init_proc,            Proc,     :default => proc{ }
 
       def initialize(host)
@@ -83,7 +83,7 @@ module Sanford
     end
 
     def error(&block)
-      self.configuration.error_proc = block
+      self.configuration.error_procs << block
     end
 
     def init(&block)

data/lib/sanford/host_data.rb

@@ -11,7 +11,7 @@ module Sanford
 
     # NOTE: The `name` attribute shouldn't be removed, it is used to identify
     # a `HostData`, particularly in error handlers
-    attr_reader :name, :logger, :verbose, :keep_alive, :runner, :error_proc
+    attr_reader :name, :logger, :verbose, :keep_alive, :runner, :error_procs
 
     def initialize(service_host, options = nil)
       service_host.configuration.init_proc.call
@@ -19,12 +19,12 @@ module Sanford
       overrides = self.remove_nil_values(options || {})
       configuration = service_host.configuration.to_hash.merge(overrides)
 
-      @name       = configuration[:name]
-      @logger     = configuration[:logger]
-      @verbose    = configuration[:verbose_logging]
-      @keep_alive = configuration[:receives_keep_alive]
-      @runner     = configuration[:runner]
-      @error_proc = configuration[:error_proc]
+      @name        = configuration[:name]
+      @logger      = configuration[:logger]
+      @verbose     = configuration[:verbose_logging]
+      @keep_alive  = configuration[:receives_keep_alive]
+      @runner      = configuration[:runner]
+      @error_procs = configuration[:error_procs]
 
       @handlers = service_host.versioned_services.inject({}) do |hash, (version, services)|
         hash.merge({ version => self.constantize_services(services) })

data/lib/sanford/version.rb

@@ -1,3 +1,3 @@
 module Sanford
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/test/unit/error_handler_test.rb

@@ -39,7 +39,7 @@ class Sanford::ErrorHandler
         Sanford::Protocol::Response.new([ 567, 'custom message'], 'custom data')
       end
       host_data = Sanford::HostData.new(EmptyHost, @host_defaults.merge({
-        :error_proc => error_proc
+        :error_procs => [ error_proc ]
       }))
       response = Sanford::ErrorHandler.new(@exception, host_data).run
 
@@ -50,7 +50,7 @@ class Sanford::ErrorHandler
 
     should "use an integer returned by the error proc to generate a protocol response" do
       host_data = Sanford::HostData.new(EmptyHost, @host_defaults.merge({
-        :error_proc => proc{ 345 }
+        :error_procs => [ proc{ 345 } ]
       }))
       response = Sanford::ErrorHandler.new(@exception, host_data).run
 
@@ -61,7 +61,7 @@ class Sanford::ErrorHandler
 
     should "use a symbol returned by the error proc to generate a protocol response" do
       host_data = Sanford::HostData.new(EmptyHost, @host_defaults.merge({
-        :error_proc => proc{ :not_found }
+        :error_procs => [ proc{ :not_found } ]
       }))
       response = Sanford::ErrorHandler.new(@exception, host_data).run
 
@@ -72,7 +72,7 @@ class Sanford::ErrorHandler
 
     should "use the default behavior if the error proc doesn't return a valid response result" do
       host_data = Sanford::HostData.new(EmptyHost, @host_defaults.merge({
-        :error_proc => proc{ true }
+        :error_procs => [ proc{ true } ]
       }))
       response = Sanford::ErrorHandler.new(@exception, host_data).run
 
@@ -83,7 +83,7 @@ class Sanford::ErrorHandler
     should "use the default behavior for an exception raised by the error proc " \
       "and ignore the original exception" do
       host_data = Sanford::HostData.new(EmptyHost, @host_defaults.merge({
-        :error_proc => proc{ raise Sanford::NotFoundError }
+        :error_procs => [ proc{ raise Sanford::NotFoundError } ]
       }))
       response = Sanford::ErrorHandler.new(@exception, host_data).run
 
@@ -130,4 +130,58 @@ class Sanford::ErrorHandler
 
   end
 
+  class MultipleErrorProcsTest < ResponseFromProcTest
+    desc "with multiple error procs"
+    setup do
+      @first_called, @second_called, @third_called = nil, nil, nil
+      @host_data = Sanford::HostData.new(EmptyHost, @host_defaults.merge({
+        :error_procs => [ first_proc, second_proc, third_proc ]
+      }))
+    end
+
+    should "call every error proc" do
+      @error_handler = Sanford::ErrorHandler.new(RuntimeError.new('test'), @host_data)
+      @error_handler.run
+
+      assert_equal true, @first_called
+      assert_equal true, @second_called
+      assert_equal true, @third_called
+    end
+
+    should "should return the response of the last configured error proc " \
+           "that returned a valid response" do
+      @error_handler = Sanford::ErrorHandler.new(RuntimeError.new('test'), @host_data)
+      response = @error_handler.run
+
+      # use the second proc's generated response
+      assert_equal 987, response.code
+
+      exception = generate_exception(Sanford::NotFoundError, 'not found')
+      @error_handler = Sanford::ErrorHandler.new(exception, @host_data)
+      response = @error_handler.run
+
+      # use the third proc's generated response
+      assert_equal 876, response.code
+    end
+
+    def first_proc
+      proc{ @first_called = true }
+    end
+
+    def second_proc
+      proc do |exception, host_data, request|
+        @second_called = true
+        987
+      end
+    end
+
+    def third_proc
+      proc do |exception, host_data, request|
+        @third_called = true
+        876 if exception.kind_of?(Sanford::NotFoundError)
+      end
+    end
+
+  end
+
 end

data/test/unit/host_configuration_test.rb

@@ -10,7 +10,7 @@ class Sanford::Host::Configuration
     subject{ @configuration }
 
     should have_instance_methods :name, :ip, :port, :pid_file, :logger,
-      :verbose_logging, :logger, :error_proc
+      :verbose_logging, :logger, :error_procs
 
     should "default name to the class name of the host" do
       assert_equal 'EmptyHost', subject.name

data/test/unit/host_data_test.rb

@@ -14,7 +14,7 @@ class Sanford::HostData
     subject{ @host_data }
 
     should have_instance_methods :name, :logger, :verbose, :keep_alive, :runner,
-      :error_proc, :run, :handler_class_for
+      :error_procs, :run, :handler_class_for
 
     should "default it's configuration from the service host, but allow overrides" do
       host_data = Sanford::HostData.new(TestHost, :verbose_logging => false)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sanford
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-27 00:00:00 Z
+date: 2013-03-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false