closure_tree 7.0.0 → 7.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad24f6acfed9da72a06c877919ef7a349680abb951a185307590b42484582e0
-  data.tar.gz: 543f9482cd9497d99174358b6d342caa6c860608acc51f5989e5d780c1747f58
+  metadata.gz: 7465d4d3d8e4188cc0d64ffdc93e31df1f943ea3685d0aa36c1c3980065625bb
+  data.tar.gz: a48c396aa59ea4890ce2700d2dd340659485923714296df792698c5f97414c3c
 SHA512:
-  metadata.gz: 69c034fe0ee0278b143758381412ca43663da441bd35a81b67d516d58defc5f19b79d83a28a9fea18984cb105b757b7028c9898cab34eaae98fccb56e7b0d71e
-  data.tar.gz: 53346203044b6eb82b784bc715105b6a2a5029d8ab8c48665d1bb02bf667bff643ba0768c6dfa6ec476b03b7f5567e28846c8b6b2c7b17344f2d17227ca1e24c
+  metadata.gz: 25e8e406ea7dee123d49f02060339b49bf1272adf07c2bcb261a442c396c766fd0e646cc916a4dce08b832ffe2225bdb00f604d39f1a301825f26ad3f839595f
+  data.tar.gz: 5709b20dcd1d2fc78da96c7f9d884ee58c680beb5180c583396052038acacf9d81adfb5b7718160e05624db5027bc7f3286610b4d3a1cbfd6497672455b89432

data/.github/workflows/ci.yml

@@ -0,0 +1,98 @@
+---
+name: CI
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  rspec:
+    runs-on: ubuntu-20.04
+
+    services:
+      postgres:
+        image: 'postgres:13'
+        ports: ['5432:5432']
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: closure_tree
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '3.0'
+          - '2.7'
+          - '2.6'
+          - '2.5'
+        rails:
+          - activerecord_6.1
+          - activerecord_6.0
+          - activerecord_5.2
+          - activerecord_5.1
+          - activerecord_5.0
+          - activerecord_4.2
+          - 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
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Set DB Adapter
+        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
+
+      - 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 --trace spec:all

data/.gitignore

@@ -13,3 +13,5 @@ tmp/
 *.lock
 tmp/
 .ruby-*
+*.iml
+coverage/

data/.rspec

@@ -1 +1 @@
---format documentation --color --order random
+--color

data/Appraisals

@@ -4,7 +4,7 @@ appraise 'activerecord-4.2' do
   platforms :ruby do
     gem 'mysql2', "< 0.5"
     gem 'pg', "~> 0.21"
-    gem 'sqlite3'
+    gem 'sqlite3', '~> 1.3.13'
   end
 
   platforms :jruby do
@@ -19,7 +19,7 @@ appraise 'activerecord-5.0' do
   platforms :ruby do
     gem 'mysql2'
     gem 'pg'
-    gem 'sqlite3'
+    gem 'sqlite3', '~> 1.3.13'
   end
 
   platforms :jruby do
@@ -34,7 +34,7 @@ appraise 'activerecord-5.1' do
   platforms :ruby do
     gem 'mysql2'
     gem 'pg'
-    gem 'sqlite3'
+    gem 'sqlite3', '~> 1.3.13'
   end
 
   platforms :jruby do
@@ -59,6 +59,36 @@ appraise 'activerecord-5.2' do
   end
 end
 
+appraise 'activerecord-6.0' do
+  gem 'activerecord', '~> 6.0.0'
+  platforms :ruby do
+    gem 'mysql2'
+    gem 'pg'
+    gem 'sqlite3'
+  end
+
+  platforms :jruby do
+    gem 'activerecord-jdbcmysql-adapter'
+    gem 'activerecord-jdbcpostgresql-adapter'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  end
+end
+
+appraise 'activerecord-6.1' do
+  gem 'activerecord', '~> 6.1.0'
+  platforms :ruby do
+    gem 'mysql2'
+    gem 'pg'
+    gem 'sqlite3'
+  end
+
+  platforms :jruby do
+    gem 'activerecord-jdbcmysql-adapter'
+    gem 'activerecord-jdbcpostgresql-adapter'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  end
+end
+
 appraise 'activerecord-edge' do
   gem 'activerecord', github: 'rails/rails'
   platforms :ruby do

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [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)
+
+- fix: hierarchy model with namespace should inherit from the superclass of basic model [\#384](https://github.com/ClosureTree/closure_tree/pull/384) ([shawndodo](https://github.com/shawndodo))
+- Add with\_descendant to readme [\#381](https://github.com/ClosureTree/closure_tree/pull/381) ([mattvague](https://github.com/mattvague))
+
+### 7.3.0
+- Ruby 3.0 support
+
+### 7.2.0
+- Ruby 2.7 support
+- Ordering raw SQL argument wrapped with Arel.sql
+
+### 7.1.0
+Closure Tree is now tested against Rails 6.0
+- Directly require core_ext for String#strip_heredoc[PR 350](https://github.com/ClosureTree/closure_tree/pull/350) 
+- Call Module#module_parent instead of deprecated #parent[PR 354](https://github.com/ClosureTree/closure_tree/pull/354)
+
 ### 7.0.0
 Closure Tree is now tested against Rails 5.2
 

data/Gemfile

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

data/README.md

@@ -1,7 +1,5 @@
 # Closure Tree
 
-__Important: please [vote on the future of ClosureTree](https://github.com/ClosureTree/closure_tree/issues/277)!__
-
 ### Closure_tree lets your ActiveRecord models act as nodes in a [tree data structure](http://en.wikipedia.org/wiki/Tree_%28data_structure%29)
 
 Common applications include modeling hierarchical data, like tags, threaded comments, page graphs in CMSes,
@@ -10,7 +8,6 @@ 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)
 [![Gem Version](https://badge.fury.io/rb/closure_tree.svg)](https://badge.fury.io/rb/closure_tree)
-[![Dependency Status](https://gemnasium.com/badges/github.com/ClosureTree/closure_tree.svg)](https://gemnasium.com/github.com/ClosureTree/closure_tree)
 
 Dramatically more performant than
 [ancestry](https://github.com/stefankroes/ancestry) and
@@ -28,7 +25,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, and 5.1, with  Ruby 2.2 and 2.3__
+* __Tested against ActiveRecord 4.2, 5.0, 5.1, 5.2 and 6.0 with  Ruby 2.5 and 2.6__
 * 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)
@@ -340,8 +337,9 @@ When you include ```has_closure_tree``` in your model, you can provide a hash to
 * ```Tag.find_by_path(path, attributes)``` returns the node whose name path is ```path```. See (#find_or_create_by_path).
 * ```Tag.find_or_create_by_path(path, attributes)``` returns the node whose name path is ```path```, and will create the node if it doesn't exist already.See (#find_or_create_by_path).
 * ```Tag.find_all_by_generation(generation_level)``` returns the descendant nodes who are ```generation_level``` away from a root. ```Tag.find_all_by_generation(0)``` is equivalent to ```Tag.roots```.
-* ```Tag.with_ancestor(ancestors)``` scopes to all descendants whose ancestor is in the given list.
-
+* ```Tag.with_ancestor(ancestors)``` scopes to all descendants whose ancestors(s) is/are in the given list.
+* ```Tag.with_descendant(ancestors)``` scopes to all ancestors whose descendant(s) is/are in the given list.
+* ```Tag.lowest_common_ancestor(descendants)``` finds the lowest common ancestor of the descendants.
 ### Instance methods
 
 * ```tag.root``` returns the root for this node
@@ -665,8 +663,8 @@ end
 
 Closure tree is [tested under every valid combination](http://travis-ci.org/#!/ClosureTree/closure_tree) of
 
-* Ruby 2.2, 2.3
-* ActiveRecord 4.2, 5.0, and 5.1
+* Ruby 2.5, 2.6 and 2.7
+* ActiveRecord 4.2, 5.x and 6.0
 * 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

data/Rakefile

@@ -1,23 +1,20 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
+# frozen_string_literal: true
 
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec) do |task|
-  task.pattern = 'spec/*_spec.rb'
+  task.pattern = 'spec/closure_tree/*_spec.rb'
 end
 
-task :default => :spec
+task default: :spec
 
 namespace :spec do
   desc 'Run all spec variants'
   task :all do
-    rake = 'bundle exec rake'
+    rake = 'bin/rake'
     fail unless system("#{rake} spec:generators")
+
     [['', ''], ['db_prefix_', ''], ['', '_db_suffix'], ['abc_', '_123']].each do |prefix, suffix|
       env = "DB_PREFIX=#{prefix} DB_SUFFIX=#{suffix}"
       fail unless system("#{rake} spec #{env}")
@@ -29,3 +26,12 @@ namespace :spec do
     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'
+end

data/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-leap-day

data/bin/appraisal

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'appraisal' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("appraisal", "appraisal")

data/bin/rake

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/closure_tree.gemspec

@@ -1,5 +1,6 @@
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
-require 'closure_tree/version'
+# frozen_string_literal: true
+
+require_relative 'lib/closure_tree/version'
 
 Gem::Specification.new do |gem|
   gem.name        = 'closure_tree'
@@ -26,8 +27,11 @@ Gem::Specification.new do |gem|
   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 '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'
   # gem.add_development_dependency 'ruby-prof' # <- don't need this normally.

data/lib/closure_tree/finders.rb

@@ -34,7 +34,7 @@ module ClosureTree
     end
 
     def find_all_by_generation(generation_level)
-      s = _ct.base_class.joins(<<-SQL.strip_heredoc)
+      s = _ct.base_class.joins(<<-SQL.squish)
         INNER JOIN (
           SELECT descendant_id
           FROM #{_ct.quoted_hierarchy_table_name}
@@ -70,7 +70,7 @@ module ClosureTree
       end
 
       def leaves
-        s = joins(<<-SQL.strip_heredoc)
+        s = joins(<<-SQL.squish)
           INNER JOIN (
             SELECT ancestor_id
             FROM #{_ct.quoted_hierarchy_table_name}
@@ -99,8 +99,21 @@ module ClosureTree
         _ct.scope_with_order(scope)
       end
 
+      def lowest_common_ancestor(*descendants)
+        descendants = descendants.first if descendants.length == 1 && descendants.first.respond_to?(:each)
+        ancestor_id = hierarchy_class
+          .where(descendant_id: descendants)
+          .group(:ancestor_id)
+          .having("COUNT(ancestor_id) = #{descendants.count}")
+          .order(Arel.sql('MIN(generations) ASC'))
+          .limit(1)
+          .pluck(:ancestor_id).first
+
+        find_by(primary_key => ancestor_id) if ancestor_id
+      end
+
       def find_all_by_generation(generation_level)
-        s = joins(<<-SQL.strip_heredoc)
+        s = joins(<<-SQL.squish)
           INNER JOIN (
             SELECT #{primary_key} as root_id
             FROM #{_ct.quoted_table_name}
@@ -130,7 +143,7 @@ module ClosureTree
         last_joined_table = _ct.table_name
         path.reverse.each_with_index do |ea, idx|
           next_joined_table = "p#{idx}"
-          scope = scope.joins(<<-SQL.strip_heredoc)
+          scope = scope.joins(<<-SQL.squish)
             INNER JOIN #{_ct.quoted_table_name} #{ _ct.t_alias_keyword } #{next_joined_table}
               ON #{next_joined_table}.#{_ct.quoted_id_column_name} =
  #{connection.quote_table_name(last_joined_table)}.#{_ct.quoted_parent_column_name}

data/lib/closure_tree/has_closure_tree_root.rb

@@ -8,7 +8,7 @@ module ClosureTree
        options[:class_name] ||= assoc_name.to_s.sub(/\Aroot_/, "").classify
       options[:foreign_key] ||= self.name.underscore << "_id"
 
-      has_one assoc_name, -> { where(parent: nil) }, options
+      has_one assoc_name, -> { where(parent: nil) }, **options
 
       # Fetches the association, eager loading all children and given associations
       define_method("#{assoc_name}_including_tree") do |*args|

data/lib/closure_tree/hash_tree_support.rb

@@ -4,7 +4,7 @@ module ClosureTree
         # Deepest generation, within limit, for each descendant
         # NOTE: Postgres requires HAVING clauses to always contains aggregate functions (!!)
         having_clause = limit_depth ? "HAVING MAX(generations) <= #{limit_depth - 1}" : ''
-        generation_depth = <<-SQL.strip_heredoc
+        generation_depth = <<-SQL.squish
           INNER JOIN (
             SELECT descendant_id, MAX(generations) as depth
             FROM #{quoted_hierarchy_table_name}
@@ -14,7 +14,7 @@ module ClosureTree
             ON #{quoted_table_name}.#{model_class.primary_key} = generation_depth.descendant_id
         SQL
         scope_with_order(scope.joins(generation_depth), 'generation_depth.depth')
-      end
+    end
 
     def hash_tree(tree_scope, limit_depth = nil)
       limited_scope = limit_depth ? tree_scope.where("#{quoted_hierarchy_table_name}.generations <= #{limit_depth - 1}") : tree_scope
@@ -33,4 +33,4 @@ module ClosureTree
       tree
     end
   end
-end
+end

data/lib/closure_tree/hierarchy_maintenance.rb

@@ -67,7 +67,7 @@ module ClosureTree
         delete_hierarchy_references unless (defined? @was_new_record) && @was_new_record
         hierarchy_class.create!(:ancestor => self, :descendant => self, :generations => 0)
         unless root?
-          _ct.connection.execute <<-SQL.strip_heredoc
+          _ct.connection.execute <<-SQL.squish
             INSERT INTO #{_ct.quoted_hierarchy_table_name}
               (ancestor_id, descendant_id, generations)
             SELECT x.ancestor_id, #{_ct.quote(_ct_id)}, x.generations + 1
@@ -94,7 +94,7 @@ module ClosureTree
         # It shouldn't affect performance of postgresql.
         # See http://dev.mysql.com/doc/refman/5.0/en/subquery-errors.html
         # Also: PostgreSQL doesn't support INNER JOIN on DELETE, so we can't use that.
-        _ct.connection.execute <<-SQL.strip_heredoc
+        _ct.connection.execute <<-SQL.squish
           DELETE FROM #{_ct.quoted_hierarchy_table_name}
           WHERE descendant_id IN (
             SELECT DISTINCT descendant_id
@@ -112,11 +112,28 @@ module ClosureTree
       # Note that the hierarchy table will be truncated.
       def rebuild!
         _ct.with_advisory_lock do
-          hierarchy_class.delete_all # not destroy_all -- we just want a simple truncate.
+          cleanup!
           roots.find_each { |n| n.send(:rebuild!) } # roots just uses the parent_id column, so this is safe.
         end
         nil
       end
+
+      def cleanup!
+        hierarchy_table = hierarchy_class.arel_table
+
+        [: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)
+          arel_join = hierarchy_table.join(alias_table, Arel::Nodes::OuterJoin)
+                                     .on(alias_table[primary_key].eq(hierarchy_table[foreign_key]))
+                                     .join_sources
+
+          lonely_childs = hierarchy_class.joins(arel_join).where(alias_table[primary_key].eq(nil))
+          ids = lonely_childs.pluck(foreign_key)
+
+          hierarchy_class.where(hierarchy_table[foreign_key].in(ids)).delete_all
+        end
+      end
     end
   end
 end

data/lib/closure_tree/model.rb

@@ -6,7 +6,7 @@ module ClosureTree
 
     included do
 
-      belongs_to :parent, nil, *_ct.belongs_to_with_optional_option(
+      belongs_to :parent, nil, **_ct.belongs_to_with_optional_option(
         class_name: _ct.model_class.to_s,
         foreign_key: _ct.parent_column_name,
         inverse_of: :children,
@@ -15,11 +15,11 @@ module ClosureTree
 
       order_by_generations = -> { Arel.sql("#{_ct.quoted_hierarchy_table_name}.generations ASC") }
 
-      has_many :children, *_ct.has_many_with_order_option(
+      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
+        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.
@@ -28,25 +28,21 @@ module ClosureTree
           end
         end
 
-      has_many :ancestor_hierarchies, *_ct.has_many_without_order_option(
+      has_many :ancestor_hierarchies, *_ct.has_many_order_without_option(order_by_generations),
         class_name: _ct.hierarchy_class_name,
-        foreign_key: 'descendant_id',
-        order: order_by_generations)
+        foreign_key: 'descendant_id'
 
-      has_many :self_and_ancestors, *_ct.has_many_without_order_option(
+      has_many :self_and_ancestors, *_ct.has_many_order_without_option(order_by_generations),
         through: :ancestor_hierarchies,
-        source: :ancestor,
-        order: order_by_generations)
+        source: :ancestor
 
-      has_many :descendant_hierarchies, *_ct.has_many_without_order_option(
+      has_many :descendant_hierarchies, *_ct.has_many_order_without_option(order_by_generations),
         class_name: _ct.hierarchy_class_name,
-        foreign_key: 'ancestor_id',
-        order: order_by_generations)
+        foreign_key: 'ancestor_id'
 
-      has_many :self_and_descendants, *_ct.has_many_with_order_option(
+      has_many :self_and_descendants, *_ct.has_many_order_with_option(order_by_generations),
         through: :descendant_hierarchies,
-        source: :descendant,
-        order: order_by_generations)
+        source: :descendant
     end
 
     # Delegate to the Support instance on the class:

data/lib/closure_tree/numeric_deterministic_ordering.rb

@@ -51,7 +51,7 @@ module ClosureTree
 
       # If node is nil, order the whole tree.
       def _ct_sum_order_by(node = nil)
-        stats_sql = <<-SQL.strip_heredoc
+        stats_sql = <<-SQL.squish
           SELECT
             count(*) as total_descendants,
             max(generations) as max_depth
@@ -74,7 +74,7 @@ module ClosureTree
           raise ClosureTree::RootOrderingDisabledError.new("Root ordering is disabled on this model")
         end
 
-        join_sql = <<-SQL.strip_heredoc
+        join_sql = <<-SQL.squish
           JOIN #{_ct.quoted_hierarchy_table_name} anc_hier
             ON anc_hier.descendant_id = #{_ct.quoted_table_name}.#{_ct.quoted_id_column_name}
           JOIN #{_ct.quoted_table_name} anc

data/lib/closure_tree/numeric_order_support.rb

@@ -21,7 +21,7 @@ module ClosureTree
           ""
         end
         connection.execute 'SET @i = 0'
-        connection.execute <<-SQL.strip_heredoc
+        connection.execute <<-SQL.squish
           UPDATE #{quoted_table_name}
             SET #{quoted_order_column} = (@i := @i + 1) + #{minimum_sort_order_value.to_i - 1}
           WHERE #{where_eq(parent_column_name, parent_id)} #{min_where}
@@ -38,7 +38,7 @@ module ClosureTree
         else
           ""
         end
-        connection.execute <<-SQL.strip_heredoc
+        connection.execute <<-SQL.squish
           UPDATE #{quoted_table_name}
           SET #{quoted_order_column(false)} = t.seq + #{minimum_sort_order_value.to_i - 1}
           FROM (

data/lib/closure_tree/support.rb

@@ -32,13 +32,15 @@ module ClosureTree
     end
 
     def hierarchy_class_for_model
-      hierarchy_class = model_class.parent.const_set(short_hierarchy_class_name, Class.new(ActiveRecord::Base))
+      parent_class = ActiveSupport::VERSION::MAJOR >= 6 ? model_class.module_parent : model_class.parent
+      hierarchy_class = parent_class.const_set(short_hierarchy_class_name, Class.new(model_class.superclass))
       use_attr_accessible = use_attr_accessible?
       include_forbidden_attributes_protection = include_forbidden_attributes_protection?
-      hierarchy_class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+      model_class_name = model_class.to_s
+      hierarchy_class.class_eval do
         include ActiveModel::ForbiddenAttributesProtection if include_forbidden_attributes_protection
-        belongs_to :ancestor, :class_name => "#{model_class}"
-        belongs_to :descendant, :class_name => "#{model_class}"
+        belongs_to :ancestor, class_name: model_class_name
+        belongs_to :descendant, class_name: model_class_name
         attr_accessible :ancestor, :descendant, :generations if use_attr_accessible
         def ==(other)
           self.class == other.class && ancestor_id == other.ancestor_id && descendant_id == other.descendant_id
@@ -47,7 +49,7 @@ module ClosureTree
         def hash
           ancestor_id.hash << 31 ^ descendant_id.hash
         end
-      RUBY
+      end
       hierarchy_class.table_name = hierarchy_table_name
       hierarchy_class
     end
@@ -78,20 +80,20 @@ module ClosureTree
     end
 
     def belongs_to_with_optional_option(opts)
-      [ActiveRecord::VERSION::MAJOR < 5 ? opts.except(:optional) : opts]
+      ActiveRecord::VERSION::MAJOR < 5 ? opts.except(:optional) : opts
     end
 
     # lambda-ize the order, but don't apply the default order_option
-    def has_many_without_order_option(opts)
-      [lambda { order(opts[:order].call) }, opts.except(:order)]
+    def has_many_order_without_option(order_by_opt)
+      [lambda { order(order_by_opt.call) }]
     end
 
-    def has_many_with_order_option(opts)
-      order_options = [opts[:order], order_by].compact
+    def has_many_order_with_option(order_by_opt=nil)
+      order_options = [order_by_opt, order_by].compact
       [lambda {
         order_options = order_options.map { |o| o.is_a?(Proc) ? o.call : o }
         order(order_options)
-      }, opts.except(:order)]
+      }]
     end
 
     def ids_from(scope)

data/lib/closure_tree/support_attributes.rb

@@ -80,7 +80,7 @@ module ClosureTree
     end
 
     def nulls_last_order_by
-      "-#{quoted_order_column} #{order_by_order(reverse = true)}"
+      Arel.sql "-#{quoted_order_column} #{order_by_order(true)}"
     end
 
     def order_by_order(reverse = false)

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = Gem::Version.new('7.0.0')
+  VERSION = Gem::Version.new('7.4.0.rc1')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.4.0.rc1
 platform: ruby
 authors:
 - Matthew McEachen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-23 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -143,9 +185,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - ".yardopts"
 - Appraisals
 - CHANGELOG.md
@@ -153,6 +195,10 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- _config.yml
+- bin/appraisal
+- bin/rake
+- bin/rspec
 - closure_tree.gemspec
 - lib/closure_tree.rb
 - lib/closure_tree/active_record_support.rb
@@ -183,7 +229,7 @@ homepage: http://mceachen.github.io/closure_tree/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,13 +240,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Easily and efficiently make your ActiveRecord model support hierarchies
 test_files: []

data/.travis.yml

@@ -1,30 +0,0 @@
-cache: bundler
-sudo: false
-language: ruby
-rvm:
-  - 2.6.0
-  - 2.5.1
-  - 2.4.4
-  - 2.3.6
-  - 2.2.10
-
-gemfile:
-  - gemfiles/activerecord_5.2.gemfile
-  - gemfiles/activerecord_5.1.gemfile
-  - gemfiles/activerecord_5.0.gemfile
-  - gemfiles/activerecord_4.2.gemfile
-  - gemfiles/activerecord_edge.gemfile
-
-env:
-  - DB=sqlite
-  - DB=mysql
-  - DB=postgresql
-
-script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace spec:all
-
-matrix:
-  allow_failures:
-    - gemfile: gemfiles/activerecord_edge.gemfile
-    - rvm: jruby-head
-    - rvm: rbx
-    - rvm: 2.6.0