iknow_view_models 3.2.11 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a75096a1b8ac47eee4ff5b2a303a0d447cfe8e93668f579bb697b863947eaa5
-  data.tar.gz: ca0edc9b15a0b436d36d7b12dbd8f4255008ad4a6cd6d1ed23a352a989013fa1
+  metadata.gz: 169b16cc95d420bc248b0d201edecc825ce67cdcaf8a8bc743083685731017bf
+  data.tar.gz: 974ba2af7789e733a3aecdb989e0508147c9d415332398a7ab024d212babef9e
 SHA512:
-  metadata.gz: 683a95fe51734a420f87f4709942314ec03ee32a8a95a63487bb4495eaad7a61c0f6ba4216d67ee31f33acf9f593607833eebcd3fd9e1dfd8a4f3440a337f249
-  data.tar.gz: e889492e1e0b76a3f8b3ed8775c16fa6f67f6a45eb9ed14e09f53f41b3dc6a1675d093eec75ba2b94d79567238d22d4996236a5388dafb5ee078fb9760d0c97e
+  metadata.gz: a4dc1e63038e01b6af791ef0551f7f79ac19cbe0ba9b47a6d1fa3367200417afe0b3bfaa9951b8c7287c97d821139e217521229c4bdee34c045da70bcbf0d052
+  data.tar.gz: 63bab618289cf6e24e26ffd7be8d6a2a7571d220c1a1c5b05bb45d52c778bab4aff751f4c3853ce58226c1830de3dfebfa0296db8ad070b5e8e696224ccb3bc7

data/.circleci/config.yml

@@ -5,7 +5,7 @@ executors:
     parameters:
       ruby-version:
         type: string
-        default: "2.6"
+        default: "2.7"
       pg-version:
         type: string
         default: "11"
@@ -102,8 +102,8 @@ workflows:
   build:
     jobs:
       - test:
-          name: 'ruby 2.6 rails 5.2 pg 12'
-          ruby-version: "2.6"
+          name: 'ruby 2.7 rails 5.2 pg 12'
+          ruby-version: "2.7"
           pg-version: "12"
           gemfile: gemfiles/rails_5_2.gemfile
       - test:
@@ -111,6 +111,16 @@ workflows:
           ruby-version: "2.7"
           pg-version: "12"
           gemfile: gemfiles/rails_6_0.gemfile
+      - test:
+          name: 'ruby 2.7 rails 6.1 pg 12'
+          ruby-version: "2.7"
+          pg-version: "12"
+          gemfile: gemfiles/rails_6_1.gemfile
+      - test:
+          name: 'ruby 3.0 rails 6.1 pg 12'
+          ruby-version: "3.0"
+          pg-version: "12"
+          gemfile: gemfiles/rails_6_1.gemfile
       - publish:
           filters:
             branches:

data/Appraisals

@@ -7,3 +7,8 @@ appraise 'rails-6-0' do
   gem 'activerecord', '~> 6.0.0'
   gem 'activesupport', '~> 6.0.0'
 end
+
+appraise 'rails-6-1' do
+  gem 'activerecord', '~> 6.1.0'
+  gem 'activesupport', '~> 6.1.0'
+end

data/README.md

@@ -1,6 +1,6 @@
 # IknowViewModels
 
-[![Build Status](https://travis-ci.org/iknow/iknow_view_models.svg?branch=master)](https://travis-ci.org/iknow/iknow_view_models)
+[![Build Status](https://circleci.com/gh/iknow/iknow_view_models.svg?style=svg)](https://circleci.com/gh/iknow/iknow_view_models/)
 
 ViewModels provide a means of encapsulating a collection of related data and specifying its JSON serialization.
 

data/gemfiles/rails_6_1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'minitest-ci'
+gem 'activerecord', '~> 6.1.0'
+gem 'activesupport', '~> 6.1.0'
+
+gemspec path: '../'

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.6
+  spec.required_ruby_version = '>= 2.7'
 
   spec.add_dependency 'activerecord', '>= 5.0'
   spec.add_dependency 'activesupport', '>= 5.0'

data/lib/iknow_view_models/version.rb

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

data/lib/view_model.rb

@@ -173,6 +173,17 @@ class ViewModel
       Jbuilder.new { |json| serialize(viewmodel, json, serialize_context: serialize_context) }.attributes!
     end
 
+    def serialize_from_cache(views, migration_versions: {}, locked: false, serialize_context:)
+      plural = views.is_a?(Array)
+      views = Array.wrap(views)
+
+      json_views, json_refs = ViewModel::ActiveRecord::Cache.render_viewmodels_from_cache(
+                    views, locked: locked, migration_versions: migration_versions, serialize_context: serialize_context)
+
+      json_views = json_views.first unless plural
+      return json_views, json_refs
+    end
+
     def encode_json(value)
       # Jbuilder#encode no longer uses MultiJson, but instead calls `.to_json`. In
       # the context of ActiveSupport, we don't want this, because AS replaces the
@@ -227,16 +238,16 @@ class ViewModel
       ViewModel::SerializeContext
     end
 
-    def new_serialize_context(*args)
-      serialize_context_class.new(*args)
+    def new_serialize_context(...)
+      serialize_context_class.new(...)
     end
 
     def deserialize_context_class
       ViewModel::DeserializeContext
     end
 
-    def new_deserialize_context(*args)
-      deserialize_context_class.new(*args)
+    def new_deserialize_context(...)
+      deserialize_context_class.new(...)
     end
 
     def accepts_schema_version?(schema_version)

data/lib/view_model/active_record.rb

@@ -182,9 +182,14 @@ class ViewModel::ActiveRecord < ViewModel::Record
     end
 
     # Constructs a preload specification of the required models for
-    # serializing/deserializing this view.
-    def eager_includes(serialize_context: new_serialize_context, include_referenced: true)
+    # serializing/deserializing this view. Cycles in the schema will be broken
+    # after two layers of eager loading.
+    def eager_includes(serialize_context: new_serialize_context, include_referenced: true, vm_path: [])
       association_specs = {}
+
+      return nil if vm_path.count(self) > 2
+
+      child_path = vm_path + [self]
       _members.each do |assoc_name, association_data|
         next unless association_data.is_a?(AssociationData)
         next if association_data.external?
@@ -201,7 +206,7 @@ class ViewModel::ActiveRecord < ViewModel::Record
         case
         when association_data.through?
           viewmodel = association_data.direct_viewmodel
-          children = viewmodel.eager_includes(serialize_context: child_context, include_referenced: include_referenced)
+          children = viewmodel.eager_includes(serialize_context: child_context, include_referenced: include_referenced, vm_path: child_path)
 
         when !include_referenced && association_data.referenced?
           children = nil # Load up to the root viewmodel, but no further
@@ -210,13 +215,13 @@ class ViewModel::ActiveRecord < ViewModel::Record
           children_by_klass = {}
           association_data.viewmodel_classes.each do |vm_class|
             klass = vm_class.model_class.name
-            children_by_klass[klass] = vm_class.eager_includes(serialize_context: child_context, include_referenced: include_referenced)
+            children_by_klass[klass] = vm_class.eager_includes(serialize_context: child_context, include_referenced: include_referenced, vm_path: child_path)
           end
           children = DeepPreloader::PolymorphicSpec.new(children_by_klass)
 
         else
           viewmodel = association_data.viewmodel_class
-          children = viewmodel.eager_includes(serialize_context: child_context, include_referenced: include_referenced)
+          children = viewmodel.eager_includes(serialize_context: child_context, include_referenced: include_referenced, vm_path: child_path)
         end
 
         association_specs[association_data.direct_reflection.name.to_s] = children
@@ -340,12 +345,15 @@ class ViewModel::ActiveRecord < ViewModel::Record
 
     case
     when association_data.through?
-      # associated here are join_table models; we need to get the far side out
+      # associated here are join-table models; we need to get the far side out
+      join_models = associated
+
       if association_data.direct_viewmodel._list_member?
-        associated.order(association_data.direct_viewmodel._list_attribute_name)
+        attr = association_data.direct_viewmodel._list_attribute_name
+        join_models = join_models.sort_by { |j| j[attr] }
       end
 
-      associated.map do |through_model|
+      join_models.map do |through_model|
         model = through_model.public_send(association_data.indirect_reflection.name)
         association_data.viewmodel_class_for_model!(model.class).new(model)
       end

data/lib/view_model/active_record/cache.rb

@@ -11,6 +11,30 @@ class ViewModel::ActiveRecord::Cache
 
   attr_reader :viewmodel_class
 
+  class << self
+    def render_viewmodels_from_cache(viewmodels, migration_versions: {}, locked: false, serialize_context: nil)
+      if viewmodels.empty?
+        return [], {}
+      end
+
+      ids = viewmodels.map(&:id)
+      # ideally the roots wouldn't have to all be the same type
+      viewmodel_class = viewmodels.first.class
+      serialize_context ||= viewmodel_class.new_serialize_context
+
+      render_from_cache(viewmodel_class, ids,
+                        initial_viewmodels: viewmodels,
+                        migration_versions: migration_versions,
+                        locked: locked,
+                        serialize_context: serialize_context)
+    end
+
+    def render_from_cache(viewmodel_class, ids, initial_viewmodels: nil, migration_versions: {}, locked: false, serialize_context: viewmodel_class.new_serialize_context)
+      worker = CacheWorker.new(migration_versions: migration_versions, serialize_context: serialize_context)
+      worker.render_from_cache(viewmodel_class, ids, initial_viewmodels: initial_viewmodels, locked: locked)
+    end
+  end
+
   # If cache_group: is specified, it must be a group of a single key: `:id`
   def initialize(viewmodel_class, cache_group: nil)
     @viewmodel_class = viewmodel_class
@@ -35,85 +59,98 @@ class ViewModel::ActiveRecord::Cache
     @cache_group.invalidate_cache_group
   end
 
+  # @deprecated Replaced by class methods
   def fetch_by_viewmodel(viewmodels, migration_versions: {}, locked: false, serialize_context: @viewmodel_class.new_serialize_context)
     ids = viewmodels.map(&:id)
     fetch(ids, initial_viewmodels: viewmodels, migration_versions: migration_versions, locked: locked, serialize_context: serialize_context)
   end
 
+  # @deprecated Replaced by class methods
   def fetch(ids, initial_viewmodels: nil, migration_versions: {}, locked: false, serialize_context: @viewmodel_class.new_serialize_context)
-    data_serializations = Array.new(ids.size)
-    worker = CacheWorker.new(migration_versions: migration_versions, serialize_context: serialize_context)
-
-    # If initial root viewmodels were provided, visit them to ensure that they
-    # are visible. Other than this, no traversal callbacks are performed, as a
-    # view may be resolved from the cache without ever loading its viewmodel.
-    # Note that if unlocked, these views will be reloaded as part of obtaining a
-    # share lock. If the visibility of this viewmodel can change due to edits,
-    # it is necessary to obtain a lock before calling `fetch`.
-    initial_viewmodels&.each do |v|
-      serialize_context.run_callback(ViewModel::Callbacks::Hook::BeforeVisit, v)
-      serialize_context.run_callback(ViewModel::Callbacks::Hook::AfterVisit, v)
-    end
+    self.class.render_from_cache(@viewmodel_class, ids,
+                                 initial_viewmodels: initial_viewmodels, locked: locked,
+                                 migration_versions: migration_versions, serialize_context: serialize_context)
+  end
 
-    # Collect input array positions for each id, allowing duplicates
-    positions = ids.each_with_index.with_object({}) do |(id, i), h|
-      (h[id] ||= []) << i
-    end
+  class CacheWorker
+    SENTINEL = Object.new
+    WorklistEntry = Struct.new(:ref_name, :viewmodel)
 
-    # Fetch duplicates only once
-    ids = positions.keys
+    attr_reader :migration_versions, :serialize_context, :resolved_references
 
-    # Load existing serializations from the cache
-    cached_serializations = worker.load_from_cache(self, ids)
-    cached_serializations.each do |id, data|
-      positions[id].each do |idx|
-        data_serializations[idx] = data
-      end
+    def initialize(migration_versions:, serialize_context:)
+      @worklist                = {} # Hash[type_name, Hash[id, WorklistEntry]]
+      @resolved_references     = {} # Hash[refname, json]
+      @migration_versions      = migration_versions
+      @migrated_cache_versions = {}
+      @serialize_context       = serialize_context
     end
 
-    # Resolve and serialize missing views
-    missing_ids = ids.to_set.subtract(cached_serializations.keys)
+    def render_from_cache(viewmodel_class, ids, initial_viewmodels: nil, locked: false)
+      viewmodel_class.transaction do
+        root_serializations = Array.new(ids.size)
 
-    # If initial viewmodels have been locked, we can serialize them for cache
-    #  misses.
-    available_viewmodels =
-      if locked
-        initial_viewmodels&.each_with_object({}) do |vm, h|
-          h[vm.id] = vm if missing_ids.include?(vm.id)
+        # Collect input array positions for each id, allowing duplicates
+        positions = ids.each_with_index.with_object({}) do |(id, i), h|
+          (h[id] ||= []) << i
         end
-      end
 
-    @viewmodel_class.transaction do
-      # Load remaining views and serialize
-      viewmodels = worker.find_and_preload_viewmodels(@viewmodel_class, missing_ids.to_a,
-                                                      available_viewmodels: available_viewmodels)
+        # If duplicates are specified, fetch each only once
+        ids = positions.keys
+
+        ids_to_render = ids.to_set
+
+        if viewmodel_class < CacheableView
+          # Load existing serializations from the cache
+          cached_serializations = load_from_cache(viewmodel_class.viewmodel_cache, ids)
+          cached_serializations.each do |id, data|
+            positions[id].each do |idx|
+              root_serializations[idx] = data
+            end
+          end
 
-      loaded_serializations = worker.serialize_and_cache(viewmodels)
-      loaded_serializations.each do |id, data|
-        positions[id].each do |idx|
-          data_serializations[idx] = data
+          ids_to_render.subtract(cached_serializations.keys)
+
+          # If initial root viewmodels were provided, call hooks on any
+          # viewmodels which were rendered from the cache to ensure that the
+          # root is visible (in isolation). Other than this, no traversal
+          # callbacks are performed for cache-rendered views. This particularly
+          # requires care for references: if a visible view may refer to
+          # non-visible cacheable views, those referenced views will not be
+          # access control checked.
+          initial_viewmodels&.each do |v|
+            next unless cached_serializations.has_key?(v.id)
+            serialize_context.run_callback(ViewModel::Callbacks::Hook::BeforeVisit, v)
+            serialize_context.run_callback(ViewModel::Callbacks::Hook::AfterVisit, v)
+          end
         end
-      end
 
-      # Resolve references
-      worker.resolve_references!
+        # Render remaining views. If initial viewmodels have been locked, we may
+        # use them to serialize from, otherwise we must reload with share lock
+        # in find_and_preload.
+        available_viewmodels =
+          if locked
+            initial_viewmodels&.each_with_object({}) do |vm, h|
+              h[vm.id] = vm if ids_to_render.include?(vm.id)
+            end
+          end
 
-      return data_serializations, worker.resolved_references
-    end
-  end
+        viewmodels = find_and_preload_viewmodels(viewmodel_class, ids_to_render.to_a,
+                                                 available_viewmodels: available_viewmodels)
 
-  class CacheWorker
-    SENTINEL = Object.new
-    WorklistEntry = Struct.new(:ref_name, :viewmodel)
+        loaded_serializations = serialize_and_cache(viewmodels)
 
-    attr_reader :migration_versions, :serialize_context, :resolved_references
+        loaded_serializations.each do |id, data|
+          positions[id].each do |idx|
+            root_serializations[idx] = data
+          end
+        end
 
-    def initialize(migration_versions:, serialize_context:)
-      @worklist                = {}
-      @resolved_references     = {}
-      @migration_versions      = migration_versions
-      @migrated_cache_versions = {}
-      @serialize_context       = serialize_context
+        # recursively resolve referenced views
+        self.resolve_references!
+
+        [root_serializations, self.resolved_references]
+      end
     end
 
     def resolve_references!

data/lib/view_model/active_record/cache/cacheable_view.rb

@@ -39,14 +39,6 @@ module ViewModel::ActiveRecord::Cache::CacheableView
     def viewmodel_cache
       @viewmodel_cache
     end
-
-    def serialize_from_cache(views, migration_versions: {}, locked: false, serialize_context:)
-      plural = views.is_a?(Array)
-      views = Array.wrap(views)
-      json_views, json_refs = viewmodel_cache.fetch_by_viewmodel(views, locked: locked, migration_versions: migration_versions, serialize_context: serialize_context)
-      json_views = json_views.first unless plural
-      return json_views, json_refs
-    end
   end
 
   # Clear the cache if the view or its nested children were changed during

data/lib/view_model/active_record/collection_nested_controller.rb

@@ -22,23 +22,23 @@ module ViewModel::ActiveRecord::CollectionNestedController
   extend ActiveSupport::Concern
   include ViewModel::ActiveRecord::NestedControllerBase
 
-  def index_associated(scope: nil, serialize_context: new_serialize_context, &block)
-    show_association(scope: scope, serialize_context: serialize_context, &block)
+  def index_associated(scope: nil, serialize_context: new_serialize_context, lock_owner: nil, &block)
+    show_association(scope: scope, serialize_context: serialize_context, lock_owner: lock_owner, &block)
   end
 
   # Deserialize items of the associated type and associate them with the owner,
   # replacing previously associated items.
-  def replace(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, &block)
-    write_association(serialize_context: serialize_context, deserialize_context: deserialize_context, &block)
+  def replace(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, lock_owner: nil, &block)
+    write_association(serialize_context: serialize_context, deserialize_context: deserialize_context, lock_owner: lock_owner, &block)
   end
 
-  def disassociate_all(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context)
-    destroy_association(true, serialize_context: serialize_context, deserialize_context: deserialize_context)
+  def disassociate_all(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, lock_owner: nil)
+    destroy_association(true, serialize_context: serialize_context, deserialize_context: deserialize_context, lock_owner: lock_owner)
   end
 
   # Deserialize items of the associated type and append them to the owner's
   # collection.
-  def append(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context)
+  def append(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, lock_owner: nil)
     assoc_view = nil
     pre_rendered = owner_viewmodel.transaction do
       update_hash, refs = parse_viewmodel_updates
@@ -50,7 +50,7 @@ module ViewModel::ActiveRecord::CollectionNestedController
         raise ViewModel::DeserializationError::InvalidSyntax.new('Can not provide both `before` and `after` anchors for a collection append')
       end
 
-      owner_view = owner_viewmodel.find(owner_viewmodel_id, eager_include: false, serialize_context: serialize_context)
+      owner_view = owner_viewmodel.find(owner_viewmodel_id, eager_include: false, lock: lock_owner, serialize_context: serialize_context)
 
       assoc_view = owner_view.append_associated(association_name,
                                                 update_hash,
@@ -69,9 +69,9 @@ module ViewModel::ActiveRecord::CollectionNestedController
     assoc_view
   end
 
-  def disassociate(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context)
+  def disassociate(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, lock_owner: nil)
     owner_viewmodel.transaction do
-      owner_view = owner_viewmodel.find(owner_viewmodel_id, eager_include: false, serialize_context: serialize_context)
+      owner_view = owner_viewmodel.find(owner_viewmodel_id, eager_include: false, lock: lock_owner, serialize_context: serialize_context)
       owner_view.delete_associated(association_name, viewmodel_id, type: viewmodel_class, deserialize_context: deserialize_context)
       render_viewmodel(nil)
     end

data/lib/view_model/active_record/controller.rb

@@ -76,7 +76,7 @@ module ViewModel::ActiveRecord::Controller
     end
   end
 
-  def prerender_viewmodel(*)
+  def prerender_viewmodel(...)
     super do |jbuilder|
       yield(jbuilder) if block_given?
 

data/lib/view_model/active_record/nested_controller_base.rb

@@ -9,10 +9,10 @@ module ViewModel::ActiveRecord::NestedControllerBase
 
   protected
 
-  def show_association(scope: nil, serialize_context: new_serialize_context)
+  def show_association(scope: nil, serialize_context: new_serialize_context, lock_owner: nil)
     associated_views = nil
     pre_rendered = owner_viewmodel.transaction do
-      owner_view = owner_viewmodel.find(owner_viewmodel_id, eager_include: false, serialize_context: serialize_context)
+      owner_view = owner_viewmodel.find(owner_viewmodel_id, eager_include: false, lock: lock_owner, serialize_context: serialize_context)
       ViewModel::Callbacks.wrap_serialize(owner_view, context: serialize_context) do
         # Association manipulation methods construct child contexts internally
         associated_views = owner_view.load_associated(association_name, scope: scope, serialize_context: serialize_context)
@@ -27,12 +27,12 @@ module ViewModel::ActiveRecord::NestedControllerBase
     associated_views
   end
 
-  def write_association(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context)
+  def write_association(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, lock_owner: nil)
     association_view = nil
     pre_rendered = owner_viewmodel.transaction do
       update_hash, refs = parse_viewmodel_updates
 
-      owner_view = owner_viewmodel.find(owner_viewmodel_id, eager_include: false, serialize_context: serialize_context)
+      owner_view = owner_viewmodel.find(owner_viewmodel_id, eager_include: false, lock: lock_owner, serialize_context: serialize_context)
 
       association_view = owner_view.replace_associated(association_name, update_hash,
                                                        references: refs,
@@ -49,7 +49,11 @@ module ViewModel::ActiveRecord::NestedControllerBase
     association_view
   end
 
-  def destroy_association(collection, serialize_context: new_serialize_context, deserialize_context: new_deserialize_context)
+  def destroy_association(collection, serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, lock_owner: nil)
+    if lock_owner
+      owner_viewmodel.find(owner_viewmodel_id, eager_include: false, lock: lock_owner, serialize_context: serialize_context)
+    end
+
     empty_update = collection ? [] : nil
     owner_viewmodel.deserialize_from_view(owner_update_hash(empty_update),
                                           deserialize_context: deserialize_context)

data/lib/view_model/active_record/singular_nested_controller.rb

@@ -20,15 +20,15 @@ module ViewModel::ActiveRecord::SingularNestedController
   extend ActiveSupport::Concern
   include ViewModel::ActiveRecord::NestedControllerBase
 
-  def show_associated(scope: nil, serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, &block)
-    show_association(scope: scope, serialize_context: serialize_context, &block)
+  def show_associated(scope: nil, serialize_context: new_serialize_context, lock_owner: nil, &block)
+    show_association(scope: scope, serialize_context: serialize_context, lock_owner: lock_owner, &block)
   end
 
-  def create_associated(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, &block)
-    write_association(serialize_context: serialize_context, deserialize_context: deserialize_context, &block)
+  def create_associated(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, lock_owner: nil, &block)
+    write_association(serialize_context: serialize_context, deserialize_context: deserialize_context, lock_owner: lock_owner, &block)
   end
 
-  def destroy_associated(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context)
-    destroy_association(false, serialize_context: serialize_context, deserialize_context: deserialize_context)
+  def destroy_associated(serialize_context: new_serialize_context, deserialize_context: new_deserialize_context, lock_owner: nil)
+    destroy_association(false, serialize_context: serialize_context, deserialize_context: deserialize_context, lock_owner: lock_owner)
   end
 end

data/lib/view_model/traversal_context.rb

@@ -24,8 +24,8 @@ class ViewModel::TraversalContext
 
   delegate :access_control, :callbacks, to: :shared_context
 
-  def self.new_child(*args)
-    self.allocate.tap { |c| c.initialize_as_child(*args) }
+  def self.new_child(...)
+    self.allocate.tap { |c| c.initialize_as_child(...) }
   end
 
   def initialize(shared_context: nil, **shared_context_params)

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

@@ -135,8 +135,8 @@ class ViewModel::ActiveRecord
       [data, refs]
     end
 
-    def fetch_with_cache
-      viewmodel_class.viewmodel_cache.fetch([root.id], migration_versions: migration_versions)
+    def fetch_with_cache(**rest)
+      ViewModel::ActiveRecord::Cache.render_from_cache(viewmodel_class, [root.id], migration_versions: migration_versions, **rest)
     end
 
     def serialize_with_cache
@@ -206,6 +206,19 @@ class ViewModel::ActiveRecord
 
       describe 'without migrations' do
         include BehavesLikeACache
+
+        it 'returns the right serialization with provided initial viewmodel' do
+          fetched_result = parse_result(fetch_with_cache(initial_viewmodels: [root_view]))
+
+          value(fetched_result).must_equal(serialize_from_database)
+        end
+
+        it 'returns the right serialization with provided locked initial viewmodel' do
+          locked_root_view = viewmodel_class.new(model_class.lock("FOR SHARE").find(root.id))
+          fetched_result = parse_result(fetch_with_cache(initial_viewmodels: [locked_root_view], locked: true))
+
+          value(fetched_result).must_equal(serialize_from_database)
+        end
       end
 
       describe 'with migrations' do
@@ -337,8 +350,8 @@ class ViewModel::ActiveRecord
             [data, refs]
           end
 
-          def fetch_with_cache
-            viewmodel_class.viewmodel_cache.fetch([root.id, root2.id])
+          def fetch_with_cache(**rest)
+            ViewModel::ActiveRecord::Cache.render_from_cache(viewmodel_class, [root.id, root2.id], **rest)
           end
 
           it 'merges matching shared references between cache hits and misses' do
@@ -376,8 +389,8 @@ class ViewModel::ActiveRecord
     end
 
     describe 'when fetched by viewmodel' do
-      def fetch_with_cache
-        viewmodel_class.viewmodel_cache.fetch_by_viewmodel([root_view])
+      def fetch_with_cache(**rest)
+        ViewModel::ActiveRecord::Cache.render_viewmodels_from_cache([root_view], **rest)
       end
 
       include CacheableParentAndChildren

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

@@ -808,6 +808,39 @@ class ViewModel::ActiveRecord::HasManyTest < ActiveSupport::TestCase
     assert_match(/Removed entities must have only _type and id fields/, ex.message)
   end
 
+  def test_functional_update_move
+    c1_id, c2_id, c3_id = @model1.children.pluck(:id)
+    c4_id, c5_id = @model2.children.pluck(:id)
+
+    remove_fupdate = build_fupdate do
+      remove([{ '_type' => 'Child', 'id' => c2_id }])
+    end
+
+    append_fupdate = build_fupdate do
+      append([{ '_type' => 'Child', 'id' => c2_id }])
+    end
+
+    move_view = [
+      {
+        '_type' => 'Model',
+        'id'       => @model1.id,
+        'children' => remove_fupdate
+      },
+      {
+        '_type' => 'Model',
+        'id'       => @model2.id,
+        'children' => append_fupdate
+      }
+    ]
+
+    viewmodel_class.deserialize_from_view(move_view)
+    @model1.reload
+    @model2.reload
+
+    assert_equal([c1_id, c3_id], @model1.children.pluck(:id))
+    assert_equal([c4_id, c5_id, c2_id], @model2.children.pluck(:id))
+  end
+
   def test_functional_update_update_success
     c1_id, c2_id, c3_id = @model1.children.pluck(:id)
 

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

@@ -101,8 +101,10 @@ class ViewModel::ActiveRecord::HasManyThroughTest < ActiveSupport::TestCase
     @tag1, @tag2, @tag3 = (1..3).map { |x| Tag.create!(name: "tag#{x}") }
 
     @parent1 = Parent.create(name: 'p1',
-                             parents_tags: [ParentsTag.new(tag: @tag1, position: 1.0),
-                                            ParentsTag.new(tag: @tag2, position: 2.0),])
+                             parents_tags: [
+                               ParentsTag.new(tag: @tag2, position: 2.0),
+                               ParentsTag.new(tag: @tag1, position: 1.0),
+                             ])
 
     enable_logging!
   end

data/test/unit/view_model/active_record_test.rb

@@ -416,6 +416,11 @@ class ViewModel::ActiveRecordTest < ActiveSupport::TestCase
       @list = List.new(child: List.new(child: nil))
     end
 
+    def test_list_eager_includes
+      expected_includes = 3.times.inject(nil) { |x| DeepPreloader::Spec.new({ 'child' => x }) }
+      assert_equal(expected_includes, ListView.eager_includes)
+    end
+
     def test_deserialize_context
       view = {
         '_type' => 'List',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.2.11
+  version: 3.3.1
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -379,6 +379,7 @@ files:
 - Rakefile
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
 - iknow_view_models.gemspec
 - lib/iknow_view_models.rb
 - lib/iknow_view_models/railtie.rb
@@ -485,14 +486,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: ViewModels provide a means of encapsulating a collection of related data