closure_tree 9.0.0 → 9.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da1033357e368c9a4d2a36b95a8e75899b61b63e872c25167dd5f8862afb454
-  data.tar.gz: '08df010ac42f946d8171152ad5ef4a8e6c1b94263cf39e5d297e4cbf805dca81'
+  metadata.gz: 4a3ac565445f8b4e6054dd67fe023b025db79b17a2d16af5ba8804f190142e37
+  data.tar.gz: d7e7af95d8ef2b2f01c17248e31aaf3b1c7c51109670fc88fefb9343934ee8ff
 SHA512:
-  metadata.gz: 34ef107ba1737f7e4cec6ff581149ce66b4daed0dee6b0e4bc266688a748c182e8c4e1082d38846de22671a23b2a640d80f753715f8e93fdc7889d134cd14c97
-  data.tar.gz: 300a2a3b499a8428e23f89235e409dce6cbd50378ee6406f2ab03d03b97f63d20b5365ff9adabbfaff47ce9b50a54fd5a2e80576dd5839b7d23debce98528074
+  metadata.gz: 9ecedfd06bac1b6d234c05624730b74c93b34d8ba1cb81b09653f7af3bea42d17f0154d471a7f8c0bbc842981a2a1e1260b061a51fbec4cba49f9963f7aced9c
+  data.tar.gz: 8a329d9a4483a36411515789d2d596905a27501dada6ef77f25cb0b34c3154eb3c5aad0aef28f9e4978987d33587d352a4027dd2cc0d7acf422970729e195151

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [9.1.1](https://github.com/ClosureTree/closure_tree/compare/closure_tree/v9.1.0...closure_tree/v9.1.1) (2025-07-24)
+
+
+### Bug Fixes
+
+* restore proper deprecation for database_less configuration ([#459](https://github.com/ClosureTree/closure_tree/issues/459)) ([de8b402](https://github.com/ClosureTree/closure_tree/commit/de8b40233d3de5243afce7ec9de9ad26c2eee181))
+
+## [9.1.0](https://github.com/ClosureTree/closure_tree/compare/closure_tree/v9.0.0...closure_tree/v9.1.0) (2025-07-23)
+
+
+### Features
+
+* migrate from ActiveSupport::Autoload to Zeitwerk ([#457](https://github.com/ClosureTree/closure_tree/issues/457)) ([d18e80c](https://github.com/ClosureTree/closure_tree/commit/d18e80cdbd4f3510377363bc7b5166f0cc1b0a6f))
+
 ## [9.0.0](https://github.com/ClosureTree/closure_tree/compare/closure_tree-v8.0.0...closure_tree/v9.0.0) (2025-07-21)
 
 

data/README.md

@@ -73,6 +73,8 @@ Note that closure_tree only supports ActiveRecord 7.2 and later, and has test co
 
     Make sure you check out the [large number of options](#available-options) that `has_closure_tree` accepts.
 
+    **Note:** The `acts_as_tree` alias is only created if your model doesn't already have a method with that name. This prevents conflicts with other gems like the original `acts_as_tree` gem.
+
     **IMPORTANT: Make sure you add `has_closure_tree` _after_ `attr_accessible` and
     `self.table_name =` lines in your model.**
 
@@ -156,10 +158,10 @@ Then:
 
 ```ruby
 grandparent.self_and_descendants.collect(&:name)
-=> ["Grandparent", "Parent", "First Child", "Second Child", "Third Child", "Fourth Child"]
+#=> ["Grandparent", "Parent", "First Child", "Second Child", "Third Child", "Fourth Child"]
 
 child1.ancestry_path
-=> ["Grandparent", "Parent", "First Child"]
+#=> ["Grandparent", "Parent", "First Child"]
 ```
 
 ### find_or_create_by_path
@@ -204,19 +206,16 @@ d = Tag.find_or_create_by_path %w[a b c d]
 h = Tag.find_or_create_by_path %w[e f g h]
 e = h.root
 d.add_child(e) # "d.children << e" would work too, of course
-h.ancestry_path
-=> ["a", "b", "c", "d", "e", "f", "g", "h"]
+h.ancestry_path #=> ["a", "b", "c", "d", "e", "f", "g", "h"]
 ```
 
 When it is more convenient to simply change the `parent_id` of a node directly (for example, when dealing with a form `<select>`), closure_tree will handle the necessary changes automatically when the record is saved:
 
 ```ruby
 j = Tag.find 102
-j.self_and_ancestor_ids
-=> [102, 87, 77]
+j.self_and_ancestor_ids #=> [102, 87, 77]
 j.update parent_id: 96
-j.self_and_ancestor_ids
-=> [102, 96, 95, 78]
+j.self_and_ancestor_ids #=> [102, 96, 95, 78]
 ```
 
 ### Nested hashes
@@ -233,17 +232,13 @@ c1 = d1.parent
 d2 = b.find_or_create_by_path %w(c2 d2)
 c2 = d2.parent
 
-Tag.hash_tree
-=> {a => {b => {c1 => {d1 => {}}, c2 => {d2 => {}}}, b2 => {}}}
+Tag.hash_tree #=> {a => {b => {c1 => {d1 => {}}, c2 => {d2 => {}}}, b2 => {}}}
 
-Tag.hash_tree(:limit_depth => 2)
-=> {a => {b => {}, b2 => {}}}
+Tag.hash_tree(:limit_depth => 2) #=> {a => {b => {}, b2 => {}}}
 
-b.hash_tree
-=> {b => {c1 => {d1 => {}}, c2 => {d2 => {}}}}
+b.hash_tree #=> {b => {c1 => {d1 => {}}, c2 => {d2 => {}}}}
 
-b.hash_tree(:limit_depth => 2)
-=> {b => {c1 => {}, c2 => {}}}
+b.hash_tree(:limit_depth => 2) #=> {b => {c1 => {}, c2 => {}}}
 ```
 
 **If your tree is large (or might become so), use :limit_depth.**
@@ -477,20 +472,16 @@ c = OrderedTag.create(name: 'c')
 # We have to call 'root.reload.children' because root won't be in sync with the database otherwise:
 
 a.append_sibling(b)
-root.reload.children.pluck(:name)
-=> ["a", "b"]
+root.reload.children.pluck(:name) #=> ["a", "b"]
 
 a.prepend_sibling(b)
-root.reload.children.pluck(:name)
-=> ["b", "a"]
+root.reload.children.pluck(:name) #=> ["b", "a"]
 
 a.append_sibling(c)
-root.reload.children.pluck(:name)
-=> ["b", "a", "c"]
+root.reload.children.pluck(:name) #=> ["b", "a", "c"]
 
 b.append_sibling(c)
-root.reload.children.pluck(:name)
-=> ["b", "c", "a"]
+root.reload.children.pluck(:name) #=> ["b", "c", "a"]
 ```
 
 ### Ordering Roots

data/closure_tree.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'activerecord', '>= 7.2.0'
   gem.add_dependency 'with_advisory_lock', '>= 7.0.0'
+  gem.add_dependency 'zeitwerk', '~> 2.7'
 
   gem.add_development_dependency 'database_cleaner'
   gem.add_development_dependency 'minitest'

data/lib/closure_tree/association_setup.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+module ClosureTree
+  # This concern sets up the ActiveRecord associations after all other modules are included.
+  # It must be included last to ensure that HierarchyMaintenance callbacks are already set up.
+  module AssociationSetup
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :parent, nil,
+                 class_name: _ct.model_class.to_s,
+                 foreign_key: _ct.parent_column_name,
+                 inverse_of: :children,
+                 touch: _ct.options[:touch],
+                 optional: true
+
+      order_by_generations = -> { Arel.sql("#{_ct.quoted_hierarchy_table_name}.generations ASC") }
+
+      has_many :children, *_ct.has_many_order_with_option, class_name: _ct.model_class.to_s,
+                                                           foreign_key: _ct.parent_column_name,
+                                                           dependent: _ct.options[:dependent],
+                                                           inverse_of: :parent do
+        # We have to redefine hash_tree because the activerecord relation is already scoped to parent_id.
+        def hash_tree(options = {})
+          # we want limit_depth + 1 because we don't do self_and_descendants.
+          limit_depth = options[:limit_depth]
+          _ct.hash_tree(@association.owner.descendants, limit_depth ? limit_depth + 1 : nil)
+        end
+      end
+
+      has_many :ancestor_hierarchies, *_ct.has_many_order_without_option(order_by_generations),
+               class_name: _ct.hierarchy_class_name,
+               foreign_key: 'descendant_id'
+
+      has_many :self_and_ancestors, *_ct.has_many_order_without_option(order_by_generations),
+               through: :ancestor_hierarchies,
+               source: :ancestor
+
+      has_many :descendant_hierarchies, *_ct.has_many_order_without_option(order_by_generations),
+               class_name: _ct.hierarchy_class_name,
+               foreign_key: 'ancestor_id'
+
+      has_many :self_and_descendants, *_ct.has_many_order_with_option(order_by_generations),
+               through: :descendant_hierarchies,
+               source: :descendant
+    end
+  end
+end

data/lib/closure_tree/configuration.rb

@@ -1,11 +1,22 @@
 # frozen_string_literal: true
 
 module ClosureTree
-  class Configuration # :nodoc:
-    attr_accessor :database_less
+  # Minimal configuration class to handle deprecated options
+  class Configuration
+    def database_less=(_value)
+      ActiveSupport::Deprecation.new.warn(
+        'ClosureTree.configure { |config| config.database_less = true } is deprecated ' \
+        'and will be removed in v10.0.0. The database_less option is no longer needed ' \
+        'for modern deployment practices. Remove this configuration from your initializer.'
+      )
+      # Ignore the value - this is a no-op for backward compatibility
+    end
 
-    def initialize
-      @database_less = ENV['DATABASE_URL'].to_s.include?('//user:pass@127.0.0.1/')
+    def database_less?
+      false # Always return false since this option does nothing
     end
+
+    # Keep the old method name for backward compatibility
+    alias database_less database_less?
   end
 end

data/lib/closure_tree/has_closure_tree.rb

@@ -25,7 +25,8 @@ module ClosureTree
       class_attribute :hierarchy_class
       self.hierarchy_class = _ct.hierarchy_class_for_model
 
-      # tests fail if you include Model before HierarchyMaintenance wtf
+      # Include modules - HierarchyMaintenance provides callbacks that Model associations depend on
+      # The order is maintained for consistency, but associations are now set up after all includes
       include ClosureTree::HierarchyMaintenance
       include ClosureTree::Model
       include ClosureTree::Finders
@@ -35,11 +36,13 @@ module ClosureTree
       include ClosureTree::DeterministicOrdering if _ct.order_option?
       include ClosureTree::NumericDeterministicOrdering if _ct.order_is_numeric?
 
+      # Include AssociationSetup last to ensure all dependencies are ready
+      include ClosureTree::AssociationSetup
+
       connection_pool.release_connection
-    rescue StandardError => e
-      raise e unless ClosureTree.configuration.database_less
     end
 
-    alias acts_as_tree has_closure_tree
+    # Only alias acts_as_tree if it's not already defined (to avoid conflicts with other gems)
+    alias acts_as_tree has_closure_tree unless method_defined?(:acts_as_tree)
   end
 end

data/lib/closure_tree/model.rb

@@ -6,45 +6,6 @@ module ClosureTree
   module Model
     extend ActiveSupport::Concern
 
-    included do
-      belongs_to :parent, nil,
-                 class_name: _ct.model_class.to_s,
-                 foreign_key: _ct.parent_column_name,
-                 inverse_of: :children,
-                 touch: _ct.options[:touch],
-                 optional: true
-
-      order_by_generations = -> { Arel.sql("#{_ct.quoted_hierarchy_table_name}.generations ASC") }
-
-      has_many :children, *_ct.has_many_order_with_option, class_name: _ct.model_class.to_s,
-                                                           foreign_key: _ct.parent_column_name,
-                                                           dependent: _ct.options[:dependent],
-                                                           inverse_of: :parent do
-        # We have to redefine hash_tree because the activerecord relation is already scoped to parent_id.
-        def hash_tree(options = {})
-          # we want limit_depth + 1 because we don't do self_and_descendants.
-          limit_depth = options[:limit_depth]
-          _ct.hash_tree(@association.owner.descendants, limit_depth ? limit_depth + 1 : nil)
-        end
-      end
-
-      has_many :ancestor_hierarchies, *_ct.has_many_order_without_option(order_by_generations),
-               class_name: _ct.hierarchy_class_name,
-               foreign_key: 'descendant_id'
-
-      has_many :self_and_ancestors, *_ct.has_many_order_without_option(order_by_generations),
-               through: :ancestor_hierarchies,
-               source: :ancestor
-
-      has_many :descendant_hierarchies, *_ct.has_many_order_without_option(order_by_generations),
-               class_name: _ct.hierarchy_class_name,
-               foreign_key: 'ancestor_id'
-
-      has_many :self_and_descendants, *_ct.has_many_order_with_option(order_by_generations),
-               through: :descendant_hierarchies,
-               source: :descendant
-    end
-
     # Delegate to the Support instance on the class:
     def _ct
       self.class._ct

data/lib/closure_tree/support.rb

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require 'closure_tree/support_flags'
-require 'closure_tree/support_attributes'
-require 'closure_tree/numeric_order_support'
-require 'closure_tree/active_record_support'
-require 'closure_tree/hash_tree_support'
-require 'closure_tree/arel_helpers'
-
 # This class and mixins are an effort to reduce the namespace pollution to models that act_as_tree.
 module ClosureTree
   class Support

data/lib/closure_tree/version.rb

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

data/lib/closure_tree.rb

@@ -1,50 +1,27 @@
 # frozen_string_literal: true
 
 require 'active_record'
+require 'zeitwerk'
 
-module ClosureTree
-  extend ActiveSupport::Autoload
-
-  autoload :HasClosureTree
-  autoload :HasClosureTreeRoot
-  autoload :Support
-  autoload :HierarchyMaintenance
-  autoload :Model
-  autoload :Finders
-  autoload :HashTree
-  autoload :Digraphs
-  autoload :DeterministicOrdering
-  autoload :NumericDeterministicOrdering
-  autoload :Configuration
-  autoload :AdapterSupport
+loader = Zeitwerk::Loader.for_gem
+loader.ignore("#{__dir__}/generators")
+loader.setup
 
+module ClosureTree
   def self.configure
-    yield configuration
+    if block_given?
+      # Create a temporary configuration object to capture deprecated settings
+      config = Configuration.new
+      yield config
+    else
+      ActiveSupport::Deprecation.new.warn(
+        'ClosureTree.configure is deprecated and will be removed in a future version. ' \
+        'Configuration is no longer needed.'
+      )
+    end
   end
-
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
-end
-
-ActiveSupport.on_load :active_record do
-  ActiveRecord::Base.extend ClosureTree::HasClosureTree
-  ActiveRecord::Base.extend ClosureTree::HasClosureTreeRoot
-end
-
-# Adapter injection for different database types
-ActiveSupport.on_load :active_record_postgresqladapter do
-  prepend ClosureTree::AdapterSupport
-end
-
-ActiveSupport.on_load :active_record_mysql2adapter do
-  prepend ClosureTree::AdapterSupport
-end
-
-ActiveSupport.on_load :active_record_trilogyadapter do
-  prepend ClosureTree::AdapterSupport
 end
 
-ActiveSupport.on_load :active_record_sqlite3adapter do
-  prepend ClosureTree::AdapterSupport
+ActiveSupport.on_load(:active_record) do
+  extend ClosureTree::HasClosureTree, ClosureTree::HasClosureTreeRoot
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.1.1
 platform: ruby
 authors:
 - Matthew McEachen
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.0
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -137,8 +151,8 @@ files:
 - closure_tree.gemspec
 - lib/closure_tree.rb
 - lib/closure_tree/active_record_support.rb
-- lib/closure_tree/adapter_support.rb
 - lib/closure_tree/arel_helpers.rb
+- lib/closure_tree/association_setup.rb
 - lib/closure_tree/configuration.rb
 - lib/closure_tree/deterministic_ordering.rb
 - lib/closure_tree/digraphs.rb
@@ -156,9 +170,7 @@ files:
 - lib/closure_tree/support_flags.rb
 - lib/closure_tree/test/matcher.rb
 - lib/closure_tree/version.rb
-- lib/generators/closure_tree/config_generator.rb
 - lib/generators/closure_tree/migration_generator.rb
-- lib/generators/closure_tree/templates/config.rb
 - lib/generators/closure_tree/templates/create_hierarchies_table.rb.erb
 homepage: https://github.com/ClosureTree/closure_tree/
 licenses:
@@ -166,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.0.0
+  documentation_uri: https://www.rubydoc.info/gems/closure_tree/9.1.1
   homepage_uri: https://closuretree.github.io/closure_tree/
   source_code_uri: https://github.com/ClosureTree/closure_tree
   rubygems_mfa_required: 'true'

data/lib/closure_tree/adapter_support.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module ClosureTree
-  module AdapterSupport
-    extend ActiveSupport::Concern
-
-    # This module is now only used to ensure the adapter has been loaded
-    # The actual advisory lock functionality is handled through the model's
-    # with_advisory_lock method from the with_advisory_lock gem
-  end
-end

data/lib/generators/closure_tree/config_generator.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module ClosureTree
-  module Generators # :nodoc:
-    class ConfigGenerator < Rails::Generators::Base # :nodoc:
-      source_root File.expand_path('templates', __dir__)
-      desc 'Install closure tree config.'
-
-      def config
-        template 'config.rb', 'config/initializers/closure_tree_config.rb'
-      end
-    end
-  end
-end

data/lib/generators/closure_tree/templates/config.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-ClosureTree.configure do |config|
-  # Some PaaS like Heroku don't have available the db in some build steps like
-  # assets:precompile, this is skipped when this value is true, default = false
-  # config.database_less = true
-end