Merge pull request #573 from cerebris/whitelist_controller_exceptions

Allow whitelisted errors from controller to raise

Author: lgebhardt

lib/jsonapi/acts_as_resource_controller.rb

@@ -179,9 +179,13 @@ def handle_exceptions(e)
       when JSONAPI::Exceptions::Error
         render_errors(e.errors)
       else
-        internal_server_error = JSONAPI::Exceptions::InternalServerError.new(e)
-        Rails.logger.error { "Internal Server Error: #{e.message} #{e.backtrace.join("\n")}" }
-        render_errors(internal_server_error.errors)
+        if JSONAPI.configuration.exception_class_whitelist.any? { |k| e.class.ancestors.include?(k) }
+          fail e
+        else
+          internal_server_error = JSONAPI::Exceptions::InternalServerError.new(e)
+          Rails.logger.error { "Internal Server Error: #{e.message} #{e.backtrace.join("\n")}" }
+          render_errors(internal_server_error.errors)
+        end
       end
     end
 

test/controllers/controller_test.rb

@@ -3273,10 +3273,32 @@ def test_get_namespaced_model_matching_resource
 end
 
 class Api::V7::CategoriesControllerTest < ActionController::TestCase
-  def test_uncaught_error_in_controller
+  def test_uncaught_error_in_controller_translated_to_internal_server_error
 
     get :show, {id: '1'}
     assert_response 500
     assert_match /Internal Server Error/, json_response['errors'][0]['detail']
   end
+
+  def test_not_whitelisted_error_in_controller
+    original_config = JSONAPI.configuration.dup
+    JSONAPI.configuration.operations_processor = :error_raising
+    JSONAPI.configuration.exception_class_whitelist = []
+    get :show, {id: '1'}
+    assert_response 500
+    assert_match /Internal Server Error/, json_response['errors'][0]['detail']
+  ensure
+    JSONAPI.configuration = original_config
+  end
+
+  def test_whitelisted_error_in_controller
+    original_config = JSONAPI.configuration.dup
+    JSONAPI.configuration.operations_processor = :error_raising
+    JSONAPI.configuration.exception_class_whitelist = [PostsController::SubSpecialError]
+    assert_raises PostsController::SubSpecialError do
+      get :show, {id: '1'}
+    end
+  ensure
+    JSONAPI.configuration = original_config
+  end
 end