active_record_compose 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 148413ab669022c937e7f4775cff13dc018c9ba190014b130c10b9ca7e767a3f
-  data.tar.gz: 51ec332dcf2decf04dfb7f3bf8f0d38bf791d36d960d0d19c388608ef3f33a32
+  metadata.gz: 91c3305d64d7b4e8b0cf57e127b9b1e48c0a413a5749d79f1afef5d659814271
+  data.tar.gz: 321aa91ad6500b97a38f02ea70f5904c2852016eddf7fb4388186e25c83ff825
 SHA512:
-  metadata.gz: 7db6b03f1a56d9d9d1ef0427362b65966bcfca997a465c4ce843d5dad9c4237e43b443ce0620629c665ab09163bf46fd362976009c2e426ae40849c1a41d18bd
-  data.tar.gz: 43ecb29b976c4136650e2152f1533af7e06de40afeba68f7265e97ba6eff208165271c338b4348d44127d850ebe75de2908eea60a18e986ef47e181d95d6e784
+  metadata.gz: ad550be47844182ac031aaa4c9df4c344e0b14a3173a3402c2e7d44123bd953c1b2ef4f62e0ff5ca8d49c17f688cb9a6c5385d1aeb810bb34263d7f2203cd943
+  data.tar.gz: a97affe0e201a77cb207ba0d013194c9b1a30a79611a80d4d0e133904bfd8f016e2f330a126428acdec22f248bfa2ed999df62db46a5174fe8deb3ec2ebaee84

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
+## [1.4.0] - 2026-10-14
+
+* Use a dedicated deprecator for deprecated APIs.
+  (https://github.com/hamajyotan/active_record_compose/pull/75)
+* Fix `before_commit` callback timing for transactions spanning multiple database connections.
+  (https://github.com/hamajyotan/active_record_compose/pull/76)
+  - Ensure that `before_commit` callbacks are invoked at the appropriate point before the outermost transaction commits.
+  - Leave behavior unchanged when all models use a single database connection.
+* Perform validations outside a transaction.
+  (https://github.com/hamajyotan/active_record_compose/pull/78)
+* Execute inner models' `after_commit` callbacks before outer models' callbacks.
+  (https://github.com/hamajyotan/active_record_compose/pull/79)
+* Add `ActiveRecordCompose::UninitializedAttribute#record`.
+
 ## [1.3.0] - 2026-08-09
 
 * Support secondary and multiple database

data/lib/active_record_compose/attributes.rb

@@ -167,14 +167,16 @@ module ActiveRecordCompose
 
     private
 
-    def _write_attribute(...) = _require_attributes_initialized { super } # steep:ignore
+    # @private
+    def _write_attribute(...) = _require_attributes_initialized { super }
 
+    # @private
     def attribute(...) = _require_attributes_initialized { super }
 
+    # @private
     def _require_attributes_initialized
       unless @attributes
-        raise ActiveRecordCompose::UninitializedAttribute,
-              "No attributes have been set. Is proper initialization performed, such as calling `super` in `initialize`?"
+        raise ActiveRecordCompose::UninitializedAttribute.new(self)
       end
 
       yield

data/lib/active_record_compose/exceptions.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 module ActiveRecordCompose
+  # Generic Active Record Compose exception class.
+  #
+  class ActiveRecordComposeError < StandardError
+  end
+
   # Occurs when a circular reference is detected in the containing model.
   #
   # @example
@@ -25,7 +30,7 @@ module ActiveRecordCompose
   #     inner.model = outer  # There is a circular reference in the form outer > middle > inner > outer.
   #     outer.save  #=> raises ActiveRecordCompose::CircularReferenceDetected
   #
-  class CircularReferenceDetected < StandardError; end
+  class CircularReferenceDetected < ActiveRecordComposeError; end
 
   # Occurs when accessing Attributes without initializing it.
   #
@@ -40,5 +45,13 @@ module ActiveRecordCompose
   #     model = Model.new
   #     model.foo = 1  #=> raises ActiveRecordCompose::UninitializedAttribute
   #
-  class UninitializedAttribute < StandardError; end
+  class UninitializedAttribute < ActiveRecordComposeError
+    attr_reader :record
+
+    def initialize(record = nil)
+      @record = record
+      message = "No attributes have been set. Is proper initialization performed, such as calling `super` in `initialize`?"
+      super(message)
+    end
+  end
 end

data/lib/active_record_compose/model.rb

@@ -85,8 +85,8 @@ module ActiveRecordCompose
 
     include ActiveRecordCompose::Attributes
     include ActiveRecordCompose::Persistence
-    include ActiveRecordCompose::Validations
     include ActiveRecordCompose::TransactionSupport
+    include ActiveRecordCompose::Validations
     include ActiveRecordCompose::Inspectable
 
     def initialize(attributes = {})

data/lib/active_record_compose/transaction_support/transaction_coordinator.rb

@@ -15,10 +15,9 @@ module ActiveRecordCompose
       # but not just before any inner transactions commit.
       #
       def on_before_comitted
-        return if @_before_committed_called
+        return unless final_transaction?
 
         yield
-        @_before_committed_called = true
       end
 
       # It processes after_commit/after_rollback only immediately
@@ -35,10 +34,11 @@ module ActiveRecordCompose
       def with_transaction_cleanup
         yield
       ensure
-        @_before_committed_called = false
         transactions.reject! { _1.closed? }
       end
 
+      def final_transaction? = transactions.one? { !_1.closed? }
+
       def all_finished? = transactions.all? { _1.closed? }
 
       def transactions = @transactions ||= Set.new

data/lib/active_record_compose/transaction_support.rb

@@ -15,24 +15,26 @@ module ActiveRecordCompose
     # steep:ignore:start
 
     class_methods do
-      # @private
-      # @deprecated
-      def with_connection(...)
-        ActiveRecord.deprecator.warn("`with_connection` is deprecated. Use `ActiveRecord::Base.with_connection` instead.")
-        ActiveRecord::Base.with_connection(...)
-      end
+      if ActiveRecord.version >= Gem::Version.new("7.2")
+        # @private
+        # @deprecated
+        def with_connection(...)
+          ActiveRecordCompose.deprecator.deprecation_warning(:with_connection, "Use `ActiveRecord::Base.with_connection` instead.")
+          ActiveRecord::Base.with_connection(...)
+        end
 
-      # @private
-      # @deprecated
-      def lease_connection(...)
-        ActiveRecord.deprecator.warn("`lease_connection` is deprecated. Use `ActiveRecord::Base.lease_connection` instead.")
-        ActiveRecord::Base.lease_connection(...)
+        # @private
+        # @deprecated
+        def lease_connection(...)
+          ActiveRecordCompose.deprecator.deprecation_warning(:lease_connection, "Use `ActiveRecord::Base.lease_connection` instead.")
+          ActiveRecord::Base.lease_connection(...)
+        end
       end
 
       # @private
       # @deprecated
       def connection(...)
-        ActiveRecord.deprecator.warn("`connection` is deprecated. Use `ActiveRecord::Base.connection` instead.")
+        ActiveRecordCompose.deprecator.deprecation_warning(:connection, "Use `ActiveRecord::Base.connection` instead.")
         ActiveRecord::Base.connection(...)
       end
     end
@@ -135,9 +137,12 @@ module ActiveRecordCompose
               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 }
+                begin
+                  inner_proc.call.tap { raise ActiveRecord::Rollback unless _1 }
+                ensure
+                  connection.add_transaction_record(self, ensure_finalize || has_transactional_callbacks?)
+                end
               end
             end
           end
@@ -155,7 +160,7 @@ module ActiveRecordCompose
     # @private
     def connection_pool(ar_class: default_ar_class)
       connection_specification_name = ar_class.connection_specification_name
-      role = ar_class.current_role
+      role = ar_class.current_role # steep:ignore
       shard = ar_class.current_shard # steep:ignore
       connection_handler = ar_class.connection_handler # steep:ignore
       retrieve_options = { role:, shard: }
@@ -167,7 +172,7 @@ module ActiveRecordCompose
     # @private
     def with_pool_transaction_isolation_level(connection, &block)
       if ActiveRecord.gem_version.release >= Gem::Version.new("8.1.0")
-        isolation_level = ActiveRecord.default_transaction_isolation_level # steep:ignore
+        isolation_level = ActiveRecord.default_transaction_isolation_level
         connection.pool.with_pool_transaction_isolation_level(isolation_level, connection.transaction_open?, &block)
       else
         block.call

data/lib/active_record_compose/version.rb

@@ -1,5 +1,16 @@
 # frozen_string_literal: true
 
 module ActiveRecordCompose
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
+
+  class << self
+    def version = Gem::Version.new(VERSION)
+
+    private
+
+    # @private
+    def next_major_version
+      version.segments.first + 1 # steep:ignore
+    end
+  end
 end

data/lib/active_record_compose.rb

@@ -11,6 +11,10 @@ require_relative "active_record_compose/model"
 # Most of the functionality resides in {ActiveRecordCompose::Model}.
 #
 module ActiveRecordCompose
+  # @private
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new(next_major_version, "ActiveRecordCompose") # steep:ignore
+  end
 end
 
 require "active_record_compose/railtie" if defined?(::Rails::Railtie)

data/sig/_internal/package_private.rbs

@@ -1,4 +1,7 @@
 module ActiveRecordCompose
+  private
+  def self.next_major_version: () -> Integer
+
   module Attributes
     extend ActiveSupport::Concern
     include ActiveModel::Attributes
@@ -139,7 +142,6 @@ module ActiveRecordCompose
     def transaction_coordinator: () -> ActiveRecordCompose::TransactionSupport::TransactionCoordinator
 
     class TransactionCoordinator
-      @_before_committed_called: bool
       @transactions: Set[ActiveRecord::ConnectionAdapters::Transaction]
 
       def add_transaction: (ActiveRecord::ConnectionAdapters::Transaction) -> void
@@ -147,6 +149,7 @@ module ActiveRecordCompose
       def on_before_comitted: () { () -> void } -> void
 
       private
+      def final_transaction?: -> bool
       def all_finished?: -> bool
       def transactions: () -> Set[ActiveRecord::ConnectionAdapters::Transaction]
       def with_transaction_cleanup: () { () -> void } -> void

data/sig/active_record_compose.rbs

@@ -4,6 +4,9 @@
 module ActiveRecordCompose
   VERSION: String
 
+  def self.version: () -> Gem::Version
+  def self.deprecator: () -> ActiveSupport::Deprecation
+
   interface _ARLike
     def save: (**untyped options) -> bool
     def save!: (**untyped options) -> untyped
@@ -36,6 +39,9 @@ module ActiveRecordCompose
   type destroy_context_type = ((^() -> boolish) | (^(ar_like) -> boolish))
   type condition_type = ((^() -> boolish) | (^(ar_like) -> boolish))
 
+  class ActiveRecordComposeError < StandardError
+  end
+
   class ComposedCollection
     include ::Enumerable[ar_like]
 
@@ -47,7 +53,7 @@ module ActiveRecordCompose
     def delete: (ar_like) -> ComposedCollection?
   end
 
-  class CircularReferenceDetected < StandardError
+  class CircularReferenceDetected < ActiveRecordComposeError
   end
 
   class Model
@@ -99,6 +105,9 @@ module ActiveRecordCompose
     extend Rails::Initializable::ClassMethods
   end
 
-  class UninitializedAttribute < StandardError
+  class UninitializedAttribute < ActiveRecordComposeError
+    def initialize: (?untyped) -> void
+
+    attr_reader record: untyped
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_compose
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - hamajyotan