closure_tree 7.4.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4ac0bb16bca6ba730b542b35639b067ad113e2c7010265cae6e0192425e1b82
-  data.tar.gz: 03004e7033f76268a1e96b3ee4a0c5d9066a4c716caab80c6082ddb60404b598
+  metadata.gz: 1833e9f0cef7b45722dc67fcea625de8ee04bd820de6567da77f5f7bf3a97e65
+  data.tar.gz: 6c0c050d6b081b612b11d76c2e79b1f84f56dade7ad3b6f2b445f9bfa3d90d1d
 SHA512:
-  metadata.gz: 5eac3ad625f051cc1e5fa62165076119d1cda689b619aeb6e83c9a32bbd33f343817c867cfd97abc26d32c56346eb833d39e747ec1d60ae9abf018e79a762442
-  data.tar.gz: 6f01c8b3b6ef3382340d0743a87e34243e9283bb64d3cefec1a79a7fb23c670f8da02e0125f7497e8afa834077aa75c60830988f14b2c7e095a6f7fe3ac8e02b
+  metadata.gz: 3d61b4e41fd71552f54aba6bfec350fc75d5a923797c580fe2d7e48df6e7f3917477f7992c6bd9d59b614730f9978c77acd100ee4d848d737afb42e3e629dcf6
+  data.tar.gz: ed181080ce63b08712cbd8981cfa057cb4c432ed228cff8dac22a3770f9d41d7a81adff3b3b251bffb710e030952d6fe570e767707c835d72cbb0915ec328008

data/.github/workflows/ci.yml

@@ -2,20 +2,32 @@
 name: CI
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
 
 jobs:
   rspec:
-    runs-on: ubuntu-20.04
-
+    runs-on: ubuntu-latest
     services:
+      mysql:
+        image: mysql/mysql-server
+        ports:
+          - "3306:3306"
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: closure_tree_test
+          MYSQL_ROOT_HOST: '%'
       postgres:
-        image: 'postgres:13'
+        image: 'postgres'
         ports: ['5432:5432']
         env:
           POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: closure_tree
+          POSTGRES_DB: closure_tree_test
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -26,68 +38,30 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '3.0'
-          - '2.7'
-          - '2.6'
-          - '2.5'
+          - '3.3'
         rails:
-          - activerecord_6.1
-          - activerecord_6.0
-          - activerecord_5.2
-          - activerecord_5.1
-          - activerecord_5.0
-          - activerecord_4.2
+          - activerecord_8.0
+          - activerecord_7.2
+          - activerecord_7.1
           - activerecord_edge
         adapter:
-          - sqlite3
-          - mysql2
-          - postgresql
-        exclude:
-          - ruby: '2.7'
-            rails: activerecord_4.2
-          - ruby: '3.0'
-            rails: activerecord_4.2
-          - ruby: '3.0'
-            rails: activerecord_5.0
-          - ruby: '3.0'
-            rails: activerecord_5.1
-          - ruby: '3.0'
-            rails: activerecord_5.2
-          - ruby: '2.5'
-            rails: activerecord_edge
-          - ruby: '2.6'
-            rails: activerecord_edge
+          - 'sqlite3:///:memory:'
+          - mysql2://root:root@0/closure_tree_test
+          - postgres://closure_tree:closure_tree@0/closure_tree_test
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - name: Set DB Adapter
+          bundler-cache: true
+          rubygems: latest
         env:
-          RAILS_VERSION: ${{ matrix.rails }}
-          DB_ADAPTER: ${{ matrix.adapter }}
-
-        # See: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md#mysql
-        run: |
-          if [ "${DB_ADAPTER}" = "mysql2" ]; then
-            sudo systemctl start mysql.service
-            mysql -u root -proot -e 'create database closure_tree;'
-          fi
-
-      - name: Bundle
-        env:
-          RAILS_VERSION: ${{ matrix.rails }}
-          DB_ADAPTER: ${{ matrix.adapter }}
           BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
-        run: |
-          gem install bundler
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+          RAILS_ENV: test
 
       - name: RSpec
         env:
@@ -95,4 +69,4 @@ jobs:
           DB_ADAPTER: ${{ matrix.adapter }}
           BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
           WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
-        run: bin/rake --trace spec:all
+        run: bin/rake

data/.github/workflows/ci_jruby.yml

@@ -0,0 +1,68 @@
+---
+name: CI Jruby
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+concurrency:
+  group: ci-${{ github.head_ref }}-jruby
+  cancel-in-progress: true
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql/mysql-server
+        ports:
+          - "3306:3306"
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: closure_tree_test
+          MYSQL_ROOT_HOST: '%'
+      postgres:
+        image: 'postgres'
+        ports: ['5432:5432']
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: closure_tree_test
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    strategy:
+      fail-fast: false
+      matrix:
+        rails:
+          - activerecord_7.1
+        adapter:
+          - 'sqlite3:///:memory:'
+          - mysql2://root:root@0/closure_tree_test
+          - postgres://closure_tree:closure_tree@0/closure_tree_test
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: jruby
+          bundler-cache: true
+          rubygems: latest
+        env:
+          BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
+          RAILS_ENV: test
+
+      - name: RSpec
+        env:
+          RAILS_VERSION: ${{ matrix.rails }}
+          DB_ADAPTER: ${{ matrix.adapter }}
+          BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
+          WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
+        run: bin/rake

data/.github/workflows/ci_truffleruby.yml

@@ -0,0 +1,71 @@
+---
+name: CI Truffleruby
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+concurrency:
+  group: ci-${{ github.head_ref }}-truffleruby
+  cancel-in-progress: true
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql/mysql-server
+        ports:
+          - "3306:3306"
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: closure_tree_test
+          MYSQL_ROOT_HOST: '%'
+      postgres:
+        image: 'postgres'
+        ports: ['5432:5432']
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: closure_tree_test
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - truffleruby
+        rails:
+          - activerecord_7.1
+        adapter:
+          - 'sqlite3:///:memory:'
+          - mysql2://root:root@0/closure_tree_test
+          - postgres://closure_tree:closure_tree@0/closure_tree_test
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: truffleruby
+          bundler-cache: true
+          rubygems: latest
+        env:
+          BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
+          RAILS_ENV: test
+
+      - name: RSpec
+        env:
+          RAILS_VERSION: ${{ matrix.rails }}
+          DB_ADAPTER: ${{ matrix.adapter }}
+          BUNDLE_GEMFILE: gemfiles/${{ matrix.rails }}.gemfile
+          WITH_ADVISORY_LOCK_PREFIX: ${{ github.run_id }}
+        run: bin/rake

data/.github/workflows/release.yml

@@ -0,0 +1,17 @@
+name: release-please
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: googleapis/release-please-action@v4

data/.gitignore

@@ -11,7 +11,7 @@ tmp/
 .yardoc/
 .rvmrc
 *.lock
-tmp/
 .ruby-*
 *.iml
+.env
 coverage/

data/.release-please-manifest.json

@@ -0,0 +1 @@
+{".":"8.0.0"}

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.4.4

data/Appraisals

@@ -1,55 +1,11 @@
+# frozen_string_literal: true
 
-appraise 'activerecord-4.2' do
-  gem 'activerecord', '~> 4.2.0'
-  platforms :ruby do
-    gem 'mysql2', "< 0.5"
-    gem 'pg', "~> 0.21"
-    gem 'sqlite3', '~> 1.3.13'
-  end
-
-  platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter'
-    gem 'activerecord-jdbcpostgresql-adapter'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  end
-end
-
-appraise 'activerecord-5.0' do
-  gem 'activerecord', '~> 5.0.0'
-  platforms :ruby do
-    gem 'mysql2'
-    gem 'pg'
-    gem 'sqlite3', '~> 1.3.13'
-  end
-
-  platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter'
-    gem 'activerecord-jdbcpostgresql-adapter'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  end
-end
-
-appraise 'activerecord-5.1' do
-  gem 'activerecord', '~> 5.1.0'
-  platforms :ruby do
-    gem 'mysql2'
-    gem 'pg'
-    gem 'sqlite3', '~> 1.3.13'
-  end
-
-  platforms :jruby do
-    gem 'activerecord-jdbcmysql-adapter'
-    gem 'activerecord-jdbcpostgresql-adapter'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  end
-end
-
-appraise 'activerecord-5.2' do
-  gem 'activerecord', '~> 5.2.0'
-  platforms :ruby do
+appraise 'activerecord-7.1' do
+  gem 'activerecord', '~> 7.1.0'
+  platforms :ruby, :truffleruby do
     gem 'mysql2'
     gem 'pg'
-    gem 'sqlite3'
+    gem 'sqlite3', '< 2.0'
   end
 
   platforms :jruby do
@@ -59,8 +15,8 @@ appraise 'activerecord-5.2' do
   end
 end
 
-appraise 'activerecord-6.0' do
-  gem 'activerecord', '~> 6.0.0'
+appraise 'activerecord-7.2' do
+  gem 'activerecord', '~> 7.2.0'
   platforms :ruby do
     gem 'mysql2'
     gem 'pg'
@@ -74,8 +30,8 @@ appraise 'activerecord-6.0' do
   end
 end
 
-appraise 'activerecord-6.1' do
-  gem 'activerecord', '~> 6.1.0'
+appraise 'activerecord-8.0' do
+  gem 'activerecord', '~> 8.0.0'
   platforms :ruby do
     gem 'mysql2'
     gem 'pg'

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 8.0.0
+
+- Drop support to EOL ruby and rails
+- Reference ancestor_hierarchies in depth instead of ancestors to avoid n+1
+
 ## [7.4.0](https://github.com/ClosureTree/closure_tree/tree/7.4.0)
 
 [Full Changelog](https://github.com/ClosureTree/closure_tree/compare/v7.3.0...7.4.0)

data/Gemfile

@@ -1,7 +1,6 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
-
-gem "bump", "~> 0.10.0"
-gem "github_changelog_generator", "~> 1.16"

data/README.md

@@ -5,8 +5,7 @@
 Common applications include modeling hierarchical data, like tags, threaded comments, page graphs in CMSes,
 and tracking user referrals.
 
-[![Join the chat at https://gitter.im/closure_tree/Lobby](https://badges.gitter.im/closure_tree/Lobby.svg)](https://gitter.im/closure_tree/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://api.travis-ci.org/ClosureTree/closure_tree.svg?branch=master)](http://travis-ci.org/ClosureTree/closure_tree)
+[![CI](https://github.com/ClosureTree/closure_tree/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/ClosureTree/closure_tree/actions/workflows/ci.yml)
 [![Gem Version](https://badge.fury.io/rb/closure_tree.svg)](https://badge.fury.io/rb/closure_tree)
 
 Dramatically more performant than
@@ -25,7 +24,7 @@ closure_tree has some great features:
   * 2 SQL INSERTs on node creation
   * 3 SQL INSERT/UPDATEs on node reparenting
 * __Support for [concurrency](#concurrency)__ (using [with_advisory_lock](https://github.com/ClosureTree/with_advisory_lock))
-* __Tested against ActiveRecord 4.2, 5.0, 5.1, 5.2 and 6.0 with  Ruby 2.5 and 2.6__
+* __Tested against ActiveRecord 7.1+ with Ruby 3.3+__
 * Support for reparenting children (and all their descendants)
 * Support for [single-table inheritance (STI)](#sti) within the hierarchy
 * ```find_or_create_by_path``` for [building out heterogeneous hierarchies quickly and conveniently](#find_or_create_by_path)
@@ -53,7 +52,7 @@ for a description of different tree storage algorithms.
 
 ## Installation
 
-Note that closure_tree only supports ActiveRecord 4.2 and later, and has test coverage for MySQL, PostgreSQL, and SQLite.
+Note that closure_tree only supports ActiveRecord 7.1 and later, and has test coverage for MySQL, PostgreSQL, and SQLite.
 
 1.  Add `gem 'closure_tree'` to your Gemfile
 
@@ -661,14 +660,27 @@ end
 
 ## Testing
 
-Closure tree is [tested under every valid combination](http://travis-ci.org/#!/ClosureTree/closure_tree) of
+Closure tree is [tested under every valid combination](https://github.com/ClosureTree/closure_tree/blob/master/.github/workflows/ci.yml) of
 
-* Ruby 2.5, 2.6 and 2.7
-* ActiveRecord 4.2, 5.x and 6.0
+* Ruby 3.3+
+* ActiveRecord 7.1+
 * PostgreSQL, MySQL, and SQLite. Concurrency tests are only run with MySQL and PostgreSQL.
 
-Assuming you're using [rbenv](https://github.com/sstephenson/rbenv), you can use ```tests.sh``` to
-run the test matrix locally.
+```shell
+$ bundle
+$ appraisal bundle # this will install the matrix of dependencies
+$ appraisal rake # this will run the tests in all combinations
+$ appraisal activerecord-7.0 rake # this will run the tests in AR 7.0 only
+$ appraisal activerecord-7.0 rake spec # this will run rspec in AR 7.0 only
+$ appraisal activerecord-7.0 rake test # this will run minitest in AR 7.0 only
+```
+
+By default the test are run with sqlite3 only. 
+You run test with other databases by passing the database url as environment variable:
+
+```shell
+$ DATABASE_URL=postgres://localhost/my_database appraisal activerecord-7.0 rake test 
+```
 
 ## Change log
 

data/Rakefile

@@ -2,36 +2,31 @@
 
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rake/testtask'
 
 RSpec::Core::RakeTask.new(:spec) do |task|
   task.pattern = 'spec/closure_tree/*_spec.rb'
 end
 
-task default: :spec
+task default: %i[spec test]
 
 namespace :spec do
   desc 'Run all spec variants'
   task :all do
     rake = 'bin/rake'
-    fail unless system("#{rake} spec:generators")
 
-    [['', ''], ['db_prefix_', ''], ['', '_db_suffix'], ['abc_', '_123']].each do |prefix, suffix|
+    [['', ''], ['db_prefix_', ''], ['', '_db_suffix'], %w[abc_ _123]].each do |prefix, suffix|
       env = "DB_PREFIX=#{prefix} DB_SUFFIX=#{suffix}"
-      fail unless system("#{rake} spec #{env}")
+      raise unless system("#{rake} spec #{env}")
     end
   end
-
-  desc 'Run generator specs'
-  RSpec::Core::RakeTask.new(:generators) do |task|
-    task.pattern = 'spec/generators/*_spec.rb'
-  end
 end
 
-require 'github_changelog_generator/task'
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.user = 'ClosureTree'
-  config.project = 'closure_tree'
-  config.issues = false
-  config.future_release = '5.2.0'
-  config.since_tag = 'v7.3.0'
+Rake::TestTask.new do |t|
+  t.libs.push 'lib'
+  t.libs.push 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
 end
+
+task default: 'spec:all'

data/closure_tree.gemspec

@@ -5,32 +5,39 @@ require_relative 'lib/closure_tree/version'
 Gem::Specification.new do |gem|
   gem.name        = 'closure_tree'
   gem.version     = ::ClosureTree::VERSION
-  gem.authors     = ['Matthew McEachen']
-  gem.email       = ['matthew-github@mceachen.org']
-  gem.homepage    = 'http://mceachen.github.io/closure_tree/'
+  gem.authors     = ['Matthew McEachen', 'Abdelkader Boudih']
+  gem.email       = %w[matthew+github@mceachen.org terminale@gmail.com]
+  gem.homepage    = 'https://github.com/ClosureTree/closure_tree/'
 
   gem.summary     = %q(Easily and efficiently make your ActiveRecord model support hierarchies)
-  gem.description = gem.summary
   gem.license     = 'MIT'
 
+  gem.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/#{gem.version}",
+    'homepage_uri'      => "https://closuretree.github.io/closure_tree/",
+    'source_code_uri'   => "https://github.com/ClosureTree/closure_tree",
+  }
+
   gem.files         = `git ls-files`.split($/).reject do |f|
     f.match(%r{^(spec|img|gemfiles)})
   end
 
   gem.test_files  = gem.files.grep(%r{^spec/})
-  gem.required_ruby_version = '>= 2.0.0'
+  gem.required_ruby_version = '>= 3.3.0'
 
-  gem.add_runtime_dependency 'activerecord', '>= 4.2.10'
-  gem.add_runtime_dependency 'with_advisory_lock', '>= 4.0.0'
+  gem.add_runtime_dependency 'activerecord', '>= 7.1.0'
+  gem.add_runtime_dependency 'with_advisory_lock', '>= 5.0.0', '< 6.0.0'
 
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'database_cleaner'
   gem.add_development_dependency 'generator_spec'
   gem.add_development_dependency 'parallel'
-  gem.add_development_dependency 'pg'
+  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'minitest-reporters'
   gem.add_development_dependency 'rspec-instafail'
   gem.add_development_dependency 'rspec-rails'
-  gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'timecop'
   # gem.add_development_dependency 'byebug'

data/lib/closure_tree/active_record_support.rb

@@ -1,20 +1,9 @@
 module ClosureTree
   module ActiveRecordSupport
+    delegate :quote, to: :connection
 
-    def quote(field)
-      connection.quote(field)
-    end
-
-    def ensure_fixed_table_name(table_name)
-      [
-        ActiveRecord::Base.table_name_prefix,
-        remove_prefix_and_suffix(table_name),
-        ActiveRecord::Base.table_name_suffix
-      ].compact.join
-    end
-
-    def remove_prefix_and_suffix(table_name)
-      pre, suff = ActiveRecord::Base.table_name_prefix, ActiveRecord::Base.table_name_suffix
+    def remove_prefix_and_suffix(table_name, model = ActiveRecord::Base)
+      pre, suff = model.table_name_prefix, model.table_name_suffix
       if table_name.start_with?(pre) && table_name.end_with?(suff)
         table_name[pre.size..-(suff.size + 1)]
       else

data/lib/closure_tree/digraphs.rb

@@ -11,7 +11,7 @@ module ClosureTree
       _ct.has_name? ? read_attribute(_ct.name_column) : to_s
     end
 
-    module ClassMethods
+    class_methods do
       # Renders the given scope as a DOT digraph, suitable for rendering by Graphviz
       def to_dot_digraph(tree_scope)
         id_to_instance = tree_scope.reduce({}) { |h, ea| h[ea.id] = ea; h }

data/lib/closure_tree/finders.rb

@@ -50,7 +50,7 @@ module ClosureTree
       scope.without_instance(self)
     end
 
-    module ClassMethods
+    class_methods do
 
       def without_instance(instance)
         if instance.new_record?

data/lib/closure_tree/hash_tree.rb

@@ -6,7 +6,7 @@ module ClosureTree
       _ct.hash_tree(self_and_descendants, options[:limit_depth])
     end
 
-    module ClassMethods
+    class_methods do
 
       # There is no default depth limit. This might be crazy-big, depending
       # on your tree shape. Hash huge trees at your own peril!

data/lib/closure_tree/hierarchy_maintenance.rb

@@ -35,13 +35,10 @@ module ClosureTree
     end
 
     def _ct_after_save
-      as_5_1 = ActiveSupport.version >= Gem::Version.new('5.1.0')
-      changes_method = as_5_1 ? :saved_changes : :changes
-
-      if public_send(changes_method)[_ct.parent_column_name] || @was_new_record
+      if public_send(:saved_changes)[_ct.parent_column_name] || @was_new_record
         rebuild!
       end
-      if public_send(changes_method)[_ct.parent_column_name] && !@was_new_record
+      if public_send(:saved_changes)[_ct.parent_column_name] && !@was_new_record
         # Resetting the ancestral collections addresses
         # https://github.com/mceachen/closure_tree/issues/68
         ancestor_hierarchies.reload
@@ -107,7 +104,7 @@ module ClosureTree
       end
     end
 
-    module ClassMethods
+    class_methods do
       # Rebuilds the hierarchy table based on the parent_id column in the database.
       # Note that the hierarchy table will be truncated.
       def rebuild!