iknow_view_models 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e0fb612b3ee4fc28b8bba11d40dfcd2da75775af0c8154a83a913f179824ccd
-  data.tar.gz: 6027d6f5a46e2654432e8c7b28cfcde8d2cb07f523efa7f87be199241246b83e
+  metadata.gz: 87a056bba1e37b5593a5ad90365c5b761976529f1c5ab4074b26dd666060d57e
+  data.tar.gz: 5a796e74204b2fb1b55d8f94bf95c347b3b80a65bf3d48036f7b6de06cba8cf2
 SHA512:
-  metadata.gz: 7301fdf85df162d86aaaa558e136dd1df2f047aec97abd084ba83369cac83b5d1b7904a8d0930c9cfb34a9c08aa49e835f89d0ea5c83eef007dbec4ff92a4b31
-  data.tar.gz: 861f4a2b0ab0eb4a48fa6ef1a2116307dd9d8409508e40c2534cb3e07b6dfe92e843f2eeb4904249d97326d83147eccf3b1757c0200b2ce796aa83eeb1eb3c0f
+  metadata.gz: 1b7d484cb7ab2d0286bfc99460f029e8a9ccbb5edcc355cee42671e285f7ce2efe45946f2f7130d528b947fdb8e3bd41aa12dc007a049674b35d7a41b6f6b5be
+  data.tar.gz: 7ab16b3a6ec5569704da7a5bdfccde6374d43770c53e1e78ceca961e7043400842c8e84e3614528eee3b8f7c81ccf884f2d0ffc24793ef5cc8328d96cee12152

data/lib/iknow_view_models/version.rb

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

data/lib/view_model/active_record.rb

@@ -339,7 +339,7 @@ class ViewModel::ActiveRecord < ViewModel::Record
       # associated here are join-table models; we need to get the far side out
       join_models = associated
 
-      if association_data.direct_viewmodel._list_member?
+      if association_data.ordered?
         attr = association_data.direct_viewmodel._list_attribute_name
         join_models = join_models.sort_by { |j| j[attr] }
       end
@@ -350,11 +350,16 @@ class ViewModel::ActiveRecord < ViewModel::Record
       end
 
     when association_data.collection?
-      associated_viewmodel_class = association_data.viewmodel_class
-      associated_viewmodels = associated.map { |x| associated_viewmodel_class.new(x) }
-      if associated_viewmodel_class._list_member?
+      associated_viewmodels = associated.map do |x|
+        associated_viewmodel_class = association_data.viewmodel_class_for_model!(x.class)
+        associated_viewmodel_class.new(x)
+      end
+
+      # If any associated type is a list member, they must all be
+      if association_data.ordered?
         associated_viewmodels.sort_by!(&:_list_attribute)
       end
+
       associated_viewmodels
 
     else

data/lib/view_model/active_record/association_data.rb

@@ -196,6 +196,21 @@ class ViewModel::ActiveRecord::AssociationData
     viewmodel_classes.first
   end
 
+  def ordered?
+    @ordered ||=
+      if through?
+        direct_viewmodel._list_member?
+      else
+        list_members = viewmodel_classes.map { |c| c._list_member? }.uniq
+
+        if list_members.size > 1
+          raise ArgumentError.new('Inconsistent associated views: mixed list membership')
+        end
+
+        list_members[0]
+      end
+  end
+
   def through?
     @indirect_association_name.present?
   end

data/lib/view_model/active_record/association_manipulation.rb

@@ -16,11 +16,13 @@ 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
+
       associated_viewmodel = association.klass.try { |k| association_data.viewmodel_class_for_model!(k) }
       direct_viewmodel     = associated_viewmodel
     end
 
-    if direct_viewmodel._list_member?
+    if association_data.ordered?
       association_scope = association_scope.order(direct_viewmodel._list_attribute_name)
     end
 
@@ -116,6 +118,8 @@ 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
+
             direct_viewmodel_class = association_data.viewmodel_class
             root_update_data, referenced_update_data = construct_direct_append_updates(association_data, subtree_hashes, references)
           end
@@ -127,7 +131,7 @@ module ViewModel::ActiveRecord::AssociationManipulation
           update_context.root_updates.each { |update| update.reparent_to = new_parent }
 
           # Set place in list.
-          if direct_viewmodel_class._list_member?
+          if association_data.ordered?
             new_positions = select_append_positions(association_data,
                                                     direct_viewmodel_class._list_attribute_name,
                                                     update_context.root_updates.count,
@@ -238,6 +242,8 @@ 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
+
           # 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/lib/view_model/active_record/update_operation.rb

@@ -450,14 +450,13 @@ class ViewModel::ActiveRecord
       parent_data = ParentData.new(association_data.direct_reflection.inverse_of, viewmodel)
 
       # load children already attached to this model
-      child_viewmodel_class = association_data.viewmodel_class
-
       previous_child_viewmodels =
         model.public_send(association_data.direct_reflection.name).map do |child_model|
+          child_viewmodel_class = association_data.viewmodel_class_for_model!(child_model.class)
           child_viewmodel_class.new(child_model)
         end
 
-      if child_viewmodel_class._list_member?
+      if association_data.ordered?
         previous_child_viewmodels.sort_by!(&:_list_attribute)
       end
 
@@ -604,7 +603,7 @@ class ViewModel::ActiveRecord
       # need to be updated anyway since their parent pointer will change.
       new_positions = Array.new(resolved_children.length)
 
-      if association_data.viewmodel_class._list_member?
+      if association_data.ordered?
         set_position = ->(index, pos) { new_positions[index] = pos }
 
         get_previous_position = ->(index) do
@@ -802,7 +801,7 @@ class ViewModel::ActiveRecord
         ReferencedCollectionMember.new(indirect_viewmodel_ref, direct_vm)
       end
 
-      if direct_viewmodel_class._list_member?
+      if association_data.ordered?
         previous_members.sort_by!(&:position)
       end
 
@@ -868,7 +867,7 @@ class ViewModel::ActiveRecord
         viewmodel.association_changed!(association_data.association_name)
       end
 
-      if direct_viewmodel_class._list_member?
+      if association_data.ordered?
         ActsAsManualList.update_positions(target_collection.members)
       end
 

data/lib/view_model/migrator.rb

@@ -102,11 +102,18 @@ class ViewModel
   class DownMigrator < Migrator
     private
 
-    def migrate_viewmodel!(view_name, _, view_hash, references)
+    def migrate_viewmodel!(view_name, source_version, view_hash, references)
       path = @paths[view_name]
       return false unless path
 
-      required_version, _current_version = @versions[view_name]
+      # In a serialized output, the source version should always be the present
+      # and the current version, unless already modified by a parent migration
+      required_version, current_version = @versions[view_name]
+      return false if source_version == required_version
+
+      unless source_version == current_version
+        raise ViewModel::Migration::UnspecifiedVersionError.new(view_name, source_version)
+      end
 
       path.reverse_each do |migration|
         migration.down(view_hash, references)

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

@@ -168,26 +168,61 @@ class ViewModel::ActiveRecord::BelongsToTest < ActiveSupport::TestCase
 
   class GCTests < ActiveSupport::TestCase
     include ARVMTestUtilities
-    include ViewModelSpecHelpers::ParentAndBelongsToChild
+    include ViewModelSpecHelpers::Base
 
     def model_attributes
       super.merge(
         schema: ->(t) do
+          t.integer :destroyed_child_id
           t.integer :deleted_child_id
           t.integer :ignored_child_id
+          t.foreign_key :children, column: :destroyed_child_id
+          t.foreign_key :children, column: :deleted_child_id
+          t.foreign_key :children, column: :ignored_child_id
         end,
         model: ->(_m) do
-          belongs_to :deleted_child, class_name: Child.name, dependent: :delete
-          belongs_to :ignored_child, class_name: Child.name
+          belongs_to :destroyed_child, class_name: Child.name, inverse_of: :destroyed_model, dependent: :destroy
+          belongs_to :deleted_child,   class_name: Child.name, inverse_of: :deleted_model,   dependent: :delete
+          belongs_to :ignored_child,   class_name: Child.name, inverse_of: :ignored_model
         end,
         viewmodel: ->(_v) do
-          associations :deleted_child, :ignored_child
+          associations :destroyed_child, :deleted_child, :ignored_child
         end)
     end
 
-    # test belongs_to garbage collection - dependent: delete_all
-    def test_gc_dependent_delete_all
+    def child_attributes
+      super.merge(
+        model: ->(_m) do
+          has_one :destroyed_model, class_name: 'Model', inverse_of: :destroyed_child, foreign_key: 'destroyed_child_id'
+          has_one :deleted_model, class_name: 'Model', inverse_of: :deleted_child, foreign_key: 'deleted_child_id'
+          has_one :ignored_model, class_name: 'Model', inverse_of: :ignored_child, foreign_key: 'ignored_child_id'
+        end)
+    end
+
+    def viewmodel_class
+      child_viewmodel_class
+      super
+    end
+
+    # test belongs_to garbage collection - dependent: destroy
+    def test_gc_dependent_destroy
+      model = model_class.create(destroyed_child: Child.new(name: 'one'))
+
+      old_child = model.destroyed_child
+
+      alter_by_view!(ModelView, model) do |ov, _refs|
+        ov['destroyed_child'] = { '_type' => 'Child', 'name' => 'two' }
+      end
+
+      assert_equal('two', model.destroyed_child.name)
+      refute_equal(old_child, model.destroyed_child)
+      assert(Child.where(id: old_child.id).blank?)
+    end
+
+    # test belongs_to garbage collection - dependent: delete
+    def test_gc_dependent_delete
       model = model_class.create(deleted_child: Child.new(name: 'one'))
+
       old_child = model.deleted_child
 
       alter_by_view!(ModelView, model) do |ov, _refs|

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

@@ -898,6 +898,131 @@ class ViewModel::ActiveRecord::HasManyTest < ActiveSupport::TestCase
     assert_match(/Duplicate functional update targets\b.*\bChild\b/, ex.message)
   end
 
+  describe 'sti polymorphic children' do
+    def setup
+      child_viewmodel_class
+      dog_viewmodel_class
+      cat_viewmodel_class
+      enable_logging!
+    end
+
+    def child_attributes
+      super().merge(schema: ->(t) do
+                      t.string :type, null: false
+                      t.integer :dog_number
+                      t.integer :cat_number
+                    end)
+    end
+
+    def subject_association_features
+      { viewmodels: [:Dog, :Cat] }
+    end
+
+    def dog_viewmodel_class
+      @dog_viewmodel_class ||= define_viewmodel_class(:Dog, namespace: namespace, viewmodel_base: viewmodel_base, model_base: child_model_class) do
+        define_model {}
+        define_viewmodel do
+          attribute :dog_number
+          acts_as_list :position
+        end
+      end
+    end
+
+    def cat_viewmodel_class
+      @cat_viewmodel_class ||= define_viewmodel_class(:Cat, namespace: namespace, viewmodel_base: viewmodel_base, model_base: child_model_class) do
+        define_model {}
+        define_viewmodel do
+          attribute :cat_number
+          acts_as_list :position
+        end
+      end
+    end
+
+    def new_model
+      model_class.new(name: 'p', children: [Dog.new(position: 1, dog_number: 1), Cat.new(position: 2, cat_number: 2)])
+    end
+
+    it 'creates the model structure' do
+      m = create_model!
+      m.reload
+      assert(m.is_a?(Model))
+      children = m.children.order(:position)
+      assert_equal(2, children.size)
+      assert_kind_of(Dog, children[0])
+      assert_kind_of(Cat, children[1])
+    end
+
+    it 'serializes' do
+      model = create_model!
+      view = serialize(ModelView.new(model))
+      expected_view = {
+        'id' => 1, '_type' => 'Model', '_version' => 1, 'name' => 'p',
+        'children' => [
+          { 'id' => 1, '_type' => 'Dog', '_version' => 1, 'dog_number' => 1 },
+          { 'id' => 2, '_type' => 'Cat', '_version' => 1, 'cat_number' => 2 },
+        ]
+      }
+      assert_equal(expected_view, view)
+    end
+
+    it 'creates from view' do
+      view = {
+        '_type' => 'Model',
+        'name' => 'p',
+        'children' => [
+          { '_type' => 'Dog', 'dog_number' => 1 },
+          { '_type' => 'Cat', 'cat_number' => 2 },
+        ]
+      }
+
+      pv = ModelView.deserialize_from_view(view)
+      p = pv.model
+
+      assert(!p.changed?)
+      assert(!p.new_record?)
+
+      assert_equal('p', p.name)
+
+      children = p.children.order(:position)
+
+      assert_equal(2, children.size)
+      assert_kind_of(Dog, children[0])
+      assert_equal(1, children[0].dog_number)
+      assert_kind_of(Cat, children[1])
+      assert_equal(2, children[1].cat_number)
+    end
+
+    it 'updates with reordering' do
+      model = create_model!
+
+      alter_by_view!(ModelView, model) do |view, _refs|
+        view['children'].reverse!
+      end
+
+      children = model.children.order(:position)
+      assert_equal(2, children.size)
+      assert_kind_of(Cat, children[0])
+      assert_equal(2, children[0].cat_number)
+      assert_kind_of(Dog, children[1])
+      assert_equal(1, children[1].dog_number)
+    end
+
+    it 'functional updates' do
+      model = create_model!
+
+      alter_by_view!(ModelView, model) do |view, refs|
+        view['children'] = build_fupdate do
+          append([{ '_type' => 'Cat', 'cat_number' => 100 }])
+        end
+      end
+
+      assert_equal(3, model.children.size)
+      new_child = model.children.order(:position).last
+      assert_kind_of(Cat, new_child)
+      assert_equal(100, new_child.cat_number)
+    end
+  end
+
   describe 'owned reference children' do
     def child_attributes
       super.merge(viewmodel: ->(_v) { root! })

data/test/unit/view_model/callbacks_test.rb

@@ -494,7 +494,7 @@ class ViewModel::CallbacksTest < ActiveSupport::TestCase
       let(:callback) { CallbackCrasher.new }
 
       it 'raises the callback error' do
-        proc { serialize(vm) }.must_raise(Crash)
+        _(-> { serialize(vm) }).must_raise(Crash)
       end
 
       describe 'with an access control that rejects' do
@@ -503,7 +503,7 @@ class ViewModel::CallbacksTest < ActiveSupport::TestCase
         end
 
         it 'fails access control first' do
-          proc { serialize(vm) }.must_raise(ViewModel::AccessControlError)
+          _(-> { serialize(vm) }).must_raise(ViewModel::AccessControlError)
         end
 
         describe 'and a view-mutating callback that crashes' do
@@ -514,7 +514,7 @@ class ViewModel::CallbacksTest < ActiveSupport::TestCase
           let(:callback) { MutatingCrasher.new }
 
           it 'raises the callback error first' do
-            proc { serialize(vm) }.must_raise(Crash)
+            _(-> { serialize(vm) }).must_raise(Crash)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord