continuing to work correct solution to #173

Author: catmando

ruby/hyper-model/lib/reactive_record/active_record/reactive_record/base.rb

@@ -310,7 +310,8 @@ def saving!
       @saving = true
     end
 
-    def errors!(hash)
+    def errors!(hash, saving)
+      @errors_at_last_sync = hash if saving
       notify_waiting_for_save
       errors.clear && return unless hash
       hash.each do |attribute, messages|
@@ -320,6 +321,11 @@ def errors!(hash)
       end
     end
 
+    def revert_errors!
+      puts "#{inspect}.revert_errors!  @errors_at_last_sync: #{@errors_at_last_sync}"
+      errors!(@errors_at_last_sync)
+    end
+
     def saved!(save_only = nil) # sets saving to false AND notifies
       notify_waiting_for_save
       return self if save_only

ruby/hyper-model/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb

@@ -264,8 +264,17 @@ def save_or_validate(save, validate, force, &block)
           HyperMesh.load do
             ReactiveRecord.loads_pending! unless self.class.pending_fetches.empty?
           end.then { send_save_to_server(save, validate, force, &block) }
-          #save_to_server(validate, force, &block)
         else
+          if validate
+            # Handles the case where a model is valid, then some attribute is
+            # updated, and model.validate is called updating the error data.
+            # Now lets say the attribute changes back to the last synced value.  In
+            # this case we need to revert the error records.
+            models, _, backing_records = self.class.gather_records([self], true, self)
+            models.each do |item|
+              backing_records[item[:id]].revert_errors!
+            end
+          end
           promise = Promise.new
           yield true, nil, [] if block
           promise.resolve({success: true})
@@ -302,7 +311,7 @@ def send_save_to_server(save, validate, force, &block)
 
               response[:saved_models].each do | item |
                 backing_records[item[0]].sync_unscoped_collection! if save
-                backing_records[item[0]].errors! item[3]
+                backing_records[item[0]].errors! item[3], save
               end
 
               yield response[:success], response[:message], response[:models]  if block

ruby/hyper-model/lib/reactive_record/active_record/reactive_record/setters.rb

@@ -120,9 +120,8 @@ def change_status_and_notify_helper(attr, changed)
       # || data_loading? added so that model.new can be wrapped in a ReactiveRecord.load_data
       if !changed || data_loading?
         changed_attributes.delete(attr)
-      else
-        changed_attributes << attr if !changed_attributes.include?(attr)
-        synced_attributes.delete(attr)
+      elsif !changed_attributes.include?(attr)
+        changed_attributes << attr
       end
       yield @attributes.key?(attr), @attributes[attr]
       return unless empty_before != changed_attributes.empty?