object_attorney 2.2.11 → 2.2.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDNjNTU1NmM2MDhkZmIwODRlMjE1ZjhmMmRiYzI5ODFlMzFlZDIxMg==
+    YWYxODZiZjI4ZDA3ZmI3N2RlMzJjZDliMmQ1ZTRlYzg5NDkxZDZlNw==
   data.tar.gz: !binary |-
-    MjQ0NGYyYjg1NmRhMzY1NGVjZGFiZGYzODk1NGQyMTJjMWJkMzFhNg==
+    YWIzZDY5MGUwN2NkYzliNjc0YmMxYTkyY2QyOTg2NzIwNzAzMjEyNQ==
 SHA512:
   metadata.gz: !binary |-
-    NTMyNDA4MDY3N2UyZDJmMDgxNzU5OWQ1N2JhNWZlOWRiN2Q2YzE1MDg2MTQ4
-    OGMzNmE0ZTgwZjEyNzc2YjU4ZjFjOWI0ODEzYzdiMDNmODI4N2VlYjI3NDk3
-    ZWNmYTc0MmRkODdmYzFhNTEzOTM1MzdkNTM0OGQ0NWViODg1ZGU=
+    NGQ3ZjVkMjc3MTMxNmEwNWFhMzI2MWQwNTc2NDEwYTM5MDZiZDljNWM5MDcx
+    MDhiZDM1MjU5OThiMjM0YjAwOWExN2YwMWE0NjU3NDlmMzM2ZGUzMmI5Yjk2
+    YmVhMzMyMDAxYzZmYzY5YjM5ZDEzNzAxNjNkZmM1YWUwMjUxMDA=
   data.tar.gz: !binary |-
-    ZmZhZmRmZjNlODA1YzkyMzQ5MzcyNGQzODRkNWM3ZTZlNjJkN2JkZTdkOWFl
-    ZDdhZDc2ZjcyYzdiMDc4ODkxZjdiZWI0MjNhODljNWYyOTRlOTMwMzdkMDk2
-    NzlkOTc3NGI0NDkxNTBjYjVhYzdhNjJiZGVlYWY0N2EyMTg3YmY=
+    NjhkMWYzYTFlNTg2NGQ4YzRmYjgzMWNmYjBiOTg0MGJlNjUzZGNkZjEwMjBj
+    MGJiZTViMmYwMzViN2JkMzBlZDVkODA1MmVlZTBiNmI3YWVjMDJmZmNhMTA5
+    ZmVlOWNjODc1YjcwMjk4OTYwN2JhOWZkMmE5NDFjZGRiYTljYjA=

data/lib/object_attorney/nested_objects.rb

@@ -168,23 +168,43 @@ module ObjectAttorney
     def build_nested_object(nested_object_name, attributes = {})
       reflection = self.class.reflect_on_association(nested_object_name)
       
-      new_nested_object = build_from_represented_object(reflection, nested_object_name, attributes) || reflection.klass.new(attributes)
       
+      if can_represented_object_build_nested?(reflection, nested_object_name)
+        new_nested_object = build_from_represented_object(reflection, nested_object_name, attributes)
+
+        new_nested_object = build_nested_custom_class_if_necessary(reflection, attributes, new_nested_object)
+      else
+        new_nested_object = reflection.klass.new(attributes)
+      end
+
       populate_foreign_key(self, new_nested_object, reflection, :has_many)
 
       new_nested_object
     end
 
-    def build_from_represented_object(reflection, nested_object_name, attributes)
+    def build_nested_custom_class_if_necessary(reflection, attributes, new_nested_object)
+      real_reflection_class = self.class.represented_object_reflect_on_association(reflection.name).try(:klass)
+
+      if reflection.klass == real_reflection_class
+        new_nested_object
+      else
+        reflection.klass.respond_to?(:represents) ? reflection.klass.new(attributes, new_nested_object) : reflection.klass.new(attributes)
+      end
+    end
+
+    def can_represented_object_build_nested?(reflection, nested_object_name)
       return nil if represented_object.blank?
-      return nil if reflection.klass != self.class.represented_object_class.reflect_on_association(nested_object_name).try(:klass)
+      
+      represented_object.respond_to?("build_#{nested_object_name}") || represented_object.send(nested_object_name).respond_to?(:build)
+    end
 
+    def build_from_represented_object(reflection, nested_object_name, attributes)
       build_method = "build_#{nested_object_name}"
 
       if represented_object.respond_to?(build_method)
         represented_object.send(build_method, attributes)
       else
-        represented_object.send(nested_object_name).build(attributes)
+        represented_object.send(nested_object_name).try(:build, attributes)
       end
     end
 

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.2.11"
+  VERSION = "2.2.12"
 end

data/lib/object_attorney.rb

@@ -117,6 +117,12 @@ module ObjectAttorney
       represented_object_reflection.try(:klass)
     end
 
+    def represented_object_reflect_on_association(association)
+      return nil if represented_object_class.nil?
+
+      represented_object_class.reflect_on_association(association)
+    end
+
     def zuper_method(method_name, *args)
       self.superclass.send(method_name, *args) if self.superclass.respond_to?(method_name)
     end

metadata

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