iknow_view_models 3.6.7 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c673bb5888e36eb62ba3ac6ece035d8cda3203cb10bdf19716b66454df4b20f1
-  data.tar.gz: 157092fa9b7e5e6a815981a144566945ddb342bf3c108d3d788a0e476ed2dc84
+  metadata.gz: 1fb4421931099dc325d159573afcd9ea3529f6e29b4ac80f60d3628c9812df4c
+  data.tar.gz: 97d730c4d0a28ec9ce257906f69a1dd79e1b99c5fe025067ad57ba4ca9774931
 SHA512:
-  metadata.gz: 546321a01ca0f1bee84d7607b44f93124cf76353c28868b047ffcab66d976e2eeec6287e6b505d68b302ef14ea4eb9b69941596ce9dd8d0437ff6e6b3435cdd3
-  data.tar.gz: e95d5d0b60defa73d7ebc30dabc0e390acdac733d2f95ed888c3f6001f0330565268ab99c4003a64ac23b092716140f99012af5adb75a0801ce08f901980c7b8
+  metadata.gz: 53aff699c92efd1c334333b2f417444498c504b2f91ea57a00741e3e6e1e259c988723b23e68a7f2c16fba1a6906786471748f5adf5dc2797ca2a4d0924f10df
+  data.tar.gz: b739f19369e3282f6e897a000f04bb56b432796acbe78ca70777e349eef8f39a4058488032f4b42eeda0c4c7c4f60e9b4dba1fba1f2cf253a3c2bd960ff753e3

data/iknow_view_models.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 2.7.3'
 
   spec.add_dependency 'actionpack', '>= 5.0'
   spec.add_dependency 'activerecord', '>= 5.0'

data/lib/iknow_view_models/version.rb

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

data/lib/view_model/callbacks.rb

@@ -11,9 +11,9 @@ module ViewModel::Callbacks
   # callbacks instance with additional instance method access to the view,
   # context and extra context-dependent parameters.
   module CallbackEnvContext
-    def method_missing(method, *args, &block)
+    def method_missing(method, ...)
       if _callbacks.respond_to?(method, true)
-        _callbacks.send(method, *args, &block)
+        _callbacks.send(method, ...)
       else
         super
       end

data/lib/view_model/migrator.rb

@@ -39,7 +39,26 @@ class ViewModel
     def migrate!(serialization)
       references = (serialization['references'] ||= {})
 
-      migrate_tree!(serialization, references: references)
+      # First visit everything except references; there's no issue with adding
+      # new references during this.
+      migrate_tree!(serialization.except('references'), references: references)
+
+      # While visiting references itself, we need to take care that we can
+      # concurrently modify them (e.g. by adding new referenced views).
+      # Moreover, such added references must themselves be visited, as they'll
+      # be synthesized at the current version and so may need to be migrated
+      # down to the client's requested version.
+      visited_refs = []
+      loop do
+        unvisited_refs = references.keys - visited_refs
+        break if unvisited_refs.empty?
+
+        unvisited_refs.each do |ref|
+          migrate_tree!(references[ref], references: references)
+        end
+
+        visited_refs.concat(unvisited_refs)
+      end
 
       GarbageCollection.garbage_collect_references!(serialization)
 
@@ -112,10 +131,11 @@ class ViewModel
       path = @paths[view_name]
       return false unless path
 
-      # We assume that an unspecified source version is the same as the required
-      # version.
       required_version, current_version = @versions[view_name]
+      return false if source_version == current_version
 
+      # We assume that an unspecified source version is the same as the required
+      # version (i.e. the version demanded by the client request).
       unless source_version.nil? || source_version == required_version
         raise ViewModel::Migration::UnspecifiedVersionError.new(view_name, source_version)
       end

data/lib/view_model/reference.rb

@@ -29,5 +29,13 @@ class ViewModel
     def hash
       [viewmodel_class, model_id].hash
     end
+
+    # Generate a stable reference key for this viewmodel using type name and id
+    def stable_reference
+      raise RuntimeError.new('Model id required to generate a stable reference') unless model_id
+
+      hash = Digest::SHA256.base64digest("#{viewmodel_class.name}.#{model_id}")
+      "ref:h:#{hash}"
+    end
   end
 end

data/lib/view_model/references.rb

@@ -37,12 +37,13 @@ class ViewModel
 
     private
 
-    # Ensure stable reference ids for the same (persisted) viewmodels.
+    # Ensure stable reference keys for the same (persisted) viewmodels. For
+    # unpersisted viewmodels, use a counter to generate a reference key unique
+    # to this serialization.
     def new_ref!(viewmodel)
       vm_ref = viewmodel.to_reference
       if vm_ref.model_id
-        hash = Digest::SHA256.base64digest("#{vm_ref.viewmodel_class.name}.#{vm_ref.model_id}")
-        "ref:h:#{hash}"
+        vm_ref.stable_reference
       else
         format('ref:i:%06<count>d', count: (@last_ref += 1))
       end

data/lib/view_model.rb

@@ -303,12 +303,12 @@ class ViewModel
     end
   end
 
-  def to_hash(serialize_context: self.class.new_serialize_context)
+  def serialize_to_hash(serialize_context: self.class.new_serialize_context)
     Jbuilder.new { |json| serialize(json, serialize_context: serialize_context) }.attributes!
   end
 
   def to_json(serialize_context: self.class.new_serialize_context)
-    ViewModel.encode_json(self.to_hash(serialize_context: serialize_context))
+    ViewModel.encode_json(self.serialize_to_hash(serialize_context: serialize_context))
   end
 
   # Render this viewmodel to a jBuilder. Usually overridden in subclasses.

data/test/helpers/arvm_test_utilities.rb

@@ -98,7 +98,7 @@ module ARVMTestUtilities
   end
 
   def assert_serializes(vm, model, serialize_context: vm.new_serialize_context)
-    h = vm.new(model).to_hash(serialize_context: serialize_context)
+    h = vm.new(model).serialize_to_hash(serialize_context: serialize_context)
     assert_kind_of(Hash, h)
     refs = serialize_context.serialize_references_to_hash
     assert_kind_of(Hash, refs)
@@ -106,7 +106,7 @@ module ARVMTestUtilities
 
   def refute_serializes(vm, model, message = nil, serialize_context: vm.new_serialize_context)
     ex = assert_raises(ViewModel::AccessControlError) do
-      vm.new(model).to_hash(serialize_context: serialize_context)
+      vm.new(model).serialize_to_hash(serialize_context: serialize_context)
       serialize_context.serialize_references_to_hash
     end
     assert_match(message, ex.message) if message

data/test/helpers/viewmodel_spec_helpers.rb

@@ -295,6 +295,14 @@ module ViewModelSpecHelpers
     end
   end
 
+  module ReferencedList
+    extend ActiveSupport::Concern
+    include ViewModelSpecHelpers::List
+    def model_attributes
+      super.merge(viewmodel: ->(_v) { root! })
+    end
+  end
+
   module ParentAndHasOneChild
     extend ActiveSupport::Concern
     include ViewModelSpecHelpers::Base

data/test/unit/view_model/active_record/controller_nested_test.rb

@@ -44,7 +44,7 @@ class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
     assert_equal(200, childcontroller.status)
 
     expected_children = @parent.children
