Merge pull request #1026 from DavidMikeSimon/handle_exceptions_from_callbacks

Handle exceptions from process_operations callbacks, remove :rollback callback

Author: lgebhardt

lib/jsonapi/acts_as_resource_controller.rb

@@ -10,8 +10,7 @@ def self.included(base)
       base.include Callbacks
       base.cattr_reader :server_error_callbacks
       base.define_jsonapi_resources_callbacks :process_operations,
-                                              :transaction,
-                                              :rollback
+                                              :transaction
     end
 
     attr_reader :response_document
@@ -76,57 +75,46 @@ def process_request
 
       transactional = request_parser.transactional?
 
-      force_rollback = false
-      run_in_transaction(transactional) do
-        begin
+      begin
+        run_in_transaction(transactional) do
           run_callbacks :process_operations do
-            begin
-              request_parser.each(response_document) do |op|
-                op.options[:serializer] = resource_serializer_klass.new(
-                    op.resource_klass,
-                    include_directives: op.options[:include_directives],
-                    fields: op.options[:fields],
-                    base_url: base_url,
-                    key_formatter: key_formatter,
-                    route_formatter: route_formatter,
-                    serialization_options: serialization_options
-                )
-                op.options[:cache_serializer_output] = !JSONAPI.configuration.resource_cache.nil?
-
-                process_operation(op)
-              end
-            rescue => e
-              handle_exceptions(e)
+            request_parser.each(response_document) do |op|
+              op.options[:serializer] = resource_serializer_klass.new(
+                  op.resource_klass,
+                  include_directives: op.options[:include_directives],
+                  fields: op.options[:fields],
+                  base_url: base_url,
+                  key_formatter: key_formatter,
+                  route_formatter: route_formatter,
+                  serialization_options: serialization_options
+              )
+              op.options[:cache_serializer_output] = !JSONAPI.configuration.resource_cache.nil?
+
+              process_operation(op)
             end
           end
-        rescue => e
-          force_rollback = true
-          raise e
-        ensure
-          if response_document.has_errors? || force_rollback
-            rollback_transaction(transactional)
+          if response_document.has_errors?
+            raise ActiveRecord::Rollback
           end
         end
+      rescue => e
+        handle_exceptions(e)
       end
       render_response_document
     end
 
     def run_in_transaction(transactional)
       if transactional
         run_callbacks :transaction do
-          transaction do
+          ActiveRecord::Base.transaction do
             yield
           end
         end
       else
-        yield
-      end
-    end
-
-    def rollback_transaction(transactional)
-      if transactional
-        run_callbacks :rollback do
-          rollback
+        begin
+          yield
+        rescue ActiveRecord::Rollback
+          # Can't rollback without transaction, so just ignore it
         end
       end
     end
@@ -136,16 +124,6 @@ def process_operation(operation)
       response_document.add_result(result, operation)
     end
 
-    def transaction
-      ActiveRecord::Base.transaction do
-        yield
-      end
-    end
-
-    def rollback
-      fail ActiveRecord::Rollback
-    end
-
     private
 
     def resource_klass
@@ -276,7 +254,7 @@ def handle_exceptions(e)
           errors = JSONAPI::Exceptions::ParameterMissing.new(e.param).errors
         else
           if JSONAPI.configuration.exception_class_whitelisted?(e)
-            fail e
+            raise e
           else
             if self.class.server_error_callbacks
               self.class.server_error_callbacks.each { |callback|