Merge pull request #280 from cerebris/transaction_fix

Add Internal Server Error support with rollback

Author: dgeb

lib/jsonapi/active_record_operations_processor.rb

@@ -24,5 +24,13 @@ def process_operation(operation)
   rescue ActiveRecord::RecordNotFound
     record_not_found = JSONAPI::Exceptions::RecordNotFound.new(operation.associated_key)
     return JSONAPI::ErrorsOperationResult.new(record_not_found.errors[0].code, record_not_found.errors)
+
+  rescue JSONAPI::Exceptions::Error => e
+    raise e
+
+  rescue => e
+    internal_server_error = JSONAPI::Exceptions::InternalServerError.new(e)
+    Rails.logger.error { "Internal Server Error: #{e.message} #{e.backtrace.join("\n")}" }
+    return JSONAPI::ErrorsOperationResult.new(internal_server_error.errors[0].code, internal_server_error.errors)
   end
 end

lib/jsonapi/error_codes.rb

@@ -24,6 +24,7 @@ module JSONAPI
   RECORD_NOT_FOUND = 404
   UNSUPPORTED_MEDIA_TYPE = 415
   LOCKED = 423
+  INTERNAL_SERVER_ERROR = 500
 
   TEXT_ERRORS =
     { VALIDATION_ERROR => 'VALIDATION_ERROR',
@@ -50,6 +51,7 @@ module JSONAPI
       FORBIDDEN => 'FORBIDDEN',
       RECORD_NOT_FOUND => 'RECORD_NOT_FOUND',
       UNSUPPORTED_MEDIA_TYPE => 'UNSUPPORTED_MEDIA_TYPE',
-      LOCKED => 'LOCKED'
+      LOCKED => 'LOCKED',
+      INTERNAL_SERVER_ERROR => 'INTERNAL_SERVER_ERROR'
     }
 end

lib/jsonapi/exceptions.rb

@@ -2,6 +2,22 @@ module JSONAPI
   module Exceptions
     class Error < RuntimeError; end
 
+    class InternalServerError < Error
+      attr_accessor :exception
+
+      def initialize(exception)
+        @exception = exception
+      end
+
+      def errors
+        [JSONAPI::Error.new(code: JSONAPI::INTERNAL_SERVER_ERROR,
+                            status: 500,
+                            title: 'Internal Server Error',
+                            detail: 'Internal Server Error')]
+      end
+
+    end
+
     class InvalidResource < Error
       attr_accessor :resource
       def initialize(resource)

lib/jsonapi/operations_processor.rb

@@ -82,6 +82,18 @@ def rollback
 
     def process_operation(operation)
       operation.apply
+
+    rescue JSONAPI::Exceptions::Error => e
+      # :nocov:
+      raise e
+      # :nocov:
+
+    rescue => e
+      # :nocov:
+      internal_server_error = JSONAPI::Exceptions::InternalServerError.new(e)
+      Rails.logger.error { "Internal Server Error: #{e.message} #{e.backtrace.join("\n")}" }
+      return JSONAPI::ErrorsOperationResult.new(internal_server_error.errors[0].code, internal_server_error.errors)
+      # :nocov:
     end
   end
 end

test/controllers/controller_test.rb

@@ -631,6 +631,28 @@ def test_update_with_links
                           json_response['data']['relationships']['tags']['data'])
   end
 
+  def test_update_with_internal_server_error
+    set_content_type_header!
+    post_object = Post.find(3)
+    title = post_object.title
+
+    put :update,
+        {
+          id: 3,
+          data: {
+            id: '3',
+            type: 'posts',
+            attributes: {
+              title: 'BOOM'
+            }
+          }
+        }
+
+    assert_response 500
+    post_object = Post.find(3)
+    assert_equal title, post_object.title
+  end
+
   def test_update_remove_links
     set_content_type_header!
     put :update,

test/fixtures/active_record.rb

@@ -611,6 +611,13 @@ def subject
     @model.title
   end
 
+  def title=(title)
+    @model.title = title
+    if title == 'BOOM'
+      raise 'The Server just tested going boom. If this was a real emergency you would be really dead right now.'
+    end
+  end
+
   filters :title, :author, :tags, :comments
   filters :id, :ids