object_attorney 2.5.9 → 2.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDljMzMxODgxODg3MjU0NGFlMjlkZmQyN2Y4M2ZmODBkMGNlMDZlYw==
+    ZGFkZjIwNjQ2MzM4NmU5YTYxZGU3ODViMWIwNGM5YzY5NmVhYzVjOA==
   data.tar.gz: !binary |-
-    Y2QzZTVlNzQ2OGJlYWFlYjM1ZDcxYTYyZTZkM2ZlYzJmMzJmNmJlYw==
+    NzIzNGI4MzI1ZmRlZGQxMTM2ZWQwNDk0ZWUzN2M0MTkwZGUwMDFiMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZThjMDNjMDVhMzIyYzI0ZDg0NjJmNzQ2N2NiZDVkNGI4ODE5NjgwYmY4ZDdh
-    MzNiYWM1MzUwYWI4YWI3MGRiMjdhNjRmNzlkZDQ4NmU5ZWZjOTY1Yjg2Y2Q1
-    MTQyMzEyYmQyZmI1M2FlYjFkZWNhNmNlOGY3ZTUxOTc1MWNmZmQ=
+    ZmQ5ZjQ5YTFhYjgzYmJiZTIyYjM0MzI1MjNmYjg0NmViYjk5MmJlMDYwMGRi
+    OGFjYmQ2MTNlZjUxMTIyNTJmOTgwODhiNGMyMWQ3ZmNhMDI3NmY2MGE0Y2Y4
+    ZjIzNjg2YzE1MjFhODdmM2VlM2ZlYWEzZWRiY2M5NTExN2U4NmI=
   data.tar.gz: !binary |-
-    MjA5Nzg0MmNmNjVhMzRkZWQ0OTdjMWFjZTc0NmEwN2U0ZmEzZTg3NTc5Nzgw
-    Zjg3ZWViMWEzMjhiMDZkNTcxNWYzMTBmY2JjNjY1ZjRlZDkxYmM0ZjBlNmVj
-    Mjk2Y2Q4ZWNiYWE5NjBhY2I3YmJhZjliNDYyMWJkMzVhMGI4OTA=
+    MzY2M2JhOWFmNzM3NmM1MmU1ZDYzNTljMTliZWQwZTA0YWI2ODAzNDE3ZTQ1
+    ZjM0NDE5NDIwMzc2ZDU0MDM0NTgyNDUyYWRhZjBlMWYzYTk3YzA3NWNiYzhj
+    ZWU1NTc4YzJhY2M2Nzc3YmZlYzkwMmMxYmRjODIzOGE5N2Q0MDM=

data/lib/object_attorney/attribute_assignment.rb

@@ -29,6 +29,21 @@ module ObjectAttorney
       respond_to?("#{attribute}=")
     end
 
+    def attributes_without_destroy(attributes)
+      return nil unless attributes.is_a?(Hash)
+
+      _attributes = attributes.dup
+      _attributes.delete("_destroy")
+      _attributes.delete(:_destroy)
+
+      _attributes
+    end
+
+    def attributes_order_destruction?(attributes)
+      _destroy = attributes["_destroy"] || attributes[:_destroy]
+      ["true", "1", true].include?(_destroy)
+    end
+
   end
 
 end

data/lib/object_attorney/nested_objects.rb

@@ -20,9 +20,7 @@ module ObjectAttorney
     def mark_for_destruction_if_necessary(object, attributes)
       return nil unless attributes.is_a?(Hash)
 
-      _destroy = attributes["_destroy"] || attributes[:_destroy]
-
-      object.mark_for_destruction if ["true", "1", true].include?(_destroy)
+      object.mark_for_destruction if attributes_order_destruction? attributes
     end
 
     def nested_objects(macro = nil)
@@ -86,16 +84,6 @@ module ObjectAttorney
       end
     end
 
-    def attributes_without_destroy(attributes)
-      return nil unless attributes.is_a?(Hash)
-
-      _attributes = attributes.dup
-      _attributes.delete("_destroy")
-      _attributes.delete(:_destroy)
-
-      _attributes
-    end
-
     def nested_getter(nested_object_name)
       nested_instance_variable = self.instance_variable_get("@#{nested_object_name}")
 
@@ -123,7 +111,7 @@ module ObjectAttorney
 
         nested_object.assign_attributes(attributes_without_destroy(attributes))
         mark_for_destruction_if_necessary(nested_object, attributes)
