acts_as_recursive_tree 3.1.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3681366c263bd90e2479c6a4761042825547241a15e828678c260789f05ad54
-  data.tar.gz: c526e787809100bcba957ddeae424ffa068afe7f10e8e2ece1aec354cce6c70b
+  metadata.gz: b60be808a8b0a3e93edfbb83a83cc8b270eebade9888ddc6038bb4af4429d7da
+  data.tar.gz: 96622ef4e488bbd73de8dd4d0ae51c51a2b11843219d2a34669367ace4f77d60
 SHA512:
-  metadata.gz: 2b4e5b9a5a1462b39cc8c2cc0184d8db0653b1d02be8728d2bf46fa309d847224765c3e6b8ac885f064a42f64b34375d9e032e888d5588c9940d55225ceced4a
-  data.tar.gz: 4e8a2077169e98b889671412c87c80d21f03541bbcdc62cefe520e47c626459c29ff1ee6a07bb54a9ebd94ca8418c4369d27ff9950a3c559b0bd7ef41970afc6
+  metadata.gz: fca6f5732cc344c395d1d74f3cc13ac5be4af9ea74eb545764b28ef1a7550fcb3300975cccce92a2772f5d3ca1e12fb1e4a6e124f07037f66099b86256918c57
+  data.tar.gz: 8b2cf07e6aa5ef4543f6d81200ac3421d918039140480314496c416f8ff3f6fce65a1ba43bdcae837f67df5e279e9281d8680ca76945d84a8115877eeb4cc7d2

data/.github/workflows/ci.yml

@@ -19,19 +19,35 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.6', '2.7', '3.0']
+        ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
         gemfile: [ar_52, ar_60, ar_61, ar_70]
         exclude:
+          - ruby-version: '3.2'
+            gemfile: ar_52
+          - ruby-version: '3.2'
+            gemfile: ar_60
+          - ruby-version: '3.2'
+            gemfile: ar_61
+          - ruby-version: '3.1'
+            gemfile: ar_52
+          - ruby-version: '3.1'
+            gemfile: ar_60
+          - ruby-version: '3.1'
+            gemfile: ar_61
           - ruby-version: '3.0'
             gemfile: ar_52
-          - ruby-version: '2.5'
-            gemfile: ar_70
+#          - ruby-version: '2.6'
+#            gemfile: ar_next
           - ruby-version: '2.6'
             gemfile: ar_70
+#          - ruby-version: '2.5'
+#            gemfile: ar_next
+          - ruby-version: '2.5'
+            gemfile: ar_70
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):

data/.gitignore

@@ -17,3 +17,4 @@ db.log
 test.sqlite3
 /gemfiles/*.lock
 /gemfiles/.bundle
+/.ruby-version

data/Appraisals

@@ -16,6 +16,13 @@ appraise 'ar-61' do
 end
 
 appraise 'ar-70' do
-  gem 'activerecord', '~> 7.0.0'
-  gem 'activesupport', '~> 7.0.0'
+  gem 'activerecord', '~> 7.0'
+  gem 'activesupport', '~> 7.0'
+end
+
+appraise 'ar-next' do
+  git 'https://github.com/rails/rails.git', branch: 'main' do
+    gem 'activerecord'
+    gem 'activesupport'
+  end
 end

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### Version 3.3.0
+- added __includes:__ option to __preload_tree__
+
+### Version 3.2.0
+- Added #preload_tree method to preload the parent/child relations of a single node
+
 ### Version 3.1.0
 - Rails 7 support
 

data/README.md

@@ -19,6 +19,17 @@ ActsAsRecursiveTree currently supports following ActiveRecord versions and is te
   * ActiveRecord 6.1.x
   * ActiveRecord 7.0.x
 
+## Supported Rubies
+ActsAsRecursiveTree is tested with following rubies:
+  * MRuby 2.5
+  * MRuby 2.6
+  * MRuby 2.7
+  * MRuby 3.0
+  * MRuby 3.1
+  * MRuby 3.2
+
+Other Ruby implementations are not tested, but should also work.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -123,7 +134,11 @@ __Additional methods:__
 __Utility methods:__
   * `root?` - returns true if this node is a root node
   * `leaf?` - returns true if this node is a leave node
+  * `preload_tree` - fetches all descendants of this node and assigns the proper parent/children associations. You are then able to traverse the tree through the children/parent association without querying the database again. You can also pass arguments to `includes` which will be forwarded when fetching records.  
 
+```ruby
+    node.preload_tree(includes: [:association, :another_association])
+```
 
 ## Customizing the recursion
 
@@ -201,17 +216,6 @@ sub_node_instance.descendants # => returns Node and SubNode instances
 ```
 
 
-## Known Issues
-
-When using PostgreSQL as underlying database system chances are good that you encounter following error message:
-
-`
-ActiveRecord::StatementInvalid: PG::ProtocolViolation: ERROR:  bind message supplies 1 parameters, but prepared statement "" requires 2
-`
-
-This is a known ActiveRecord issue which should be fixed in Rails 5.2. Alternative 
-
-
 ## Contributing
 
 1. Fork it ( https://github.com/1and1/acts_as_recursive_tree/fork )

data/acts_as_recursive_tree.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'zeitwerk', '>= 2.4'
 
   spec.add_development_dependency 'appraisal', '~> 2.4'
-  spec.add_development_dependency 'database_cleaner', '~> 1.5'
+  spec.add_development_dependency 'database_cleaner', '~> 2.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec-rails', '>= 3.5'
   spec.add_development_dependency 'rubocop', '~> 1.23.0'

data/gemfiles/ar_70.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 7.0.0"
-gem "activesupport", "~> 7.0.0"
+gem "activerecord", "~> 7.0"
+gem "activesupport", "~> 7.0"
 
 gemspec path: "../"

data/gemfiles/ar_next.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+git "https://github.com/rails/rails.git", branch: "main" do
+  gem "activerecord"
+  gem "activesupport"
+end
+
+gemspec path: "../"

data/lib/acts_as_recursive_tree/acts_macro.rb

@@ -8,7 +8,8 @@ module ActsAsRecursiveTree
     # * <tt>foreign_key</tt> - specifies the column name to use for tracking
     # of the tree (default: +parent_id+)
     def recursive_tree(parent_key: :parent_id, parent_type_column: nil)
-      class_attribute :_recursive_tree_config
+      class_attribute(:_recursive_tree_config, instance_writer: false)
+
       self._recursive_tree_config = Config.new(
         model_class: self,
         parent_key: parent_key.to_sym,

data/lib/acts_as_recursive_tree/model.rb

@@ -91,6 +91,16 @@ module ActsAsRecursiveTree
       children.none?
     end
 
+    #
+    # Fetches all descendants of this node and assigns the parent/children associations
+    #
+    # @param includes [Array|Hash] pass the same arguments that should be passed to the #includes() method.
+    #
+    def preload_tree(includes: nil)
+      ActsAsRecursiveTree::Preloaders::Descendants.new(self, includes: includes).preload!
+      true
+    end
+
     def base_class
       self.class.base_class
     end
@@ -99,11 +109,11 @@ module ActsAsRecursiveTree
 
     module ClassMethods
       def self_and_ancestors_of(ids, &block)
-        Builders::Ancestors.build(self, ids, &block)
+        ActsAsRecursiveTree::Builders::Ancestors.build(self, ids, &block)
       end
 
       def ancestors_of(ids, &block)
-        Builders::Ancestors.build(self, ids, exclude_ids: true, &block)
+        ActsAsRecursiveTree::Builders::Ancestors.build(self, ids, exclude_ids: true, &block)
       end
 
       def roots_of(ids)
@@ -111,15 +121,15 @@ module ActsAsRecursiveTree
       end
 
       def self_and_descendants_of(ids, &block)
-        Builders::Descendants.build(self, ids, &block)
+        ActsAsRecursiveTree::Builders::Descendants.build(self, ids, &block)
       end
 
       def descendants_of(ids, &block)
-        Builders::Descendants.build(self, ids, exclude_ids: true, &block)
+        ActsAsRecursiveTree::Builders::Descendants.build(self, ids, exclude_ids: true, &block)
       end
 
       def leaves_of(ids, &block)
-        Builders::Leaves.build(self, ids, &block)
+        ActsAsRecursiveTree::Builders::Leaves.build(self, ids, &block)
       end
     end
   end

data/lib/acts_as_recursive_tree/preloaders/descendants.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module ActsAsRecursiveTree
+  module Preloaders
+    #
+    # Preloads all descendants records for a given node and sets the parent and child associations on each record
+    # based on the preloaded data. After this, calling #parent or #children will not trigger a database query.
+    #
+    class Descendants
+      def initialize(node, includes: nil)
+        @node       = node
+        @parent_key = node._recursive_tree_config.parent_key
+        @includes   = includes
+      end
+
+      def preload!
+        apply_records(@node)
+      end
+
+      private
+
+      def records
+        @records ||= begin
+          descendants = @node.descendants
+          descendants = descendants.includes(*@includes) if @includes
+          descendants.to_a
+        end
+      end
+
+      def apply_records(parent_node)
+        children = records.select { |child| child.send(@parent_key) == parent_node.id }
+
+        parent_node.association(:children).target = children
+
+        children.each do |child|
+          child.association(:parent).target = parent_node
+          apply_records(child)
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_recursive_tree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActsAsRecursiveTree
-  VERSION = '3.1.0'
+  VERSION = '3.3.0'
 end

data/spec/acts_as_recursive_tree/builders/ancestors_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ActsAsRecursiveTree::Builders::Ancestors do
+  context 'basic' do
+    it_behaves_like 'build recursive query'
+    it_behaves_like 'ancestor query'
+    include_context 'context with ordering'
+  end
+
+  context 'with options' do
+    include_context 'setup with enforced ordering' do
+      it_behaves_like 'with ordering'
+    end
+  end
+end

data/spec/acts_as_recursive_tree/builders/descendants_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ActsAsRecursiveTree::Builders::Descendants do
+  context 'basic' do
+    it_behaves_like 'build recursive query'
+    it_behaves_like 'descendant query'
+    include_context 'context without ordering'
+  end
+
+  context 'with options' do
+    include_context 'setup with enforced ordering' do
+      let(:ordering) { true }
+      it_behaves_like 'with ordering'
+    end
+  end
+end

data/spec/acts_as_recursive_tree/builders/leaves_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ActsAsRecursiveTree::Builders::Leaves do
+  context 'basic' do
+    it_behaves_like 'build recursive query'
+    it_behaves_like 'descendant query'
+    include_context 'context without ordering'
+  end
+
+  context 'with options' do
+    include_context 'setup with enforced ordering' do
+      let(:ordering) { true }
+      it_behaves_like 'without ordering'
+    end
+  end
+end

data/spec/{values_spec.rb → acts_as_recursive_tree/options/values_spec.rb}

@@ -2,21 +2,21 @@
 
 require 'spec_helper'
 
-shared_examples 'single values' do
-  subject(:value) { described_class.create(single_value) }
+RSpec.describe ActsAsRecursiveTree::Options::Values do
+  shared_examples 'single values' do
+    subject(:value) { described_class.create(single_value) }
 
-  it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::SingleValue }
+    it { is_expected.to be_a described_class::SingleValue }
 
-  it 'apply_toes' do
-    expect(value.apply_to(attribute).to_sql).to end_with " = #{single_value}"
-  end
+    it 'apply_toes' do
+      expect(value.apply_to(attribute).to_sql).to end_with " = #{single_value}"
+    end
 
-  it 'apply_negated_toes' do
-    expect(value.apply_negated_to(attribute).to_sql).to end_with " != #{single_value}"
+    it 'apply_negated_toes' do
+      expect(value.apply_negated_to(attribute).to_sql).to end_with " != #{single_value}"
+    end
   end
-end
 
-describe ActsAsRecursiveTree::Options::Values do
   let(:table) { Arel::Table.new('test_table') }
   let(:attribute) { table['test_attr'] }
 
@@ -44,7 +44,7 @@ describe ActsAsRecursiveTree::Options::Values do
 
       let(:array) { [1, 2, 3] }
 
-      it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::MultiValue }
+      it { is_expected.to be_a described_class::MultiValue }
 
       it 'apply_toes' do
         expect(value.apply_to(attribute).to_sql).to end_with " IN (#{array.join(', ')})"
@@ -60,7 +60,7 @@ describe ActsAsRecursiveTree::Options::Values do
 
       let(:range) { 1..3 }
 
-      it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::RangeValue }
+      it { is_expected.to be_a described_class::RangeValue }
 
       it 'apply_toes' do
         expect(value.apply_to(attribute).to_sql).to end_with "BETWEEN #{range.begin} AND #{range.end}"
@@ -83,7 +83,7 @@ describe ActsAsRecursiveTree::Options::Values do
         end
       end
 
-      it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::Relation }
+      it { is_expected.to be_a described_class::Relation }
 
       it 'apply_toes' do
         expect(value.apply_to(attribute).to_sql).to match(/IN \(SELECT.*\)/)

data/spec/acts_as_recursive_tree/preloaders/descendants_spec.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ActsAsRecursiveTree::Preloaders::Descendants do
+  include TreeMethods
+
+  let(:preloader) { described_class.new(root.reload, includes: included_associations) }
+  let(:included_associations) { nil }
+  let(:root) { create_tree(2, create_node_info: true) }
+  let(:children) { root.children }
+
+  describe '#preload! will set the associations target attribute' do
+    before do
+      preloader.preload!
+    end
+
+    it 'sets the children association' do
+      children.each do |child|
+        expect(child.association(:children).target).not_to be_nil
+      end
+    end
+
+    it 'sets the parent association' do
+      children.each do |child|
+        expect(child.association(:parent).target).not_to be_nil
+      end
+    end
+  end
+
+  describe '#preload! will include associations' do
+    let(:included_associations) { :node_info }
+
+    before do
+      preloader.preload!
+    end
+
+    it 'sets the children association' do
+      children.each do |child|
+        expect(child.association(included_associations).target).not_to be_nil
+      end
+    end
+  end
+end

data/spec/model/location_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Location do
+RSpec.describe Location do
   before do
     @building = Building.create!(name: 'big house')
 

data/spec/model/node_spec.rb

@@ -2,17 +2,8 @@
 
 require 'spec_helper'
 
-describe Node do
-  def create_tree(max_level, current_level = 0, node = nil)
-    node = Node.create!(name: 'root') if node.nil?
-
-    1.upto(max_level - current_level) do |index|
-      child = node.children.create!(name: "child #{index} - level #{current_level}")
-      create_tree(max_level, current_level + 1, child)
-    end
-
-    node
-  end
+RSpec.describe Node do
+  include TreeMethods
 
   before do
     @root  = create_tree(3)

data/spec/model/relation_spec.rb

@@ -2,57 +2,68 @@
 
 require 'spec_helper'
 
-describe 'Relation' do
-  def create_tree(max_level, current_level: 0, node: nil, stop_at: nil)
-    node = Node.create!(name: 'root') if node.nil?
-
-    1.upto(max_level - current_level) do |index|
-      child = node.children.create!(name: "child #{index} - level #{current_level}", active: stop_at > current_level)
-      child.create_node_info(status: stop_at > current_level ? 'foo' : 'bar')
-      create_tree(max_level, current_level: current_level + 1, node: child, stop_at: stop_at)
-    end
+RSpec.describe 'Relation' do
+  include TreeMethods
 
-    node
-  end
+  let(:root) { create_tree(4, stop_at: 2) }
 
-  before do
-    @root  = create_tree(4, stop_at: 2)
-    @child = @root.children.first
-  end
+  describe '#descendants' do
+    context 'with simple relation' do
+      let(:descendants) { root.descendants { |opts| opts.condition = Node.where(active: true) }.to_a }
 
-  context 'descendants' do
-    it 'works with simple relation' do
-      desc = @root.descendants { |opts| opts.condition = Node.where(active: true) }
-      desc.all.each do |node|
-        expect(node.active).to be_truthy
+      it 'returns only active nodes' do
+        descendants.each do |node|
+          expect(node.active).to be_truthy
+        end
       end
     end
 
-    it 'works with joins relation' do
-      desc = @root.descendants { |opts| opts.condition = Node.joins(:node_info).where.not(node_infos: { status: 'bar' }) }
-      desc.all.each do |node|
-        expect(node.node_info.status).to eql('foo')
+    context 'with condition on joined association' do
+      let(:descendants) do
+        root.descendants do |opts|
+          opts.condition = Node.joins(:node_info).where.not(node_infos: { status: 'bar' })
+        end
+      end
+
+      it 'returns only node with condition fulfilled' do
+        descendants.each do |node|
+          expect(node.node_info.status).to eql('foo')
+        end
       end
     end
   end
 
-  context 'ancestors' do
-    it 'works with simple relation' do
-      ancestors = @root.leaves.first.ancestors { |opts| opts.condition = Node.where(active: false) }.to_a
+  describe '#ancestors' do
+    context 'with simple_relation' do
+      let(:ancestors) { root.leaves.first.ancestors { |opts| opts.condition = Node.where(active: false) }.to_a }
 
-      ancestors.each do |node|
-        expect(node.active).to be_falsey
+      it 'return only active nodes' do
+        ancestors.each do |node|
+          expect(node.active).to be_falsey
+        end
       end
 
-      expect(ancestors).not_to include(@root)
+      it 'does not return the root node' do
+        expect(ancestors).not_to include(root)
+      end
     end
 
-    it 'works with joins relation' do
-      ancestors = @root.leaves.first.ancestors { |opts| opts.condition = Node.joins(:node_info).where.not(node_infos: { status: 'foo' }) }
-      ancestors.all.each do |node|
-        expect(node.node_info.status).to eql('bar')
+    context 'with condition on joined association' do
+      let(:ancestors) do
+        root.leaves.first.ancestors do |opts|
+          opts.condition = Node.joins(:node_info).where.not(node_infos: { status: 'foo' })
+        end
+      end
+
+      it 'return only nodes for the matching condition' do
+        ancestors.each do |node|
+          expect(node.node_info.status).to eql('bar')
+        end
+      end
+
+      it 'does not return the root node' do
+        expect(ancestors).not_to include(root)
       end
-      expect(ancestors).not_to include(@root)
     end
   end
 end

data/spec/spec_helper.rb

@@ -11,6 +11,10 @@ require_relative 'db/database'
 
 require 'database_cleaner'
 
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(__dir__, 'support/**/*.rb')].sort.each { |f| require f }
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause
@@ -72,7 +76,7 @@ RSpec.configure do |config|
   #   #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
   #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
   #   #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  #   config.disable_monkey_patching!
+    config.disable_monkey_patching!
   #
   #   # This setting enables warnings. It's recommended, but in some cases may
   #   # be too noisy due to issues in dependencies.

data/spec/{builders_spec.rb → support/shared_examples/builders.rb}

@@ -1,15 +1,12 @@
-# frozen_string_literal: true
 
-require 'spec_helper'
-
-shared_context 'setup with enforced ordering' do
+RSpec.shared_context 'setup with enforced ordering' do
   let(:ordering) { false }
   include_context 'base_setup' do
     let(:proc) { ->(config) { config.ensure_ordering! } }
   end
 end
 
-shared_context 'base_setup' do
+RSpec.shared_context 'base_setup' do
   subject(:query) { builder.build.to_sql }
 
   let(:model_id) { 1 }
@@ -21,7 +18,7 @@ shared_context 'base_setup' do
   end
 end
 
-shared_examples 'basic recursive examples' do
+RSpec.shared_examples 'basic recursive examples' do
   it { is_expected.to start_with "SELECT \"#{model_class.table_name}\".* FROM \"#{model_class.table_name}\"" }
 
   it { is_expected.to match(/WHERE "#{model_class.table_name}"."#{model_class.primary_key}" = #{model_id}/) }
@@ -35,7 +32,7 @@ shared_examples 'basic recursive examples' do
   }
 end
 
-shared_examples 'build recursive query' do
+RSpec.shared_examples 'build recursive query' do
   context 'simple id' do
     context 'with simple class' do
       include_context 'base_setup' do
@@ -67,79 +64,35 @@ shared_examples 'build recursive query' do
   end
 end
 
-shared_examples 'ancestor query' do
+RSpec.shared_examples 'ancestor query' do
   include_context 'base_setup'
 
   it { is_expected.to match(/"#{builder.travers_loc_table.name}"."#{model_class._recursive_tree_config.parent_key}" = "#{model_class.table_name}"."#{model_class.primary_key}"/) }
 end
 
-shared_examples 'descendant query' do
+RSpec.shared_examples 'descendant query' do
   include_context 'base_setup'
 
   it { is_expected.to match(/"#{model_class.table_name}"."#{model_class._recursive_tree_config.parent_key}" = "#{builder.travers_loc_table.name}"."#{model_class.primary_key}"/) }
   it { is_expected.to match(/#{Regexp.escape(builder.travers_loc_table.project(builder.travers_loc_table[model_class.primary_key]).to_sql)}/) }
 end
 
-shared_context 'context with ordering' do
+RSpec.shared_context 'context with ordering' do
   include_context 'base_setup' do
     it_behaves_like 'with ordering'
   end
 end
 
-shared_context 'context without ordering' do
+RSpec.shared_context 'context without ordering' do
   include_context 'base_setup' do
     it_behaves_like 'without ordering'
   end
 end
 
-shared_examples 'with ordering' do
+RSpec.shared_examples 'with ordering' do
   it { is_expected.to match(/ORDER BY #{Regexp.escape(builder.recursive_temp_table[model_class._recursive_tree_config.depth_column].asc.to_sql)}/) }
 end
 
-shared_examples 'without ordering' do
+RSpec.shared_examples 'without ordering' do
   it { is_expected.not_to match(/ORDER BY/) }
 end
-
-describe ActsAsRecursiveTree::Builders::Descendants do
-  context 'basic' do
-    it_behaves_like 'build recursive query'
-    it_behaves_like 'descendant query'
-    include_context 'context without ordering'
-  end
-
-  context 'with options' do
-    include_context 'setup with enforced ordering' do
-      let(:ordering) { true }
-      it_behaves_like 'with ordering'
-    end
-  end
-end
-
-describe ActsAsRecursiveTree::Builders::Ancestors do
-  context 'basic' do
-    it_behaves_like 'build recursive query'
-    it_behaves_like 'ancestor query'
-    include_context 'context with ordering'
-  end
-
-  context 'with options' do
-    include_context 'setup with enforced ordering' do
-      it_behaves_like 'with ordering'
-    end
-  end
-end
-
-describe ActsAsRecursiveTree::Builders::Leaves do
-  context 'basic' do
-    it_behaves_like 'build recursive query'
-    it_behaves_like 'descendant query'
-    include_context 'context without ordering'
-  end
-
-  context 'with options' do
-    include_context 'setup with enforced ordering' do
-      let(:ordering) { true }
-      it_behaves_like 'without ordering'
-    end
-  end
-end

data/spec/support/tree_methods.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# Helper methods for simple tree creation
+module TreeMethods
+  def create_tree(max_level, current_level: 0, node: nil, create_node_info: false, stop_at: -1)
+    node = Node.create!(name: 'root') if node.nil?
+
+    1.upto(max_level - current_level) do |index|
+      child = node.children.create!(
+        name:   "child #{index} - level #{current_level}",
+        active: stop_at > current_level
+      )
+
+      child.create_node_info(status: stop_at > current_level ? 'foo' : 'bar') if create_node_info
+
+      create_tree(
+        max_level,
+        current_level:    current_level + 1,
+        node:             child,
+        create_node_info: create_node_info,
+        stop_at:          stop_at
+      )
+    end
+
+    node
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_recursive_tree
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Wolfgang Wedelich-John
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2023-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +205,7 @@ files:
 - gemfiles/ar_60.gemfile
 - gemfiles/ar_61.gemfile
 - gemfiles/ar_70.gemfile
+- gemfiles/ar_next.gemfile
 - lib/acts_as_recursive_tree.rb
 - lib/acts_as_recursive_tree/acts_macro.rb
 - lib/acts_as_recursive_tree/associations.rb
@@ -222,10 +223,15 @@ files:
 - lib/acts_as_recursive_tree/options/depth_condition.rb
 - lib/acts_as_recursive_tree/options/query_options.rb
 - lib/acts_as_recursive_tree/options/values.rb
+- lib/acts_as_recursive_tree/preloaders/descendants.rb
 - lib/acts_as_recursive_tree/railtie.rb
 - lib/acts_as_recursive_tree/scopes.rb
 - lib/acts_as_recursive_tree/version.rb
-- spec/builders_spec.rb
+- spec/acts_as_recursive_tree/builders/ancestors_spec.rb
+- spec/acts_as_recursive_tree/builders/descendants_spec.rb
+- spec/acts_as_recursive_tree/builders/leaves_spec.rb
+- spec/acts_as_recursive_tree/options/values_spec.rb
+- spec/acts_as_recursive_tree/preloaders/descendants_spec.rb
 - spec/db/database.rb
 - spec/db/database.yml
 - spec/db/models.rb
@@ -234,7 +240,8 @@ files:
 - spec/model/node_spec.rb
 - spec/model/relation_spec.rb
 - spec/spec_helper.rb
-- spec/values_spec.rb
+- spec/support/shared_examples/builders.rb
+- spec/support/tree_methods.rb
 homepage: https://github.com/1and1/acts_as_recursive_tree
 licenses:
 - MIT
@@ -261,7 +268,11 @@ signing_key:
 specification_version: 4
 summary: Drop in replacement for acts_as_tree but using recursive queries
 test_files:
-- spec/builders_spec.rb
+- spec/acts_as_recursive_tree/builders/ancestors_spec.rb
+- spec/acts_as_recursive_tree/builders/descendants_spec.rb
+- spec/acts_as_recursive_tree/builders/leaves_spec.rb
+- spec/acts_as_recursive_tree/options/values_spec.rb
+- spec/acts_as_recursive_tree/preloaders/descendants_spec.rb
 - spec/db/database.rb
 - spec/db/database.yml
 - spec/db/models.rb
@@ -270,4 +281,5 @@ test_files:
 - spec/model/node_spec.rb
 - spec/model/relation_spec.rb
 - spec/spec_helper.rb
-- spec/values_spec.rb
+- spec/support/shared_examples/builders.rb
+- spec/support/tree_methods.rb