Pr/895 (#914)

* Rescue JSON parsing error and concat JSONAPI exception.

* Add two new exception classes with more detail regarding the error and address CR comments.

* Address CR comment and use fail call and be explicit with rescue blocks.

* Return all exceptions from the parser in `_parser_exception` and raise them to the controller

Author: lgebhardt

lib/jsonapi/error_codes.rb

@@ -20,6 +20,7 @@ module JSONAPI
   INVALID_FILTERS_SYNTAX = '120'
   SAVE_FAILED = '121'
   INVALID_DATA_FORMAT = '122'
+  BAD_REQUEST = '400'
   FORBIDDEN = '403'
   RECORD_NOT_FOUND = '404'
   NOT_ACCEPTABLE = '406'

lib/jsonapi/exceptions.rb

@@ -119,6 +119,32 @@ def errors
       end
     end
 
+    class BadRequest < Error
+      def initialize(exception)
+        @exception = exception
+      end
+
+      def errors
+        [JSONAPI::Error.new(code: JSONAPI::BAD_REQUEST,
+                            status: :bad_request,
+                            title: I18n.translate('jsonapi-resources.exceptions.bad_request.title',
+                                                  default: 'Bad Request'),
+                            detail: I18n.translate('jsonapi-resources.exceptions.bad_request.detail',
+                                                   default: @exception))]
+      end
+    end
+
+    class InvalidRequestFormat < Error
+      def errors
+        [JSONAPI::Error.new(code: JSONAPI::BAD_REQUEST,
+                            status: :bad_request,
+                            title: I18n.translate('jsonapi-resources.exceptions.invalid_request_format.title',
+                                                  default: 'Bad Request'),
+                            detail: I18n.translate('jsonapi-resources.exceptions.invalid_request_format.detail',
+                                                   default: 'Request must be a hash'))]
+      end
+    end
+
     class ToManySetReplacementForbidden < Error
       def errors
         [JSONAPI::Error.new(code: JSONAPI::FORBIDDEN,

lib/jsonapi/mime_types.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module JSONAPI
   MEDIA_TYPE = 'application/vnd.api+json'
 
@@ -19,9 +21,18 @@ def self.install
 
     def self.parser
       lambda do |body|
-        data = JSON.parse(body)
-        data = {:_json => data} unless data.is_a?(Hash)
-        data.with_indifferent_access
+        begin
+          data = JSON.parse(body)
+          if data.is_a?(Hash)
+            data.with_indifferent_access
+          else
+            fail JSONAPI::Exceptions::InvalidRequestFormat.new
+          end
+        rescue JSON::ParserError => e
+          { _parser_exception: JSONAPI::Exceptions::BadRequest.new(e.to_s)  }
+        rescue => e
+          { _parser_exception: e }
+        end
       end
     end
   end

lib/jsonapi/request_parser.rb

@@ -34,6 +34,7 @@ def setup_action(params)
 
       setup_action_method_name = "setup_#{params[:action]}_action"
       if respond_to?(setup_action_method_name)
+        raise params[:_parser_exception] if params[:_parser_exception]
         send(setup_action_method_name, params)
       end
     rescue ActionController::ParameterMissing => e

test/integration/requests/request_test.rb

@@ -353,6 +353,39 @@ def test_put_content_type
     assert_match JSONAPI::MEDIA_TYPE, headers['Content-Type']
   end
 
+  def test_put_valid_json
+    put '/posts/3', params: '{"data": { "type": "posts", "id": "3", "attributes": { "title": "A great new Post" } } }',
+        headers: {
+            'CONTENT_TYPE' => JSONAPI::MEDIA_TYPE,
+            'Accept' => JSONAPI::MEDIA_TYPE
+        }
+
+    assert_equal 200, status
+  end
+
+  def test_put_invalid_json
+    put '/posts/3', params: '{"data": { "type": "posts", "id": "3" "attributes": { "title": "A great new Post" } } }',
+        headers: {
+            'CONTENT_TYPE' => JSONAPI::MEDIA_TYPE,
+            'Accept' => JSONAPI::MEDIA_TYPE
+        }
+
+    assert_equal 400, status
+    assert_equal 'Bad Request', json_response['errors'][0]['title']
+    assert_match 'unexpected token at', json_response['errors'][0]['detail']
+  end
+
+  def test_put_valid_json_but_array
+    put '/posts/3', params: '[{"data": { "type": "posts", "id": "3", "attributes": { "title": "A great new Post" } } }]',
+        headers: {
+            'CONTENT_TYPE' => JSONAPI::MEDIA_TYPE,
+            'Accept' => JSONAPI::MEDIA_TYPE
+        }
+
+    assert_equal 400, status
+    assert_equal 'Request must be a hash', json_response['errors'][0]['detail']
+  end
+
   def test_patch_content_type
     patch '/posts/3', params:
         {