wip refactored setters has_many_through update methods

Author: catmando

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

@@ -177,13 +177,25 @@ def find_inverse(model)  # private
       def klass(model = nil)
         @klass ||= Object.const_get(@klass_name) if @klass_name
         raise "model is not correct class" if @klass && model && model.class != @klass
+        debugger unless @klass || model
         raise "no model supplied for polymorphic relationship" unless @klass || model
         @klass || model.class
       end
 
       def collection?
         [:has_many].include? @macro
       end
+
+      def remove_member(member, owner)
+        collection = owner.attributes[attribute]
+        return if collection.nil?
+        collection.delete(member)
+      end
+
+      def add_member(member, owner)
+        owner.attributes[attribute] ||= Collection.new(owner_class, owner, assoc)
+        owner.attributes[attribute] << member
+      end
     end
   end
 end

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

@@ -44,9 +44,11 @@ def set_has_many(assoc, raw_value)
 
     def set_belongs_to(assoc, raw_value)
       set_common(assoc.attribute, raw_value) do |value, attr|
-        update_has_many_through_associations assoc, value
-        update_current_inverse_attribute     assoc, @attributes[assoc.attribute]
-        update_new_inverse_attribute         assoc, value
+        current_value = @attributes[assoc.attribute]
+        update_has_many_through_associations assoc, current_value, :remove_member
+        update_has_many_through_associations assoc, value, :add_member
+        remove_current_inverse_attribute     assoc, current_value
+        add_new_inverse_attribute            assoc, value
         update_belongs_to                    attr,  value.itself
       end
     end
@@ -134,7 +136,7 @@ def change_status_and_notify_helper(attr, changed)
     # change from has_one to has_many.  So we first deal with the current value, then
     # update the new value which uses the push_onto_collection helper
 
-    def update_current_inverse_attribute(association, model)
+    def remove_current_inverse_attribute(association, model)
       return if model.nil?
       inverse_association = association.inverse(model)
       if inverse_association.collection?
@@ -146,7 +148,7 @@ def update_current_inverse_attribute(association, model)
       end
     end
 
-    def update_new_inverse_attribute(association, model)
+    def add_new_inverse_attribute(association, model)
       return if model.nil?
       inverse_association = association.inverse(model)
       if inverse_association.collection?
@@ -191,36 +193,28 @@ def push_onto_collection(model, association, ar_instance)
     # and we have to then find any inverse has_many_through association (i.e. group or projects.uzers) and delete the
     # current value from those collections and push the new value on
 
-    def update_has_many_through_associations(assoc, value)
-      # note that through and source_associations returns an empty set of
-      # the provided ar_instance does not belong to a has_many_through association
+    def update_has_many_through_associations(assoc, value, method)
+      return if value.nil?
       assoc.through_associations(value).each do |ta|
         source_value = @attributes[ta.source]
-        current_value = @attributes[assoc.attribute]
         # skip if source value is nil or if type of the association does not match type of source
         next unless source_value.class.to_s == ta.source_type
-        update_through_association(ta, source_value, current_value, value)
+        ta.send method, source_value, value
         ta.source_associations(source_value).each do |sa|
-          update_source_association(sa, source_value, current_value, value)
+          sa.send method, value, source_value
         end
       end
     end
 
-    def update_through_association(ta, source_value, current_value, new_value)
-      unless current_value.nil? || current_value.attributes[ta.attribute].nil?
-        current_value.attributes[ta.attribute].delete(source_value)
-      end
-      return unless new_value
-      new_value.attributes[ta.attribute] ||= Collection.new(ta.owner_class, new_value, ta)
-      new_value.attributes[ta.attribute] << source_value
-    end
+    # def remove_src_assoc(sa, source_value, current_value)
+    #   source_inverse_collection = source_value.attributes[sa.attribute]
+    #   source_inverse_collection.delete(current_value) if source_inverse_collection
+    # end
+    #
+    # def add_src_assoc(sa, source_value, new_value)
+    #   source_value.attributes[sa.attribute] ||= Collection.new(sa.owner_class, source_value, sa)
+    #   source_value.attributes[sa.attribute] << new_value
+    # end
 
-    def update_source_association(sa, source_value, current_value, new_value)
-      source_inverse_collection = source_value.attributes[sa.attribute]
-      source_inverse_collection.delete(current_value) if source_inverse_collection
-      return unless new_value
-      source_value.attributes[sa.attribute] ||= Collection.new(sa.owner_class, source_value, sa)
-      source_value.attributes[sa.attribute] << new_value
-    end
   end
 end

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

@@ -2,7 +2,7 @@
 require 'test_components'
 require 'rspec-steps'
 
-describe "polymorphic relationships", js: true, skip: 'not working yet' do
+describe "polymorphic relationships", js: true, skip: 'wip' do
 
   before(:all) do
     require 'pusher'
@@ -18,12 +18,6 @@
       config.opts = {app_id: Pusher.app_id, key: Pusher.key, secret: Pusher.secret}.merge(PusherFake.configuration.web_options)
     end
 
-    class ApplicationPolicy
-      always_allow_connection
-      regulate_all_broadcasts { |policy| policy.send_all }
-      allow_change(to: :all, on: [:create, :update, :destroy]) { true }
-    end
-
     class ActiveRecord::Base
       class << self
         def public_columns_hash
@@ -35,6 +29,17 @@ def public_columns_hash
 
   before(:each) do
 
+    # spec_helper resets the policy system after each test so we have to setup
+    # before each test
+    stub_const 'TestApplicationPolicy', Class.new
+    TestApplicationPolicy.class_eval do
+      always_allow_connection
+      regulate_all_broadcasts { |policy| policy.send_all }
+      allow_change(to: :all, on: [:create, :update, :destroy]) { true }
+    end
+
+    size_window(:small, :large)
+
     isomorphic do
 
       class Picture < ActiveRecord::Base
@@ -164,11 +169,6 @@ def self.build_tables
       @imageable3 = Product.create(name:  'imageable3', description: 'product2 description')
 
     end
-    #
-    # it 'read has_many' do  # baseline
-    #   expect(@imageable1.pictures.collect(&:name)).to eq ['picture11', 'picture12']
-    #   expect(@imageable2.pictures.collect(&:name)).to eq ['picture21', 'picture22']
-    # end
 
     def compare_to_server(model, expression, expected_result, load=true)
       server_side = eval("#{model.class}.find(#{model.id}).#{expression}")
@@ -182,7 +182,6 @@ def compare_to_server(model, expression, expected_result, load=true)
       end
     end
 
-
     it 'read belongs_to' do
       compare_to_server @picture11, 'imageable.name',        'imageable1'
       compare_to_server @picture11, 'imageable.ss',          '123'