object_attorney 2.4.0 → 2.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjViM2Y4OGE1ODBmYjU1ODZlMzI2Y2UxNTVkOTg3MWQ1NmI1YzMxMQ==
+    MGMwYTYwMmZhY2E1MDNmYTk3ZTdmY2RmZmFiYThjZjRiYzkzN2FmYg==
   data.tar.gz: !binary |-
-    ZWU0OWJhYTViMGQwNjkxNzlhYWM3NjQ5MzY2NjUxYjczY2RjMDlmMw==
+    ZDczNTc0ZjcxNmM2NGQ0ZjU0MmI2OWFiMWUzZDZhMjVhYTEwMTY5Ng==
 SHA512:
   metadata.gz: !binary |-
-    ZDIyNjczOTM4MjZlMTVmZDEyZDUyNGViOTEyOWNlMDU5YTE1MjdkMGZmNDkw
-    MmM1OTZkN2YxMTY1YjQ3MzNhNDFkYjM1ZmIzYWMxZTg0Yjk3ODlhMjU5YTk4
-    NmI4N2Y1NDVkMjZjMWVhOWM1MGQ2ZjIzOWU5OGM4YjQ2YzA5YTk=
+    ZWMzZTMyZDIwNjY1YzM2OTgzOTc3MWU1NzM2ZWJiZjBjN2FjOGUyMjY2NGUy
+    Y2U1MjZjOTE5ZDA5ZjY3OTMyNDA5NjIyNGQzY2E3ZTE4Yzg3MThiYTlhZmQw
+    ZTkxYTU4MzNjYTA4YjdkYjA5OWE0MDAzOWViOTZkNmQ1MTYxYmU=
   data.tar.gz: !binary |-
-    ZTZmN2NlNTllY2JhYzdmY2VhZGE4ZjZjZWM5ODVkNDhjYTdjNTcyOThmZWIw
-    MDU4OGRkMGU1MjY2MzlhMzFhNzMzMzg5NTUwZDA5MzZhMTQwOGQxMzg0ODRk
-    ZjhjNWRmYWIwYWUxOTc3Y2E1MjgyNjdhZTE3NmUyYWQ5YjYxZTk=
+    ZGFmMzQ0ZGM1NWUyMzFiYTYwYjRiYWRiYTcxNDhmZGQxMzVmZjFhMzU3N2Jm
+    MGM4NDdlMzg2NWVjN2EzZTBiMTE4ZjM1ZjRmMjE2MTVlYzM4OWRjN2IwMjJl
+    NjExZmE5MDQ5YTFjNzU3M2ZjY2FjNzM1ZGZlNTE0MzVkYjc2YTM=

data/lib/object_attorney/imported_errors.rb

@@ -0,0 +1,33 @@
+module ObjectAttorney
+  module ImportedErrors
+
+    protected #################### PROTECTED METHODS DOWN BELOW ######################
+
+    def clear_imported_errors
+      @imported_errors = {}
+    end
+
+    def populate_imported_errors
+      if respond_to?(:represented_object)
+        represented_object.errors.each { |key, value| @imported_errors[key] = value } if represented_object.present?
+      else
+        errors.each { |key, value| @imported_errors[key] = value }
+      end
+    end
+
+    def validate_imported_errors
+      imported_errors = (@imported_errors || {})
+      
+      incorporate_errors_from imported_errors
+
+      imported_errors.empty?
+    end
+
+    private #################### PRIVATE METHODS DOWN BELOW ######################
+    
+    def incorporate_errors_from(errors)
+      errors.each { |key, value| self.errors.add(key, value) }
+    end
+
+  end
+end

data/lib/object_attorney/nested_objects.rb

@@ -110,6 +110,12 @@ module ObjectAttorney
 
         nested_instance_variable = reflection.has_many? ? get_existing_and_new_nested_objects(nested_object_name) : get_existing_or_new_nested_object(nested_object_name)
 
+        [*nested_instance_variable].each do |nested_object|
+          nested_object.extend(ImportedErrors)
+
+          # nested_object.singleton_class.validate(:validate_imported_errors)
+        end
+
         self.instance_variable_set("@#{nested_object_name}", nested_instance_variable)
       end
 
@@ -168,7 +174,6 @@ module ObjectAttorney
     def build_nested_object(nested_object_name, attributes = {})
       reflection = self.class.reflect_on_association(nested_object_name)
       
-      
       if can_represented_object_build_nested?(reflection, nested_object_name)
         new_nested_object = build_from_represented_object(reflection, nested_object_name)
 
@@ -187,6 +192,7 @@ module ObjectAttorney
 
       if reflection.klass == real_reflection_class
         new_nested_object.assign_attributes(attributes)
+        new_nested_object
       else
         reflection.klass.respond_to?(:represents) ? reflection.klass.new(attributes, new_nested_object) : reflection.klass.new(attributes)
       end

data/lib/object_attorney/orm.rb

@@ -43,15 +43,21 @@ module ObjectAttorney
       end
     end
 
-    def clear_imported_errors
-      @imported_errors = {}
-    end
+    def clear_nested_imported_errors
+      nested_objects.each do |reflection, nested_object|
+        nested_object.clear_imported_errors
 
-    def populate_imported_errors
-      represented_object.errors.each { |key, value| @imported_errors[key] = value } if represented_object.present?
+        nested_object.clear_nested_imported_errors if nested_object.respond_to?(:clear_nested_imported_errors)
+      end
+    end
 
-      nested_objects.map do |reflection, nested_object|
-        nested_object.clear_imported_errors_and_import_new if nested_object.respond_to?(:clear_imported_errors_and_import_new)
+    def populate_nested_imported_errors
+      nested_objects.each do |reflection, nested_object|
+        next if nested_object.marked_for_destruction?
+        
+        nested_object.populate_imported_errors
+        
+        nested_object.populate_nested_imported_errors if nested_object.respond_to?(:populate_nested_imported_errors)
       end
     end
 
@@ -59,12 +65,14 @@ module ObjectAttorney
 
     def save_or_!
       clear_imported_errors
-
-      before_save
+      
+      clear_imported_errors
+      clear_nested_imported_errors
       
       save_result = valid? ? yield : false
       
       populate_imported_errors
+      populate_nested_imported_errors
 
       after_save if valid? && save_result
 

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/lib/object_attorney.rb

@@ -1,6 +1,7 @@
 require "object_attorney/version"
 require "object_attorney/helpers"
 require "object_attorney/reflection"
+require "object_attorney/imported_errors"
 require "object_attorney/nested_objects"
 require "object_attorney/orm"
 require 'active_record'
@@ -62,18 +63,6 @@ module ObjectAttorney
     valid
   end
 
-  def validate_imported_errors
-    imported_errors = (@imported_errors || {})
-    
-    incorporate_errors_from imported_errors
-
-    imported_errors.empty?
-  end
-
-  def incorporate_errors_from(errors)
-    errors.each { |key, value| self.errors.add(key, value) }
-  end
-
   def represented_object
     @represented_object ||= self.class.represented_object_class.try(:new)
   end
@@ -85,6 +74,7 @@ module ObjectAttorney
       include ActiveModel::Validations
       include ActiveModel::Validations::Callbacks
       include ActiveModel::Conversion
+      include ObjectAttorney::ImportedErrors
       include ObjectAttorney::NestedObjects
       include ObjectAttorney::ORM
 

data/spec/object_attorney/post_form_spec.rb

@@ -17,7 +17,8 @@ shared_examples "a PostForm" do
     post_form = described_class.new(params[:post])
 
     post_form.save.should == true
-    
+    post_form.comments.length.should == 2
+
     Post.all.count.should == 1
     post = Post.first
     post.title.should == 'First post'
@@ -47,7 +48,9 @@ shared_examples "a PostForm" do
     Comment.first.body.should == 'body1'
 
     post_form = described_class.new(params[:post], Post.find(params[:id]))
-    post_form.save
+    
+    post_form.save.should == true
+    post_form.comments.length.should == 1
     
     post = Post.first
     post.title.should == 'altered post'
@@ -74,7 +77,9 @@ shared_examples "a PostForm" do
     Comment.all.count.should == 1
 
     post_form = described_class.new(params[:post], Post.find(params[:id]))
-    post_form.save
+
+    post_form.save.should == true
+    post_form.comments.length.should == 1
     
     Post.first.title.should == 'altered post'
     Comment.all.count.should == 0
@@ -100,7 +105,9 @@ shared_examples "a PostForm" do
     Comment.all.count.should == 2
 
     post_form = described_class.new(params[:post], Post.find(params[:id]))
-    post_form.save
+
+    post_form.save.should == true
+    post_form.comments.length.should == 3
     
     post = Post.first
     post.title.should == 'altered post'

data/spec/object_attorney/post_validations_form_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+
+describe PostValidationsForm do
+
+  it "asd", current: true do
+    post1 = Post.new
+    post1.valid?.should == true
+    
+    post1.singleton_class.validates_presence_of :title
+    # binding.pry
+    post1.valid?.should == false
+
+    post2 = Post.new
+    post2.valid?.should == true
+  end
+
+  it "1. 'PostValidationsForm' becomes invalid if 'Post' has errors after the #submit method and incorporates its errors." do
+    params = {
+      post: {
+        title: 'First post',
+        body: 'post body',
+        comments_attributes: {
+          "0" => { body: "body1" }
+        }
+      }
+    }
+
+    post_form = PostValidationsForm.new(params[:post])
+    post_form.valid?.should == true
+    
+    post_form.save
+    
+    post_form.should have(1).error_on(:title)
+    post_form.errors.size.should == 2
+    post_form.comments.first.should have(1).error_on(:body)
+
+    post_form.valid?.should == false
+    post_form.should have(1).error_on(:title)
+    post_form.errors.size.should == 2
+    post_form.comments.first.should have(1).error_on(:body)
+
+    post_form.save
+
+    post_form.should have(1).error_on(:title)
+    post_form.errors.size.should == 2
+    post_form.comments.first.should have(1).error_on(:body)
+
+    post_form.valid?.should == false
+    post_form.should have(1).error_on(:title)
+    post_form.errors.size.should == 2
+    post_form.comments.first.should have(1).error_on(:body)
+  end
+
+end

data/spec/object_attorney/post_with_comment_validations_form_spec.rb

@@ -0,0 +1,42 @@
+require "spec_helper"
+
+describe PostWithCommentValidationsForm do
+
+  it "1. 'PostWithCommentValidationsForm' becomes invalid if 'Post' or nested 'Comment's has errors after the #submit method and incorporates its errors." do
+    params = {
+      post: {
+        title: 'First post',
+        body: 'post body',
+        comments_attributes: {
+          "0" => { body: "body1" }
+        }
+      }
+    }
+
+    post_form = PostWithCommentValidationsForm.new(params[:post])
+    post_form.valid?.should == true
+    
+    post_form.save
+    
+    post_form.should have(1).error_on(:title)
+    post_form.errors.size.should == 2
+    post_form.comments.first.should have(1).error_on(:body)
+
+    post_form.valid?.should == false
+    post_form.should have(1).error_on(:title)
+    post_form.errors.size.should == 2
+    post_form.comments.first.should have(1).error_on(:body)
+
+    post_form.save
+
+    post_form.should have(1).error_on(:title)
+    post_form.errors.size.should == 2
+    post_form.comments.first.should have(1).error_on(:body)
+
+    post_form.valid?.should == false
+    post_form.should have(1).error_on(:title)
+    post_form.errors.size.should == 2
+    post_form.comments.first.should have(1).error_on(:body)
+  end
+
+end

data/spec/object_attorney/post_with_comments_and_address_form_spec.rb

@@ -21,6 +21,7 @@ describe PostWithCommentsAndAddressForm do
     post_form = described_class.new(params[:post])
 
     post_form.save.should == true
+    post_form.address.present?.should == true
     
     Post.all.count.should == 1
     post = Post.first

data/spec/spec_helper.rb

@@ -18,15 +18,16 @@ require 'support/models/post'
 require 'support/models/user'
 
 require 'support/form_objects/post_form'
+require 'support/form_objects/post_validations_form'
 require 'support/form_objects/comment_form'
 require 'support/form_objects/post_with_comment_form'
+require 'support/form_objects/post_with_comment_validations_form'
 require 'support/form_objects/post_with_comments_and_address_form'
 require 'support/form_objects/bulk_posts_form'
 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_validations_form'
 
 RSpec.configure do |config|
   #config.treat_symbols_as_metadata_keys_with_true_values = true

data/spec/support/form_objects/post_validations_form.rb

@@ -0,0 +1,17 @@
+class PostValidationsForm
+
+  include ObjectAttorney
+
+  represents :post, properties: [:title, :body]
+
+  has_many :comments
+
+  validates_presence_of :title
+
+  def submit
+    post.errors.add(:title, :blank)
+    post.comments.first.errors.add(:body, :blank)
+    false
+  end
+  
+end

