active_record_compose 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 810feb87760ff992aa21ca019081e6072ec43c99387ea0ee013f767d4d2c875c
-  data.tar.gz: 7077c4d5b79d12c6c5f5a0297d0d2837c3d3c79a3b8e74a13c12e05a3511c078
+  metadata.gz: 148413ab669022c937e7f4775cff13dc018c9ba190014b130c10b9ca7e767a3f
+  data.tar.gz: 51ec332dcf2decf04dfb7f3bf8f0d38bf791d36d960d0d19c388608ef3f33a32
 SHA512:
-  metadata.gz: 283b3beaab24fb19d30e134dbe543a25c730bf0d331bdd5114ae89747d0a247b8b572d7e6f2578c06d80f2f7cb4b8c6023f2640518c5b0dc21d335401e45ab5c
-  data.tar.gz: 6f55ebeb0bd4379d206f55b8dc8dc618beca9d281f0d425c0cc8d96078d60ed74fd26c67b92b2bb8c26f9cb6dd4634557ef1064990c4a7ca91bb15e99d6c381e
+  metadata.gz: 7db6b03f1a56d9d9d1ef0427362b65966bcfca997a465c4ce843d5dad9c4237e43b443ce0620629c665ab09163bf46fd362976009c2e426ae40849c1a41d18bd
+  data.tar.gz: 43ecb29b976c4136650e2152f1533af7e06de40afeba68f7265e97ba6eff208165271c338b4348d44127d850ebe75de2908eea60a18e986ef47e181d95d6e784

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [1.3.0] - 2026-08-09
+
+* Support secondary and multiple database
+  (https://github.com/hamajyotan/active_record_compose/pull/74)
+  - When models connecting to different databases are used together, the system behaves in a manner simulating a two-phase commit.
+  - Due to the nature of the ActiveRecord API supported by Rails, a true two-phase commit is not implemented; instead, transactions are nested when multiple database connections are involved.
+  - Note that operations remain unchanged when all models belong to a single primary database.
+
 ## [1.2.1] - 2026-03-21
 
 * Improved clarity of error when accessing uninitialized attributes.

data/README.md

@@ -59,6 +59,10 @@ $ bundle
 
 ## Quick Start
 
+For a complete runnable application, see the Sample Application section below.
+
+The examples in this section focus on ActiveRecordCompose itself and intentionally omit surrounding application code such as migrations, routes, views, and jobs.
+
 ### Basic Example
 
 Suppose you have two models:

data/lib/active_record_compose/composed_collection.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "set"
 require_relative "wrapped_model"
 
 module ActiveRecordCompose
@@ -117,7 +118,7 @@ module ActiveRecordCompose
     def symbol_proc_map
       @symbol_proc_map ||=
         Hash.new do |h, k|
-          h[k] = -> { owner.__send__(k) }
+          h[k] = -> { owner.__send__(k) } # steep:ignore
         end
     end
 

data/lib/active_record_compose/transaction_support/active_transaction.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module ActiveRecordCompose
+  module TransactionSupport
+    # @private
+    # steep:ignore:start
+
+    # In older versions, the ActiveRecord::Transaction object is not passed to the block argument of #transaction.
+    # So instead, we define a transaction object that can be evaluated equivalently.
+    # This follow-up will no longer be necessary when support for Rails 7.1 is dropped.
+    #
+    class ActiveTransaction
+      def initialize(transaction)
+        @real_transaction = transaction
+      end
+
+      attr_reader :real_transaction
+
+      def open? = !closed?
+
+      def closed? = real_transaction&.state&.completed?
+
+      def ==(other)
+        return true if equal?(other)
+        return false unless self.class == other.class
+
+        real_transaction == other.real_transaction
+      end
+
+      def eql?(other)
+        return true if equal?(other)
+        return false unless self.class == other.class
+
+        real_transaction.eql?(other.real_transaction)
+      end
+
+      def hash = real_transaction.hash
+    end
+
+    # steep:ignore:end
+  end
+end

data/lib/active_record_compose/transaction_support/transaction_coordinator.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "set"
+
+module ActiveRecordCompose
+  module TransactionSupport
+    # @private
+    class TransactionCoordinator
+      def add_transaction(active_transaction)
+        transactions << active_transaction
+      end
+
+      # The before_commit callback is controlled so that
+      # it runs just before the outermost transaction commits,
+      # but not just before any inner transactions commit.
+      #
+      def on_before_comitted
+        return if @_before_committed_called
+
+        yield
+        @_before_committed_called = true
+      end
+
+      # It processes after_commit/after_rollback only immediately
+      # after all transactions are closed.
+      #
+      def on_after_transaction
+        return unless all_finished?
+
+        with_transaction_cleanup { yield }
+      end
+
+      private
+
+      def with_transaction_cleanup
+        yield
+      ensure
+        @_before_committed_called = false
+        transactions.reject! { _1.closed? }
+      end
+
+      def all_finished? = transactions.all? { _1.closed? }
+
+      def transactions = @transactions ||= Set.new
+    end
+  end
+end

data/lib/active_record_compose/transaction_support.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require "active_support/core_ext/module"
+require_relative "transaction_support/active_transaction"
+require_relative "transaction_support/transaction_coordinator"
 
 module ActiveRecordCompose
   module TransactionSupport
@@ -86,17 +88,17 @@ module ActiveRecordCompose
 
       # @private
       def before_committed!
-        _run_before_commit_callbacks
+        transaction_coordinator.on_before_comitted { _run_before_commit_callbacks }
       end
 
       # @private
       def committed!(should_run_callbacks: true)
-        _run_commit_callbacks if should_run_callbacks
+        transaction_coordinator.on_after_transaction { _run_commit_callbacks if should_run_callbacks }
       end
 
       # @private
       def rolledback!(force_restore_state: false, should_run_callbacks: true)
-        _run_rollback_callbacks if should_run_callbacks
+        transaction_coordinator.on_after_transaction { _run_rollback_callbacks if should_run_callbacks }
       end
     end
 
@@ -104,23 +106,49 @@ module ActiveRecordCompose
 
     def save!(**options) = with_transaction_returning_status { super }
 
-    private
-
     # @private
-    def with_transaction_returning_status
-      connection_pool.with_connection do |connection|
-        with_pool_transaction_isolation_level(connection) do
-          ensure_finalize = !connection.transaction_open?
+    def connection_pools
+      pools =
+        models.compact.flat_map do |model|
+          if model.is_a?(ActiveRecordCompose::TransactionSupport)
+            model.connection_pools
+          elsif model.is_a?(ActiveRecord::Base)
+            connection_pool(ar_class: model.class)
+          else
+            [] # : Array[ActiveRecord::ConnectionAdapters::ConnectionPool]
+          end
+        end
+      pools << connection_pool if pools.blank?
+      pools.uniq
+    end
 
-          connection.transaction do
-            connection.add_transaction_record(self, ensure_finalize || has_transactional_callbacks?)
+    private
 
-            yield.tap { raise ActiveRecord::Rollback unless _1 }
-          end || false
+    # @private
+    def with_transaction_returning_status(&block)
+      procs = connection_pools.inject(block) do |inner_proc, pool|
+        -> do
+          pool.with_connection do |connection|
+            with_pool_transaction_isolation_level(connection) do
+              ensure_finalize = !connection.transaction_open?
+
+              connection.transaction do |tran|
+                tran ||= ActiveTransaction.new(connection.current_transaction) # steep:ignore
+                transaction_coordinator.add_transaction(tran)
+                connection.add_transaction_record(self, ensure_finalize || has_transactional_callbacks?)
+
+                inner_proc.call.tap { raise ActiveRecord::Rollback unless _1 }
+              end
+            end
+          end
         end
       end
+      procs.call || false
     end
 
+    # @private
+    def transaction_coordinator = @transaction_coordinator ||= TransactionCoordinator.new
+
     # @private
     def default_ar_class = ActiveRecord::Base
 

data/lib/active_record_compose/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordCompose
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/sig/_internal/package_private.rbs

@@ -118,6 +118,8 @@ module ActiveRecordCompose
     include ActiveSupport::Callbacks
     extend ActiveSupport::Callbacks::ClassMethods
 
+    @transaction_coordinator: ActiveRecordCompose::TransactionSupport::TransactionCoordinator
+
     def self.before_commit: (*untyped) -> untyped
     def self.after_commit: (*untyped) -> untyped
     def self.after_rollback: (*untyped) -> untyped
@@ -127,11 +129,28 @@ module ActiveRecordCompose
     def _run_before_commit_callbacks: () -> untyped
     def _run_commit_callbacks: () -> untyped
     def _run_rollback_callbacks: () -> untyped
+    def connection_pools: () -> Array[ActiveRecord::ConnectionAdapters::ConnectionPool]
 
     private
+    def models: -> ComposedCollection
     def default_ar_class: -> singleton(ActiveRecord::Base)
     def connection_pool: (?ar_class: singleton(ActiveRecord::Base)) -> ActiveRecord::ConnectionAdapters::ConnectionPool
     def with_pool_transaction_isolation_level: [T] (ActiveRecord::ConnectionAdapters::AbstractAdapter) { () -> T } -> T
+    def transaction_coordinator: () -> ActiveRecordCompose::TransactionSupport::TransactionCoordinator
+
+    class TransactionCoordinator
+      @_before_committed_called: bool
+      @transactions: Set[ActiveRecord::ConnectionAdapters::Transaction]
+
+      def add_transaction: (ActiveRecord::ConnectionAdapters::Transaction) -> void
+      def on_after_transaction: () { () -> void } -> void
+      def on_before_comitted: () { () -> void } -> void
+
+      private
+      def all_finished?: -> bool
+      def transactions: () -> Set[ActiveRecord::ConnectionAdapters::Transaction]
+      def with_transaction_cleanup: () { () -> void } -> void
+    end
   end
 
   module Persistence

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_compose
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - hamajyotan
@@ -56,6 +56,8 @@ files:
 - lib/active_record_compose/persistence.rb
 - lib/active_record_compose/railtie.rb
 - lib/active_record_compose/transaction_support.rb
+- lib/active_record_compose/transaction_support/active_transaction.rb
+- lib/active_record_compose/transaction_support/transaction_coordinator.rb
 - lib/active_record_compose/validations.rb
 - lib/active_record_compose/version.rb
 - lib/active_record_compose/wrapped_model.rb
@@ -84,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.16
 specification_version: 4
 summary: activemodel form object pattern
 test_files: []