startback 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a7f631f93683bc9a9fe0705fc5e3f7df55fa782
-  data.tar.gz: 6335d0ff1b733355c96116ce19f9094adea45694
+  metadata.gz: 3117a103e54b43bf6703778fd08002b65d33bfd7
+  data.tar.gz: 119886b87454ac00d437a106039aedbf3245859d
 SHA512:
-  metadata.gz: b1bec4146b344fac7d8ef51b130e149fb823e6d10ab5a3050be9165c877585f8dcf38092fa2548c884a8974d97868f0f161d7871908da0117af06fc851e5aaa1
-  data.tar.gz: f7482b4b5446cc1557841302cade907c4b597ff704b88ff8017ebf652a92809cf44d5ca24d9c59d0af63dd68b579eed30afd71b5deebc516b0ae94214f6e2cb2
+  metadata.gz: 9080577d0443af321abc8def35d0623837ba9a0624ab29341022e895769d3e9c702fec3b0cfd73b99fd1eb0331163b63513e0d8fe3d6aecb1dec567db74f10f7
+  data.tar.gz: a3d0f8ba4c1d98e084f4989f8868471313c3dccd8931cf31c5be4cec8af794eb2434eff04502e3b69ab615cb793e3ec96b2fdc0a72ceb3ef0fbd47aa23c874fc

data/lib/startback/context.rb

@@ -11,6 +11,13 @@ module Startback
   class Context
     attr_accessor :original_rack_env
 
+    # An error handler can be provided on the Context class. The latter
+    # MUST expose an API similar to ruby's Logger class. It can be a logger
+    # instance, simply.
+    #
+    # Fatal errors catched by Web::CatchAll are sent on `error_handler#fatal`
+    attr_accessor :error_handler
+
   end # class Context
 end # module Startback
 require_relative 'context/middleware'

data/lib/startback/version.rb

@@ -1,7 +1,7 @@
 module Startback
   module Version
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"

data/lib/startback/web/catch_all.rb

@@ -8,6 +8,9 @@ module Startback
     # This class aims at being used as top level of a Rack chain. It is not
     # aimed at being subclassed.
     #
+    # Fatal error cached are also sent as a `fatal` messange, on the error
+    # handler provided on Context#error_handler.fatal, if any.
+    #
     # Examples:
     #
     #     Rack::Builder.new do
@@ -18,17 +21,23 @@ module Startback
       include Errors
 
       FATAL_ERROR = {
-        code: "Gybr::Errors::ServerError",
+        code: "Startback::Errors::InternalServerError",
         description: "An error occured, sorry"
       }.to_json
 
       self.catch_all
+      self.on(Exception)
       self.status 500
       self.content_type 'application/json'
-      self.body FATAL_ERROR.to_json
+      self.body FATAL_ERROR
 
       self.ensure(true) do |ex|
-        Startback::LOGGER.fatal(ex)
+        context = env[Context::Middleware::RACK_ENV_KEY]
+        if context && context.respond_to?(:error_handler) && context.error_handler
+          context.error_handler.fatal(ex)
+        else
+          Startback::LOGGER.fatal(ex)
+        end
       end
 
     end # class CatchAll

data/spec/unit/web/test_catch_all.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+require 'singleton'
+
+module Startback
+  module Web
+    describe CatchAll do
+      include Rack::Test::Methods
+
+      context 'when used without context' do
+        def app
+          Rack::Builder.new do
+            use CatchAll
+            run ->(env){ raise "Hello error" }
+          end
+        end
+
+        it 'returns a 500 with json explanation' do
+          get '/'
+          expect(last_response.status).to eql(500)
+          expect(last_response.content_type).to eql("application/json")
+          result = JSON.parse(last_response.body)
+          expect(result).to eql({
+            "code" => "Startback::Errors::InternalServerError",
+            "description" => "An error occured, sorry"
+          })
+        end
+      end
+
+      context 'when used with a context providing an error handler' do
+
+        class AnError < StandardError
+        end
+
+        class ErrorHandler
+          include Singleton
+
+          attr_reader :ex
+
+          def fatal(ex)
+            @ex = ex
+          end
+
+        end
+
+        class MyContextWithErrorHandler < Startback::Context
+
+          def error_handler
+            ErrorHandler.instance
+          end
+
+        end
+
+        def app
+          Rack::Builder.new do
+            use Context::Middleware, context_class: MyContextWithErrorHandler
+            use CatchAll
+            run ->(env){ raise AnError, "Hello error" }
+          end
+        end
+
+        it 'returns a 500 with json explanation' do
+          get '/'
+          expect(last_response.status).to eql(500)
+          expect(last_response.content_type).to eql("application/json")
+          result = JSON.parse(last_response.body)
+          expect(result).to eql({
+            "code" => "Startback::Errors::InternalServerError",
+            "description" => "An error occured, sorry"
+          })
+          expect(ErrorHandler.instance.ex).to be_a(AnError)
+        end
+      end
+
+    end # CatchAll
+  end # module Web
+end # module Startback

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: startback
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -139,6 +139,7 @@ files:
 - spec/unit/context/test_middleware.rb
 - spec/unit/test_operation.rb
 - spec/unit/test_support.rb
+- spec/unit/web/test_catch_all.rb
 - spec/unit/web/test_healthcheck.rb
 - tasks/gem.rake
 - tasks/test.rake