iknow_view_models 3.2.5 → 3.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 054e6799ccf140f543987391ad729cb084aeb026c721a301b026d63dbe0239e2
-  data.tar.gz: d5f49f2865e261862fdf6b91e04095418be559dc47a0417a0613c0efeda41a12
+  metadata.gz: 280c8d764916ec30bb500e2f0e982131416d27ea51a3a25d1cd7e3908bb4ad5b
+  data.tar.gz: 50d202b87cde141ac58ad82a5de6b73332f9b60a71c23fbbd378ba6c1def8184
 SHA512:
-  metadata.gz: 8ba6fcabc99bc718d1814167b425a2e5cce46d8dc882c741ced4a3e016bf038f487eed71cb7d568ef2d1cee83236ceb08680de6d705e80faa27dbe22d660a539
-  data.tar.gz: 8384c93cf1427bd45cd145df76cbe76b0df97f34fd63b89a8da7df3086e9c5548c82e2123f1756d56a03eb51255c3a8a17fdb2e640c0a39d1dffaa0e78589302
+  metadata.gz: 51333e3292118de4b71e8869ea4843be804ad2d24ce0c7296918c3f09b0df93740561afeb466b4a8874a1b5b667922b664745e994151b8fe47ce458bb087d14d
+  data.tar.gz: 999d1feb717d4ef5ce11b400abf67772c5b70fd7c91cf3e328f14e5ff66a373b7c98aa5f701cb436cf4bf7df448bc553fca96131de570cead59734e8131c4788

data/lib/iknow_view_models/version.rb

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

data/lib/view_model.rb

@@ -243,9 +243,17 @@ class ViewModel
       schema_version == self.schema_version
     end
 
+    def schema_versions(viewmodels)
+      viewmodels.each_with_object({}) do |view, h|
+        h[view.view_name] = view.schema_version
+      end
+    end
+
     def schema_hash(schema_versions)
       version_string = schema_versions.to_a.sort.join(',')
-      Base64.urlsafe_encode64(Digest::MD5.digest(version_string))
+      # We want a short hash value, as this will be used in cache keys
+      hash = Digest::SHA256.digest(version_string).byteslice(0, 16)
+      Base64.urlsafe_encode64(hash, 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

@@ -243,11 +243,10 @@ class ViewModel::ActiveRecord < ViewModel::Record
     end
 
     def deep_schema_version(include_referenced: true, include_external: true)
-      (@deep_schema_version ||= {})[include_referenced] ||=
+      (@deep_schema_version ||= {})[[include_referenced, include_external]] ||=
         begin
-          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
+          vms = dependent_viewmodels(include_referenced: include_referenced, include_external: include_external)
+          ViewModel.schema_versions(vms).freeze
         end
     end
 

data/lib/view_model/migratable_view.rb

@@ -52,6 +52,9 @@ module ViewModel::MigratableView
 
       graph = RGL::DirectedAdjacencyGraph.new
 
+      # Add a vertex for the current version, in case no edges reach it
+      graph.add_vertex(self.schema_version)
+
       # Add edges backwards, as we care about paths from the latest version
       @migration_classes.each_key do |from, to|
         graph.add_edge(to, from)
@@ -60,7 +63,7 @@ module ViewModel::MigratableView
       paths = graph.dijkstra_shortest_paths(Hash.new { 1 }, self.schema_version)
 
       paths.each do |target_version, path|
-        next if path.length == 1
+        next if path.nil? || path.length == 1
 
         # Store the path forwards rather than backwards
         path_migration_classes = path.reverse.each_cons(2).map do |from, to|

data/lib/view_model/migration/no_path_error.rb

@@ -4,6 +4,7 @@ class ViewModel::Migration::NoPathError < ViewModel::AbstractError
   attr_reader :vm_name, :from, :to
 
   status 400
+  code 'Migration.NoPathError'
 
   def initialize(viewmodel, from, to)
     @vm_name = viewmodel.view_name

data/lib/view_model/migration/one_way_error.rb

@@ -4,6 +4,7 @@ class ViewModel::Migration::OneWayError < ViewModel::AbstractError
   attr_reader :vm_name, :direction
 
   status 400
+  code 'Migration.OneWayError'
 
   def initialize(vm_name, direction)
     @vm_name = vm_name

data/lib/view_model/migration/unspecified_version_error.rb

@@ -4,6 +4,7 @@ class ViewModel::Migration::UnspecifiedVersionError < ViewModel::AbstractError
   attr_reader :vm_name, :version
 
   status 400
+  code 'Migration.UnspecifiedVersionError'
 
   def initialize(vm_name, version)
     @vm_name = vm_name

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

@@ -12,14 +12,21 @@ class ViewModel::ActiveRecord::Migration < ActiveSupport::TestCase
   include ARVMTestUtilities
   extend Minitest::Spec::DSL
 
-  include ViewModelSpecHelpers::ParentAndBelongsToChildWithMigration
-
   def new_model
     model_class.new(name: 'm1', child: child_model_class.new(name: 'c1'))
   end
 
   let(:viewmodel) { create_viewmodel! }
 
+  let(:migration_versions) { { viewmodel_class => 2, child_viewmodel_class => 2 } }
+
+  let(:down_migrator) { ViewModel::DownMigrator.new(migration_versions) }
+  let(:up_migrator) { ViewModel::UpMigrator.new(migration_versions) }
+
+  def migrate!
+    migrator.migrate!(subject, references: {})
+  end
+
   let(:current_serialization) { ViewModel.serialize_to_hash(viewmodel) }
 
   let(:v2_serialization) do
@@ -39,120 +46,144 @@ class ViewModel::ActiveRecord::Migration < ActiveSupport::TestCase
     }
   end
 
-  let(:migration_versions) { { viewmodel_class => 2, child_viewmodel_class => 2 } }
-
-  let(:down_migrator) { ViewModel::DownMigrator.new(migration_versions) }
-  let(:up_migrator) { ViewModel::UpMigrator.new(migration_versions) }
+  describe 'with defined migrations' do
+    include ViewModelSpecHelpers::ParentAndBelongsToChildWithMigration
 
-  def migrate!
-    migrator.migrate!(subject, references: {})
-  end
+    describe 'downwards' do
+      let(:migrator) { down_migrator }
+      let(:subject) { current_serialization.deep_dup }
 
-  describe 'downwards' do
-    let(:migrator) { down_migrator }
-    let(:subject) { current_serialization.deep_dup }
-
-    let(:expected_result) do
-      v2_serialization.deep_merge(
-        {
-          ViewModel::MIGRATED_ATTRIBUTE => true,
-          'old_field' => -1,
-          'child' => {
+      let(:expected_result) do
+        v2_serialization.deep_merge(
+          {
             ViewModel::MIGRATED_ATTRIBUTE => true,
-            'former_field' => 'reconstructed',
+            'old_field' => -1,
+            'child' => {
+              ViewModel::MIGRATED_ATTRIBUTE => true,
+              'former_field' => 'reconstructed',
+            },
           },
-        },
-      )
-    end
+        )
+      end
 
-    it 'migrates' do
-      migrate!
+      it 'migrates' do
+        migrate!
 
-      assert_equal(expected_result, subject)
-    end
+        assert_equal(expected_result, subject)
+      end
 
-    describe 'to an unreachable version' do
-      let(:migration_versions) { { viewmodel_class => 2, child_viewmodel_class => 1 } }
+      describe 'to an unreachable version' do
+        let(:migration_versions) { { viewmodel_class => 2, child_viewmodel_class => 1 } }
 
-      it 'raises' do
-        assert_raises(ViewModel::Migration::NoPathError) do
-          migrate!
+        it 'raises' do
+          assert_raises(ViewModel::Migration::NoPathError) do
+            migrate!
+          end
         end
       end
     end
-  end
 
-  describe 'upwards' do
-    let(:migrator) { up_migrator }
-    let(:subject) { v2_serialization.deep_dup }
+    describe 'upwards' do
+      let(:migrator) { up_migrator }
+      let(:subject) { v2_serialization.deep_dup }
 
-    let(:expected_result) do
-      current_serialization.deep_merge(
-        ViewModel::MIGRATED_ATTRIBUTE => true,
-        'new_field' => 3,
-        'child' => {
+      let(:expected_result) do
+        current_serialization.deep_merge(
           ViewModel::MIGRATED_ATTRIBUTE => true,
-        },
-      )
-    end
-
-    it 'migrates' do
-      migrate!
-
-      assert_equal(expected_result, subject)
-    end
-
-    describe 'with version unspecified' do
-      let(:subject) do
-        v2_serialization
-          .except(ViewModel::VERSION_ATTRIBUTE)
+          'new_field' => 3,
+          'child' => {
+            ViewModel::MIGRATED_ATTRIBUTE => true,
+          },
+        )
       end
 
-      it 'treats it as the requested version' do
+      it 'migrates' do
         migrate!
+
         assert_equal(expected_result, subject)
       end
-    end
 
-    describe 'with a version not in the specification' do
-      let(:subject) do
-        v2_serialization
-          .except('old_field')
-          .deep_merge(ViewModel::VERSION_ATTRIBUTE => 3, 'mid_field' => 1)
-      end
+      describe 'with version unspecified' do
+        let(:subject) do
+          v2_serialization
+            .except(ViewModel::VERSION_ATTRIBUTE)
+        end
 
-      it 'rejects it' do
-        assert_raises(ViewModel::Migration::UnspecifiedVersionError) do
+        it 'treats it as the requested version' do
           migrate!
+          assert_equal(expected_result, subject)
         end
       end
-    end
 
-    describe 'from an unreachable version' do
-      let(:migration_versions) { { viewmodel_class => 2, child_viewmodel_class => 1 } }
+      describe 'with a version not in the specification' do
+        let(:subject) do
+          v2_serialization
+            .except('old_field')
+            .deep_merge(ViewModel::VERSION_ATTRIBUTE => 3, 'mid_field' => 1)
+        end
 
-      let(:subject) do
-        v2_serialization.deep_merge(
-          'child' => { ViewModel::VERSION_ATTRIBUTE => 1 },
-        )
+        it 'rejects it' do
+          assert_raises(ViewModel::Migration::UnspecifiedVersionError) do
+            migrate!
+          end
+        end
       end
 
-      it 'raises' do
-        assert_raises(ViewModel::Migration::NoPathError) do
-          migrate!
+      describe 'from an unreachable version' do
+        let(:migration_versions) { { viewmodel_class => 2, child_viewmodel_class => 1 } }
+
+        let(:subject) do
+          v2_serialization.deep_merge(
+            'child' => { ViewModel::VERSION_ATTRIBUTE => 1 },
+          )
+        end
+
+        it 'raises' do
+          assert_raises(ViewModel::Migration::NoPathError) do
+            migrate!
+          end
+        end
+      end
+
+      describe 'in an undefined direction' do
+        let(:migration_versions) { { viewmodel_class => 1, child_viewmodel_class => 2 } }
+
+        let(:subject) do
+          v2_serialization.except('old_field').merge(ViewModel::VERSION_ATTRIBUTE => 1)
+        end
+
+        it 'raises' do
+          assert_raises(ViewModel::Migration::OneWayError) do
+            migrate!
+          end
         end
       end
     end
+  end
 
-    describe 'in an undefined direction' do
-      let(:migration_versions) { { viewmodel_class => 1, child_viewmodel_class => 2 } }
+  describe 'without migrations' do
+    describe 'to an unreachable version' do
+      include ViewModelSpecHelpers::ParentAndBelongsToChild
+
+      def model_attributes
+        super.merge(viewmodel: ->(_v) {
+                      self.schema_version = 4
+                      # Define an unreachable migration to ensure that the view
+                      # attempts to realize paths.
+                      migrates from: 1, to: 2 do
+                      end
+                    })
+      end
 
-      let(:subject) do
-        v2_serialization.except('old_field').merge(ViewModel::VERSION_ATTRIBUTE => 1)
+      def child_attributes
+        super.merge(viewmodel: ->(_v) { self.schema_version = 3 })
       end
 
-      it 'raises' do
-        assert_raises(ViewModel::Migration::OneWayError) do
+      let(:migrator) { down_migrator }
+      let(:subject) { current_serialization.deep_dup }
+
+      it 'raises no path error' do
+        assert_raises(ViewModel::Migration::NoPathError) do
           migrate!
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.10
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord