jsonapi_errorable 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63b8a3652fd9414efabf6132a0f6271570b2463e
-  data.tar.gz: c40c41cc6bacf302bdc1c11ac5a2da11a4b5f92c
+  metadata.gz: c83d0f33880b1ff0f1c6b69396e1aa6a22a074cf
+  data.tar.gz: e9182252a226267a32b05bb2b81845b9f9e91beb
 SHA512:
-  metadata.gz: 18531dd8ed2e9f13613008feab5479778b3d364178883812865d0c794c690e48e704d304e7f68012303876a166e741ccc41f991592d9cbbfb319cc6086661dd0
-  data.tar.gz: c0ba639d7807955bc3eead312d6c63d24de0a36f6a4d05179dc88679e44ebdc322ad40fb02eeda167d7e0b2951f67685ff040a6b73cecc3d0e5b8beec79e1559
+  metadata.gz: 0b11c3d3a3ac8d174d197bfe0c49579eb96351141f977f61819ee9eb7c959d089b76159649018388aa8c967918adc4f2804844efaf11c1c6bf89cb05eddf8464
+  data.tar.gz: 110aa34014a6648dc4656bdddc4d3c463aac23e4828b4ce663621dbdd8921bb71aa190cd2ffa38782a5041f1de0793cd57e15811629ad6852f067d70831a55a1

data/lib/jsonapi_errorable/serializers/validation.rb

@@ -3,23 +3,33 @@ module JsonapiErrorable
     class Validation
       attr_reader :object
 
-      def initialize(object)
+      def initialize(object, relationship_params, relationship_message = {})
         @object = object
+        @relationship_params = relationship_params || {}
+        @relationship_message = relationship_message
       end
 
       def errors
-        object.errors.to_hash.map do |attribute, messages|
+        return [] unless object.respond_to?(:errors)
+
+        all_errors = object.errors.to_hash.map do |attribute, messages|
           messages.map do |message|
+            meta = { attribute: attribute, message: message }.merge(@relationship_message)
+            meta = { relationship: meta } if @relationship_message.present?
             {
               code:   'unprocessable_entity',
               status: '422',
               title: 'Validation Error',
               detail: "#{attribute.capitalize} #{message}",
               source: { pointer: pointer_for(object, attribute) },
-              meta:   { attribute: attribute, message: message }
+              meta:   meta
             }
           end
         end.flatten
+        all_errors << relationship_errors(@relationship_params)
+        all_errors.flatten!
+        all_errors.compact!
+        all_errors
       end
 
       def relationship?(name)
@@ -49,6 +59,28 @@ module JsonapiErrorable
       def activerecord?
         object.is_a?(ActiveRecord::Base)
       end
+
+      def relationship_errors(relationship_params)
+        errors = []
+        relationship_params.each_pair do |name, payload|
+          related = Array(@object.send(name))
+          related.each do |r|
+            if payload.is_a?(Array)
+              related_payload = payload.find { |p| p[:meta][:temp_id] === r.instance_variable_get(:@_jsonapi_temp_id) || p[:meta][:id] == r.id }
+            else
+              related_payload = payload
+            end
+            relationship_message = {
+              name: name,
+              id: r.id,
+              :'temp-id' => r.instance_variable_get(:@_jsonapi_temp_id)
+            }
+
+            errors << Validation.new(r, related_payload[:relationships], relationship_message).errors
+          end
+        end
+        errors
+      end
     end
   end
 end

data/lib/jsonapi_errorable/validatable.rb

@@ -1,10 +1,11 @@
 module JsonapiErrorable
   module Validatable
     def render_errors_for(record)
-      validation = Serializers::Validation.new(record)
+      validation = Serializers::Validation.new \
+        record, deserialized_params.relationships
 
       render \
-        json: validation.errors,
+        json: { errors: validation.errors },
         status: :unprocessable_entity
     end
   end

data/lib/jsonapi_errorable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiErrorable
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_errorable
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-09 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: jsonapi.org compatible error handling