Merge pull request #915 from cerebris/revert-914-pr/895

Revert "Pr/895"

Author: lgebhardt

lib/jsonapi/error_codes.rb

@@ -20,7 +20,6 @@ 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,32 +119,6 @@ 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,5 +1,3 @@
-require 'json'
-
 module JSONAPI
   MEDIA_TYPE = 'application/vnd.api+json'
 
@@ -21,18 +19,9 @@ def self.install
 
     def self.parser
       lambda do |body|
-        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
+        data = JSON.parse(body)
+        data = {:_json => data} unless data.is_a?(Hash)
+        data.with_indifferent_access
       end
     end
   end

lib/jsonapi/request_parser.rb

@@ -34,7 +34,6 @@ 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,39 +353,6 @@ 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:
         {