-    assert_equal({ 'data' => expected_children.map { |c| ChildView.new(c).to_hash } },
+    assert_equal({ 'data' => expected_children.map { |c| ChildView.new(c).serialize_to_hash } },
       childcontroller.hash_response)
 
     assert_all_hooks_nested_inside_parent_hook(childcontroller.hook_trace)
@@ -59,7 +59,7 @@ class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
     assert_equal(200, childcontroller.status)
 
     expected_children = @parent.children + distractor.children
-    assert_equal({ 'data' => expected_children.map { |c| ChildView.new(c).to_hash } },
+    assert_equal({ 'data' => expected_children.map { |c| ChildView.new(c).serialize_to_hash } },
       childcontroller.hash_response)
   end
 
@@ -79,7 +79,7 @@ class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
     @parent.reload
 
     assert_equal(%w[c1 c2 c3], @parent.children.order(:position).pluck(:name))
-    assert_equal({ 'data' => ChildView.new(@parent.children.last).to_hash },
+    assert_equal({ 'data' => ChildView.new(@parent.children.last).serialize_to_hash },
       childcontroller.hash_response)
 
     assert_all_hooks_nested_inside_parent_hook(childcontroller.hook_trace)
@@ -102,7 +102,7 @@ class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
     @parent.reload
 
     assert_equal(%w[c1 c2 c3 c4], @parent.children.order(:position).pluck(:name))
-    new_children_hashes = @parent.children.last(2).map { |c| ChildView.new(c).to_hash }
+    new_children_hashes = @parent.children.last(2).map { |c| ChildView.new(c).serialize_to_hash }
     assert_equal({ 'data' => new_children_hashes },
       childcontroller.hash_response)
 
@@ -265,7 +265,7 @@ class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
     old_child.reload
 
     assert_equal('new_name', old_child.name)
-    assert_equal({ 'data' => ChildView.new(old_child).to_hash },
+    assert_equal({ 'data' => ChildView.new(old_child).serialize_to_hash },
       childcontroller.hash_response)
   end
 
@@ -275,7 +275,7 @@ class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
     childcontroller = ChildController.new(params: { id: old_child.id })
     childcontroller.invoke(:show)
 
-    assert_equal({ 'data' => ChildView.new(old_child).to_hash },
+    assert_equal({ 'data' => ChildView.new(old_child).serialize_to_hash },
       childcontroller.hash_response)
 
     assert_equal(200, childcontroller.status)
@@ -323,7 +323,7 @@ class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
 
     assert_equal(200, labelcontroller.status, labelcontroller.hash_response)
 
-    assert_equal({ 'data' => LabelView.new(old_label).to_hash },
+    assert_equal({ 'data' => LabelView.new(old_label).serialize_to_hash },
       labelcontroller.hash_response)
 
     assert_all_hooks_nested_inside_parent_hook(labelcontroller.hook_trace)
@@ -367,7 +367,7 @@ class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
     old_label.reload
 
     assert_equal('new label', old_label.text)
-    assert_equal({ 'data' => LabelView.new(old_label).to_hash },
+    assert_equal({ 'data' => LabelView.new(old_label).serialize_to_hash },
       labelcontroller.hash_response)
 
     assert_all_hooks_nested_inside_parent_hook(labelcontroller.hook_trace)
@@ -381,7 +381,7 @@ class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
 
     assert_equal(200, labelcontroller.status, labelcontroller.hash_response)
 
-    assert_equal({ 'data' => LabelView.new(old_label).to_hash },
+    assert_equal({ 'data' => LabelView.new(old_label).serialize_to_hash },
       labelcontroller.hash_response)
   end
 
@@ -414,7 +414,7 @@ class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
     old_label.reload
 
     assert_equal('new label', old_label.text)
-    assert_equal({ 'data' => LabelView.new(old_label).to_hash },
+    assert_equal({ 'data' => LabelView.new(old_label).serialize_to_hash },
       labelcontroller.hash_response)
   end
 
@@ -472,11 +472,11 @@ class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
           'updates' => [
             {
               'id'     => @parent.id,
-              'update' => TargetView.new(target).to_hash,
+              'update' => TargetView.new(target).serialize_to_hash,
             },
             {
               'id'     => other_parent.id,
-              'update' => TargetView.new(other_target).to_hash,
+              'update' => TargetView.new(other_target).serialize_to_hash,
             },
           ].sort_by { |x| x.fetch('id') }
         }
@@ -535,7 +535,7 @@ class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
 
     assert_equal(
       {
-        ref_key => CategoryView.new(@parent.category).to_hash,
+        ref_key => CategoryView.new(@parent.category).serialize_to_hash,
       },
       references,
     )
@@ -591,7 +591,7 @@ class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
 
     assert_equal(
       {
-        ref_key => TagView.new(@parent.parent_tags.first.tag).to_hash,
+        ref_key => TagView.new(@parent.parent_tags.first.tag).serialize_to_hash,
       },
       references,
     )

data/test/unit/view_model/active_record/controller_test.rb

@@ -37,7 +37,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     parentcontroller = ParentController.new(params: { id: @parent.id })
     parentcontroller.invoke(:show)
 
-    assert_equal({ 'data' => @parent_view.to_hash },
+    assert_equal({ 'data' => @parent_view.serialize_to_hash },
                  parentcontroller.hash_response)
 
     assert_equal(200, parentcontroller.status)
@@ -52,7 +52,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
 
     parentcontroller.invoke(:show)
 
-    expected_view = @parent_view.to_hash
+    expected_view = @parent_view.serialize_to_hash
                       .except('name')
                       .merge('old_name' => @parent.name,
                              ViewModel::VERSION_ATTRIBUTE => 1,
@@ -88,7 +88,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     assert_equal(200, parentcontroller.status)
 
     assert_equal(parentcontroller.hash_response,
-                 { 'data' => [@parent_view.to_hash, p2_view.to_hash] })
+                 { 'data' => [@parent_view.serialize_to_hash, p2_view.serialize_to_hash] })
 
     assert_all_hooks_nested_inside_parent_hook(parentcontroller.hook_trace)
   end
@@ -112,7 +112,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     p2_view = ParentView.new(p2)
     assert(p2.present?, 'p2 created')
 
-    assert_equal({ 'data' => p2_view.to_hash }, parentcontroller.hash_response)
+    assert_equal({ 'data' => p2_view.serialize_to_hash }, parentcontroller.hash_response)
 
     assert_all_hooks_nested_inside_parent_hook(parentcontroller.hook_trace)
   end
@@ -160,7 +160,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     @parent.reload
 
     assert_equal('new', @parent.name)
-    assert_equal({ 'data' => @parent_view.to_hash },
+    assert_equal({ 'data' => @parent_view.serialize_to_hash },
                  parentcontroller.hash_response)
 
     assert_all_hooks_nested_inside_parent_hook(parentcontroller.hook_trace)

data/test/unit/view_model/active_record/customization_test.rb

@@ -283,13 +283,13 @@ class ViewModel::ActiveRecord::FlattenAssociationTest < ActiveSupport::TestCase
 
   def test_serialize
     v = SectionView.new(@simplesection)
-    assert_equal(@simplesection_view, v.to_hash)
+    assert_equal(@simplesection_view, v.serialize_to_hash)
 
     v = SectionView.new(@quizsection)
-    assert_equal(@quizsection_view, v.to_hash)
+    assert_equal(@quizsection_view, v.serialize_to_hash)
 
     v = SectionView.new(@vocabsection)
-    assert_equal(@vocabsection_view, v.to_hash)
+    assert_equal(@vocabsection_view, v.serialize_to_hash)
   end
 
   def new_view_like(view)

data/test/unit/view_model/active_record/has_many_test.rb

@@ -469,8 +469,8 @@ class ViewModel::ActiveRecord::HasManyTest < ActiveSupport::TestCase
     old_children = @model1.children.order(:position)
     moved_child = old_children[1]
 
-    view = viewmodel_class.new(@model2).to_hash
-    view['children'] << child_viewmodel_class.new(moved_child).to_hash
+    view = viewmodel_class.new(@model2).serialize_to_hash
+    view['children'] << child_viewmodel_class.new(moved_child).serialize_to_hash
 
     retained_children = old_children - [moved_child]
     release_view = { '_type' => 'Model', 'id' => @model1.id,
@@ -503,7 +503,7 @@ class ViewModel::ActiveRecord::HasManyTest < ActiveSupport::TestCase
   def test_has_many_append_and_update_existing_association
     child = @model1.children[1]
 
-    cv = child_viewmodel_class.new(child).to_hash
+    cv = child_viewmodel_class.new(child).serialize_to_hash
     cv['name'] = 'newname'
 
     viewmodel_class.new(@model1).append_associated(:children, cv)
@@ -558,7 +558,7 @@ class ViewModel::ActiveRecord::HasManyTest < ActiveSupport::TestCase
   def test_move_and_edit_child_to_new
     child = @model1.children[1]
 
-    child_view = child_viewmodel_class.new(child).to_hash
+    child_view = child_viewmodel_class.new(child).serialize_to_hash
     child_view['name'] = 'changed'
 
     view = { '_type' => 'Model',
@@ -592,9 +592,9 @@ class ViewModel::ActiveRecord::HasManyTest < ActiveSupport::TestCase
   def test_move_and_edit_child_to_existing
     old_child = @model1.children[1]
 
-    old_child_view = child_viewmodel_class.new(old_child).to_hash
+    old_child_view = child_viewmodel_class.new(old_child).serialize_to_hash
     old_child_view['name'] = 'changed'
-    view = viewmodel_class.new(@model2).to_hash
+    view = viewmodel_class.new(@model2).serialize_to_hash
     view['children'] << old_child_view
 
     release_view = { '_type' => 'Model', 'id' => @model1.id,

data/test/unit/view_model/active_record/migration_test.rb

@@ -436,16 +436,17 @@ class ViewModel::ActiveRecord::Migration < ActiveSupport::TestCase
       let(:migrator) { down_migrator }
       let(:subject) do
         ser = current_serialization.deep_dup
-        raise ArgumentError.new("Expected no references") if ser.has_key?('references')
+        raise ArgumentError.new('Expected no references') if ser.has_key?('references')
+
         ser
       end
 
       let(:expected_result) do
         {
           'data' => v1_serialization_data.deep_dup.deep_merge(
-            { ViewModel::MIGRATED_ATTRIBUTE => true }
+            { ViewModel::MIGRATED_ATTRIBUTE => true },
           ),
-          'references' => v1_serialization_references
+          'references' => v1_serialization_references,
         }
       end
 
@@ -460,7 +461,8 @@ class ViewModel::ActiveRecord::Migration < ActiveSupport::TestCase
       let(:migrator) { up_migrator }
       let(:subject) do
         ser = v1_serialization.deep_dup
-        raise ArgumentError.new("Expected references") unless ser.has_key?('references')
+        raise ArgumentError.new('Expected references') unless ser.has_key?('references')
+
         ser
       end
 
@@ -480,4 +482,96 @@ class ViewModel::ActiveRecord::Migration < ActiveSupport::TestCase
       end
     end
   end
+
+  describe 'concurrently inserting a reference' do
+    include ViewModelSpecHelpers::ReferencedList
+    let(:migration_versions) { { viewmodel_class => 1 } }
+
+    # Use a list with two members
+    def new_model
+      model_class.new(name: 'root',
+                      next: model_class.new(name: 'old-tail'))
+    end
+
+    # Define a down migration that matches the old tail to insert a new tail
+    # after it, and the new tail to change its name.
+    def model_attributes
+      super.merge(
+        viewmodel: ->(v) {
+          self.schema_version = 2
+
+          migrates from: 1, to: 2 do
+            down do |view, refs|
+              case view['name']
+              when 'old-tail'
+                view['next'] = { ViewModel::REFERENCE_ATTRIBUTE => 'ref:s:new_tail' }
+                refs['ref:s:new_tail'] = {
+                  ViewModel::TYPE_ATTRIBUTE    => v.view_name,
+                  ViewModel::VERSION_ATTRIBUTE => v.schema_version,
+                  'id' => 100, # entirely fake
+                  'name' => 'new-tail',
+                  'next' => nil,
+                }
+
+              when 'new-tail'
+                view['name'] = 'newer-tail'
+              end
+            end
+          end
+        },
+      )
+    end
+
+    let(:v1_serialization_data) do
+      {
+        ViewModel::TYPE_ATTRIBUTE => viewmodel_class.view_name,
+        ViewModel::VERSION_ATTRIBUTE => 1,
+        ViewModel::ID_ATTRIBUTE => viewmodel.id,
+        'name' => viewmodel.name,
+        'next' => { ViewModel::REFERENCE_ATTRIBUTE => viewmodel.next.to_reference.stable_reference },
+        ViewModel::MIGRATED_ATTRIBUTE => true,
+      }
+    end
+
+    let(:v1_serialization_references) do
+      old_tail = viewmodel.next
+      old_tail_ref = old_tail.to_reference.stable_reference
+      {
+        old_tail_ref => {
+          ViewModel::TYPE_ATTRIBUTE => viewmodel_class.view_name,
+          ViewModel::VERSION_ATTRIBUTE => 1,
+          ViewModel::ID_ATTRIBUTE => old_tail.id,
+          'name' => 'old-tail',
+          'next' => { ViewModel::REFERENCE_ATTRIBUTE => 'ref:s:new_tail' },
+          ViewModel::MIGRATED_ATTRIBUTE => true,
+        },
+        'ref:s:new_tail' => {
+          ViewModel::TYPE_ATTRIBUTE => viewmodel_class.view_name,
+          ViewModel::VERSION_ATTRIBUTE => 1,
+          ViewModel::ID_ATTRIBUTE => 100,
+          'name' => 'newer-tail',
+          'next' => nil,
+          ViewModel::MIGRATED_ATTRIBUTE => true,
+        },
+      }
+    end
+
+    let(:v1_serialization) do
+      {
+        'data' => v1_serialization_data,
+        'references' => v1_serialization_references,
+      }
+    end
+
+    describe 'downwards' do
+      let(:migrator) { down_migrator }
+      let(:subject) { current_serialization.deep_dup }
+
+      it 'migrates' do
+        migrate!
+
+        assert_equal(v1_serialization, subject)
+      end
+    end
+  end
 end

data/test/unit/view_model/active_record_test.rb

@@ -146,7 +146,7 @@ class ViewModel::ActiveRecordTest < ActiveSupport::TestCase
 
     assert_raises(ViewModel::AccessControlError) do
       no_view_context = ViewModelBase.new_serialize_context(can_view: false)
-      parentview.to_hash(serialize_context: no_view_context)
+      parentview.serialize_to_hash(serialize_context: no_view_context)
     end
 
     assert_raises(ViewModel::AccessControlError) do
@@ -191,7 +191,7 @@ class ViewModel::ActiveRecordTest < ActiveSupport::TestCase
 
     ex = assert_raises(ViewModel::AccessControlError) do
       # edit
-      v = ParentView.new(@parent1).to_hash.merge('name' => 'p2')
+      v = ParentView.new(@parent1).serialize_to_hash.merge('name' => 'p2')
       ParentView.deserialize_from_view(v, deserialize_context: no_edit_context)
     end
     assert_match(/Illegal edit/, ex.message)
@@ -214,7 +214,7 @@ class ViewModel::ActiveRecordTest < ActiveSupport::TestCase
 
     ex = assert_raises(ViewModel::AccessControlError) do
       # edit
-      v = ParentView.new(@parent1).to_hash.merge('name' => 'p2')
+      v = ParentView.new(@parent1).serialize_to_hash.merge('name' => 'p2')
       ParentView.deserialize_from_view(v, deserialize_context: no_edit_context)
     end
     assert_match(/Illegal edit/, ex.message)

data/test/unit/view_model/callbacks_test.rb

@@ -554,6 +554,35 @@ class ViewModel::CallbacksTest < ActiveSupport::TestCase
       end
     end
 
+    describe 'delegates to methods on the callback object' do
+      class TestCallback
+        include ViewModel::Callbacks
+
+        attr_reader :a_args, :b_args
+
+        def a(*args)
+          @a_args = args
+        end
+
+        def b(*args, **kwargs)
+          @b_args = [args, kwargs]
+        end
+
+        before_visit do
+          a(1, 2, x: 1, y: 2)
+          b(1, 2, x: 1, y: 2)
+        end
+      end
+
+      let(:callback) { TestCallback.new }
+
+      it 'delegates to callback methods including kwargs' do
+        serialize(vm)
+        value(callback.a_args).must_equal([1, 2, { x: 1, y: 2 }])
+        value(callback.b_args).must_equal([[1, 2], { x: 1, y: 2 }])
+      end
+    end
+
     describe 'provides details to the execution environment' do
       class EnvCallback
         include ViewModel::Callbacks

data/test/unit/view_model/record_test.rb

@@ -204,7 +204,7 @@ class ViewModel::RecordTest < ActiveSupport::TestCase
       def self.included(base)
         base.instance_eval do
           it 'can serialize to the expected view' do
-            h = viewmodel_class.new(subject_model).to_hash
+            h = viewmodel_class.new(subject_model).serialize_to_hash
             assert_equal(expected_view, h)
           end
         end
@@ -318,7 +318,7 @@ class ViewModel::RecordTest < ActiveSupport::TestCase
       it 'raises correctly on an undeserializable value' do
         bad_model = subject_model.tap { |m| m.moment = 2.7 }
         ex = assert_raises(ViewModel::SerializationError) do
-          viewmodel_class.new(bad_model).to_hash
+          viewmodel_class.new(bad_model).serialize_to_hash
         end
         assert_match(/Could not serialize invalid value.*'moment'.*Incorrect type/, ex.detail)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.6.7
+  version: 3.7.1
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -502,7 +502,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: 2.7.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="