Merge pull request #540 from cerebris/controller_errors

Translate exceptions arrising in the ActsAsResourceController code in…

lib/jsonapi/acts_as_resource_controller.rb

@@ -178,10 +178,10 @@ def handle_exceptions(e)
       case e
       when JSONAPI::Exceptions::Error
         render_errors(e.errors)
-      else # raise all other exceptions
-        # :nocov:
-        fail e
-        # :nocov:
+      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
 

test/controllers/controller_test.rb

@@ -3270,4 +3270,13 @@ def test_get_namespaced_model_matching_resource
     assert_response :success
     assert_equal 'customers', json_response['data'][0]['type']
   end
+end
+
+class Api::V7::CategoriesControllerTest < ActionController::TestCase
+  def test_uncaught_error_in_controller
+
+    get :show, {id: '1'}
+    assert_response 500
+    assert_match /Internal Server Error/, json_response['errors'][0]['detail']
+  end
 end

test/fixtures/active_record.rb

@@ -565,6 +565,15 @@ class SubSpecialError < PostsController::SpecialError; end
     head :forbidden
   end
 
+  def handle_exceptions(e)
+    case e
+      when PostsController::SpecialError
+        raise e
+      else
+        super(e)
+    end
+  end
+
   #called by test_on_server_error
   def self.set_callback_message(error)
     @callback_message = "Sent from method"
@@ -758,6 +767,9 @@ class LineItemsController < JSONAPI::ResourceController
     class OrderFlagsController < JSONAPI::ResourceController
     end
 
+    class CategoriesController < JSONAPI::ResourceController
+    end
+
     class ClientsController < JSONAPI::ResourceController
     end
   end
@@ -1406,6 +1418,14 @@ class ClientResource < JSONAPI::Resource
       has_many :purchase_orders
     end
 
+    class CategoryResource < CategoryResource
+      attribute :name
+
+      # Raise exception for failure in controller
+      def name
+        fail "Something Exceptional Happened"
+      end
+    end
   end
 
   module V8

test/test_helper.rb

@@ -229,6 +229,7 @@ class CatResource < JSONAPI::Resource
       jsonapi_resources :customers
       jsonapi_resources :purchase_orders
       jsonapi_resources :line_items
+      jsonapi_resources :categories
 
       jsonapi_resources :clients
     end