jsonapi_compliable 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25562eb5beee62f18eacf4e9cbeced3d5a245b3f
-  data.tar.gz: f559d365a3647591fd0d221902303a3e84ff0e06
+  metadata.gz: 9138437a5f6cf6613987e8f84a8822d1cf2c84e4
+  data.tar.gz: 16ac6bf944f5f04e3573fd8e033a90d83658a97d
 SHA512:
-  metadata.gz: efc0088447905a6120acfad7a4fb1d8790e49e3e7732f98b76c3063b3da64e18f4a49dbdb60dee8bb95b9833658ab5a99738e6a9ca2b4d4c1122b081d24602ea
-  data.tar.gz: f87a8b7b3dc56b0449afbfc67682ae901ab4ebe97db6c4cfdff1caad303a5b98128aca66ba60f1f2a1b3fe6459ff6477171ea3f545a4fcb6ea1cdc021a0472c7
+  metadata.gz: e5eb95f420f9811808b528d5e73e40e8f0279e829d307aaaeda6d1127fe3e99d897ce63d56a47b8e3a6ee3b3b25a902d51af68c7bd4a7c7e57a3744a3b721423
+  data.tar.gz: d2cb8c48650ca2c1be14683e0bef55f354153efe7d7189d3803d521dd7f22befc34cda32f027810330358e6c81c219d7d401e4382343e2d3b06886601ba00c86

data/lib/jsonapi_compliable.rb

@@ -32,6 +32,7 @@ end
 
 require "jsonapi_compliable/extensions/extra_attribute"
 require "jsonapi_compliable/extensions/boolean_attribute"
+require "jsonapi_compliable/extensions/temp_id"
 
 module JsonapiCompliable
   autoload :Base, 'jsonapi_compliable/base'

data/lib/jsonapi_compliable/adapters/active_record.rb

@@ -16,7 +16,7 @@ module JsonapiCompliable
       end
 
       def count(scope, attr)
-        scope.count
+        scope.uniq.count
       end
 
       def average(scope, attr)

data/lib/jsonapi_compliable/base.rb

@@ -48,23 +48,32 @@ module JsonapiCompliable
     end
 
     def jsonapi_create
-      created = resource.transaction do
+      _persist do
         resource.persist_with_relationships \
           deserialized_params.meta,
           deserialized_params.attributes,
           deserialized_params.relationships
       end
-      Util::ValidationResponse.new(created, deserialized_params)
     end
 
     def jsonapi_update
-      updated = resource.transaction do
+      _persist do
         resource.persist_with_relationships \
           deserialized_params.meta,
           deserialized_params.attributes,
           deserialized_params.relationships
       end
-      Util::ValidationResponse.new(updated, deserialized_params)
+    end
+
+    def _persist
+      validation_response = nil
+      resource.transaction do
+        object = yield
+        validation_response = Util::ValidationResponse.new \
+          object, deserialized_params
+        raise Errors::ValidationError unless validation_response.to_a[1]
+      end
+      validation_response
     end
 
     def perform_render_jsonapi(opts)

data/lib/jsonapi_compliable/errors.rb

@@ -1,6 +1,7 @@
 module JsonapiCompliable
   module Errors
     class BadFilter < StandardError; end
+    class ValidationError < StandardError; end
 
     class UnsupportedPageSize < StandardError
       def initialize(size, max)

data/lib/jsonapi_compliable/extensions/temp_id.rb

@@ -0,0 +1,15 @@
+module JsonapiCompliable
+  module SerializableTempId
+    def as_jsonapi(*)
+      super.tap do |hash|
+        if temp_id = @object.instance_variable_get(:'@_jsonapi_temp_id')
+          hash[:'temp-id'] = temp_id
+        end
+      end
+    end
+  end
+end
+
+JSONAPI::Serializable::Resource.class_eval do
+  prepend JsonapiCompliable::SerializableTempId
+end

data/lib/jsonapi_compliable/resource.rb

@@ -226,9 +226,14 @@ module JsonapiCompliable
     end
 
     def transaction
-      adapter.transaction(model) do
-        yield
+      response = nil
+      begin
+        adapter.transaction(model) do
+          response = yield
+        end
+      rescue Errors::ValidationError
       end
+      response
     end
   end
 end

data/lib/jsonapi_compliable/util/validation_response.rb

@@ -7,14 +7,40 @@ class JsonapiCompliable::Util::ValidationResponse
   end
 
   def success?
-    if object.respond_to?(:errors)
-      object.errors.blank?
-    else
-      true
-    end
+    all_valid?(object, @deserialized_params.relationships)
   end
 
   def to_a
     [object, success?]
   end
+
+  private
+
+  def valid_object?(object)
+    object.respond_to?(:errors) && object.errors.blank?
+  end
+
+  def all_valid?(model, deserialized_params)
+    valid = true
+    return false unless valid_object?(model)
+    deserialized_params.each_pair do |name, payload|
+      if payload.is_a?(Array)
+        related_objects = model.send(name)
+        related_objects.each do |r|
+          valid = valid_object?(r)
+
+          if valid
+            valid = all_valid?(r, deserialized_params[:relationships] || {})
+          end
+        end
+      else
+        related_object = model.send(name)
+        valid = valid_object?(related_object)
+        if valid
+          valid = all_valid?(related_object, deserialized_params[:relationships] || {})
+        end
+      end
+    end
+    valid
+  end
 end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -153,6 +153,7 @@ files:
 - lib/jsonapi_compliable/errors.rb
 - lib/jsonapi_compliable/extensions/boolean_attribute.rb
 - lib/jsonapi_compliable/extensions/extra_attribute.rb
+- lib/jsonapi_compliable/extensions/temp_id.rb
 - lib/jsonapi_compliable/query.rb
 - lib/jsonapi_compliable/rails.rb
 - lib/jsonapi_compliable/resource.rb
@@ -196,7 +197,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: Easily build jsonapi.org-compatible APIs