iknow_view_models 3.4.1 → 3.5.0

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

@@ -438,19 +438,24 @@ class ViewModel::ActiveRecord::HasManyThroughTest < ActiveSupport::TestCase
     pv = ParentView.new(@parent1)
     context = ParentView.new_deserialize_context
 
-    nc = pv.replace_associated(:tags,
-                               [{ '_type' => 'Tag', 'name' => 'new_tag' }],
-                               deserialize_context: context)
+    data = [{ ViewModel::REFERENCE_ATTRIBUTE => 'tag1' }]
+    references = { 'tag1' => { '_type' => 'Tag', 'name' => 'new_tag' } }
+
+    updated = pv.replace_associated(:tags,
+      data, references: references,
+      deserialize_context: context)
+
+    post_children = ParentView.new(Parent.find(@parent1.id))._read_association(:tags)
 
     expected_edit_checks = [pv.to_reference,
-                            *nc.map(&:to_reference),]
+                            *post_children.map(&:to_reference),]
 
     assert_contains_exactly(expected_edit_checks,
                             context.valid_edit_refs)
 
-    assert_equal(1, nc.size)
-    assert(nc[0].is_a?(TagView))
-    assert_equal('new_tag', nc[0].name)
+    assert_equal(1, updated.size)
+    assert(updated[0].is_a?(TagView))
+    assert_equal('new_tag', updated[0].name)
 
     @parent1.reload
     assert_equal(['new_tag'], tags(@parent1).map(&:name))
@@ -467,13 +472,19 @@ class ViewModel::ActiveRecord::HasManyThroughTest < ActiveSupport::TestCase
     tag2 = @tag2
 
     update = build_fupdate do
-      append([{ '_type' => 'Tag', 'name' => 'new_tag' }])
+      append([{ViewModel::REFERENCE_ATTRIBUTE => 'ref_new_tag'}])
       remove([{ '_type' => 'Tag', 'id' => tag2.id }])
-      update([{ '_type' => 'Tag', 'id' => tag1.id, 'name' => 'renamed tag1' }])
+      update([{ViewModel::REFERENCE_ATTRIBUTE => 'ref_tag1'}])
     end
 
-    nc = pv.replace_associated(:tags, update, deserialize_context: context)
-    new_tag = nc.detect { |t| t.name == 'new_tag' }
+    references = {
+      'ref_new_tag' => { '_type' => 'Tag', 'name' => 'new_tag' },
+      'ref_tag1' => { '_type' => 'Tag', 'id' => tag1.id, 'name' => 'renamed tag1' },
+    }
+
+    updated = pv.replace_associated(:tags, update, references: references, deserialize_context: context)
+    post_children = ParentView.new(Parent.find(@parent1.id))._read_association(:tags)
+    new_tag = post_children.detect { |t| t.name == 'new_tag' }
 
     expected_edit_checks = [ViewModel::Reference.new(ParentView, @parent1.id),
                             ViewModel::Reference.new(TagView, @tag1.id),
@@ -482,7 +493,12 @@ class ViewModel::ActiveRecord::HasManyThroughTest < ActiveSupport::TestCase
     assert_contains_exactly(expected_edit_checks,
                             context.valid_edit_refs)
 
-    assert_equal(2, nc.size)
+    assert_equal(2, post_children.size)
+    assert_equal(2, update.size)
+    assert_contains_exactly(
+      ['new_tag', 'renamed tag1'],
+      updated.map(&:name),
+    )
 
     @parent1.reload
     assert_equal(['renamed tag1', 'new_tag'], tags(@parent1).map(&:name))

data/test/unit/view_model/traversal_context_test.rb

@@ -187,7 +187,21 @@ class ViewModel::TraversalContextTest < ActiveSupport::TestCase
         it 'traverses as expected in replace_associated' do
           ctx = vm_deserialize_context(viewmodel_class)
           replacement = subject_association.collection? ? [new_child_hash] : new_child_hash
-          vm.replace_associated(subject_association_name, replacement, deserialize_context: ctx)
+          references = {}
+
+          # Referenced collections need to be presented as is, _except_ for when they're owned, as
+          # this is special cased in NestedControllerBase#write_association (+_bulk) for
+          # convenience.
+          if subject_association.referenced? && !subject_association.owned?
+            replacement = ViewModel::Utils.wrap_one_or_many(replacement) do |replacements|
+              replacements.map!.with_index do |update, index|
+                references["ref#{index}"] = update
+                { ViewModel::REFERENCE_ATTRIBUTE => "ref#{index}" }
+              end
+            end
+          end
+
+          vm.replace_associated(subject_association_name, replacement, references: references, deserialize_context: ctx)
 
           expected = expected_parent_details
           expected = expected.merge(expected_children_details) unless subject_association.referenced?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: iknow_cache
   requirement: !ruby/object:Gem::Requirement
@@ -362,7 +362,7 @@ dependencies:
         version: '0'
 description: ''
 email:
-- edge@iknow.jp
+- systems@iknow.jp
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -453,6 +453,7 @@ files:
 - test/unit/view_model/active_record/belongs_to_test.rb
 - test/unit/view_model/active_record/cache_test.rb
 - test/unit/view_model/active_record/cloner_test.rb
+- test/unit/view_model/active_record/controller_nested_test.rb
 - test/unit/view_model/active_record/controller_test.rb
 - test/unit/view_model/active_record/counter_test.rb
 - test/unit/view_model/active_record/customization_test.rb
@@ -514,6 +515,7 @@ test_files:
 - test/unit/view_model/active_record/belongs_to_test.rb
 - test/unit/view_model/active_record/cache_test.rb
 - test/unit/view_model/active_record/cloner_test.rb
+- test/unit/view_model/active_record/controller_nested_test.rb
 - test/unit/view_model/active_record/controller_test.rb
 - test/unit/view_model/active_record/counter_test.rb
 - test/unit/view_model/active_record/customization_test.rb