has_many_through and poly specs all passing

Author: catmando

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

@@ -193,7 +193,7 @@ def remove_member(member, owner)
 
       def add_member(member, owner)
         owner.attributes[attribute] ||= ReactiveRecord::Collection.new(owner_class, owner, self)
-        owner.attributes[attribute] << member
+        owner.attributes[attribute]._internal_push member
       end
     end
   end

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

@@ -253,7 +253,7 @@ def sync_unscoped_collection!
         return if @create_sync
         @create_sync = true
       end
-      model.unscoped << ar_instance
+      model.unscoped._internal_push ar_instance
       @synced_with_unscoped = !@synced_with_unscoped
     end
 

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

@@ -77,6 +77,8 @@ def [](index)
         (@collection.length..index).each do |i|
           new_dummy_record = ReactiveRecord::Base.new_from_vector(@target_klass, nil, *@vector, "*#{i}")
           new_dummy_record.attributes[@association.inverse_of] = @owner if @association && !@association.through_association?
+          # HMT-TODO: the above needs to be looked into... if we are a hmt then don't we need to create a dummy on the joins collection as well?
+          # or maybe this just does not work for HMT?
           @collection << new_dummy_record
         end
       end
@@ -212,7 +214,7 @@ def related_records_for(record)
       return [] unless attrs[@association.inverse_of] == @owner
       if !@association.through_association
         [record]
-      elsif (source = attrs[@association.source])
+      elsif (source = attrs[@association.source]) && source.is_a?(@target_klass)
         [source]
       else
         []
@@ -233,7 +235,8 @@ def live_scopes
     end
 
     def in_this_collection(related_records)
-      return related_records unless @association
+      # HMT-TODO: I don't think we can get a set of related records here with a through association unless they are part of the collection
+      return related_records if !@association || @association.through_association?
       related_records.select do |r|
         r.backing_record.attributes[@association.inverse_of] == @owner
       end
@@ -406,7 +409,11 @@ def push_and_update_belongs_to(id)
     def set_belongs_to(child)
       if @owner
         # TODO this is major broken...current
-        child.send("#{@association.inverse_of}=", @owner) if @association && !@association.through_association
+        if (through_association = @association.through_association)
+          # HMT-TODO: create a new record with owner and child
+        else
+          child.send("#{@association.inverse_of}=", @owner) if @association && !@association.through_association
+        end
       elsif @parent
         @parent.set_belongs_to(child)
       end
@@ -421,7 +428,10 @@ def set_belongs_to(child)
 
     def update_child(item)
       backing_record = item.backing_record
-      if backing_record && @owner && @association && item.attributes[@association.inverse_of] != @owner #&& [email protected]_association?
+      # HMT TODO:  The following && !association.through_association was commented out, causing wrong class items to be added to
+      # associations
+      # Why was it commented out.
+      if backing_record && @owner && @association && item.attributes[@association.inverse_of] != @owner && !@association.through_association?
         inverse_of = @association.inverse_of
         current_association_value = item.attributes[inverse_of]
         backing_record.virgin = false unless backing_record.data_loading?
@@ -440,6 +450,17 @@ def update_child(item)
     end
 
     def push(item)
+      if (through_association = @association&.through_association)
+        through_association.klass.create(@association.inverse_of => @owner, @association.source => item)
+        self
+      else
+        _internal_push(item)
+      end
+    end
+
+    alias << push
+
+    def _internal_push(item)
       item.itself # force get of at least the id
       if collection
         self.force_push item
@@ -455,8 +476,6 @@ def push(item)
       self
     end
 
-    alias << push
-
     def sort!(*args, &block)
       replace(sort(*args, &block))
     end
@@ -529,20 +548,20 @@ def internal_replace(new_array)
       if new_array.is_a? Collection
         @dummy_collection = new_array.dummy_collection
         @dummy_record = new_array.dummy_record
-        new_array.collection.each { |item| self << item } if new_array.collection
+        new_array.collection.each { |item| _internal_push item } if new_array.collection
       else
         @dummy_collection = @dummy_record = nil
-        new_array.each { |item| self << item }
+        new_array.each { |item| _internal_push item }
       end
       notify_of_change new_array
     end
 
     def delete(item)
       unsaved_children.delete(item)
       notify_of_change(
-        if @owner && @association && !@association.through_association?
+        if @owner && @association
           inverse_of = @association.inverse_of
-          if (backing_record = item.backing_record) && item.attributes[inverse_of] == @owner
+          if (backing_record = item.backing_record) && item.attributes[inverse_of] == @owner && !@association.through_association?
             # the if prevents double update if delete is being called from << (see << above)
             backing_record.update_belongs_to(inverse_of, nil)
           end

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

@@ -123,6 +123,11 @@ def find_association(association, id, klass)
       inverse_of = association.inverse_of(instance)
       instance_backing_record_attributes = instance.attributes
       inverse_association = association.klass.reflect_on_association(inverse_of)
+      # HMT-TODO: don't we need to do something with the through association case.
+      # perhaps we never hit this point...
+      if association.through_association?
+        IsomorphicHelpers.log "*********** called #{ar_instance}.find_association(#{association.attribute}) which is has many through!!!!!!!", :error
+      end
       if inverse_association.collection?
         instance_backing_record_attributes[inverse_of] = if id and id != ""
           Collection.new(@model, instance, inverse_association, association.klass, ["find", id], inverse_of)

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

@@ -29,7 +29,6 @@ def set_non_ar_aggregate(aggregation, raw_value)
     end
 
     def set_has_many(assoc, raw_value)
-      puts "********* set_has_many called **********"
       set_common(assoc.attribute, raw_value) do |value, attr|
         # create a new collection to hold value, shove it in, and return the new collection
         # the replace method will take care of updating the inverse belongs_to links as
@@ -54,12 +53,9 @@ def set_belongs_to(assoc, raw_value)
     end
 
     def set_belongs_to_via_has_many(orig, value)
-      puts "set_belongs_to_via_has_many(#{orig.inspect}, #{value.inspect})"
       assoc = orig.inverse
       attr = assoc.attribute
       current_value = @attributes[attr]
-      puts "set_belongs_to_via_has_many(#{orig.attribute}, #{attr}, #{current_value.inspect}, #{value.inspect})"
-
       update_has_many_through_associations assoc, orig, current_value, :remove_member
       update_has_many_through_associations assoc, orig, value, :add_member
       remove_current_inverse_attribute     assoc, orig, current_value
@@ -179,7 +175,7 @@ def add_new_inverse_attribute(association, orig, model)
 
     def push_onto_collection(model, association, ar_instance)
       @attributes[association.attribute] ||= Collection.new(model, @ar_instance, association)
-      @attributes[association.attribute] << ar_instance
+      @attributes[association.attribute]._internal_push ar_instance
     end
 
     # class Membership < ActiveRecord::Base

ruby/hyper-model/lib/reactive_record/server_data_cache.rb

@@ -492,9 +492,7 @@ def self.load_from_json(tree, target = nil)
             # not sure if its necessary to check the id above... is it possible to for the method to be an association but not have an id?
             klass = value[:model_name] ? Object.const_get(value[:model_name].first) : association.klass
             new_target = ReactiveRecord::Base.find_by_id(klass, value[:id].first)
-            puts "got a new_target #{new_target.inspect}"
             target.send "#{method}=", new_target
-            puts "and that worked!"
           elsif !(target.class < ActiveRecord::Base)
             new_target = target.send(*method)
             # value is an array if scope returns nil, so we destroy the bogus record

ruby/hyper-model/spec/batch7/poly_assoc_spec.rb

@@ -92,6 +92,8 @@ def self.build_tables
         has_one :picture, as: :imageable
       end
 
+      class ReactiveRecord::Collection
+      end if RUBY_ENGINE == 'opal'
 
       class Membership < ActiveRecord::Base
         def self.build_tables
@@ -150,8 +152,6 @@ def self.build_tables
         has_many :groups,   through: :memberships, source: :memerable, source_type: 'Group'
         has_many :projects, through: :memberships, source: :memerable, source_type: 'Project'
       end
-
-
     end
 
     [Picture, Employee, Product, Membership, Project, Group, Uzer].each { |klass| klass.build_tables }
@@ -180,10 +180,8 @@ def compare_to_server(model, expression, expected_result, load=true)
       @picture21 =  Picture.create(name:  'picture21',  imageable:   @imageable2)
       @picture22 =  Picture.create(name:  'picture22',  imageable:   @imageable2)
       @imageable3 = Product.create(name:  'imageable3', description: 'product2 description')
-
     end
 
-
     it 'read belongs_to' do
       compare_to_server @picture11, 'imageable.name',        'imageable1'
       compare_to_server @picture11, 'imageable.ss',          '123'
@@ -278,48 +276,52 @@ def compare_to_server(model, expression, expected_result, load=true)
       @project1 = Project.create(name: 'project1', project_data: 'project data1')
       @project2 = Project.create(name: 'project2', project_data: 'project data2')
       @project3 = Project.create(name: 'project3', project_data: 'project data3')
+      # client scopes have the be 'live' on the display to be automatically updated
+      # so we have this handy component to keep the @group1.uzers scope live.
+      mount 'Testing123' do
+        class Testing123 < HyperComponent
+          render(UL) do
+            Group.find(1).uzers.each { |uzer| LI { uzer.id.to_s }}
+          end
+        end
+      end
     end
 
     it 'loads previously defined data client side' do
       @uzer1.groups << @group1
-      compare_to_server @group1, 'uzers.collect(&:id)', [@uzer1.id]
+      wait_for_ajax
+      compare_to_server @group1, 'uzers.collect(&:id)', [@uzer1.id], false
     end
 
     it 'creates due to a broadcast client side' do
-      compare_to_server @group1, 'uzers.collect(&:id)', [] # client side
-      @uzer1.groups << @group1 # server side
-      compare_to_server @group1, 'uzers.collect(&:id)', [@uzer1.id], false # client side
+      @uzer1.groups << @group1
+      compare_to_server @group1, 'uzers.collect(&:id)', [@uzer1.id], false
     end
 
     it 'destroys due to a broadcast client side' do
       @uzer1.groups << @group1 # server side
-      compare_to_server @group1, 'uzers.collect(&:id)', [@uzer1.id] # client
+      compare_to_server @group1, 'uzers.collect(&:id)', [@uzer1.id], false # client
       Membership.find_by(uzer: @uzer1, memerable: @group1).destroy # server side
-      compare_to_server @group1, 'uzers.count', 0  # client side
+      compare_to_server @group1, 'uzers.count', 0, false  # client side
     end
 
     it 'updates the server when new entries are made on the client' do
-      # Not Working!
-      evaluate_promise do
-        uzer = Uzer.find(1)
-        group = Group.find(1)
-        project = Membership.new(uzer: uzer, memerable: group)
-        #uzer.groups << group # client side
-        #group.save # needed for client side semantics
-        project.save
+      evaluate_ruby do
+        Uzer.find(1).groups << Group.find(1) # client side
       end
-      #binding.pry
+      wait_for_ajax
       @group1.reload
-      compare_to_server @group1, 'uzers.collect(&:id)', [@uzer1.id] # server side
+      compare_to_server @group1, 'uzers.collect(&:id)', [@uzer1.id], false # server side
     end
 
     it 'updates the server when entries are deleted on the client' do
-      # Not converted to client side execution
       @uzer1.groups << @group1 # server side
-      Membership.find_by(uzer: @uzer1, memerable: @group1).destroy # client side
-      expect(@group1.uzers.count).to eq(0)  # server side
+      evaluate_promise do
+        Hyperstack::Model.load do
+          Membership.find_by(uzer_id: 1, memerable_id: 1, memerable_type: 'Group')
+        end.then(&:destroy)
+      end
+      compare_to_server @group1, 'uzers.count', 0, false
     end
-
   end
-
 end