jsonapi_errors_handler 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ced85209200ee1300de00d6ed66ed974c4367ed8fd9590f928e72af1beec7bf2
-  data.tar.gz: 9237654c617b83da0086c7c23177a3643bb879d3930eb12a27a0687b9bf3b950
+  metadata.gz: ba2a86c74563398a7436e21ceea674a26a9672bbfba6c8fadc125df8eed70615
+  data.tar.gz: f56a1281368f6ef3ab4c3a2a38afd1c80affd3997c32acca0f5cfe0784b4ba95
 SHA512:
-  metadata.gz: 736c7c05eae6fee9f3577b929640ebc5edd53e6b38792de692dd9bbd85addec9968b3d92953f11721d804fa3ab1d3e36ff77cf99c333da55aaac8082e5c58341
-  data.tar.gz: 1d3ee769bcf962f31b3056079db996e3d8f71289ca20e7b0cd623f8a8117897c884b1d50bbe1ae7b85056f81013dcba0be8df600c5ffbb3c2e2dc88dd1481dd3
+  metadata.gz: 3661da30d706ed7cdc762136424326c0bca8d749afee213f80479e420d7f639bc1be1ef39954fced7ebf01c2a7a25aa8358dfe9ef5cc38ffb63f2f2984e4da86
+  data.tar.gz: 62f72aa1e1ea8df5b8b68733a14cd3df02705fa47bd4b5c2f1dc5bdc66ef9f3ceb376473608d3927a9eb0669f569aa43e290e7cdc3011635eee35f038510933c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jsonapi_errors_handler (0.1.4)
+    jsonapi_errors_handler (0.1.5)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -46,7 +46,7 @@ If you want your custom errors being handled by default, just add them to the ma
 
 ```ruby
   include JsonapiErrorsHandler
-  ErrorsMapper.map_errors!({
+  ErrorMapper.map_errors!({
       'ActiveRecord::RecordNotFound' => 'JsonapiErrorsHandler::Errors::NotFound',
       'ActiveRecord::RecordInvalid' => 'JsonapiErrorsHandler::Errors::Invalid',
   })

data/lib/jsonapi_errors_handler.rb

@@ -2,6 +2,7 @@
 
 require 'irb'
 require 'jsonapi_errors_handler/version'
+require 'jsonapi_errors_handler/configuration'
 require 'jsonapi_errors_handler/errors'
 require 'jsonapi_errors_handler/error_mapper'
 require 'jsonapi_errors_handler/error_serializer'
@@ -19,22 +20,26 @@ module JsonapiErrorsHandler
   end
 
   def handle_error(error)
-    mapped = map_error(error)
-    log_error(error) if respond_to?(:log_error) && !mapped
-    mapped ||= ::JsonapiErrorsHandler::Errors::StandardError.new
-    render_error(mapped)
+    mapped = ErrorMapper.mapped_error(error)
+    mapped ? render_error(mapped) : handle_unexpected_error(error)
   end
 
-  def map_error(error)
-    error_klass = error.is_a?(Class) ? error : error.class
-
-    return nil unless ErrorMapper.mapped_error?(error_klass.to_s)
-    return error if error.instance_of?(error_klass)
-
-    Object.const_get(ErrorMapper.mapped_errors[error_klass.to_s]).new
+  def handle_unexpected_error(error)
+    return raise error unless config.handle_unexpected?
+    log_error(error) if respond_to?(:log_error)
+    render_error(::JsonapiErrorsHandler::Errors::StandardError.new)
   end
 
   def render_error(error)
     render json: ::JsonapiErrorsHandler::ErrorSerializer.new(error), status: error.status
   end
+
+  def self.configure(&block)
+    config = Configuration.instance
+    config.configure(&block)
+  end
+
+  def self.config
+    Configuration.instance
+  end
 end

data/lib/jsonapi_errors_handler/configuration.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+module JsonapiErrorsHandler
+  class Configuration
+    include Singleton
+
+    attr_writer :handle_unexpected
+
+    def configure
+      yield(self) if block_given?
+    end
+
+    def handle_unexpected?
+      @handle_unexpected
+    end
+
+    private
+
+    def initialize
+      @handle_unexpected = false
+    end
+  end
+end

data/lib/jsonapi_errors_handler/error_mapper.rb

@@ -14,5 +14,20 @@ module JsonapiErrorsHandler
     def self.mapped_error?(error_klass)
       mapped_errors.key?(error_klass)
     end
+
+    def self.mapped_error(error)
+      return error if descendant_of_predefined?(error)
+
+      error_class = error.is_a?(Class) ? error.to_s : error.class.name
+      root_class = error_class.split('::').first
+      mapped = mapped_errors[error_class] || mapped_errors[root_class]
+      return unless mapped
+      Object.const_get(mapped).new
+    end
+
+    def self.descendant_of_predefined?(error)
+      return false if error.is_a?(Class)
+      error.class < JsonapiErrorsHandler::Errors::StandardError
+    end
   end
 end

data/lib/jsonapi_errors_handler/errors/standard_error.rb

@@ -5,7 +5,7 @@ require 'jsonapi_errors_handler/keys_stringifier'
 module JsonapiErrorsHandler
   module Errors
     class StandardError < ::StandardError
-      def initialize(title: nil, detail: nil, status: nil, source: {})
+      def initialize(title: nil, detail: nil, status: nil, message: nil, source: {})
         @title = title || 'Something went wrong'
         @detail = detail
         @detail ||= 'We encountered unexpected error, but our developers had been already notified about it'

data/lib/jsonapi_errors_handler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonapiErrorsHandler
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_errors_handler
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Sebastian Wilgosz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2019-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - bin/setup
 - jsonapi_errors_handler.gemspec
 - lib/jsonapi_errors_handler.rb
+- lib/jsonapi_errors_handler/configuration.rb
 - lib/jsonapi_errors_handler/error_mapper.rb
 - lib/jsonapi_errors_handler/error_serializer.rb
 - lib/jsonapi_errors_handler/errors.rb