iknow_view_models 3.8.0 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10ac2bba9965a5eb683cdbb972d1a7c8b31a6fd86304b1e52816cdd5649818d9
-  data.tar.gz: dcd13cba67c3b27beb4491b23d6a487ff30a3a3b930a8d2188a5503f77298c89
+  metadata.gz: 847b6426a13f947b600789d37e80eb2987018117c916ea0f7a802871a13ca5be
+  data.tar.gz: 5d2547f725016af1965bc3ec18267c4ad79232f43d41e825e2a5ee035e84a7f3
 SHA512:
-  metadata.gz: a0faccad196615ad236d93016b3268fe50c3eac86bfc52750445a53655fc24d24ff068442071d4ea0a6d1d19e86cdaba8ae24ad9cba5d4feedfbb007333217e9
-  data.tar.gz: 253dea949f2c1a79360969fbd662a93d072ef93ff43554b5b08bc65344e2cc96c58b0eea2a71ff734cd8d3507c07b2569638be4d483c116d7b498ea98aca5fd5
+  metadata.gz: 4e23bce06bde36efefec1d58a8a878562292e431a2d81d52e7e7307576a9ed715dfd46ef4600e4b04c49d965393ace84a7e7e9ca49f16b94d6313ceb26fc1816
+  data.tar.gz: 13450f34bab5d028f4993478b0fe40f49dc572eaf1b75aaef3e320a12236bb0097d674c7296b05325949c30dc6345981e48022007dbe596459b1689e8cb73745

data/lib/iknow_view_models/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IknowViewModels
-  VERSION = '3.8.0'
+  VERSION = '3.9.1'
 end

data/lib/view_model/active_record/cache.rb

@@ -49,8 +49,12 @@ class ViewModel::ActiveRecord::Cache
     @migrated_cache = @migrated_cache_group.register_cache(cache_name)
   end
 
+  # Handles being called with either ids or model/viewmodel objects
   def delete(*ids)
     ids.each do |id|
+      id = id.id if id.respond_to?(:id)
+      raise ArgumentError.new unless id.is_a?(Numeric) || id.is_a?(String)
+
       @cache_group.delete_all(@cache.key.new(id))
     end
   end

data/lib/view_model/active_record/update_operation.rb

@@ -14,8 +14,7 @@ class ViewModel::ActiveRecord
 
     attr_accessor :viewmodel,
                   :update_data,
-                  :points_to,  # AssociationData => UpdateOperation (returns single new viewmodel to update fkey)
-                  :pointed_to, # AssociationData => UpdateOperation(s) (returns viewmodel(s) with which to update assoc cache)
+                  :association_updates, # AssociationData => UpdateOperation(s)
                   :reparent_to, # If node needs to update its pointer to a new parent, ParentData for the parent
                   :reposition_to, # if this node participates in a list under its parent, what should its position be?
                   :released_children # Set of children that have been released
@@ -23,13 +22,12 @@ class ViewModel::ActiveRecord
     delegate :attributes, to: :update_data
 
     def initialize(viewmodel, update_data, reparent_to: nil, reposition_to: nil)
-      self.viewmodel         = viewmodel
-      self.update_data       = update_data
-      self.points_to         = {}
-      self.pointed_to        = {}
-      self.reparent_to       = reparent_to
-      self.reposition_to     = reposition_to
-      self.released_children = []
+      self.viewmodel           = viewmodel
+      self.update_data         = update_data
+      self.association_updates = {}
+      self.reparent_to         = reparent_to
+      self.reposition_to       = reposition_to
+      self.released_children   = []
 
       @run_state = RunState::Pending
       @changed_associations = []
@@ -82,46 +80,47 @@ class ViewModel::ActiveRecord
           end
 
           # Visit attributes and associations as much as possible in the order
