object_attorney 2.2.3 → 2.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzI5NzFiNmZiYjNhMzg3MWU2ZjQ4MzI5M2Q0ODI2ODczM2M1YjFmOA==
+    OTY5N2E4OTU1YTk3NzQ4MDkyNDZlNTQxN2I5OWNmZDI0YTZmNWEzZg==
   data.tar.gz: !binary |-
-    NTdjMWMyMWM3YjYyZWFhOTc2ZjlkNjMyZTJhMTViYjZmNjgzMmNhOA==
+    YzE0ODY2ZmRlNmE0MzM3NDc1YWI1N2MyMjIxNmNiNzFmODA2OTAxZA==
 SHA512:
   metadata.gz: !binary |-
-    MTVhMmJjZmViNDU2ZjNkYWNhMjI0MDI4ZWMwODdlMDdhYjEzOWEwZDkzNzJh
-    ZTc5Nzg5NDE3ZGVjNTM4MmExOGE5MmRkYWE0NGUyM2E4ZDNkM2ZhNDM3ZGZj
-    NTU2NDJmNWZiM2Q1ZmU0YTY2OThkNTRhZjBlMDkzOGE0ODMwYmU=
+    MWJjMTkxYTU0MWU3NGM4YzFjZTg3ZDBmMDk1NDRmMWQzMzllNDBkYjI5N2Y5
+    MWRmMmRkOTE3NmFiNWRkMmUwODQ5ODg4OWVjOTY2NDYwODM1NzZjNjM2MzI3
+    MDg1NWQzZmRjYjQwNzc1OTM0ZTk2MzI0ZjdkMGZiODdiYjg3OTQ=
   data.tar.gz: !binary |-
-    ODgyOTE4YzgyNTA5NDliYjlhOWY0MzA0NWEwZGExOGY0ZWNmNjUwZGEzMWM4
-    Y2M5NzI4YjZmOTMwZWUzOTVhMDUzNGZjN2QxM2ExOTdjM2U1MzAyZTllZjVh
-    Y2NmNTI3YWM0YjhkZjgxZmUyOTcxZTQxYjAyZWJkMDQ1ZWY3OGQ=
+    ZTVjNjQ2NzNkZGZiMGVmMmE4Yzg5MzUxM2VlYWI3NzdkMmM0NTNmZDAyZmM4
+    YjY1ZGQ3NDljYTNhNWM2Mjc5ZjMyZWYwYWE4NWRlOTkzMmQ0Yzg1MWE4MTI4
+    YTA3ZTMwNTgyYjYxYjdmYmJjYzI5ZDljY2E3YTRiMDRmNTY1NGE=

data/lib/object_attorney/nested_objects.rb

@@ -115,7 +115,7 @@ module ObjectAttorney
       attributes = send("#{nested_object_name}_attributes")
 
       if nested_object.present?
-        return nested_object if (attributes["id"] || attributes[:id]).to_s != nested_object.id.to_s
+        #return nested_object if (attributes["id"] || attributes[:id]).to_s != nested_object.id.to_s
 
         nested_object.assign_attributes(attributes_without_destroy(attributes))
         mark_for_destruction_if_necessary(nested_object, attributes)
@@ -183,15 +183,16 @@ module ObjectAttorney
     end
 
     def existing_nested_objects(nested_object_name)
-      nested_association_klass = self.class.reflect_on_association(nested_object_name).klass
+      nested_relection = self.class.reflect_on_association(nested_object_name)
 
-      existing_list = represented_object.blank? ? nested_association_klass.all : (represented_object.send(nested_object_name) || [])
+      existing = represented_object.blank? ? nested_relection.klass.all : represented_object.send(nested_object_name)
+      existing ||= (nested_relection.has_many? ? [] : nil)
       
-      if represented_object.present? && nested_association_klass != self.class.represented_object_class.reflect_on_association(nested_object_name).try(:klass)
-        existing_list = existing_list.map { |existing_nested_object| nested_association_klass.new({}, existing_nested_object) }
+      if represented_object.present? && nested_relection.klass != self.class.represented_object_class.reflect_on_association(nested_object_name).try(:klass)
+        existing = existing.map { |existing_nested_object| nested_relection.klass.new({}, existing_nested_object) }
       end
 
-      existing_list
+      existing
     end
 
     module ClassMethods

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - João Gonçalves