reactive-record 0.7.26 → 0.7.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c15527bb6caf4a10ea5a096502f28922b327ed1
-  data.tar.gz: 57eaf2bda747f35a7d73f6c6921686c5e2e62097
+  metadata.gz: d768497702030401fd48ec8d9149f4c74e20c725
+  data.tar.gz: 4fbf024a9ade1663b8b2b0106f982d39b5642c92
 SHA512:
-  metadata.gz: 53444409324a592f76f37a56c4164ee4f52f88df2b9912060a3e0d2807e0020d42a490650a2d9b45d2e4d12c727336bddb79e3a1c59c23d0d93dfdaf884f4a45
-  data.tar.gz: 68b8f20350a595919c8ef0ecae9a57b029512e27077467d0bf8b5f9bfd26a573ffda5a286c1f3a604fe6b5a303ba96c555341777b849ea24eb1e76f8685bc799
+  metadata.gz: cdd59f7cc5d7704559c48099fb91c81b6ce124ad8817be2bf8a8b755d272dab3a8f2514cb3e48ddcf99dcd9ccd26b7f097fe56595ea94912f99cc5f6b65292bb
+  data.tar.gz: e09150e494aadd60d997b79473bd9cc9377027b4ea585f5ed243c34cf69629dc22be59e53c0aa39fc5772baea063c74b66c47d79fe4660efb3b57e00d6dfc16e

data/lib/reactive_record/active_record/reactive_record/base.rb

@@ -189,16 +189,16 @@ module ReactiveRecord
             inverse_of = association.inverse_of
             inverse_association = association.klass.reflect_on_association(inverse_of)
             if inverse_association.collection?
-              if !value
-                attributes[attribute].attributes[inverse_of].delete(@ar_instance) if attributes[attribute]
+              if value.nil?
+                attributes[attribute].attributes[inverse_of].delete(@ar_instance) unless attributes[attribute].nil?
               elsif value.attributes[inverse_of]
                 value.attributes[inverse_of] << @ar_instance
               else
                 value.attributes[inverse_of] = Collection.new(@model, value, inverse_association)
                 value.attributes[inverse_of].replace [@ar_instance]
               end
-            elsif value
-              attributes[attribute].attributes[inverse_of] = nil if attributes[attribute]
+            elsif !value.nil?
+              attributes[attribute].attributes[inverse_of] = nil unless attributes[attribute].nil?
               value.attributes[inverse_of] = @ar_instance
               React::State.set_state(value.backing_record, inverse_of, @ar_instance) unless data_loading?
             elsif attributes[attribute]
@@ -260,15 +260,17 @@ module ReactiveRecord
       elsif !changed_attributes.include?(attribute)
         changed_attributes << attribute
       end
+      had_key = attributes.has_key? attribute
       current_value = attributes[attribute]
       attributes[attribute] = value if args.count != 0
       if !data_loading?
         React::State.set_state(self, attribute, value)
-      elsif on_opal_client? and current_value.loaded? and current_value != value  # this is to handle changes in already loaded server side methods
-        #after(0.001) { React::State.set_state(self, attribute, value) }
+      elsif on_opal_client? and had_key and current_value.loaded? and current_value != value and args.count > 0  # this is to handle changes in already loaded server side methods
+        puts "setting up delayed change for #{@ar_instance}.#{attribute} current: #{current_value} new: #{value}"
         React::State.set_state(self, attribute, value, true)
       end
       if empty_before != changed_attributes.empty?
+        puts "setting up delayed change on record" unless on_opal_server? or data_loading?
         React::State.set_state(self, "!CHANGED!", !changed_attributes.empty?, true) unless on_opal_server? or data_loading?
         aggregate_owner.update_attribute(aggregate_attribute) if aggregate_owner
       end

data/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb

@@ -277,7 +277,7 @@ module ReactiveRecord
             elsif record.changed?(attribute)
               output_attributes[attribute] = value
             end
-          end if record.changed? || (record == record_being_saved && force)
+          end if record.new? || record.changed? || (record == record_being_saved && force)
           record_index += 1
         end
         [models, associations, backing_records]
@@ -374,6 +374,7 @@ module ReactiveRecord
         vectors = {}
         new_models = []
         saved_models = []
+        dont_save_list = []
 
         models.each do |model_to_save|
           attributes = model_to_save[:attributes]
@@ -406,6 +407,7 @@ module ReactiveRecord
             end
           elsif record
             # either the model is new, or its not even an active record model
+            dont_save_list << record unless save
             keys = record.attributes.keys
             attributes.each do |key, value|
               if keys.include? key
