isolator 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84829cfcac568cd691333a7d2e36d7413414c0aaf3c1980a5445725ee35b3506
-  data.tar.gz: 4cda5f918834344df2fa05ecec3e60869cc191d8802b5563f8e653d954ea01d7
+  metadata.gz: 1c367300194152c4e2d8adb2c9ff4ab37cc66f9e1eab3e5a1d1576b98fb4970b
+  data.tar.gz: c132274cc0936d897f2ecfda8d4c1523db73d5a803f5516ed8eb655fda9f9586
 SHA512:
-  metadata.gz: f152a5a36394be2a010535ac14511b66cafeaeaa65e079e05f8ab2b4849992a5dbbe07ef212a1b150fd6a5cd9297527dbbed671937839413ed8e6e26b946db7b
-  data.tar.gz: ef341ee673b9463893ac903a89b4ffb68967dc9fd8422f04d2717904a2e4338bc1a819157f3435749b5c1f65892b963454c05fd0a54908704e447bfc025701b5
+  metadata.gz: 8eb94aeb576bb42fe9b267403cde9d6418964db34c111ca23e5a8f415fc85aa936eab2da5647eec2878526e0d5998a6b40e09c68fd55afa5ef5648bb8f66ba12
+  data.tar.gz: 6285571a44a18c0d21816d48c7580f1a9a0167fedae5db5d5ff757f1485561bef15798f6781e7b7347fe0d87105931a0fd42560abb6b52f1e3fdb223d58785be

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## master
 
+## 1.2.0 (2025-11-07)
+
+- Use `ActiveRecord::Base.lease_connection` instead of `ActiveRecord::Base.connection`, if available. ([@viralpraxis][])
+
+- Add ability to limit subtransaction amount. ([@dnamsons][])
+
+  This feature is disabled by default, opt-in via: `Isolator.config.max_subtransactions_depth = :desired_depth`.
+
+## 1.1.2 (2025-10-16)
+
+- Fix `database_cleaner` support: require `base.rb` explicitly. ([@viralpraxis][])
+
+- Fix checking for Rails versions between 8.0 and 8.1. ([@sunny][])
+
 ## 1.1.1 (2025-03-12)
 
 - Fix handling Rails 8 `enqueue_after_transaction_commit` logic. ([@palkan][])
@@ -155,3 +169,4 @@ This, for example, makes Isolator compatible with Rails multi-database apps.
 [@tagirahmad]: https://github.com/tagirahmad
 [@arthurWD]: https://github.com/arthurWD
 [@joshuay03]: https://github.com/joshuay03
+[@viralpraxis]: https://github.com/viralpraxis

data/README.md

@@ -108,7 +108,10 @@ Isolator.configure do |config|
   config.ignorer = Isolator::Ignorer
 
   # Turn on/off raising exceptions for simultaneous transactions to different databases
-  config.disallow_cross_database_transactions = false
+  config.disallow_per_thread_concurrent_transactions = false
+
+  # Limit the amount of allowed nested transactions
+  config.max_subtransactions_depth = 5
 end
 ```
 
@@ -132,13 +135,13 @@ Isolator.after_isolate do
 end
 
 # This callback is called every time a new transaction is open (root or nested)
-Isolator.on_transaction_open do |event|
+Isolator.on_transaction_begin do |event|
   puts "New transaction from #{event[:connection_id]}. " \
        "Current depth: #{event[:depth]}"
 end
 
 # This callback is called every time a transaction is completed
-Isolator.on_transaction_close do |event|
+Isolator.on_transaction_end do |event|
   puts "Transaction completed from #{event[:connection_id]}. " \
        "Current depth: #{event[:depth]}"
 end

data/lib/isolator/adapters/background_jobs/active_job.rb

@@ -6,7 +6,7 @@ Isolator.isolate :active_job,
   exception_class: Isolator::BackgroundJobError,
   details_message: ->(obj) {
     "#{obj.class.name}" \
-    "#{obj.arguments.any? ? " (#{obj.arguments.join(", ")})" : ""}"
+    "#{" (#{obj.arguments.join(", ")})" if obj.arguments.any?}"
   },
   ignore_on: ->(job) {
                config = job.class.try(:enqueue_after_transaction_commit)

data/lib/isolator/database_cleaner_support.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
+require "database_cleaner/active_record/base"
 require "database_cleaner/active_record/transaction"
 ::DatabaseCleaner::ActiveRecord::Transaction.prepend(
   Module.new do
     def start
       super
-      connection_id = connection_class.connection.object_id
+
+      connection_id = connection.object_id
+
       Isolator.set_connection_threshold(
         Isolator.transactions_threshold(connection_id) + 1,
         connection_id
@@ -13,12 +16,24 @@ require "database_cleaner/active_record/transaction"
     end
 
     def clean
-      connection_id = connection_class.connection.object_id
+      connection_id = connection.object_id
+
       Isolator.set_connection_threshold(
         Isolator.transactions_threshold(connection_id) - 1,
         connection_id
       )
+
       super
     end
+
+    private
+
+    def connection
+      if Gem::Version.new("7.2") <= Gem::Version.new(Rails::VERSION::STRING)
+        connection_class.lease_connection
+      else
+        connection_class.connection
+      end
+    end
   end
 )

data/lib/isolator/orm_adapters/active_record.rb

@@ -3,7 +3,8 @@
 require_relative "active_support_subscriber"
 
 # We rely on this feature introduced in 7.1.0.beta1: https://github.com/rails/rails/pull/49192
-if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+if (ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1) ||
+    ActiveRecord.version >= Gem::Version.new("7.1")
   require_relative "active_support_transaction_subscriber"
   Isolator::ActiveSupportTransactionSubscriber.subscribe!
 else

data/lib/isolator/plugins/database_subtransactions.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Isolator
+  class Configuration
+    attr_accessor :max_subtransactions_depth
+  end
+
+  class MaxSubtransactionsExceededError < UnsafeOperationError
+    MESSAGE = "Allowed subtransaction amount exceeded"
+  end
+
+  Isolator.on_transaction_begin do |event|
+    next if Isolator.config.max_subtransactions_depth.nil?
+
+    depth = event[:depth]
+    next unless (depth - 1) > Isolator.config.max_subtransactions_depth
+
+    Isolator.notify(exception: MaxSubtransactionsExceededError.new, backtrace: caller)
+  end
+end

data/lib/isolator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Isolator
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/isolator.rb

@@ -263,3 +263,4 @@ require "isolator/database_cleaner_support" if defined?(DatabaseCleaner)
 
 # Built-in extensions
 require "isolator/plugins/concurrent_database_transactions"
+require "isolator/plugins/database_subtransactions"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isolator
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2025-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sniffer
@@ -318,6 +318,7 @@ files:
 - lib/isolator/orm_adapters/active_support_transaction_subscriber.rb
 - lib/isolator/orm_adapters/rom_active_support.rb
 - lib/isolator/plugins/concurrent_database_transactions.rb
+- lib/isolator/plugins/database_subtransactions.rb
 - lib/isolator/railtie.rb
 - lib/isolator/simple_hashie.rb
 - lib/isolator/version.rb