-      elsif attributes.keys.present?
+      elsif attributes.keys.present? && !attributes_order_destruction?(attributes)
         nested_object = send("build_#{Helpers.singularize(nested_object_name)}", attributes_without_destroy(attributes))
         mark_for_destruction_if_necessary(nested_object, attributes)
       end
@@ -153,7 +141,7 @@ module ObjectAttorney
 
     def build_new_nested_objects(existing_and_new_nested_objects, nested_object_name)
       (send("#{nested_object_name}_attributes") || {}).values.each do |attributes|
-        next if attributes["id"].present? || attributes[:id].present?
+        next if attributes["id"].present? || attributes[:id].present? || attributes_order_destruction?(attributes)
 
         new_nested_object = send("build_#{Helpers.singularize(nested_object_name)}", attributes_without_destroy(attributes))
         next unless new_nested_object

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.5.9"
+  VERSION = "2.6.0"
 end

data/spec/object_attorney/post_form_spec.rb

@@ -122,6 +122,27 @@ shared_examples "a PostForm" do
     comment.body.should == 'new comment'
   end
 
+  it "5. Creating new 'Comment's and deleting them at the same time." do
+    params = {
+      id: 1,
+      post: {
+        title: "altered post",
+        comments_attributes: {
+          "0" => { body: '1', _destroy: true },
+          "1" => { body: '2' },
+          "2" => { body: '3', _destroy: true }
+        }
+      }
+    }
+
+    post_form = described_class.new(params[:post])
+
+    post_form.comments.length.should == 1
+    post_form.save.should == true
+    post_form.comments.length.should == 1
+    Comment.all.count.should == 1
+  end
+
 end
 
 describe PostForm::Base do

data/spec/object_attorney/user_form_with_ruby_errors_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe UserFormWithRubyErrors do
+
+  xit "1. 'UserFormWithRubyErrors' when saving should through an error!" do
+    params = { user: { email: 'email@gmail.com', terms_of_service: true } }
+
+    user_form = UserFormWithRubyErrors.new(params[:user])
+    save_result = user_form.save
+
+    save_result.should == true
+    User.all.count.should == 1
+  end
+
+end

data/spec/spec_helper.rb

@@ -28,6 +28,7 @@ require 'support/form_objects/bulk_posts_allow_only_existing_form'
 require 'support/form_objects/bulk_posts_allow_only_new_form'
 require 'support/form_objects/bulk_posts_with_form_objects_form'
 require 'support/form_objects/user_form'
+require 'support/form_objects/user_form_with_ruby_errors'
 
 RSpec.configure do |config|
   #config.treat_symbols_as_metadata_keys_with_true_values = true

data/spec/support/form_objects/user_form_with_ruby_errors.rb

@@ -0,0 +1,15 @@
+class UserFormWithRubyErrors
+
+  include ObjectAttorney
+
+  represents :user, properties: [:email]
+
+  attr_accessor :terms_of_service
+
+  validates_acceptance_of :terms_of_service, accept: true, allow_nil: false
+
+  def submit
+    fake_var == true
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.5.9
+  version: 2.6.0
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,6 +98,7 @@ files:
 - spec/object_attorney/post_with_comment_validations_form_spec.rb
 - spec/object_attorney/post_with_comments_and_address_form_spec.rb
 - spec/object_attorney/user_form_spec.rb
+- spec/object_attorney/user_form_with_ruby_errors_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model/validations.rb
 - spec/support/database_setup.rb
@@ -112,6 +113,7 @@ files:
 - spec/support/form_objects/post_with_comment_validations_form.rb
 - spec/support/form_objects/post_with_comments_and_address_form.rb
 - spec/support/form_objects/user_form.rb
+- spec/support/form_objects/user_form_with_ruby_errors.rb
 - spec/support/models/address.rb
 - spec/support/models/comment.rb
 - spec/support/models/post.rb
@@ -153,6 +155,7 @@ test_files:
 - spec/object_attorney/post_with_comment_validations_form_spec.rb
 - spec/object_attorney/post_with_comments_and_address_form_spec.rb
 - spec/object_attorney/user_form_spec.rb
+- spec/object_attorney/user_form_with_ruby_errors_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model/validations.rb
 - spec/support/database_setup.rb
@@ -167,8 +170,8 @@ test_files:
 - spec/support/form_objects/post_with_comment_validations_form.rb
 - spec/support/form_objects/post_with_comments_and_address_form.rb
 - spec/support/form_objects/user_form.rb
+- spec/support/form_objects/user_form_with_ruby_errors.rb
 - spec/support/models/address.rb
 - spec/support/models/comment.rb
 - spec/support/models/post.rb
 - spec/support/models/user.rb
-has_rdoc: