From 72b203cc5843fecbd8ac79e26c6e0ba3ff453b3d Mon Sep 17 00:00:00 2001
From: Chris Andreae <chris@bibo.com.ph>
Date: Tue, 23 Apr 2024 16:00:32 +0900
Subject: [PATCH 1/2] Extract migration parsing from VM::AR::Controller to a
 concern

---
 lib/view_model/active_record/controller.rb    | 49 +----------------
 .../controller/migration_versions.rb          | 52 +++++++++++++++++++
 2 files changed, 54 insertions(+), 47 deletions(-)
 create mode 100644 lib/view_model/controller/migration_versions.rb

diff --git a/lib/view_model/active_record/controller.rb b/lib/view_model/active_record/controller.rb
index 1e5994a7..f2c5a1c7 100644
--- a/lib/view_model/active_record/controller.rb
+++ b/lib/view_model/active_record/controller.rb
@@ -3,6 +3,7 @@
 require 'view_model/active_record/controller_base'
 require 'view_model/active_record/collection_nested_controller'
 require 'view_model/active_record/singular_nested_controller'
+require 'view_model/controller/migration_versions'
 
 # Controller for accessing an ViewModel::ActiveRecord
 # Provides for the following routes:
@@ -16,8 +17,7 @@ module ViewModel::ActiveRecord::Controller
   include ViewModel::ActiveRecord::ControllerBase
   include ViewModel::ActiveRecord::CollectionNestedController
   include ViewModel::ActiveRecord::SingularNestedController
-
-  MIGRATION_VERSION_HEADER = 'X-ViewModel-Versions'
+  include ViewModel::Controller::MigrationVersions
 
   def show(scope: nil, viewmodel_class: self.viewmodel_class, serialize_context: new_serialize_context(viewmodel_class: viewmodel_class))
     view = nil
@@ -95,51 +95,6 @@ def viewmodel_id
     parse_param(:id)
   end
 
-  def migration_versions
-    @migration_versions ||=
-      begin
-        specified_migration_versions.reject do |viewmodel_class, required_version|
-          viewmodel_class.schema_version == required_version
-        end.freeze
-      end
-  end
-
-  def specified_migration_versions
-    @specified_migration_versions ||=
-      begin
-        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 = {}
-
-        versions.each do |view_name, required_version|
-          viewmodel_class = ViewModel::Registry.for_view_name(view_name)
-          migration_versions[viewmodel_class] = required_version
-        rescue ViewModel::DeserializationError::UnknownView
-          # Ignore requests to migrate types that no longer exist
-          next
-        end
-
-        migration_versions.freeze
-      end
-  end
-
   def migrated_deep_schema_version
     ViewModel::Migrator.migrated_deep_schema_version(viewmodel_class, migration_versions, include_referenced: true)
   end
diff --git a/lib/view_model/controller/migration_versions.rb b/lib/view_model/controller/migration_versions.rb
new file mode 100644
index 00000000..46a0672e
--- /dev/null
+++ b/lib/view_model/controller/migration_versions.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module ViewModel::Controller::MigrationVersions
+  extend ActiveSupport::Concern
+
+  MIGRATION_VERSION_HEADER = 'X-ViewModel-Versions'
+
+  def migration_versions
+    @migration_versions ||=
+      begin
+        specified_migration_versions.reject do |viewmodel_class, required_version|
+          viewmodel_class.schema_version == required_version
+        end.freeze
+      end
+  end
+
+  def specified_migration_versions
+    @specified_migration_versions ||=
+      begin
+        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 = {}
+
+        versions.each do |view_name, required_version|
+          viewmodel_class = ViewModel::Registry.for_view_name(view_name)
+          migration_versions[viewmodel_class] = required_version
+        rescue ViewModel::DeserializationError::UnknownView
+          # Ignore requests to migrate types that no longer exist
+          next
+        end
+
+        migration_versions.freeze
+      end
+  end
+end

From d1a4c5b837e9dad006f5a69338d7dcdcd04b8348 Mon Sep 17 00:00:00 2001
From: Chris Andreae <chris@bibo.com.ph>
Date: Tue, 23 Apr 2024 16:01:47 +0900
Subject: [PATCH 2/2] Bump minor version to indicate API change

MIGRATION_VERSION_HEADER constant moved from VM::AR::Controller to a
separate (included) concern.
---
 lib/iknow_view_models/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/iknow_view_models/version.rb b/lib/iknow_view_models/version.rb
index be31530c..8f80ae3b 100644
--- a/lib/iknow_view_models/version.rb
+++ b/lib/iknow_view_models/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IknowViewModels
-  VERSION = '3.9.2'
+  VERSION = '3.10.0'
 end