@@ -423,54 +425,64 @@ module ReactiveRecord
         end
 
         puts "!!!!!!!!!!!!!!attributes updated"
+        ActiveRecord::Base.transaction do
+          associations.each do |association|
+            parent = reactive_records[association[:parent_id]]
+            next unless parent
+            #parent.instance_variable_set("@reactive_record_#{association[:attribute]}_changed", true) remove this????
+            if parent.class.reflect_on_aggregation(association[:attribute].to_sym)
+              puts ">>>>>>AGGREGATE>>>> #{parent.class.name}.send('#{association[:attribute]}=', #{reactive_records[association[:child_id]]})"
+              aggregate = reactive_records[association[:child_id]]
+              dont_save_list << aggregate
+              current_attributes = parent.send(association[:attribute]).attributes
+              puts "current parent attributes = #{current_attributes}"
+              new_attributes = aggregate.attributes
+              puts "current child attributes = #{new_attributes}"
+              merged_attributes = current_attributes.merge(new_attributes) { |k, current_attr, new_attr| aggregate.send("#{k}_changed?") ? new_attr : current_attr}
+              puts "merged attributes = #{merged_attributes}"
+              aggregate.assign_attributes(merged_attributes)
+              puts "aggregate attributes after merge = #{aggregate.attributes}"
+              parent.send("#{association[:attribute]}=", aggregate)
+              puts "updated  is frozen? #{aggregate.frozen?}, parent attributes = #{parent.send(association[:attribute]).attributes}"
+            elsif parent.class.reflect_on_association(association[:attribute].to_sym).nil?
+              raise "Missing association :#{association[:attribute]} for #{parent.class.name}.  Was association defined on opal side only?"
+            elsif parent.class.reflect_on_association(association[:attribute].to_sym).collection?
+              puts ">>>>>>>>>> #{parent.class.name}.send('#{association[:attribute]}') << #{reactive_records[association[:child_id]]})"
+              dont_save_list.delete(parent)
+              if false and parent.new?
+                parent.send("#{association[:attribute]}") << reactive_records[association[:child_id]] if parent.new?
+                puts "updated"
+              else
+                puts "skipped"
+              end
+            else
+              puts ">>>>ASSOCIATION>>>> #{parent.class.name}.send('#{association[:attribute]}=', #{reactive_records[association[:child_id]]})"
+              parent.send("#{association[:attribute]}=", reactive_records[association[:child_id]])
+              dont_save_list.delete(parent)
+              puts "updated"
+            end
+          end if associations
 
-        associations.each do |association|
-          parent = reactive_records[association[:parent_id]]
-          next unless parent
-          #parent.instance_variable_set("@reactive_record_#{association[:attribute]}_changed", true) remove this????
-          if parent.class.reflect_on_aggregation(association[:attribute].to_sym)
-            puts ">>>>>>AGGREGATE>>>> #{parent.class.name}.send('#{association[:attribute]}=', #{reactive_records[association[:child_id]]})"
-            aggregate = reactive_records[association[:child_id]]
-            current_attributes = parent.send(association[:attribute]).attributes
-            puts "current parent attributes = #{current_attributes}"
-            new_attributes = aggregate.attributes
-            puts "current child attributes = #{new_attributes}"
-            merged_attributes = current_attributes.merge(new_attributes) { |k, current_attr, new_attr| aggregate.send("#{k}_changed?") ? new_attr : current_attr}
-            puts "merged attributes = #{merged_attributes}"
-            aggregate.assign_attributes(merged_attributes)
-            puts "aggregate attributes after merge = #{aggregate.attributes}"
-            parent.send("#{association[:attribute]}=", aggregate)
-            puts "updated  is frozen? #{aggregate.frozen?}, parent attributes = #{parent.send(association[:attribute]).attributes}"
-          elsif parent.class.reflect_on_association(association[:attribute].to_sym).nil?
-            raise "Missing association :#{association[:attribute]} for #{parent.class.name}.  Was association defined on opal side only?"
-          elsif parent.class.reflect_on_association(association[:attribute].to_sym).collection?
-            puts ">>>>>>>>>> #{parent.class.name}.send('#{association[:attribute]}') << #{reactive_records[association[:child_id]]})"
-            puts "Skipped (should be done by belongs to)"
-          else
-            puts ">>>>ASSOCIATION>>>> #{parent.class.name}.send('#{association[:attribute]}=', #{reactive_records[association[:child_id]]})"
-            parent.send("#{association[:attribute]}=", reactive_records[association[:child_id]])
-            puts "updated"
-          end
-        end if associations
-
-        puts "!!!!!!!!!!!!associations updated"
+          puts "!!!!!!!!!!!!associations updated"
 
