closure_tree 9.6.2 → 9.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7326f71d858362cf125f0db24593f22441bcfb1c1fc81124036d8d4cdaa7110f
-  data.tar.gz: 0b14cd7c237b4b48e7f04777c213dcaed3cfe526eb74d26672f1736ee5bf89ec
+  metadata.gz: 85721d6e16c245ba1eeb1d4a513464df79e33ec64cf91f6252084ac2c4d49d55
+  data.tar.gz: aafd7ee3e237653140f31e35d299ad3d9afc21006708c6e2425df7909222ae0b
 SHA512:
-  metadata.gz: 53ae09bebff724ee6540d5b274330ef489726dfd690a164774a140382bc631ee0e10a8f4ad522e04f8a997714567bb2151d514b203aa6b14bc24785507a3c660
-  data.tar.gz: 14cc8606e54f4adf1de9331edc0833e7e4521a3b8a5fbb0bf9a99dad2fe619c69e6f22362f549ee44c36b21785ec14a0804a0ed3dd83976ad4350e839a6aba61
+  metadata.gz: 755dc5dedfca297b47841f9bebd4fdd2ca7cf84f57828850290c7981a764a127a2acbf65175e8ed0be583f2e6620112fdf37f0690b9e174c93e26ee8265d051b
+  data.tar.gz: 5369312577a8c88ea1430258340171772dd40c6efabe69d5eafdf304cea4f678865a982cc153a07bdfdc234edcf63f7607825758e265b5f9c4483dd781d6938c

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [9.8.0](https://github.com/ClosureTree/closure_tree/compare/closure_tree/v9.7.0...closure_tree/v9.8.0) (2026-08-05)
+
+
+### Features
+
+* require with_advisory_lock 7.6.0 ([27d9f5e](https://github.com/ClosureTree/closure_tree/commit/27d9f5e268afb266e53fddac21100bfc67ab1d83))
+
+
+### Bug Fixes
+
+* batch find_by_large_path in groups of max_join_tables elements ([7e05aa1](https://github.com/ClosureTree/closure_tree/commit/7e05aa1cd1771278f920a3dce917da36db456c1f)), closes [#347](https://github.com/ClosureTree/closure_tree/issues/347)
+* materialize transaction before taking transaction-level advisory lock ([a2ea522](https://github.com/ClosureTree/closure_tree/commit/a2ea5223ba69195add5f6361c6fa3af2a76d37b8))
+* use model arel_table in cleanup! for Rails 8.2 compatibility ([f46abc7](https://github.com/ClosureTree/closure_tree/commit/f46abc7e540a3cc53ea17b7ffa2a9abd7724ecdd))
+* use transaction-level advisory locks inside open transactions on PostgreSQL ([b4eb3df](https://github.com/ClosureTree/closure_tree/commit/b4eb3df89dd4f7a4151a7f6204842661b219b241))
+
+## [9.7.0](https://github.com/ClosureTree/closure_tree/compare/closure_tree/v9.6.2...closure_tree/v9.7.0) (2026-05-06)
+
+
+### Features
+
+* allow advisory_lock_name proc to receive instance for per-tenant lock granularity ([#491](https://github.com/ClosureTree/closure_tree/issues/491)) ([a7a554c](https://github.com/ClosureTree/closure_tree/commit/a7a554c004fb865ab4ee721f929a8a00bb5cdc46))
+
 ## [9.6.2](https://github.com/ClosureTree/closure_tree/compare/closure_tree/v9.6.1...closure_tree/v9.6.2) (2026-04-07)
 
 

data/README.md

@@ -109,9 +109,6 @@ Note that closure_tree only supports ActiveRecord 7.2 and later, and has test co
 
     If you're starting from scratch you don't need to call `rebuild!`.
 
-NOTE: Run `rails g closure_tree:config` to create an initializer with extra
-      configurations. (Optional)
-
 ## Warning
 
 As stated above, using multiple hierarchy gems (like `ancestry` or `nested set`) on the same model
@@ -560,7 +557,7 @@ class Tag < ApplicationRecord
   has_closure_tree advisory_lock_name: 'custom_tag_lock'
 end
 
-# Dynamic via Proc
+# Dynamic via Proc (1-arity: receives model class only)
 class Tag < ApplicationRecord
   has_closure_tree advisory_lock_name: ->(model_class) { "#{Rails.env}_#{model_class.name.underscore}" }
 end
@@ -568,16 +565,36 @@ end
 # Delegate to model method
 class Tag < ApplicationRecord
   has_closure_tree advisory_lock_name: :custom_lock_name
-  
+
   def self.custom_lock_name
     "tag_lock_#{current_tenant_id}"
   end
 end
 ```
 
+#### Per-instance lock names (multi-tenant / scoped models)
+
+Pass a 2-arity proc to receive both the model class and the current record instance.
+This is the recommended approach for scoped models where each tenant should have its own lock,
+avoiding unnecessary serialization across tenants.
+
+```ruby
+class Node < ApplicationRecord
+  has_closure_tree scope: :company_id,
+                   advisory_lock_name: ->(klass, instance) {
+                     company = instance&.company_id
+                     company ? "ct_#{klass.name}_#{company}" : "ct_#{klass.name}"
+                   }
+end
+```
+
+When `instance` is `nil` (class-level operations like `Node.rebuild!`), the proc should
+fall back to a model-wide name. Instance-level operations (`save`, `destroy`, `add_sibling`,
+`find_or_create_by_path`) pass the record itself so the lock is scoped to that tenant.
+
 This is particularly useful when:
 * You need environment-specific lock names
-* You're using multi-tenancy and need tenant-specific locks
+* You're using multi-tenancy and need per-tenant locks (avoiding cross-tenant contention)
 * You want to avoid lock name collisions between similar model names
 
 ## Multi-Database Support

data/closure_tree.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 3.3.0'
 
   gem.add_dependency 'activerecord', '>= 7.2.0'
-  gem.add_dependency 'with_advisory_lock', '>= 7.5.0'
+  gem.add_dependency 'with_advisory_lock', '>= 7.6.0'
   gem.add_dependency 'zeitwerk', '~> 2.7'
 
   gem.add_development_dependency 'database_cleaner'

data/lib/closure_tree/finders.rb

@@ -20,7 +20,7 @@ module ClosureTree
       return found if found
 
       attrs = subpath.shift
-      _ct.with_advisory_lock do
+      _ct.with_advisory_lock(self) do
         # shenanigans because children.create is bound to the superclass
         # (in the case of polymorphism):
         child = children.where(attrs).first || begin

data/lib/closure_tree/hierarchy_maintenance.rb

@@ -64,7 +64,7 @@ module ClosureTree
     end
 
     def _ct_before_destroy
-      _ct.with_advisory_lock do
+      _ct.with_advisory_lock(self) do
         _ct_adopt_children_to_grandparent if _ct.options[:dependent] == :adopt
         delete_hierarchy_references
         self.class.find(id).children.find_each(&:rebuild!) if _ct.options[:dependent] == :nullify
@@ -86,7 +86,7 @@ module ClosureTree
     end
 
     def rebuild!(called_by_rebuild = false)
-      _ct.with_advisory_lock do
+      _ct.with_advisory_lock(self) do
         delete_hierarchy_references unless (defined? @was_new_record) && @was_new_record
         hierarchy_class.create!(ancestor: self, descendant: self, generations: 0)
         unless root?
@@ -112,7 +112,7 @@ module ClosureTree
     end
 
     def delete_hierarchy_references
-      _ct.with_advisory_lock do
+      _ct.with_advisory_lock(self) do
         # The crazy double-wrapped sub-subselect works around MySQL's limitation of subselects on the same table that is being mutated.
         # It shouldn't affect performance of postgresql.
         # See http://dev.mysql.com/doc/refman/5.0/en/subquery-errors.html
@@ -140,7 +140,9 @@ module ClosureTree
 
         %i[descendant_id ancestor_id].each do |foreign_key|
           alias_name = "#{foreign_key.to_s.split('_').first}s"
-          alias_table = Arel::Table.new(table_name).alias(alias_name)
+          # Rails 8.2 made Arel::Table.new keyword-only; the model's own arel_table
+          # is equivalent and works across all supported Rails versions.
+          alias_table = arel_table.alias(alias_name)
           arel_join = hierarchy_table.join(alias_table, Arel::Nodes::OuterJoin)
                                      .on(alias_table[primary_key].eq(hierarchy_table[foreign_key]))
                                      .join_sources

data/lib/closure_tree/numeric_deterministic_ordering.rb

@@ -162,7 +162,7 @@ module ClosureTree
       # Make sure self isn't dirty, because we're going to call reload:
       save
 
-      _ct.with_advisory_lock do
+      _ct.with_advisory_lock(self) do
         prior_sibling_parent = sibling.parent
 
         sibling.order_value = order_value

data/lib/closure_tree/support.rb

@@ -157,10 +157,15 @@ module ClosureTree
       " AND #{conditions.join(' AND ')}"
     end
 
-    def with_advisory_lock(&block)
+    def with_advisory_lock(instance = nil, &block)
       lock_method = options[:advisory_lock_timeout_seconds].present? ? :with_advisory_lock! : :with_advisory_lock
       if options[:with_advisory_lock] && connection.supports_advisory_locks? && model_class.respond_to?(lock_method)
-        model_class.public_send(lock_method, advisory_lock_name, advisory_lock_options) do
+        lock_options = advisory_lock_options
+        if use_transaction_level_lock?
+          connection.materialize_transactions
+          lock_options = lock_options.merge(transaction: true)
+        end
+        model_class.public_send(lock_method, advisory_lock_name(instance), lock_options) do
           transaction(&block)
         end
       else
@@ -168,6 +173,12 @@ module ClosureTree
       end
     end
 
+    private def use_transaction_level_lock?
+      return false unless connection.adapter_name.match?(/postg/i)
+
+      connection.open_transactions == 1 && connection.current_transaction.joinable?
+    end
+
     def build_ancestry_attr_path(path, attributes)
       path = path.is_a?(Array) ? path.dup : [path]
       unless path.first.is_a?(Hash)
@@ -195,7 +206,7 @@ module ClosureTree
     def find_by_large_path(path, attributes = {}, parent_id = nil)
       next_parent_id = parent_id
       child = nil
-      path.in_groups(max_join_tables, false).each do |subpath|
+      path.in_groups_of(max_join_tables, false).each do |subpath|
         child = model_class.find_by_path(subpath, attributes, next_parent_id)
         return nil if child.nil?
 

data/lib/closure_tree/support_attributes.rb

@@ -8,28 +8,22 @@ module ClosureTree
     extend Forwardable
     def_delegators :model_class, :connection, :transaction, :table_name, :base_class, :inheritance_column, :column_names
 
-    def advisory_lock_name
-      # Allow customization via options or instance method
+    def advisory_lock_name(instance = nil)
       if options[:advisory_lock_name]
         case options[:advisory_lock_name]
         when Proc
-          # Allow dynamic generation via proc
-          options[:advisory_lock_name].call(base_class)
+          proc = options[:advisory_lock_name]
+          proc.arity == 1 ? proc.call(base_class) : proc.call(base_class, instance)
         when Symbol
-          # Allow delegation to a model method
           if model_class.respond_to?(options[:advisory_lock_name])
             model_class.send(options[:advisory_lock_name])
           else
             raise ArgumentError, "Model #{model_class} does not respond to #{options[:advisory_lock_name]}"
           end
         else
-          # Use static string value
           options[:advisory_lock_name].to_s
         end
       else
-        # Default: Use CRC32 for a shorter, consistent hash
-        # This gives us 8 hex characters which is plenty for uniqueness
-        # and leaves room for prefixes
         "ct_#{Zlib.crc32(base_class.name.to_s).to_s(16)}"
       end
     end

data/lib/closure_tree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClosureTree
-  VERSION = Gem::Version.new('9.6.2')
+  VERSION = Gem::Version.new('9.8.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 9.6.2
+  version: 9.8.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.5.0
+        version: 7.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.5.0
+        version: 7.6.0
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/ClosureTree/closure_tree/issues
   changelog_uri: https://github.com/ClosureTree/closure_tree/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/closure_tree/9.6.2
+  documentation_uri: https://www.rubydoc.info/gems/closure_tree/9.8.0
   homepage_uri: https://closuretree.github.io/closure_tree/
   source_code_uri: https://github.com/ClosureTree/closure_tree
   rubygems_mfa_required: 'true'
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Easily and efficiently make your ActiveRecord model support hierarchies
 test_files: []