data/spec/support/form_objects/post_with_comment_validations_form.rb

@@ -0,0 +1,17 @@
+class PostWithCommentValidationsForm
+
+  include ObjectAttorney
+
+  represents :post, properties: [:title, :body]
+
+  has_many :comments, class_name: CommentForm
+
+  validates_presence_of :title
+
+  def submit
+    post.errors.add(:title, :blank)
+    post.comments.first.errors.add(:body, :blank)
+    false
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - João Gonçalves
@@ -75,6 +75,7 @@ files:
 - lib/object_attorney.rb
 - lib/object_attorney/association_reflection.rb
 - lib/object_attorney/helpers.rb
+- lib/object_attorney/imported_errors.rb
 - lib/object_attorney/nested_objects.rb
 - lib/object_attorney/nested_uniqueness_validator.rb
 - lib/object_attorney/orm.rb
@@ -87,10 +88,11 @@ files:
 - spec/object_attorney/bulk_posts_allow_only_new_form_spec.rb
 - spec/object_attorney/bulk_posts_with_form_objects_form_spec.rb
 - spec/object_attorney/post_form_spec.rb
+- spec/object_attorney/post_validations_form_spec.rb
 - spec/object_attorney/post_with_comment_form_spec.rb
+- 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_validations_form_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model/validations.rb
 - spec/support/database_setup.rb
@@ -100,10 +102,11 @@ files:
 - spec/support/form_objects/bulk_posts_with_form_objects_form.rb
 - spec/support/form_objects/comment_form.rb
 - spec/support/form_objects/post_form.rb
+- spec/support/form_objects/post_validations_form.rb
 - spec/support/form_objects/post_with_comment_form.rb
+- 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_validations_form.rb
 - spec/support/models/address.rb
 - spec/support/models/comment.rb
 - spec/support/models/post.rb
@@ -140,10 +143,11 @@ test_files:
 - spec/object_attorney/bulk_posts_allow_only_new_form_spec.rb
 - spec/object_attorney/bulk_posts_with_form_objects_form_spec.rb
 - spec/object_attorney/post_form_spec.rb
+- spec/object_attorney/post_validations_form_spec.rb
 - spec/object_attorney/post_with_comment_form_spec.rb
+- 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_validations_form_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model/validations.rb
 - spec/support/database_setup.rb
@@ -153,10 +157,11 @@ test_files:
 - spec/support/form_objects/bulk_posts_with_form_objects_form.rb
 - spec/support/form_objects/comment_form.rb
 - spec/support/form_objects/post_form.rb
+- spec/support/form_objects/post_validations_form.rb
 - spec/support/form_objects/post_with_comment_form.rb
+- 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_validations_form.rb
 - spec/support/models/address.rb
 - spec/support/models/comment.rb
 - spec/support/models/post.rb

data/spec/object_attorney/user_validations_form_spec.rb

@@ -1,30 +0,0 @@
-require "spec_helper"
-
-describe UserValidationsForm do
-
-  it "1. 'UserValidationsForm' becomes invalid if 'User' has errors after the #submit method and incorporates its errors.", current: true do
-    user = User.new(email: "email@gmail.com")
-    user.valid?.should == true
-
-    user_form = UserValidationsForm.new(email: "email@gmail.com", terms_of_service: true)
-    user_form.valid?.should == true
-    
-    user_form.save
-    user_form.should have(1).error_on(:email)
-    user_form.errors.size.should == 1
-
-    user_form.valid?.should == false
-    user_form.should have(1).error_on(:email)
-    user_form.errors.size.should == 1
-
-    user_form.save
-
-    user_form.should have(1).error_on(:email)
-    user_form.errors.size.should == 1
-
-    user_form.valid?.should == false
-    user_form.should have(1).error_on(:email)
-    user_form.errors.size.should == 1
-  end
-
-end

data/spec/support/form_objects/user_validations_form.rb

@@ -1,16 +0,0 @@
-class UserValidationsForm
-
-  include ObjectAttorney
-
-  represents :user, properties: [:email]
-
-  attr_accessor :terms_of_service
-
-  validates_acceptance_of :terms_of_service, accept: true, allow_nil: false
-
-  def submit
-    user.errors.add(:email, :blank)
-    false
-  end
-
-end