jsonapi-resources 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 228adb9ade738e5407a5ae9a5703f7cf5b45af69
-  data.tar.gz: 61fdfbc616b39f2fcd354220d31e8bec9e7820b3
+  metadata.gz: 1b9c37e4c95b76725a1cd1c63fe6f065dc56eb04
+  data.tar.gz: c206e1fec888ce0031ad4c2c5d26a2519a82791c
 SHA512:
-  metadata.gz: a9ca0d04854314ef0df6f5566ea7edbfb3c8767487e7de9376f99b3e36d5e96bbc87a20b54aae4a911feb841709fd13411f57cc35913011348077c66e96f3049
-  data.tar.gz: c8368190cf3edf7bb23b98949c1444e8b5df018c56658f4d8f8a905d4cdce7e5c37008227aaaec7c1d740eecf12885713297fc6e1799f3cda2c6b6eebb9da45b
+  metadata.gz: c8f727dc37c485ba63ccb9de5abfa3903ea3369c4ea1a7175d796d00a63b971913672d5c33b0685b87b873ba586e1caba4b1a5ce5761961151a7bf4287c6ff63
+  data.tar.gz: c5c6a4dc06ad88949d1d18ffbc23b0447a8843c9e658ae386d3eb510af36448de75f749b6f20076b46f1b294802dbc1366f25ed0bbfd5fb6a6861676cb464d16

data/lib/jsonapi/exceptions.rb

@@ -448,11 +448,12 @@ module JSONAPI
     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)
@@ -474,7 +475,7 @@ module JSONAPI
         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
@@ -484,7 +485,12 @@ module JSONAPI
         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}"
@@ -492,6 +498,10 @@ module JSONAPI
           "/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

data/lib/jsonapi/resource.rb

@@ -352,7 +352,7 @@ module JSONAPI
 
         @reload_needed = true
       else
-        @model.public_send(relationship.relation_name(context: @context)).delete(key)
+        @model.public_send(relationship.relation_name(context: @context)).destroy(key)
       end
 
       :completed
@@ -911,6 +911,10 @@ module JSONAPI
         default_attribute_options.merge(@_attributes[attr])
       end
 
+      def _has_attribute?(attr)
+        @_attributes.keys.include?(attr.to_sym)
+      end
+
       def _updatable_relationships
         @_relationships.map { |key, _relationship| key }
       end

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.9.2'
+    VERSION = '0.9.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-18 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler