Merge pull request #1104 from cerebris/pr/1099

Adds test to 1099

Author: lgebhardt

lib/jsonapi/exceptions.rb

@@ -465,11 +465,12 @@ def errors
     end
 
     class ValidationErrors < Error
-      attr_reader :error_messages, :error_metadata, :resource_relationships
+      attr_reader :error_messages, :error_metadata, :resource_relationships, :resource_class
 
       def initialize(resource, error_object_overrides = {})
         @error_messages = resource.model_error_messages
         @error_metadata = resource.validation_error_metadata
+        @resource_class = resource.class
         @resource_relationships = resource.class._relationships.keys
         @key_formatter = JSONAPI.configuration.key_formatter
         super(error_object_overrides)
@@ -491,7 +492,7 @@ def json_api_error(attr_key, message)
         create_error_object(code: JSONAPI::VALIDATION_ERROR,
                             status: :unprocessable_entity,
                             title: message,
-                            detail: "#{format_key(attr_key)} - #{message}",
+                            detail: detail(attr_key, message),
                             source: { pointer: pointer(attr_key) },
                             meta: metadata_for(attr_key, message))
       end
@@ -501,14 +502,23 @@ def metadata_for(attr_key, message)
         error_metadata[attr_key] ? error_metadata[attr_key][message] : nil
       end
 
+      def detail(attr_key, message)
+        general_error?(attr_key) ? message : "#{format_key(attr_key)} - #{message}"
+      end
+
       def pointer(attr_or_relationship_name)
+        return '/data' if general_error?(attr_or_relationship_name)
         formatted_attr_or_relationship_name = format_key(attr_or_relationship_name)
         if resource_relationships.include?(attr_or_relationship_name)
           "/data/relationships/#{formatted_attr_or_relationship_name}"
         else
           "/data/attributes/#{formatted_attr_or_relationship_name}"
         end
       end
+
+      def general_error?(attr_key)
+        attr_key.to_sym == :base && !resource_class._has_attribute?(attr_key)
+      end
     end
 
     class SaveFailed < Error

lib/jsonapi/resource.rb

@@ -837,6 +837,10 @@ def _attribute_delegated_name(attr)
         @_attributes.fetch(attr.to_sym, {}).fetch(:delegate, attr)
       end
 
+      def _has_attribute?(attr)
+        @_attributes.keys.include?(attr.to_sym)
+      end
+
       def _updatable_attributes
         _attributes.map { |key, options| key unless options[:readonly] }.compact
       end

test/controllers/controller_test.rb

@@ -1869,11 +1869,21 @@ def test_update_bad_attributes
     assert_response :bad_request
   end
 
-  def test_delete_with_validation_error
+  def test_delete_with_validation_error_base
     post = Post.create!(title: "can't destroy me", author: Person.first)
     delete :destroy, params: { id: post.id }
 
     assert_equal "can't destroy me", json_response['errors'][0]['title']
+    assert_equal "/data", json_response['errors'][0]['source']['pointer']
+    assert_response :unprocessable_entity
+  end
+
+  def test_delete_with_validation_error_attr
+    post = Post.create!(title: "locked title", author: Person.first)
+    delete :destroy, params: { id: post.id }
+
+    assert_equal "is locked", json_response['errors'][0]['title']
+    assert_equal "/data/attributes/title", json_response['errors'][0]['source']['pointer']
     assert_response :unprocessable_entity
   end
 
@@ -3755,6 +3765,15 @@ def test_caching_with_join_from_resource_with_sql_fragment
     assert_cacheable_get :index, params: {include: 'section'}
     assert_response :success
   end
+
+  def test_delete_with_validation_error_base_on_resource
+    post = Post.create!(title: "can't destroy me either", author: Person.first)
+    delete :destroy, params: { id: post.id }
+
+    assert_equal "can't destroy me", json_response['errors'][0]['title']
+    assert_equal "/data/attributes/base", json_response['errors'][0]['source']['pointer']
+    assert_response :unprocessable_entity
+  end
 end
 
 class Api::V6::SectionsControllerTest < ActionController::TestCase

test/fixtures/active_record.rb

@@ -376,8 +376,19 @@ class Post < ActiveRecord::Base
   before_destroy :destroy_callback
 
   def destroy_callback
-    if title == "can't destroy me"
-      errors.add(:title, "can't destroy me")
+    case title
+    when "can't destroy me", "can't destroy me either"
+      errors.add(:base, "can't destroy me")
+
+      # :nocov:
+      if Rails::VERSION::MAJOR >= 5
+        throw(:abort)
+      else
+        return false
+      end
+      # :nocov:
+    when "locked title"
+      errors.add(:title, "is locked")
 
       # :nocov:
       if Rails::VERSION::MAJOR >= 5
@@ -1775,6 +1786,12 @@ class PostResource < PostResource
       def self.records(options = {})
         _model_class.all.joins('INNER JOIN people on people.id = author_id')
       end
+
+      attribute :base
+
+      def base
+        _model.title
+      end
     end
 
     class CustomerResource < JSONAPI::Resource