object_attorney 2.10.1 → 2.10.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjBlYjkxZTVkYTM4OTdjZTAwNTVjMTM3MjAwNGRlOTg4YTg4NTE0Zg==
+    Mzg5Y2Q0NjA0NGIzMGUzY2ZjZjc0NTYxNzQyODAxMWQzMTE3NDIxNg==
   data.tar.gz: !binary |-
-    ODQ0NTY1NmU5MDBjOTEyNTBkNWI4YjMyYTQ0YWY5YzJmMjUyMzUzZA==
+    Yzg3ZDI0N2JjNmYxMTMzZDMzOTc3NzQxNzNmNmRmMzk4ZGQxOWY5Mw==
 SHA512:
   metadata.gz: !binary |-
-    OGZhOGIyODdjYzNmMjc3ODgyZmZkMzM2MzUzYzZiMTExZWRmOTczMmUyNDFm
-    YjJkNDEyZDNhMzg4OWMwZDNhY2ZjZjQyZDJhMGRhM2NmMWQ2MmNiZTAwYzZm
-    MzQ0NGVhYmEwYzgwYWRkOWZkYjMwYTUyMWExYTRjZDkxNTgyNWY=
+    OGU4ZGQ1MjEzYmNiYTUxYjMyZjIyN2Q4ZWZkYzcyZDYwNTAxNjczNjc0NTRk
+    YzQ3M2Y1OTA1MTVmOWFiZmRhNmYwMTZlNDA1MDg4YTU1OWNhODA1MTUxOTM1
+    MGViNzZkNWE4NTU5MzU0MDc4YjQzMjg4MjZmMDhjYjQwNzhiMmE=
   data.tar.gz: !binary |-
-    MDEwZjdiNmFiZDIzZWZhMDMyMzk3NzRmMDQzNTNiNmQwNjI5NTIyMjQ1ODEx
-    MjlkN2ZkNDU1ZmQ0MDU4ZjgwNmZjNjUyMTJmOGQyMDJlYmZkMDM1MzEyYTg3
-    Yzc1ZGM1N2MwOTM5OGUzNWZhOTYwYjZhYTliZTg3NmZjYTJmNWI=
+    M2U4MGJkZTc4YjU3NmFlZTU3N2UyZDg4ZjE0OWZjMTM0YTE3ZGZiMjBkOTBk
+    MzM2NzE5M2Y3OTExNzYzYzA3MGE3YzI2ZTNlMDEwOTcwNWUwNzcyZDNkODNi
+    NjlhMTQ2Y2Y2YjgyNDNjZTA5NzQyZmFhMWExNjY1ZTNiODE5MzU=

data/lib/object_attorney/nested_objects.rb

@@ -155,14 +155,18 @@ module ObjectAttorney
       end
     end
 
-    def build_nested_object(nested_object_name, attributes = {})
+    def build_nested_object(nested_object_name, attributes = {}, new_nested_object = nil)
       attributes = attributes.symbolize_keys
       reflection = self.class.reflect_on_association(nested_object_name)
 
       return nil if reflection.options[:new_records] == false
       
-      if reflection.options[:standalone] == true || !can_represented_object_build_nested?(reflection, nested_object_name)
+      if new_nested_object.present?
+        new_nested_object = assign_attributes_or_build_nested_object(reflection, attributes, new_nested_object)
+
+      elsif reflection.options[:standalone] == true || !can_represented_object_build_nested?(reflection, nested_object_name)
         new_nested_object = reflection.klass.new(attributes)
+
       else
         new_nested_object = build_from_represented_object(reflection, nested_object_name)
 
@@ -255,7 +259,7 @@ module ObjectAttorney
         self.send(:attr_accessor, "#{nested_object_name}_attributes".to_sym)
 
         define_method(nested_object_name) { nested_getter(nested_object_name) }
-        define_method("build_#{reflection.single_name}") { |attributes = {}, nested_object = nil| build_nested_object(nested_object_name, attributes) }
+        define_method("build_#{reflection.single_name}") { |attributes = {}, nested_object = nil| build_nested_object(nested_object_name, attributes, nested_object) }
         define_method("existing_#{nested_object_name}") { existing_nested_objects(nested_object_name) }
       end
 

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.10.1"
+  VERSION = "2.10.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler