object_attorney 2.1.3 → 2.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTNkY2ZkYWY2YWQ2Zjk0MWM2MTBmYTNjN2M4NDFkNDkwMTVmMWE2Yw==
+    NDBmNWRmNjg0YjdkZjBmYjI1NjUyOTU4ZjIwOGVhMWI4ZWY3MzcyMQ==
   data.tar.gz: !binary |-
-    NTA2YjBiNjgwZDI5OGJiYmI5Y2ZlYTc3ZTFmN2Y2MWNjMWY1MWFlNg==
+    YjcyNTlkZmEyY2UzNWUyYjM4OGQzMDg2MTgzMmY3Mzg5YTJkZmFjYg==
 SHA512:
   metadata.gz: !binary |-
-    OTNhOTMzYjJmMDcxMzQ1YzFjMDRiYzlmNzE0NTYyMWVkNGE1YmU0NTVhYTRl
-    MTc1MjM5NDc4OGNlZDQ5Y2EzYjgwZWU2N2JhZDQxMmRhN2M3OTU3Y2ZmNTNh
-    ZDM1YzY2ODgzOWQ4MDk4OWZkNDdlNTMyYWM5MTk5YjcxZGE4YzU=
+    NDY0NTBlODhjNWI1OTc0ZDc2MmNmNjI2MmU2YWJmMjc4MTg2YmYxOWI1NDhm
+    MTUwYzdmMTVkMDQ4ZmU4NmJlYTdmZGRmNzBkMTQ2OWM1Mjc0ZjEyMWQ2NWYx
+    NTdkN2IwNGY3MGVlZTVkMGJiMzZmNjlmZDZiNDViZWJhNDg2OTE=
   data.tar.gz: !binary |-
-    OTk3MTgzOWE2YjI5NDA2OTBkYzdjYzgyNjYzZjY4MzQ5OGFiYWQyZTUyYmNh
-    NWE5ZGI3ZmNkNjQ2M2FhNTJlNjU5MjNmNGExMDExYWJhYzk2N2RiOWViMjc1
-    MmEwZDM1MDY2NTI3YWIzNjgyZTUxYzI1NGRlNTRjZDI2MDhiZDI=
+    NjE0NDg4NDBhZGI3N2U2YWFlODFjYjg5ODU4OWY3NzE3ZWNlMzExMTYwYzUx
+    ZDFkMWNlNzNiM2VjNjE1MmM5NzI3OGNmMzk0YTZmOWEyYTJhMTZiZTRiMDQ5
+    MGI4NThlMTcwNDcwZGMxODQ5ZWE5MmQ3NTM0NzI3ODkxMDI2NzI=

data/db/migrate/20131205114902_create_addresses.rb

@@ -2,6 +2,7 @@ class CreateAddresses < ActiveRecord::Migration
   def up
     create_table :addresses do |t|
       t.string :street
+      t.string :city
       t.integer :post_id
       t.timestamps
     end

data/lib/object_attorney/nested_objects.rb

@@ -49,12 +49,13 @@ module ObjectAttorney
     end
 
     def validate_nested_objects
-      return true if nested_objects.map do |reflection, nested_object|
+      valid = nested_objects.map do |reflection, nested_object|
         nested_object.marked_for_destruction? ? true : nested_object.valid?
       end.all?
 
-      import_nested_objects_errors
-      false
+      import_nested_objects_errors unless valid
+      
+      valid
     end
 
     def import_nested_objects_errors
@@ -86,7 +87,7 @@ module ObjectAttorney
     end
 
     def attributes_without_destroy(attributes)
-      return nil unless attributes.kind_of?(Hash)
+      return nil unless attributes.is_a?(Hash)
 
       _attributes = attributes.dup
       _attributes.delete("_destroy")
@@ -99,13 +100,33 @@ module ObjectAttorney
       nested_instance_variable = self.instance_variable_get("@#{nested_object_name}")
 
       if nested_instance_variable.nil?
-        nested_instance_variable = get_existing_and_new_nested_objects(nested_object_name)
+        reflection = self.class.reflect_on_association(nested_object_name)
+
+        nested_instance_variable = reflection.has_many? ? get_existing_and_new_nested_objects(nested_object_name) : get_existing_or_new_nested_object(nested_object_name)
+
         self.instance_variable_set("@#{nested_object_name}", nested_instance_variable)
       end
 
       nested_instance_variable
     end
 
+    def get_existing_or_new_nested_object(nested_object_name)
+      nested_object = send("existing_#{nested_object_name}")
+      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
+
+        nested_object.assign_attributes(attributes_without_destroy(attributes))
+        mark_for_destruction_if_necessary(nested_object, attributes)
+      else
+        nested_object = send("build_#{nested_object_name.to_s.singularize}", attributes_without_destroy(attributes))
+        mark_for_destruction_if_necessary(nested_object, attributes)
+      end
+
+      nested_object
+    end
+
     def get_existing_and_new_nested_objects(nested_object_name)
       existing_and_new_nested_objects = []
       

data/lib/object_attorney/orm.rb

@@ -19,7 +19,7 @@ module ObjectAttorney
 
     def save!(save_method = :save!)
       before_save
-      save_result = valid? ? save_after_validations(save_method) : false
+      save_result = valid? ? submit(save_method) : false
       after_save if valid? && save_result
       save_result
     end
@@ -43,10 +43,6 @@ module ObjectAttorney
     def before_save; end
     def after_save; end
 
-    def save_after_validations(save_method)
-      submit(save_method)
-    end
-
     def submit(save_method)
       save_result = save_or_destroy_nested_objects(save_method, :belongs_to)
       save_result = save_or_destroy_represented_object(save_method) if save_result

data/lib/object_attorney/orm_handlers/smooth_operator.rb

@@ -9,7 +9,7 @@ module ObjectAttorney
 
       def save!(options = {}, save_method = :save!)
         before_save
-        save_result = valid? ? save_after_validations(save_method, options) : false
+        save_result = valid? ? submit(save_method, options) : false
         after_save if valid? && save_result
         save_result
       end
@@ -30,10 +30,6 @@ module ObjectAttorney
 
       protected #################### PROTECTED METHODS DOWN BELOW ######################
 
-      def save_after_validations(save_method, options = {})
-        submit(save_method, options)
-      end
-
       def submit(save_method, options = {})
         save_result = save_or_destroy_nested_objects(save_method, :belongs_to, options)
         save_result = save_or_destroy_represented_object(save_method, options) if save_result

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.1.3"
+  VERSION = "2.2.1"
 end

data/spec/object_attorney/post_with_comments_and_address_form_spec.rb

@@ -12,7 +12,8 @@ describe PostWithCommentsAndAddressForm do
           "1" => { body: "" }
         },
         address_attributes: {
-          '0' => { street: 'street' }
+          street: 'street',
+          city: 'city'
         }
       }
     }
@@ -40,6 +41,7 @@ describe PostWithCommentsAndAddressForm do
     address = Address.first
     address.post_id.should == post.id
     address.street.should == 'street'
+    address.city.should == 'city'
   end
 
 end

metadata

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