closure_tree 9.0.0 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da1033357e368c9a4d2a36b95a8e75899b61b63e872c25167dd5f8862afb454
-  data.tar.gz: '08df010ac42f946d8171152ad5ef4a8e6c1b94263cf39e5d297e4cbf805dca81'
+  metadata.gz: 9f55c2391c1a377f24383abdebcd716868debd94f7c0d9070e7c6c98f20fca7c
+  data.tar.gz: fbdbae702b5bec7a40f310e16a6a4d3eeb1c30287765ca4261e908421ec5d20a
 SHA512:
-  metadata.gz: 34ef107ba1737f7e4cec6ff581149ce66b4daed0dee6b0e4bc266688a748c182e8c4e1082d38846de22671a23b2a640d80f753715f8e93fdc7889d134cd14c97
-  data.tar.gz: 300a2a3b499a8428e23f89235e409dce6cbd50378ee6406f2ab03d03b97f63d20b5365ff9adabbfaff47ce9b50a54fd5a2e80576dd5839b7d23debce98528074
+  metadata.gz: 265cd31b5c7f5c1f3b7e90a242fb8683145a4ec67ae6f8ff0c6ea30573138e2a2cbcd962262aa7e351ebf2dd8a3a19d86ddf204d27b6c4115ded0e8f7b2a9039
+  data.tar.gz: 67483089bc889a8a335279bfe8239dd8ca7c9cfe06dfc646ec6da71c27b092c91bdf1fd35f14cc7a11c8d1ea6e635478c64d243e7b1af6c9477399513828f7f5

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [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/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/has_closure_tree.rb

@@ -36,8 +36,6 @@ module ClosureTree
       include ClosureTree::NumericDeterministicOrdering if _ct.order_is_numeric?
 
       connection_pool.release_connection
-    rescue StandardError => e
-      raise e unless ClosureTree.configuration.database_less
     end
 
     alias acts_as_tree has_closure_tree

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.0')
 end

data/lib/closure_tree.rb

@@ -1,50 +1,22 @@
 # 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
+    ActiveSupport::Deprecation.new.warn(
+      'ClosureTree.configure is deprecated and will be removed in a future version. ' \
+      'Configuration is no longer needed.'
+    )
+    yield if block_given?
   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.0
 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,9 +151,7 @@ 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/configuration.rb
 - lib/closure_tree/deterministic_ordering.rb
 - lib/closure_tree/digraphs.rb
 - lib/closure_tree/finders.rb
@@ -156,9 +168,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 +176,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.0
   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/closure_tree/configuration.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module ClosureTree
-  class Configuration # :nodoc:
-    attr_accessor :database_less
-
-    def initialize
-      @database_less = ENV['DATABASE_URL'].to_s.include?('//user:pass@127.0.0.1/')
-    end
-  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