iknow_view_models 3.2.1 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa0ab7a6ce71bd40dbb00eea4f73c33a1c3f442ccf349626154c6bf2974088e
-  data.tar.gz: 298c6f0483d477bf48f849ad380c9b7bd6eb7d4a55763ba10d1639c2d2181103
+  metadata.gz: 89b29591362703c3bed79c996f0de85f7c8c1f65506bfd70b20f6abcf90f3375
+  data.tar.gz: 81af7a5b3dd3d2c6531019fd65f10d5bcb382a943088eba6e5b16a0eb45d2253
 SHA512:
-  metadata.gz: 54c754abf844d1a4a62124df1476c3870f487b56de1108acabdb0b57acca108581817df170c318cd9d8edd0930314286d498a3d1ba9e8b68ae87a928dbfa73e9
-  data.tar.gz: 905754efd90b6176b5f7271b1cd997df974ac35dde9afdbaa7612e4a5ec722c942b1021fb565e693efac6df30aa67205d39b6adc9ba3fa64d0db401ce99d7915
+  metadata.gz: 185fd079af273bbb14f617f38539b3b72f181e8bdc9af04151705267f6a4d3f21eed99d02401c4010f4d124f0d505b51f9283353bf7da0ae84fa62afbb093ad0
+  data.tar.gz: 3b4dec46423b5bd7090de5c4f1e712e4ce5ef71e969838a52bed724bb42bef6b43c521a32e78c2b0ec948924a6f4311f05607472a4f6061e152413d465b867de

data/lib/iknow_view_models/version.rb

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

data/lib/view_model.rb

@@ -245,7 +245,7 @@ class ViewModel
 
     def schema_hash(schema_versions)
       version_string = schema_versions.to_a.sort.join(',')
-      Base64.urlsafe_encode64(Digest::MD5.digest(version_string))
+      Base64.urlsafe_encode64(Digest::MD5.digest(version_string), padding: false)
     end
 
     def preload_for_serialization(viewmodels, serialize_context: new_serialize_context, include_referenced: true, lock: nil)

data/lib/view_model/active_record.rb

@@ -224,7 +224,7 @@ class ViewModel::ActiveRecord < ViewModel::Record
       DeepPreloader::Spec.new(association_specs)
     end
 
-    def dependent_viewmodels(seen = Set.new, include_referenced: true)
+    def dependent_viewmodels(seen = Set.new, include_referenced: true, include_external: true)
       return if seen.include?(self)
 
       seen << self
@@ -232,19 +232,20 @@ class ViewModel::ActiveRecord < ViewModel::Record
       _members.each_value do |data|
         next unless data.is_a?(AssociationData)
         next unless include_referenced || !data.referenced?
+        next unless include_external   || !data.external?
 
         data.viewmodel_classes.each do |vm|
-          vm.dependent_viewmodels(seen, include_referenced: include_referenced)
+          vm.dependent_viewmodels(seen, include_referenced: include_referenced, include_external: include_external)
         end
       end
 
       seen
     end
 
-    def deep_schema_version(include_referenced: true)
+    def deep_schema_version(include_referenced: true, include_external: true)
       (@deep_schema_version ||= {})[include_referenced] ||=
         begin
-          dependent_viewmodels(include_referenced: include_referenced).each_with_object({}) do |view, h|
+          dependent_viewmodels(include_referenced: include_referenced, include_external: include_external).each_with_object({}) do |view, h|
             h[view.view_name] = view.schema_version
           end.freeze
         end

data/lib/view_model/active_record/controller.rb

@@ -17,6 +17,8 @@ module ViewModel::ActiveRecord::Controller
   include ViewModel::ActiveRecord::CollectionNestedController
   include ViewModel::ActiveRecord::SingularNestedController
 
+  MIGRATION_VERSION_HEADER = 'X-ViewModel-Versions'
+
   def show(scope: nil, viewmodel_class: self.viewmodel_class, serialize_context: new_serialize_context(viewmodel_class: viewmodel_class))
     view = nil
     pre_rendered = viewmodel_class.transaction do
@@ -96,11 +98,24 @@ module ViewModel::ActiveRecord::Controller
   def migration_versions
     @migration_versions ||=
       begin
-        versions = parse_param(
-          :versions,
-          default: {},
-          with: IknowParams::Serializer::HashOf.new(
-            IknowParams::Serializer::String, IknowParams::Serializer::Integer))
+        version_spec =
+          if params.include?(:versions)
+            params[:versions]
+          elsif request.headers.include?(MIGRATION_VERSION_HEADER)
+            begin
+              JSON.parse(request.headers[MIGRATION_VERSION_HEADER])
+            rescue JSON::ParserError
+              raise ViewModel::Error.new(status: 400, detail: "Invalid JSON in #{MIGRATION_VERSION_HEADER}")
+            end
+          else
+            {}
+          end
+
+        versions =
+          IknowParams::Parser.parse_value(
+            version_spec,
+            with: IknowParams::Serializer::HashOf.new(
+              IknowParams::Serializer::String, IknowParams::Serializer::Integer))
 
         migration_versions = {}
 

data/lib/view_model/registry.rb

@@ -6,7 +6,8 @@ class ViewModel::Registry
   DEFERRED_NAME = Object.new
 
   class << self
-    delegate :for_view_name, :register, :default_view_name, :infer_model_class_name, :clear_removed_classes!,
+    delegate :for_view_name, :register, :default_view_name, :infer_model_class_name,
+             :clear_removed_classes!, :all, :roots,
              to: :instance
   end
 
@@ -33,6 +34,17 @@ class ViewModel::Registry
     end
   end
 
+  def all
+    @lock.synchronize do
+      resolve_deferred_classes
+      @viewmodel_classes_by_name.values
+    end
+  end
+
+  def roots
+    all.select { |c| c.root? }
+  end
+
   def register(viewmodel, as: DEFERRED_NAME)
     @lock.synchronize do
       @deferred_viewmodel_classes << [viewmodel, as]

data/test/helpers/controller_test_helpers.rb

@@ -7,6 +7,8 @@ require 'view_model/active_record/controller'
 require_relative '../helpers/arvm_test_utilities'
 require_relative '../helpers/arvm_test_models'
 
+require 'action_controller'
+
 require 'acts_as_manual_list'
 
 # models for ARVM controller test
@@ -145,11 +147,11 @@ end
 
 ## Dummy Rails Controllers
 class DummyController
-  attr_reader :params, :status
+  attr_reader :params, :headers, :status
 
-  def initialize(**params)
-    # in Rails 5, this will not be a hash, which weakens the value of the test.
-    @params = params.with_indifferent_access
+  def initialize(headers: {}, params: {})
+    @params = ActionController::Parameters.new(params)
+    @headers = ActionDispatch::Http::Headers.from_hash({}).merge!(headers)
     @status = 200
   end
 
@@ -192,6 +194,11 @@ class DummyController
     JSON.parse(json_response)
   end
 
+  # for request.params and request.headers
+  def request
+    self
+  end
+
   class << self
     def inherited(subclass)
       subclass.initialize_rescue_blocks

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

@@ -98,7 +98,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   end
 
   def test_show
-    parentcontroller = ParentController.new(id: @parent.id)
+    parentcontroller = ParentController.new(params: { id: @parent.id })
     parentcontroller.invoke(:show)
 
     assert_equal({ 'data' => @parent_view.to_hash },
@@ -110,7 +110,10 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   end
 
   def test_migrated_show
-    parentcontroller = ParentController.new(id: @parent.id, versions: { ParentView.view_name => 1 })
+    parentcontroller = ParentController.new(
+      params: { id: @parent.id },
+      headers: { 'X-ViewModel-Versions' => { ParentView.view_name => 1 }.to_json })
+
     parentcontroller.invoke(:show)
 
     expected_view = @parent_view.to_hash
@@ -127,6 +130,18 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     assert_all_hooks_nested_inside_parent_hook(parentcontroller.hook_trace)
   end
 
+  def test_invalid_migration_header
+    parentcontroller = ParentController.new(
+      params: { id: @parent.id },
+      headers: { 'X-ViewModel-Versions' => 'not a json' })
+
+    parentcontroller.invoke(:show)
+    assert_equal(400, parentcontroller.status)
+    assert_match(/Invalid JSON/i,
+                 parentcontroller.hash_response['error']['detail'],
+                 'json error propagated')
+  end
+
   def test_index
     p2      = Parent.create(name: 'p2')
     p2_view = ParentView.new(p2)
@@ -152,7 +167,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
                        { '_type' => 'Child', 'name' => 'c2' },],
     }
 
-    parentcontroller = ParentController.new(data: data)
+    parentcontroller = ParentController.new(params: { data: data })
     parentcontroller.invoke(:create)
 
     assert_equal(200, parentcontroller.status)
@@ -173,7 +188,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
       'old_name' => 'p2',
     }
 
-    parentcontroller = ParentController.new(data: data, versions: { ParentView.view_name => 1 })
+    parentcontroller = ParentController.new(params: { data: data, versions: { ParentView.view_name => 1 } })
     parentcontroller.invoke(:create)
 
     assert_equal(200, parentcontroller.status)
@@ -183,14 +198,14 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   end
 
   def test_create_empty
-    parentcontroller = ParentController.new(data: [])
+    parentcontroller = ParentController.new(params: { data: [] })
     parentcontroller.invoke(:create)
 
     assert_equal(400, parentcontroller.status)
   end
 
   def test_create_invalid
-    parentcontroller = ParentController.new(data: 42)
+    parentcontroller = ParentController.new(params: { data: 42 })
     parentcontroller.invoke(:create)
 
     assert_equal(400, parentcontroller.status)
@@ -201,7 +216,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
              '_type' => 'Parent',
              'name'  => 'new' }
 
-    parentcontroller = ParentController.new(id: @parent.id, data: data)
+    parentcontroller = ParentController.new(params: { id: @parent.id, data: data })
     parentcontroller.invoke(:create)
 
     assert_equal(200, parentcontroller.status)
@@ -216,7 +231,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   end
 
   def test_destroy
-    parentcontroller = ParentController.new(id: @parent.id)
+    parentcontroller = ParentController.new(params: { id: @parent.id })
     parentcontroller.invoke(:destroy)
 
     assert_equal(200, parentcontroller.status)
@@ -230,7 +245,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   end
 
   def test_show_missing
-    parentcontroller = ParentController.new(id: 9999)
+    parentcontroller = ParentController.new(params: { id: 9999 })
     parentcontroller.invoke(:show)
 
     assert_equal(404, parentcontroller.status)
@@ -252,7 +267,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
              'children' => [{ '_type' => 'Child',
                               'age'   => 42 }] }
 
-    parentcontroller = ParentController.new(data: data)
+    parentcontroller = ParentController.new(params: { data: data })
     parentcontroller.invoke(:create)
 
     assert_equal({ 'error' => {
@@ -275,7 +290,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     data = { '_type'    => 'Parent',
              'children' => [{ '_type' => 'Child',
                               'age'   => 1 }] }
-    parentcontroller = ParentController.new(data: data)
+    parentcontroller = ParentController.new(params: { data: data })
     parentcontroller.invoke(:create)
 
     assert_equal(400, parentcontroller.status)
@@ -285,7 +300,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   end
 
   def test_destroy_missing
-    parentcontroller = ParentController.new(id: 9999)
+    parentcontroller = ParentController.new(params: { id: 9999 })
     parentcontroller.invoke(:destroy)
 
     assert_equal({ 'error' => {
@@ -307,7 +322,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   def test_nested_collection_index_associated
     _distractor = Parent.create(name: 'p2', children: [Child.new(name: 'c3', position: 1)])
 
-    childcontroller = ChildController.new(parent_id: @parent.id)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id })
     childcontroller.invoke(:index_associated)
 
     assert_equal(200, childcontroller.status)
@@ -334,7 +349,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
 
   def test_nested_collection_append_one
     data = { '_type' => 'Child', 'name' => 'c3' }
-    childcontroller = ChildController.new(parent_id: @parent.id, data: data)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id, data: data })
 
     childcontroller.invoke(:append)
 
@@ -353,7 +368,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     data = [{ '_type' => 'Child', 'name' => 'c3' },
             { '_type' => 'Child', 'name' => 'c4' },]
 
-    childcontroller = ChildController.new(parent_id: @parent.id, data: data)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id, data: data })
     childcontroller.invoke(:append)
 
     assert_equal(200, childcontroller.status, childcontroller.hash_response)
@@ -376,7 +391,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     data = [{ '_type' => 'Child', 'name' => 'newc1' },
             { '_type' => 'Child', 'name' => 'newc2' },]
 
-    childcontroller = ChildController.new(parent_id: @parent.id, data: data)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id, data: data })
     childcontroller.invoke(:replace)
 
     assert_equal(200, childcontroller.status, childcontroller.hash_response)
@@ -391,7 +406,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
 
   def test_nested_collection_replace_bad_data
     data = [{ 'name' => 'nc' }]
-    childcontroller = ChildController.new(parent_id: @parent.id, data: data)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id, data: data })
 
     childcontroller.invoke(:replace)
 
@@ -402,7 +417,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
 
   def test_nested_collection_disassociate_one
     old_child = @parent.children.first
-    childcontroller = ChildController.new(parent_id: @parent.id, id: old_child.id)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id, id: old_child.id })
     childcontroller.invoke(:disassociate)
 
     assert_equal(200, childcontroller.status, childcontroller.hash_response)
@@ -418,7 +433,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   def test_nested_collection_disassociate_many
     old_children = @parent.children
 
-    childcontroller = ChildController.new(parent_id: @parent.id)
+    childcontroller = ChildController.new(params: { parent_id: @parent.id })
     childcontroller.invoke(:disassociate_all)
 
     assert_equal(200, childcontroller.status, childcontroller.hash_response)
@@ -434,7 +449,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   # direct methods on nested controller
   def test_nested_collection_destroy
     old_child = @parent.children.first
-    childcontroller = ChildController.new(id: old_child.id)
+    childcontroller = ChildController.new(params: { id: old_child.id })
     childcontroller.invoke(:destroy)
 
     assert_equal(200, childcontroller.status, childcontroller.hash_response)
@@ -452,7 +467,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
              '_type' => 'Child',
              'name' => 'new_name' }
 
-    childcontroller = ChildController.new(data: data)
+    childcontroller = ChildController.new(params: { data: data })
     childcontroller.invoke(:create)
 
     assert_equal(200, childcontroller.status, childcontroller.hash_response)
@@ -467,7 +482,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   def test_nested_collection_show
     old_child = @parent.children.first
 
-    childcontroller = ChildController.new(id: old_child.id)
+    childcontroller = ChildController.new(params: { id: old_child.id })
     childcontroller.invoke(:show)
 
     assert_equal({ 'data' => ChildView.new(old_child).to_hash },
@@ -482,7 +497,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     old_label = @parent.label
 
     data = { '_type' => 'Label', 'text' => 'new label' }
-    labelcontroller = LabelController.new(parent_id: @parent.id, data: data)
+    labelcontroller = LabelController.new(params: { parent_id: @parent.id, data: data })
     labelcontroller.invoke(:create_associated)
 
     assert_equal(200, labelcontroller.status, labelcontroller.hash_response)
@@ -504,7 +519,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   def test_nested_singular_show_from_parent
     old_label = @parent.label
 
-    labelcontroller = LabelController.new(parent_id: @parent.id)
+    labelcontroller = LabelController.new(params: { parent_id: @parent.id })
     labelcontroller.invoke(:show_associated)
 
     assert_equal(200, labelcontroller.status, labelcontroller.hash_response)
@@ -518,7 +533,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   def test_nested_singular_destroy_from_parent
     old_label = @parent.label
 
-    labelcontroller = LabelController.new(parent_id: @parent.id)
+    labelcontroller = LabelController.new(params: { parent_id: @parent.id })
     labelcontroller.invoke(:destroy_associated)
 
     @parent.reload
@@ -536,7 +551,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     old_label = @parent.label
 
     data = { '_type' => 'Label', 'id' => old_label.id, 'text' => 'new label' }
-    labelcontroller = LabelController.new(parent_id: @parent.id, data: data)
+    labelcontroller = LabelController.new(params: { parent_id: @parent.id, data: data })
     labelcontroller.invoke(:create_associated)
 
     assert_equal(200, labelcontroller.status, labelcontroller.hash_response)
@@ -553,7 +568,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
   def test_nested_singular_show_from_id
     old_label = @parent.label
 
-    labelcontroller = LabelController.new(id: old_label.id)
+    labelcontroller = LabelController.new(params: { id: old_label.id })
     labelcontroller.invoke(:show)
 
     assert_equal(200, labelcontroller.status, labelcontroller.hash_response)
@@ -567,7 +582,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     # foreign key violation. Destroy target instead.
     old_target = @parent.target
 
-    targetcontroller = TargetController.new(id: old_target.id)
+    targetcontroller = TargetController.new(params: { id: old_target.id })
     targetcontroller.invoke(:destroy)
 
     @parent.reload
@@ -583,7 +598,7 @@ class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
     old_label = @parent.label
 
     data = { '_type' => 'Label', 'id' => old_label.id, 'text' => 'new label' }
-    labelcontroller = LabelController.new(data: data)
+    labelcontroller = LabelController.new(params: { data: data })
     labelcontroller.invoke(:create)
 
     assert_equal(200, labelcontroller.status, labelcontroller.hash_response)

data/test/unit/view_model/record_test.rb

@@ -365,122 +365,140 @@ class ViewModel::RecordTest < ActiveSupport::TestCase
       end
     end
 
-    Nested = Struct.new(:member)
+    describe 'nesting' do
+      let(:nested_model_class) do
+        klass = Struct.new(:member)
+        Object.const_set(:Nested, klass)
+        klass
+      end
 
-    class NestedView < TestViewModel
-      self.view_name = 'Nested'
-      self.model_class = Nested
-      attribute :member
-    end
+      let(:nested_viewmodel_class) do
+        mc = nested_model_class
+        klass = Class.new(TestViewModel) do
+          self.view_name = 'Nested'
+          self.model_class = mc
+          attribute :member
+        end
+        Object.const_set(:NestedView, klass)
+        klass
+      end
 
-    describe 'with nested viewmodel' do
-      let(:default_nested_model) { Nested.new('member') }
-      let(:default_nested_view)  { view_base.merge('_type' => 'Nested', 'member' => 'member') }
+      def teardown
+        Object.send(:remove_const, :Nested)
+        Object.send(:remove_const, :NestedView)
+        ActiveSupport::Dependencies::Reference.clear!
+        super
+      end
 
-      let(:attributes) { { simple: {}, nested: { using: NestedView } } }
+      describe 'with nested viewmodel' do
+        let(:default_nested_model) { nested_model_class.new('member') }
+        let(:default_nested_view)  { view_base.merge('_type' => 'Nested', 'member' => 'member') }
 
-      let(:default_view_values)  { { nested: default_nested_view } }
-      let(:default_model_values) { { nested: default_nested_model } }
+        let(:attributes) { { simple: {}, nested: { using: nested_viewmodel_class } } }
 
-      let(:update_context) do
-        TestDeserializeContext.new(targets: [default_model, default_nested_model],
-                                   access_control: access_control)
-      end
+        let(:default_view_values)  { { nested: default_nested_view } }
+        let(:default_model_values) { { nested: default_nested_model } }
 
-      include CanSerialize
-      include CanDeserializeToNew
-      include CanDeserializeToExisting
+        let(:update_context) do
+          TestDeserializeContext.new(targets: [default_model, default_nested_model],
+                                     access_control: access_control)
+        end
 
-      it 'can update the nested value' do
-        new_view = default_view.merge('nested' => default_nested_view.merge('member' => 'changed'))
+        include CanSerialize
+        include CanDeserializeToNew
+        include CanDeserializeToExisting
 
-        vm = viewmodel_class.deserialize_from_view(new_view, deserialize_context: update_context)
+        it 'can update the nested value' do
+          new_view = default_view.merge('nested' => default_nested_view.merge('member' => 'changed'))
 
-        assert(default_model.equal?(vm.model), 'returned model was not the same')
-        assert(default_nested_model.equal?(vm.model.nested), 'returned nested model was not the same')
+          vm = viewmodel_class.deserialize_from_view(new_view, deserialize_context: update_context)
 
-        assert_equal('changed', default_model.nested.member)
+          assert(default_model.equal?(vm.model), 'returned model was not the same')
+          assert(default_nested_model.equal?(vm.model.nested), 'returned nested model was not the same')
 
-        assert_unchanged(vm)
-        assert_edited(vm.nested, changed_attributes: [:member])
-      end
+          assert_equal('changed', default_model.nested.member)
 
-      it 'can replace the nested value' do
-        # The value will be unified if it is different after deserialization
-        new_view = default_view.merge('nested' => default_nested_view.merge('member' => 'changed'))
+          assert_unchanged(vm)
+          assert_edited(vm.nested, changed_attributes: [:member])
+        end
 
-        partial_update_context = TestDeserializeContext.new(targets: [default_model],
-                                                            access_control: access_control)
+        it 'can replace the nested value' do
+          # The value will be unified if it is different after deserialization
+          new_view = default_view.merge('nested' => default_nested_view.merge('member' => 'changed'))
 
-        vm = viewmodel_class.deserialize_from_view(new_view, deserialize_context: partial_update_context)
+          partial_update_context = TestDeserializeContext.new(targets: [default_model],
+                                                              access_control: access_control)
 
-        assert(default_model.equal?(vm.model), 'returned model was not the same')
-        refute(default_nested_model.equal?(vm.model.nested), 'returned nested model was the same')
+          vm = viewmodel_class.deserialize_from_view(new_view, deserialize_context: partial_update_context)
 
-        assert_edited(vm, new: false, changed_attributes: [:nested])
-        assert_edited(vm.nested, new: true, changed_attributes: [:member])
+          assert(default_model.equal?(vm.model), 'returned model was not the same')
+          refute(default_nested_model.equal?(vm.model.nested), 'returned nested model was the same')
+
+          assert_edited(vm, new: false, changed_attributes: [:nested])
+          assert_edited(vm.nested, new: true, changed_attributes: [:member])
+        end
       end
-    end
 
-    describe 'with array of nested viewmodel' do
-      let(:default_nested_model_1) { Nested.new('member1') }
-      let(:default_nested_view_1)  { view_base.merge('_type' => 'Nested', 'member' => 'member1') }
+      describe 'with array of nested viewmodel' do
+        let(:default_nested_model_1) { nested_model_class.new('member1') }
+        let(:default_nested_view_1)  { view_base.merge('_type' => 'Nested', 'member' => 'member1') }
 
-      let(:default_nested_model_2) { Nested.new('member2') }
-      let(:default_nested_view_2)  { view_base.merge('_type' => 'Nested', 'member' => 'member2') }
+        let(:default_nested_model_2) { nested_model_class.new('member2') }
+        let(:default_nested_view_2)  { view_base.merge('_type' => 'Nested', 'member' => 'member2') }
 
-      let(:attributes) { { simple: {}, nested: { using: NestedView, array: true } } }
+        let(:attributes) { { simple: {}, nested: { using: nested_viewmodel_class, array: true } } }
 
-      let(:default_view_values)  { { nested: [default_nested_view_1, default_nested_view_2] } }
-      let(:default_model_values) { { nested: [default_nested_model_1, default_nested_model_2] } }
+        let(:default_view_values)  { { nested: [default_nested_view_1, default_nested_view_2] } }
+        let(:default_model_values) { { nested: [default_nested_model_1, default_nested_model_2] } }
 
-      let(:update_context) {
-        TestDeserializeContext.new(targets: [default_model, default_nested_model_1, default_nested_model_2],
-                                   access_control: access_control)
-      }
+        let(:update_context) {
+          TestDeserializeContext.new(targets: [default_model, default_nested_model_1, default_nested_model_2],
+                                     access_control: access_control)
+        }
 
-      include CanSerialize
-      include CanDeserializeToNew
-      include CanDeserializeToExisting
+        include CanSerialize
+        include CanDeserializeToNew
+        include CanDeserializeToExisting
 
-      it 'rejects change to attribute' do
-        new_view = default_view.merge('nested' => 'terrible')
-        ex = assert_raises(ViewModel::DeserializationError::InvalidAttributeType) do
-          viewmodel_class.deserialize_from_view(new_view, deserialize_context: update_context)
+        it 'rejects change to attribute' do
+          new_view = default_view.merge('nested' => 'terrible')
+          ex = assert_raises(ViewModel::DeserializationError::InvalidAttributeType) do
+            viewmodel_class.deserialize_from_view(new_view, deserialize_context: update_context)
+          end
+          assert_equal('nested', ex.attribute)
+          assert_equal('Array',  ex.expected_type)
+          assert_equal('String', ex.provided_type)
         end
-        assert_equal('nested', ex.attribute)
-        assert_equal('Array',  ex.expected_type)
-        assert_equal('String', ex.provided_type)
-      end
 
-      it 'can edit a nested value' do
-        default_view['nested'][0]['member'] = 'changed'
-        vm = viewmodel_class.deserialize_from_view(default_view, deserialize_context: update_context)
-        assert(default_model.equal?(vm.model), 'returned model was not the same')
-        assert_equal(2, vm.model.nested.size)
-        assert(default_nested_model_1.equal?(vm.model.nested[0]))
-        assert(default_nested_model_2.equal?(vm.model.nested[1]))
+        it 'can edit a nested value' do
+          default_view['nested'][0]['member'] = 'changed'
+          vm = viewmodel_class.deserialize_from_view(default_view, deserialize_context: update_context)
+          assert(default_model.equal?(vm.model), 'returned model was not the same')
+          assert_equal(2, vm.model.nested.size)
+          assert(default_nested_model_1.equal?(vm.model.nested[0]))
+          assert(default_nested_model_2.equal?(vm.model.nested[1]))
 
-        assert_unchanged(vm)
-        assert_edited(vm.nested[0], changed_attributes: [:member])
-      end
+          assert_unchanged(vm)
+          assert_edited(vm.nested[0], changed_attributes: [:member])
+        end
 
-      it 'can append a nested value' do
-        default_view['nested'] << view_base.merge('_type' => 'Nested', 'member' => 'member3')
+        it 'can append a nested value' do
+          default_view['nested'] << view_base.merge('_type' => 'Nested', 'member' => 'member3')
 
-        vm = viewmodel_class.deserialize_from_view(default_view, deserialize_context: update_context)
+          vm = viewmodel_class.deserialize_from_view(default_view, deserialize_context: update_context)
 
-        assert(default_model.equal?(vm.model), 'returned model was not the same')
-        assert_equal(3, vm.model.nested.size)
-        assert(default_nested_model_1.equal?(vm.model.nested[0]))
-        assert(default_nested_model_2.equal?(vm.model.nested[1]))
+          assert(default_model.equal?(vm.model), 'returned model was not the same')
+          assert_equal(3, vm.model.nested.size)
+          assert(default_nested_model_1.equal?(vm.model.nested[0]))
+          assert(default_nested_model_2.equal?(vm.model.nested[1]))
 
-        vm.model.nested.each_with_index do |nvm, i|
-          assert_equal("member#{i + 1}", nvm.member)
-        end
+          vm.model.nested.each_with_index do |nvm, i|
+            assert_equal("member#{i + 1}", nvm.member)
+          end
 
-        assert_edited(vm, changed_attributes: [:nested])
-        assert_edited(vm.nested[2], new: true, changed_attributes: [:member])
+          assert_edited(vm, changed_attributes: [:nested])
+          assert_edited(vm.nested[2], new: true, changed_attributes: [:member])
+        end
       end
     end
   end

data/test/unit/view_model/registry_test.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'minitest/autorun'
+require 'minitest/unit'
+require 'minitest/hooks'
+
+require_relative '../../helpers/arvm_test_utilities'
+require_relative '../../helpers/arvm_test_models'
+require_relative '../../helpers/viewmodel_spec_helpers'
+
+require 'view_model'
+require 'view_model/active_record'
+
+class ViewModel
+  class RegistryTest < ActiveSupport::TestCase
+    using ViewModel::Utils::Collections
+    include ARVMTestUtilities
+    extend Minitest::Spec::DSL
+    include ViewModelSpecHelpers::ParentAndBelongsToChild
+
+    before(:each) do
+      ViewModel::Registry.clear_removed_classes!
+    end
+
+    it 'registers the views' do
+      assert_equal(ViewModel::Registry.for_view_name(view_name), viewmodel_class)
+      assert_equal(ViewModel::Registry.for_view_name(child_view_name), child_viewmodel_class)
+    end
+
+    it 'enumerates the views' do
+      assert_contains_exactly([ViewModel::ErrorView, viewmodel_class, child_viewmodel_class], ViewModel::Registry.all)
+    end
+
+    it 'enumerates the root views' do
+      assert_contains_exactly([viewmodel_class], ViewModel::Registry.roots)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.6
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -468,6 +468,7 @@ files:
 - test/unit/view_model/controller_test.rb
 - test/unit/view_model/deserialization_error/unique_violation_test.rb
 - test/unit/view_model/record_test.rb
+- test/unit/view_model/registry_test.rb
 - test/unit/view_model/traversal_context_test.rb
 - test/unit/view_model_test.rb
 homepage: https://github.com/iknow/cerego_view_models
@@ -527,5 +528,6 @@ test_files:
 - test/unit/view_model/controller_test.rb
 - test/unit/view_model/deserialization_error/unique_violation_test.rb
 - test/unit/view_model/record_test.rb
+- test/unit/view_model/registry_test.rb
 - test/unit/view_model/traversal_context_test.rb
 - test/unit/view_model_test.rb