-          # that they're declared in the view.
-          member_ordering = viewmodel.class._members.keys.each_with_index.to_h
-
-          # update user-specified attributes
-          attribute_keys = attributes.keys.sort_by { |k| member_ordering[k] }
-          attribute_keys.each do |attr_name|
-            serialized_value = attributes[attr_name]
-
-            # Note that the VM::AR deserialization tree asserts ownership over any
-            # references it's provided, and so they're intentionally not passed on
-            # to attribute deserialization for use by their `using:` viewmodels. A
-            # (better?) alternative would be to provide them as reference-only
-            # hashes, to indicate that no modification can be permitted.
-            viewmodel.public_send("deserialize_#{attr_name}", serialized_value,
-                                  references: {},
-                                  deserialize_context: deserialize_context)
+          # that they're declared in the view. We can visit attributes and
+          # points-to associations before save, but points-from associations
+          # must be visited after save.
+          pre_save_members, post_save_members = viewmodel.class._members.values.partition do |member_data|
+            !member_data.association? || member_data.pointer_location == :local
           end
 
-          # Update points-to associations before save
-          points_to_keys = points_to.keys.sort_by do |association_data|
-            member_ordering[association_data.association_name]
-          end
+          pre_save_members.each do |member_data|
+            if member_data.association?
+              next unless association_updates.include?(member_data)
 
-          points_to_keys.each do |association_data|
-            child_operation = points_to[association_data]
+              child_operation = association_updates[member_data]
 
-            reflection = association_data.direct_reflection
-            debug "-> #{debug_name}: Updating points-to association '#{reflection.name}'"
+              reflection = member_data.direct_reflection
+              debug "-> #{debug_name}: Updating points-to association '#{reflection.name}'"
 
-            association = model.association(reflection.name)
-            new_target =
-              if child_operation
-                child_ctx = viewmodel.context_for_child(association_data.association_name, context: deserialize_context)
-                child_viewmodel = child_operation.run!(deserialize_context: child_ctx)
-                propagate_tree_changes(association_data, child_viewmodel.previous_changes)
+              association = model.association(reflection.name)
+              new_target =
+                if child_operation
+                  child_ctx = viewmodel.context_for_child(member_data.association_name, context: deserialize_context)
+                  child_viewmodel = child_operation.run!(deserialize_context: child_ctx)
+                  propagate_tree_changes(member_data, child_viewmodel.previous_changes)
 
-                child_viewmodel.model
-              end
-            association.writer(new_target)
-            debug "<- #{debug_name}: Updated points-to association '#{reflection.name}'"
+                  child_viewmodel.model
+                end
+              association.writer(new_target)
+              debug "<- #{debug_name}: Updated points-to association '#{reflection.name}'"
+            else
+              attr_name = member_data.name
+              next unless attributes.include?(attr_name)
+
+              serialized_value = attributes[attr_name]
+              # Note that the VM::AR deserialization tree asserts ownership over any
+              # references it's provided, and so they're intentionally not passed on
+              # to attribute deserialization for use by their `using:` viewmodels. A
+              # (better?) alternative would be to provide them as reference-only
+              # hashes, to indicate that no modification can be permitted.
+              viewmodel.public_send("deserialize_#{attr_name}", serialized_value,
+                                    references: {},
+                                    deserialize_context: deserialize_context)
+            end
           end
 
           # validate
@@ -144,12 +143,10 @@ class ViewModel::ActiveRecord
 
           # Update association cache of pointed-from associations after save: the
           # child update will have saved the pointer.
-          pointed_to_keys = pointed_to.keys.sort_by do |association_data|
-            member_ordering[association_data.association_name]
-          end
+          post_save_members.each do |association_data|
+            next unless association_updates.include?(association_data)
 
-          pointed_to_keys.each do |association_data|
-            child_operation = pointed_to[association_data]
+            child_operation = association_updates[association_data]
             reflection = association_data.direct_reflection
 
             debug "-> #{debug_name}: Updating pointed-to association '#{reflection.name}'"
@@ -265,13 +262,7 @@ class ViewModel::ActiveRecord
     end
 
     def add_update(association_data, update)
-      target =
-        case association_data.pointer_location
-        when :remote then pointed_to
-        when :local then  points_to
-        end
-
-      target[association_data] = update
+      self.association_updates[association_data] = update
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.1
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack