iknow_view_models 3.1.3 → 3.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90ccbf1e2c6cbd490de913f189646e01fbb2b0cda22c6530d9d0794667a6650d
-  data.tar.gz: 2ed2d34f0d09e4ee4c295a92ef5cf34b0054062ae8dbdc433e33c10840b9e2c5
+  metadata.gz: 5fc6b7d1f2e4c48c65f3f603d8e322afe7f26d52e08bb418dc746f9c5b6bd6c0
+  data.tar.gz: 39eab5e4ae3423805b3c3d931504d08c623d8fbf602b58e4d978aeb7202aee71
 SHA512:
-  metadata.gz: c3f08635ca1378a44fbd2a9dcade0cf3f8f7edb2169b46f8c1c13c3869d4453f64d5dd96e9f1c91018d466a078ff63d3bce1e892cc938a5a45fe89979f89cacc
-  data.tar.gz: f02a6f45243e40fb54d7fd0ac146667c6673116b83eb93795b7b454d1ee286bb4d2d797587b9a35662a09f5f3e7ee616b2086aa1a24dc963ade74e22a1e70f92
+  metadata.gz: 13f7e88bc34527984aea0d73518acb2e2fa8e2a6cc4cbb408f325afd39bfedd738be907f0922efcfacebe1802002e8f8d1c86ca9c37fc9a810df767f923d4455
+  data.tar.gz: 71b8b322ce29db0b042c28b40c94820433d96beade6d991c5759a7828a7ce8101fcccc47fea3545538e522355fe949fd5a03493e26b22601c22e8bc31c8b2d92

data/lib/iknow_view_models/version.rb

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

data/lib/view_model.rb

@@ -89,7 +89,7 @@ class ViewModel
     end
 
     def member_names
-      _attributes
+      _attributes.map(&:to_s)
     end
 
     # In deserialization, verify and extract metadata from a provided hash.

data/lib/view_model/active_record/association_data.rb

@@ -17,7 +17,7 @@ class ViewModel::ActiveRecord::AssociationData
 
     @direct_reflection = owner.model_class.reflect_on_association(direct_association_name)
     if @direct_reflection.nil?
-      raise InvalidAssociation.new("Association '#{direct_association_name}' not found in model '#{model_class.name}'")
+      raise InvalidAssociation.new("Association '#{direct_association_name}' not found in model '#{owner.model_class.name}'")
     end
 
     @indirect_association_name = indirect_association_name

data/lib/view_model/active_record/update_context.rb

@@ -94,11 +94,16 @@ class ViewModel::ActiveRecord
       # won't yet include through a polymorphic boundary: for now we become
       # lazy-loading and slow every time that happens.
 
-      # Combine our root and referenced updates, and separate by viewmodel type
+      # Combine our root and referenced updates, and separate by viewmodel type.
+      # Sort by id where possible to obtain as close to possible a deterministic
+      # update order to avoid database write deadlocks. This can't be entirely
+      # comprehensive, since we can't control the order that shared references
+      # are referred to from roots (and therefore visited).
       updates_by_viewmodel_class =
         root_updates.lazily
           .map { |root_update| [nil, root_update] }
           .concat(referenced_updates)
+          .sort_by { |_, update_data| update_data.metadata.id.to_s }
           .group_by { |_, update_data| update_data.viewmodel_class }
 
       # For each viewmodel type, look up referenced models and construct viewmodels to update
@@ -115,7 +120,7 @@ class ViewModel::ActiveRecord
 
             if models.size < model_ids.size
               missing_model_ids = model_ids - models.map(&:id)
-              missing_viewmodel_refs = missing_model_ids.map  { |id| ViewModel::Reference.new(viewmodel_class, id) }
+              missing_viewmodel_refs = missing_model_ids.map { |id| ViewModel::Reference.new(viewmodel_class, id) }
               raise ViewModel::DeserializationError::NotFound.new(missing_viewmodel_refs)
             end
 

data/lib/view_model/after_transaction_runner.rb

@@ -33,7 +33,8 @@ module ViewModel::AfterTransactionRunner
     if connection.transaction_open?
       connection.add_transaction_record(self)
     else
-      after_transaction
+      before_commit
+      after_commit
     end
   end
 

data/lib/view_model/traversal_context.rb

@@ -93,13 +93,15 @@ class ViewModel::TraversalContext
   end
 
   def run_callback(hook, view, **args)
-    callbacks.each do |callback|
-      callback.run_callback(hook, view, self, **args)
-    end
-
+    # Run in-viewmodel callback hooks before context hooks, as they are
+    # permitted to alter the model.
     if view.respond_to?(hook.dsl_viewmodel_callback_method)
       view.public_send(hook.dsl_viewmodel_callback_method, hook.context_name => self, **args)
     end
+
+    callbacks.each do |callback|
+      callback.run_callback(hook, view, self, **args)
+    end
   end
 
   def root?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.8
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord