usps-support 0.2.30 → 0.2.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39ca586f34a780161a24972a3f5507c2a7461ae18b88e9e2b84987004ff37d50
-  data.tar.gz: 30f5677f9a5bc127be3efd512cb3909122bdf3c882ae49eeb76fa77f21bf0bb2
+  metadata.gz: 6dd7254a5f59aa252cd188286d4b1bbdb365b7897a4501ccd1d2af6e7d4674b7
+  data.tar.gz: 822c2f45772cd5917917d1371582d5c7740946ff192893d26165e36e54da8b12
 SHA512:
-  metadata.gz: 9c87c5d5f8e1349dda6b1cb176da3686fb98b41cb60e2d6f2670aef98d2919f56309ab6e6bccc62de20310312121dd44a5dc5f1a2d801fc43dd8aad4469f993e
-  data.tar.gz: c8cdad3ffce8de50038fb921c93f737ae461f5a5fbb796d10c30a012f38917f0237a190b90aebbbd41c12f19a4f538ed2fc52d6f957413232006e4918a05f56e
+  metadata.gz: 0d7bee79730a699e6f24da6f38bec176bcfc61855959e0c011b79689313f66cf158b4b701dfd7c97f187fca3bd7aaf7fab9fb6cc1f4259d1a3883ec0a0068feb
+  data.tar.gz: 629ceef5d2ac5dc7d4898a094360e51d4d35860dd1cd9e5538bf30fef5be852db907684b34ebe33a7cde6408bc31d0348be0bfa5878f578e1d85b3879806f975

data/app/models/usps/support/policy/admin_context.rb

@@ -7,6 +7,8 @@ module Usps::Support
     class AdminContext
       attr_reader :user, :impersonate
 
+      delegate_missing_to :user
+
       def initialize(user, impersonate)
         @user = user
         @impersonate = impersonate

data/lib/tasks/db.rake

@@ -1,34 +1,11 @@
 # frozen_string_literal: true
 
+require 'usps/support/db/auxiliary_stamper'
+
 namespace :db do
   desc "Stamp auxiliary test databases with the primary database's schema_migrations rows"
   task stamp_auxiliary_test_schemas: :environment do
-    next unless Rails.env.test?
-
-    configs = ActiveRecord::Base.configurations.configs_for(env_name: 'test')
-    primary = configs.find(&:primary?) || configs.first
-    auxiliary = configs - [primary]
-    next if auxiliary.empty?
-
-    connection = ActiveRecord::Base.connection
-    primary_versions =
-      connection
-      .execute("SELECT version FROM #{primary.database}.schema_migrations")
-      .to_a.flatten
-
-    auxiliary.each do |config|
-      existing =
-        connection
-        .execute("SELECT version FROM #{config.database}.schema_migrations")
-        .to_a.flatten
-
-      (primary_versions - existing).each do |version|
-        puts "Stamping #{version} for #{config.database}"
-        connection.execute(
-          "INSERT INTO #{config.database}.schema_migrations (version) VALUES (#{version.to_i})"
-        )
-      end
-    end
+    Usps::Support::Db::AuxiliaryStamper.call
   end
 end
 

data/lib/usps/support/db/auxiliary_stamper.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Usps
+  module Support
+    module Db
+      # Copies the primary test database's schema_migrations rows into each
+      # auxiliary test database, so Rails' pending-migration check doesn't see
+      # the primary's migrations as pending against schemas that don't run them.
+      #
+      module AuxiliaryStamper
+        class << self
+          def call(io: $stdout)
+            primary, auxiliary = test_configs
+            return if auxiliary.empty?
+
+            ActiveRecord::Base.connection_pool.with_connection do |connection|
+              primary_versions = fetch_versions(connection, primary.database)
+
+              auxiliary.each do |config|
+                existing = fetch_versions(connection, config.database)
+                (primary_versions - existing).each do |version|
+                  io.puts "Stamping #{version} for #{config.database}"
+                  connection.execute(
+                    "INSERT INTO #{config.database}.schema_migrations (version) VALUES (#{version.to_i})"
+                  )
+                end
+              end
+            end
+          end
+
+        private
+
+          def test_configs
+            configs = ActiveRecord::Base.configurations.configs_for(env_name: 'test')
+            primary = configs.find(&:primary?) || configs.first
+            [primary, configs - [primary]]
+          end
+
+          def fetch_versions(connection, database)
+            connection.execute("SELECT version FROM #{database}.schema_migrations").to_a.flatten
+          end
+        end
+      end
+    end
+  end
+end

data/lib/usps/support/railtie.rb

@@ -4,7 +4,9 @@ require 'rails'
 
 module Usps
   module Support
-    # Expose rake tasks to Rails
+    # Expose rake tasks to Rails and ensure auxiliary test schemas stay in
+    # sync with the primary's schema_migrations before Rails runs its
+    # pending-migration check.
     #
     class Railtie < Rails::Railtie
       railtie_name :usps_support
@@ -13,6 +15,23 @@ module Usps
         path = File.expand_path(__dir__)
         Dir.glob("#{path}/../../tasks/**/*.rake").each { |f| load f }
       end
+
+      initializer 'usps_support.stamp_auxiliary_test_schemas' do
+        next unless Rails.env.test?
+
+        require 'usps/support/db/auxiliary_stamper'
+
+        ActiveSupport.on_load(:active_record) do
+          ActiveRecord::Migration.singleton_class.prepend(
+            Module.new do
+              def maintain_test_schema!
+                Usps::Support::Db::AuxiliaryStamper.call(io: File.open(File::NULL, 'w'))
+                super
+              end
+            end
+          )
+        end
+      end
     end
   end
 end

data/lib/usps/support/version.rb

@@ -2,6 +2,6 @@
 
 module Usps
   module Support
-    VERSION = '0.2.30'
+    VERSION = '0.2.32'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usps-support
 version: !ruby/object:Gem::Version
-  version: 0.2.30
+  version: 0.2.32
 platform: ruby
 authors:
 - Julian Fiander
@@ -68,6 +68,7 @@ files:
 - lib/tasks/db.rake
 - lib/usps/all.rb
 - lib/usps/support.rb
+- lib/usps/support/db/auxiliary_stamper.rb
 - lib/usps/support/db/members_schema.rb
 - lib/usps/support/db/websites_schema.rb
 - lib/usps/support/engine.rb