iknow_view_models 3.4.2 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10bc5dca413705470b182157c2a38ebc2e11a7ae5a121ad328d03b35ff64f1d6
-  data.tar.gz: c31bf72ad0a62316705618344963e7ad78d29224b33c5472dc00ca9ec9413d75
+  metadata.gz: 3560a98616dd2f0548ac7e663827e68d86fa9991969ac6ee49633a0090e7d628
+  data.tar.gz: deec44e5132f91dfc1deef0dd889ee20c1b01c6d5d7791d356f1e9dc99ec1c8a
 SHA512:
-  metadata.gz: 989ff044b31ae5bdcea3e489e0528c9d7d6115fc19193c11f0986985001c2bd0d6bb3c40ef99f331d525c466c09849b2218dcbad8169545106b3736e6da7360b
-  data.tar.gz: 6bb882161397c6ad72456dd8a5d9389fce1ce3be9c27347d8168790070072287e9e5ab669c6406504e67cff15fce1df6a58babc9ec59be542a9f2935f407a787
+  metadata.gz: 5af2b38b2e8fb8805480bd665ea24e7ad4b489951c8b72660e502a053a945798f18269b60991eb416ab6959fc46e4831a911a15005810b57e288e2eeaaf37fd5
+  data.tar.gz: 5a73108237e3ffae5751f50a6e693e8fd737a4d1936f087095138ec2db47cbd7ec852f81e6ef881f794a38d67ba85429825b2393a850c149f363121f321adf30

data/iknow_view_models.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', '>= 5.0'
 
   spec.add_dependency 'acts_as_manual_list'
-  spec.add_dependency 'deep_preloader', '>= 1.0.1'
+  spec.add_dependency 'deep_preloader', '>= 1.0.2'
   spec.add_dependency 'iknow_cache'
   spec.add_dependency 'iknow_params', '~> 2.2.0'
   spec.add_dependency 'keyword_builder'

data/lib/iknow_view_models/version.rb

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

data/lib/view_model/active_record/association_data.rb

@@ -127,7 +127,9 @@ class ViewModel::ActiveRecord::AssociationData
   end
 
   def polymorphic?
-    target_reflection.polymorphic?
+    # STI polymorphism isn't shown on the association reflection, so in that
+    # case we have to infer it by having multiple target viewmodel types.
+    target_reflection.polymorphic? || viewmodel_classes.size > 1
   end
 
   # The side of the immediate association that holds the pointer.

data/lib/view_model/active_record/association_manipulation.rb

@@ -16,7 +16,7 @@ module ViewModel::ActiveRecord::AssociationManipulation
       associated_viewmodel = association_data.viewmodel_class
       direct_viewmodel     = association_data.direct_viewmodel
     else
-      raise ArgumentError.new('Polymorphic STI relationships not supported yet') if association_data.viewmodel_classes.size > 1
+      raise ArgumentError.new('Polymorphic STI relationships not supported yet') if association_data.polymorphic?
 
       associated_viewmodel = association.klass.try { |k| association_data.viewmodel_class_for_model!(k) }
       direct_viewmodel     = associated_viewmodel
@@ -118,7 +118,7 @@ module ViewModel::ActiveRecord::AssociationManipulation
             direct_viewmodel_class = association_data.direct_viewmodel
             root_update_data, referenced_update_data = construct_indirect_append_updates(association_data, subtree_hashes, references)
           else
-            raise ArgumentError.new('Polymorphic STI relationships not supported yet') if association_data.viewmodel_classes.size > 1
+            raise ArgumentError.new('Polymorphic STI relationships not supported yet') if association_data.polymorphic?
 
             direct_viewmodel_class = association_data.viewmodel_class
             root_update_data, referenced_update_data = construct_direct_append_updates(association_data, subtree_hashes, references)
@@ -242,7 +242,7 @@ module ViewModel::ActiveRecord::AssociationManipulation
           direct_viewmodel = association_data.direct_viewmodel
           association_scope = association_scope.where(association_data.indirect_reflection.foreign_key => associated_id)
         else
-          raise ArgumentError.new('Polymorphic STI relationships not supported yet') if association_data.viewmodel_classes.size > 1
+          raise ArgumentError.new('Polymorphic STI relationships not supported yet') if association_data.polymorphic?
 
           # viewmodel type for current association: nil in case of empty polymorphic association
           direct_viewmodel = association.klass.try { |k| association_data.viewmodel_class_for_model!(k) }

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

@@ -972,7 +972,7 @@ class ViewModel::ActiveRecord::HasManyTest < ActiveSupport::TestCase
         'children' => [
           { '_type' => 'Dog', 'dog_number' => 1 },
           { '_type' => 'Cat', 'cat_number' => 2 },
-        ]
+        ],
       }
 
       pv = ModelView.deserialize_from_view(view)
@@ -1010,7 +1010,7 @@ class ViewModel::ActiveRecord::HasManyTest < ActiveSupport::TestCase
     it 'functional updates' do
       model = create_model!
 
-      alter_by_view!(ModelView, model) do |view, refs|
+      alter_by_view!(ModelView, model) do |view, _refs|
         view['children'] = build_fupdate do
           append([{ '_type' => 'Cat', 'cat_number' => 100 }])
         end
@@ -1021,6 +1021,18 @@ class ViewModel::ActiveRecord::HasManyTest < ActiveSupport::TestCase
       assert_kind_of(Cat, new_child)
       assert_equal(100, new_child.cat_number)
     end
+
+    it 'calculates eager_includes' do
+      includes = viewmodel_class.eager_includes
+      expected = DeepPreloader::Spec.new(
+        'children' => DeepPreloader::PolymorphicSpec.new(
+          {
+            'Dog' => DeepPreloader::Spec.new,
+            'Cat' => DeepPreloader::Spec.new,
+          }))
+
+      assert_equal(includes, expected)
+    end
   end
 
   describe 'owned reference children' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-06-24 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