acts_as_recursive_tree 4.0.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d14ef108322971d8058356f6103d0d64cfd53b33841c54e0cca6914907a2660b
-  data.tar.gz: 8d2f856d9809597d4cec4fa307477f48050ae8c77a8e9d8678a73b590a9ac531
+  metadata.gz: 8b31870a0f7ae0f4ced9817639c863e4b0bdabbed1852a9c98320f71982ba983
+  data.tar.gz: ee8f1bdf68fb094004d2ed7c296efa9219decb62848623fdb0e9e73f2597f11d
 SHA512:
-  metadata.gz: c7cd33f746eb9d0fe7cc6f9df17e365ec1f4d21b1369dae80b44322b854403e2ff5d6759cf645b6baa0d609670d922d26c0ba263ca9f34e6ba0c252a8daee926
-  data.tar.gz: d064d90e580fabf8367dba2a60626197723d8938c4514f5e90f99541f62672d82885ae361a1acc1a486905a422f64f3f558fa420dd2d2d38e881e914b6ee9281
+  metadata.gz: 1f0fc7026dbcfe605c22d31633626135abbe72da80ba80c3a7c051b3565047551e1eebff2a01b8596ffc68fd18029b8724d1fb0cf697cf81a8039e182125e169
+  data.tar.gz: 9ef0f7c2f1007a92592f585daa798b7629c88540b44b58b51eaa5aca11a2e1ae9d2096ea9f9c28757c12099757622ffa476ff31026e955066023d3c8fe1cafd1

data/.github/workflows/ci.yml

@@ -19,11 +19,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.1', '3.2', '3.3']
-        gemfile: [ar_70, ar_71, ar_72, ar_next]
-#        exclude:
-#          - ruby-version: '3.2'
-#            gemfile: ar_60
+        ruby-version: ['3.1', '3.2', '3.3', '3.4', '4.0']
+        gemfile: [ar_70, ar_71, ar_72, ar_80, ar_81, ar_next]
+        exclude:
+          - ruby-version: '3.1'
+            gemfile: ar_80
+          - ruby-version: '3.1'
+            gemfile: ar_81
+          - ruby-version: '3.1'
+            gemfile: ar_next
+          - ruby-version: '3.2'
+            gemfile: ar_next
     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:

data/.rubocop_todo.yml

@@ -1,68 +1,39 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-08-02 08:58:28 UTC using RuboCop version 1.18.4.
+# on 2026-06-26 10:41:32 UTC using RuboCop version 1.68.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 6
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
-Metrics/BlockLength:
-  Max: 87
-
 # Offense count: 1
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# Configuration parameters: CountComments, CountAsOne.
+Metrics/ClassLength:
+  Max: 101
+
+# Offense count: 2
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 15
 
-# Offense count: 18
-# Configuration parameters: Prefixes.
+# Offense count: 2
+# Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Exclude:
-    - 'spec/builders_spec.rb'
     - 'spec/model/location_spec.rb'
     - 'spec/model/node_spec.rb'
-    - 'spec/model/relation_spec.rb'
-    - 'spec/values_spec.rb'
 
-# Offense count: 37
+# Offense count: 30
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
     - 'spec/model/location_spec.rb'
     - 'spec/model/node_spec.rb'
-    - 'spec/model/relation_spec.rb'
-
-# Offense count: 1
-RSpec/MultipleDescribes:
-  Exclude:
-    - 'spec/builders_spec.rb'
-
-# Offense count: 2
-RSpec/MultipleExpectations:
-  Max: 2
-
-# Offense count: 17
-# Configuration parameters: AllowedConstants.
-Style/Documentation:
-  Exclude:
-    - 'lib/acts_as_recursive_tree.rb'
-    - 'lib/acts_as_recursive_tree/acts_macro.rb'
-    - 'lib/acts_as_recursive_tree/builders/ancestors.rb'
-    - 'lib/acts_as_recursive_tree/builders/descendants.rb'
-    - 'lib/acts_as_recursive_tree/builders/leaves.rb'
-    - 'lib/acts_as_recursive_tree/model.rb'
-    - '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/railtie.rb'
 
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 7
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 291

data/Appraisals

@@ -15,6 +15,16 @@ appraise 'ar-72' do
   gem 'activesupport', '~> 7.2'
 end
 
+appraise 'ar-80' do
+  gem 'activerecord', '~> 8.0'
+  gem 'activesupport', '~> 8.0'
+end
+
+appraise 'ar-81' do
+  gem 'activerecord', '~> 8.1'
+  gem 'activesupport', '~> 8.1'
+end
+
 appraise 'ar-next' do
   git 'https://github.com/rails/rails.git', branch: 'main' do
     gem 'activerecord'

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### Version 4.1.1
+- ADD: Future support for change in Rails 8.2
+
+### Version 4.1.0
+- ADD: Support for Rails 8.0
+
 ### Version 4.0.0
 - ADD: Support for Rails 7.2 
 - BREAKING: Dropped support for Rails < 7

data/README.md

@@ -17,6 +17,8 @@ ActsAsRecursiveTree currently supports following ActiveRecord versions and is te
   * ActiveRecord 7.0.x
   * ActiveRecord 7.1.x
   * ActiveRecord 7.2.x
+  * ActiveRecord 8.0.x
+  * ActiveRecord 8.1.x
   * ActiveRecord NEXT (from git)
 
 ## Supported Rubies
@@ -24,6 +26,8 @@ ActsAsRecursiveTree is tested with following rubies:
   * MRuby 3.1
   * MRuby 3.2
   * MRuby 3.3
+  * MRuby 3.4
+  * MRuby 4.0
 
 Other Ruby implementations are not tested, but should also work.
 

data/acts_as_recursive_tree.gemspec

@@ -22,17 +22,17 @@ Gem::Specification.new do |spec|
   spec.files                 = `git ls-files -z`.split("\x0")
   spec.require_paths         = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 7.0.0', '< 8'
-  spec.add_dependency 'activesupport', '>= 7.0.0', '< 8'
+  spec.add_dependency 'activerecord', '>= 7.0.0', '< 9'
+  spec.add_dependency 'activesupport', '>= 7.0.0', '< 9'
   spec.add_dependency 'zeitwerk', '>= 2.4'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
   spec.add_development_dependency 'database_cleaner-active_record', '~> 2.2'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec-rails', '>= 6.1'
-  spec.add_development_dependency 'rubocop', '~> 1.66.0'
-  spec.add_development_dependency 'rubocop-rails', '~> 2.26.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 3.0.4'
+  spec.add_development_dependency 'rspec-rails', '>= 7.1'
+  spec.add_development_dependency 'rubocop', '~> 1.68.0'
+  spec.add_development_dependency 'rubocop-rails', '~> 2.27.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 3.2.0'
 
   spec.add_development_dependency 'sqlite3', '~> 2.0'
 end

data/gemfiles/ar_80.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 8.0"
+gem "activesupport", "~> 8.0"
+
+gemspec path: "../"

data/gemfiles/ar_81.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 8.1"
+gem "activesupport", "~> 8.1"
+
+gemspec path: "../"

data/lib/acts_as_recursive_tree/builders/relation_builder.rb

@@ -32,11 +32,15 @@ module ActsAsRecursiveTree
       end
 
       def recursive_temp_table
-        @recursive_temp_table ||= Arel::Table.new("recursive_#{klass.table_name}_#{@rand_int}_temp")
+        @recursive_temp_table ||= arel_table("recursive_#{klass.table_name}_#{@rand_int}_temp")
       end
 
       def travers_loc_table
-        @travers_loc_table ||= Arel::Table.new("traverse_#{@rand_int}_loc")
+        @travers_loc_table ||= arel_table("traverse_#{@rand_int}_loc")
+      end
+
+      def arel_table(name)
+        config.arel_table_requires_keyword_args? ? Arel::Table.new(name: name) : Arel::Table.new(name)
       end
 
       def config

data/lib/acts_as_recursive_tree/config.rb

@@ -31,5 +31,11 @@ module ActsAsRecursiveTree
       @cycle_detection = @model_class.connection.adapter_name == 'PostgreSQL' &&
                          @model_class.connection.database_version >= 140_000
     end
+
+    def arel_table_requires_keyword_args?
+      return @arel_table_requires_keyword_args if defined?(@arel_table_requires_keyword_args)
+
+      @arel_table_requires_keyword_args = ::ActiveRecord.version >= '8.2.0.alpha'
+    end
   end
 end

data/lib/acts_as_recursive_tree/version.rb

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

data/spec/acts_as_recursive_tree/options/values_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe ActsAsRecursiveTree::Options::Values do
     end
   end
 
-  let(:table) { Arel::Table.new('test_table') }
+  let(:table) { Location.arel_table }
   let(:attribute) { table['test_attr'] }
 
   context 'with invalid agurment' do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_recursive_tree
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Wolfgang Wedelich-John
 - Willem Mulder
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-02 00:00:00.000000000 Z
+date: 2026-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -20,7 +20,7 @@ dependencies:
         version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
         version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -113,56 +113,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.66.0
+        version: 1.68.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.66.0
+        version: 1.68.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.26.0
+        version: 2.27.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.26.0
+        version: 2.27.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,8 @@ files:
 - gemfiles/ar_70.gemfile
 - gemfiles/ar_71.gemfile
 - gemfiles/ar_72.gemfile
+- gemfiles/ar_80.gemfile
+- gemfiles/ar_81.gemfile
 - gemfiles/ar_next.gemfile
 - lib/acts_as_recursive_tree.rb
 - lib/acts_as_recursive_tree/acts_macro.rb
@@ -247,7 +249,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/1and1/acts_as_recursive_tree/issues
   changelog_uri: https://github.com/1and1/acts_as_recursive_tree/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -263,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Drop in replacement for acts_as_tree but using recursive queries
 test_files: []