jsonapi_compliable 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1383cab9b58c9423dba85c223fbe3c18bc099c9e
-  data.tar.gz: 0dad7f4689a52a9f22df16ca7e60c41c752f1951
+  metadata.gz: 683efd67df594517b01f5b4d42ac9ec7763c8b43
+  data.tar.gz: dbdb64eb9a35dd750cb3baaa64bd6d43140126fb
 SHA512:
-  metadata.gz: fdbd9dd65460c70ff0b7ce3ae2d48acfa39cdba20419f33467f651fcd475f8f04d71964d0739a08b7b12317f470dfbb54e3c9fe5d20be1912b776d69fd5bd5cb
-  data.tar.gz: 577ba99d7b29b420121d3d84f53f99b0eb723831bbf4dd31a7d0f1e54dbb57670d5e7d2342e9e9d96284c6f7451c41a7bdc54da31806b89cf850bb30d79adfd1
+  metadata.gz: 5ecc62dc5d64239da53005213e9e28fc846580e377264ffbaef7beb6a5e945d5a67132cd1c64c01eafec3187ed7d81cd8287e312059bb7f439078c9456f38c0f
+  data.tar.gz: 2c67bd4923faee105de161daea829162fa2ba48a49cbe1f17e18893c58e05a7baa13797ea704d0954d9e33417bb28065ca091bfff3e13e0bab48211116ae7c45

data/lib/jsonapi_compliable/adapters/active_record.rb

@@ -73,11 +73,14 @@ module JsonapiCompliable
       # @see Adapters::Abstract#associate
       def associate(parent, child, association_name, association_type)
         if association_type == :has_many
-          parent.association(association_name).loaded!
-          parent.association(association_name).add_to_target(child, :skip_callbacks)
+          associate_many(parent, child, association_name)
         elsif association_type == :habtm
-          parent.send(association_name) << child
-        else
+          if parent.send(association_name).exists?(child.id)
+            associate_many(parent, child, association_name)
+          else
+            parent.send(association_name) << child
+          end
+        elsif
           child.send("#{association_name}=", parent)
         end
       end
@@ -113,6 +116,13 @@ module JsonapiCompliable
         instance.destroy
         instance
       end
+
+      private
+
+      def associate_many(parent, child, association_name)
+        parent.association(association_name).loaded!
+        parent.association(association_name).add_to_target(child, :skip_callbacks)
+      end
     end
   end
 end

data/lib/jsonapi_compliable/util/persistence.rb

@@ -95,13 +95,14 @@ class JsonapiCompliable::Util::Persistence
   end
 
   def associate_children(object, children)
-    # No need to associate destroyed objects
-    return if @meta[:method] == :destroy
-
     children.each do |x|
       if x[:object] && object
         if x[:meta][:method] == :disassociate
           x[:sideload].disassociate(object, x[:object])
+        elsif x[:meta][:method] == :destroy
+          if x[:sideload].type == :habtm
+            x[:sideload].disassociate(object, x[:object])
+          end # otherwise, no need to disassociate destroyed objects
         else
           x[:sideload].associate(object, x[:object])
         end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable