Merge pull request #4 from BjornMelgaard/master

meta with proc & registered_exception? helper

Author: richmolj

gemfiles/rails_5.gemfile.lock

@@ -1,9 +1,8 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    jsonapi_errorable (0.1.1)
-      active_model_serializers (~> 0.10)
-      rails (>= 4.1, < 6)
+    jsonapi_errorable (0.6.2)
+      jsonapi-serializable (~> 0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -31,11 +30,6 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active_model_serializers (0.10.2)
-      actionpack (>= 4.1, < 6)
-      activemodel (>= 4.1, < 6)
-      jsonapi (~> 0.1.1.beta2)
-      railties (>= 4.1, < 6)
     activejob (5.0.0.1)
       activesupport (= 5.0.0.1)
       globalid (>= 0.3.6)
@@ -64,9 +58,9 @@ GEM
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    json (1.8.3)
-    jsonapi (0.1.1.beta2)
-      json (~> 1.8)
+    jsonapi-renderer (0.1.2)
+    jsonapi-serializable (0.1.3)
+      jsonapi-renderer (~> 0.1)
     jsonapi_spec_helpers (0.2.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
@@ -167,4 +161,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.12.5
+   1.15.0

lib/jsonapi_errorable.rb

@@ -55,6 +55,10 @@ def default_exception_handler
     self.class.default_exception_handler
   end
 
+  def registered_exception?(e)
+    self.class._errorable_registry.key?(e.class)
+  end
+
   module ClassMethods
     def register_exception(klass, options = {})
       exception_klass = options[:handler] || default_exception_handler

lib/jsonapi_errorable/exception_handler.rb

@@ -4,6 +4,7 @@ def initialize(options = {})
       @status  = options[:status]
       @title   = options[:title]
       @message = options[:message]
+      @meta    = options[:meta]
       @log     = options[:log]
     end
 
@@ -33,7 +34,8 @@ def detail(error)
     end
 
     def meta(error)
-      {}
+      return {} unless @meta.respond_to?(:call)
+      @meta.call(error)
     end
 
     def error_payload(error)

spec/integration/jsonapi_errorable_spec.rb

@@ -4,6 +4,7 @@ class CustomStatusError < StandardError;end
 class CustomTitleError < StandardError;end
 class MessageTrueError < StandardError;end
 class MessageProcError < StandardError;end
+class MetaProcError < StandardError;end
 class LogFalseError < StandardError;end
 class CustomHandlerError < StandardError;end
 class SpecialPostError < StandardError;end
@@ -21,6 +22,7 @@ class ApplicationController < ActionController::Base
   register_exception CustomTitleError,   title: 'My Title'
   register_exception MessageTrueError,   message: true
   register_exception MessageProcError,   message: ->(e) { e.class.name.upcase }
+  register_exception MetaProcError,      meta: ->(e) { { class_name: e.class.name.upcase } }
   register_exception LogFalseError,      log: false
   register_exception CustomHandlerError, handler: CustomErrorHandler
 
@@ -82,6 +84,11 @@ def standard_detail
   end
 
   context 'when the error is registered' do
+    it 'is registered' do
+      registered = controller.registered_exception?(CustomStatusError.new)
+      expect(registered).to eq true
+    end
+
     context 'with custom status' do
       before do
         raises(CustomStatusError, 'some message')
@@ -128,6 +135,17 @@ def standard_detail
       end
     end
 
+    context 'with meta as proc' do
+      before do
+        raises(MetaProcError, 'some_error')
+      end
+
+      it 'shows custom error detail' do
+        get :index
+        expect(error['meta']).to match('class_name' => 'METAPROCERROR')
+      end
+    end
+
     context 'with log: false' do
       before do
         expect(Rails.logger).to_not receive(:error)