-        if save
+          #if true or save
 
-          ActiveRecord::Base.transaction do
+  #        ActiveRecord::Base.transaction do
 
             has_errors = false
 
+            puts "ready to start saving... dont_save_list = #{dont_save_list}"
+
             saved_models = reactive_records.collect do |reactive_record_id, model|
               puts "saving rr_id: #{reactive_record_id} model.object_id: #{model.object_id} frozen? <#{model.frozen?}>"
-              if model.frozen?
+              if model and (model.frozen? or dont_save_list.include?(model))
                 puts "validating frozen model #{model.class.name} #{model} (reactive_record_id = #{reactive_record_id})"
                 valid = model.valid?
                 puts "has_errors before = #{has_errors}, validate= #{validate}, !valid= #{!valid}  (validate and !valid) #{validate and !valid}"
                 has_errors ||= (validate and !valid)
                 puts "validation complete errors = <#{!valid}>, #{model.errors.messages} has_errors #{has_errors}"
                 [reactive_record_id, model.class.name, model.attributes,  (valid ? nil : model.errors.messages)]
-              elsif !model.id or model.changed?
+              elsif model and (!model.id or model.changed?)
                 puts "saving #{model.class.name} #{model} (reactive_record_id = #{reactive_record_id})"
                 saved = model.check_permission_with_acting_user(acting_user, new_models.include?(model) ? :create_permitted? : :update_permitted?).save(validate: validate)
                 has_errors ||= !saved
@@ -482,16 +494,19 @@ module ReactiveRecord
 
             raise "Could not save all models" if has_errors
 
-          end
+#          end
+          if save
 
-          {success: true, saved_models: saved_models }
+            {success: true, saved_models: saved_models }
 
-        else
+          else
 
-          vectors
+            vectors.each { |vector, model| model.reload unless model.nil? or model.new_record? }
+            vectors
 
-        end
+          end
 
+        end
 
       rescue Exception => e
         puts "exception #{e}"

data/lib/reactive_record/active_record/reactive_record/while_loading.rb

@@ -115,7 +115,9 @@ module ReactiveRecord
         end
 
         def loaded_at(loaded_at)
+          puts "loaded_at started"
           React::State.set_state(self, :loaded_at, loaded_at)
+          puts "loaded_at done"
           @is_loading = false
         end
 

data/lib/reactive_record/server_data_cache.rb

@@ -106,9 +106,14 @@ module ReactiveRecord
         end
 
         def self.[](models, associations, vectors, acting_user)
-          cache = new(acting_user, ReactiveRecord::Base.save_records(models, associations, acting_user, false, false))
-          vectors.each { |vector| cache[*vector] }
-          cache.as_json
+          result = nil
+          ActiveRecord::Base.transaction do
+            cache = new(acting_user, ReactiveRecord::Base.save_records(models, associations, acting_user, false, false))
+            vectors.each { |vector| cache[*vector] }
+            result = cache.as_json
+            raise ActiveRecord::Rollback
+          end
+          result
         end
 
         def clear_requests
@@ -182,7 +187,7 @@ module ReactiveRecord
                     self
                   end
                 rescue Exception => e
-                  #binding.pry if cache_item.value and cache_item.value != []
+                  binding.pry if cache_item.value and cache_item.value != []
                   raise "ReactiveRecord exception caught when applying #{method} to db objects #{e}" if cache_item.value and cache_item.value != []
                   representative
                 end
@@ -253,7 +258,7 @@ module ReactiveRecord
                 end
               elsif @ar_object.class < ActiveRecord::Base and children.is_a? Hash
                 @parent.as_hash({jsonize(method) => children.merge({
-                  :id => [@ar_object.id],
+                  :id => (method.is_a?(Array) && method.first == "new") ? [nil] : [@ar_object.id],
                   @ar_object.class.inheritance_column => [@ar_object[@ar_object.class.inheritance_column]],
                   })})
               elsif method == "*all"
@@ -323,6 +328,9 @@ module ReactiveRecord
           load_from_json(value, new_target) if new_target
         end
         #target.save if target.respond_to? :save
+rescue Exception => e
+  `debugger`
+  nil
       end
 
 

data/lib/reactive_record/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRecord
-  VERSION = "0.7.26"
+  VERSION = "0.7.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-record
 version: !ruby/object:Gem::Version
-  version: 0.7.26
+  version: 0.7.27
 platform: ruby
 authors:
 - Mitch VanDuyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails