object_attorney 2.2.13 → 2.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzdiMGM1YTg2ZmUyMDg4MzViMWJlYzE3ZDE5OGY4MTliZTY0N2Y0ZA==
+    ZjViM2Y4OGE1ODBmYjU1ODZlMzI2Y2UxNTVkOTg3MWQ1NmI1YzMxMQ==
   data.tar.gz: !binary |-
-    NjU2Mjc5NjU4Y2VjOTM3YTEwMTA3MzgzYjQwNTY0YjNkOTRkOWM0Ng==
+    ZWU0OWJhYTViMGQwNjkxNzlhYWM3NjQ5MzY2NjUxYjczY2RjMDlmMw==
 SHA512:
   metadata.gz: !binary |-
-    ZmNjOGRjNDRkMWMxMDlhMDM0ZmUzOTFhMDVlYTEwNzZjNDNiZTMwMWYwNDMz
-    NDQ3MjAzNDFjMTFkYjk1ZGFjMmM3YmI0MTYyOGZlNDA5ODE2ODhlMzJjZTll
-    M2IzNzMwYThhNzg2MTJkNjBhMjRiYzE2NWVjNDRiNjZhYWJhNjE=
+    ZDIyNjczOTM4MjZlMTVmZDEyZDUyNGViOTEyOWNlMDU5YTE1MjdkMGZmNDkw
+    MmM1OTZkN2YxMTY1YjQ3MzNhNDFkYjM1ZmIzYWMxZTg0Yjk3ODlhMjU5YTk4
+    NmI4N2Y1NDVkMjZjMWVhOWM1MGQ2ZjIzOWU5OGM4YjQ2YzA5YTk=
   data.tar.gz: !binary |-
-    ZjcwYTFmNDg5NTU0YWVkZTIxMzJiYmUzYTJiNTA2YzdhMTU2MjI3YzgyMTJl
-    YWU3ZDBlYTRkMGFhYzVhZTE4NmZkZTdkN2UwNjE5YjI3ZmUxZTMyMWQwZGZi
-    M2E2MWMxN2Y3ZjkxNjM2NDNiYWVhMjU1OGVjMWVlNzk4NTI0NzQ=
+    ZTZmN2NlNTllY2JhYzdmY2VhZGE4ZjZjZWM5ODVkNDhjYTdjNTcyOThmZWIw
+    MDU4OGRkMGU1MjY2MzlhMzFhNzMzMzg5NTUwZDA5MzZhMTQwOGQxMzg0ODRk
+    ZjhjNWRmYWIwYWUxOTc3Y2E1MjgyNjdhZTE3NmUyYWQ5YjYxZTk=

data/lib/object_attorney/nested_objects.rb

@@ -204,7 +204,6 @@ module ObjectAttorney
       if represented_object.respond_to?(build_method)
         represented_object.send(build_method)
       else
-        binding.pry
         represented_object.send(nested_object_name).build
       end
     end

data/lib/object_attorney/orm.rb

@@ -14,14 +14,19 @@ module ObjectAttorney
     end
 
     def save
-      save!(:save)
+      save_or_! { submit }
     end
 
     def save!(save_method = :save!)
-      before_save
-      save_result = valid? ? submit(save_method) : false
-      after_save if valid? && save_result
-      save_result
+      save_or_! { submit! }
+    end
+
+    def submit
+      submit_or_!(:save)
+    end
+
+    def submit!
+      submit_or_!(:save!)
     end
 
     def destroy
@@ -38,14 +43,40 @@ module ObjectAttorney
       end
     end
 
+    def clear_imported_errors
+      @imported_errors = {}
+    end
+
+    def populate_imported_errors
+      represented_object.errors.each { |key, value| @imported_errors[key] = value } if represented_object.present?
+
+      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)
+      end
+    end
+
     protected #################### PROTECTED METHODS DOWN BELOW ######################
 
+    def save_or_!
+      clear_imported_errors
+
+      before_save
+      
+      save_result = valid? ? yield : false
+      
+      populate_imported_errors
+
+      after_save if valid? && save_result
+
+      save_result
+    end
+
     def before_save; end
     def after_save; end
 
-    def submit(save_method)
+    def submit_or_!(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
+      save_result = save_or_destroy_represented_object(save_method)
       save_result = save_or_destroy_nested_objects(save_method, :has_many) if save_result
       save_result = save_or_destroy_nested_objects(save_method, :has_one) if save_result
       save_result

data/lib/object_attorney/orm_handlers/smooth_operator.rb

@@ -4,14 +4,19 @@ module ObjectAttorney
     module SmoothOperator
 
       def save(options = {})
-        save!(options, :save)
+        save_or_! { submit(options) }
       end
 
-      def save!(options = {}, save_method = :save!)
-        before_save
-        save_result = valid? ? submit(save_method, options) : false
-        after_save if valid? && save_result
-        save_result
+      def save!(options = {})
+        save_or_! { submit!(options) }
+      end
+
+      def submit(options = {})
+        submit_or_!(:save, options)
+      end
+
+      def submit!(options = {})
+        submit_or_!(:save!, options)
       end
 
       def destroy(options = {})
@@ -30,7 +35,7 @@ module ObjectAttorney
 
       protected #################### PROTECTED METHODS DOWN BELOW ######################
 
-      def submit(save_method, options = {})
+      def submit_or_!(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
         save_result = save_or_destroy_nested_objects(save_method, :has_many, options) if save_result

data/lib/object_attorney/version.rb

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

data/lib/object_attorney.rb

@@ -56,12 +56,22 @@ module ObjectAttorney
 
   def validate_represented_object
     valid = override_validations? ? true : Helpers.try_or_return(represented_object, :valid?, true)
-    import_represented_object_errors unless valid
+    
+    incorporate_errors_from(represented_object.errors) unless valid
+
     valid
   end
 
-  def import_represented_object_errors
-    represented_object.errors.each { |key, value| self.errors.add(key, value) }
+  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
@@ -79,9 +89,10 @@ module ObjectAttorney
       include ObjectAttorney::ORM
 
       validate :validate_represented_object
+      validate :validate_imported_errors
 
-      def valid?
-        override_validations? ? true : super
+      def valid?(context = nil)
+        override_validations? ? true : super(context)
       end
     end
 

data/spec/object_attorney/user_validations_form_spec.rb

@@ -0,0 +1,30 @@
+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/spec_helper.rb

@@ -26,6 +26,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_validations_form'
 
 RSpec.configure do |config|
   #config.treat_symbols_as_metadata_keys_with_true_values = true

data/spec/support/form_objects/user_validations_form.rb

@@ -0,0 +1,16 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.2.13
+  version: 2.4.0
 platform: ruby
 authors:
 - João Gonçalves
@@ -90,6 +90,7 @@ files:
 - spec/object_attorney/post_with_comment_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
@@ -102,6 +103,7 @@ files:
 - spec/support/form_objects/post_with_comment_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
@@ -141,6 +143,7 @@ test_files:
 - spec/object_attorney/post_with_comment_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,8 +156,8 @@ test_files:
 - spec/support/form_objects/post_with_comment_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
 - spec/support/models/user.rb
-has_rdoc: