parentry 1.5.0 → 1.7.0

data/gemfiles/activerecord_7.2.0.gemfile.lock

@@ -0,0 +1,207 @@
+PATH
+  remote: ..
+  specs:
+    parentry (1.7.0)
+      activerecord (>= 6.1, < 8)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (7.2.0)
+      actionview (= 7.2.0)
+      activesupport (= 7.2.0)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4, < 3.2)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actionview (7.2.0)
+      activesupport (= 7.2.0)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activemodel (7.2.0)
+      activesupport (= 7.2.0)
+    activerecord (7.2.0)
+      activemodel (= 7.2.0)
+      activesupport (= 7.2.0)
+      timeout (>= 0.4.0)
+    activesupport (7.2.0)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
+    coderay (1.1.3)
+    combustion (1.5.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    database_cleaner (2.0.2)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.2.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    drb (2.2.1)
+    erubi (1.13.0)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    io-console (0.7.2)
+    irb (1.14.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    logger (1.6.0)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    method_source (1.1.0)
+    minitest (5.25.0)
+    nokogiri (1.16.7-x86_64-darwin)
+      racc (~> 1.4)
+    parallel (1.26.2)
+    parser (3.3.4.2)
+      ast (~> 2.4.1)
+      racc
+    pg (1.5.7)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    psych (5.1.2)
+      stringio
+    racc (1.8.1)
+    rack (3.1.7)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.2.0)
+      actionpack (= 7.2.0)
+      activesupport (= 7.2.0)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.5.9)
+      io-console (~> 0.5)
+    rexml (3.3.5)
+      strscan
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-rails (6.1.4)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-support (3.13.1)
+    rubocop (1.65.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.32.0)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.21.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-rspec (2.31.0)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.29.1)
+      rubocop (~> 1.61)
+    ruby-progressbar (1.13.0)
+    securerandom (0.3.1)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    stringio (3.1.1)
+    strscan (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
+    useragent (0.16.10)
+    webrick (1.8.1)
+    zeitwerk (2.6.17)
+
+PLATFORMS
+  x86_64-darwin
+
+DEPENDENCIES
+  activerecord (~> 7.2, < 8)
+  appraisal
+  bundler (~> 2)
+  combustion (~> 1.4)
+  database_cleaner (~> 2)
+  parentry!
+  pg (~> 1.5)
+  pry (~> 0.13)
+  rake (~> 13)
+  rspec-rails (~> 6.1)
+  rubocop-rspec (~> 2)
+  simplecov (~> 0.20)
+
+BUNDLED WITH
+   2.5.17

data/lib/parentry/navigation.rb

@@ -33,7 +33,7 @@ module Parentry
     end
 
     def leaf?
-      children.size.zero?
+      children.empty?
     end
     alias childless? leaf?
 
@@ -46,7 +46,7 @@ module Parentry
     end
 
     def siblings
-      parentry_scope.where.not(id: id).where.not(parent_id: nil).where(parent_id: parent_id)
+      parentry_scope.where.not(id:).where.not(parent_id: nil).where(parent_id:)
     end
 
     def siblings?
@@ -73,7 +73,7 @@ module Parentry
 
     def descendants(scopes = {})
       with_depth_scopes(scopes) do
-        subtree.where.not(id: id)
+        subtree.where.not(id:)
       end
     end
 

data/lib/parentry/strategy/array/class_methods.rb

@@ -3,7 +3,7 @@ module Parentry
     module Array
       module ClassMethods
         def parentry_depth_function
-          Arel.sql("array_length(#{parentry_column}, 1)")
+          Arel::Nodes::NamedFunction.new('array_length', [arel_table[parentry_column], 1])
         end
       end
     end

data/lib/parentry/strategy/array/instance_methods.rb

@@ -15,7 +15,7 @@ module Parentry
         def cascade_parentry
           old_path, new_path = saved_changes[parentry_column]
           parentry_scope.where(
-            ["#{parentry_column} @> ARRAY[:tree] AND id != :id", { tree: old_path, id: id }]
+            ["#{parentry_column} @> ARRAY[:tree] AND id != :id", { tree: old_path, id: }]
           ).update_all(
             [
               "#{parentry_column} = array_cat(ARRAY[?], #{parentry_column}[?:array_length(#{parentry_column}, 1)])",

data/lib/parentry/strategy/ltree/class_methods.rb

@@ -3,7 +3,7 @@ module Parentry
     module Ltree
       module ClassMethods
         def parentry_depth_function
-          Arel.sql("nlevel(#{parentry_column})")
+          Arel::Nodes::NamedFunction.new('nlevel', [arel_table[parentry_column]])
         end
       end
     end

data/lib/parentry/strategy/ltree/instance_methods.rb

@@ -13,11 +13,11 @@ module Parentry
         def cascade_parentry
           old_path, new_path = saved_changes[parentry_column]
           parentry_scope.where(
-            ["#{parentry_column} <@ :tree AND id != :id", { tree: old_path, id: id }]
+            ["#{parentry_column} <@ :tree AND id != :id", { tree: old_path, id: }]
           ).update_all(
             [
               "#{parentry_column} = :new_path || subpath(#{parentry_column}, nlevel(:old_path))",
-              { new_path: new_path, old_path: old_path }
+              { new_path:, old_path: }
             ]
           )
         end

data/lib/parentry/version.rb

@@ -1,3 +1,3 @@
 module Parentry
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.7.0'.freeze
 end

data/lib/parentry.rb

@@ -39,13 +39,17 @@ module Parentry
 
     scope :order_by_parentry, -> { order(parentry_depth_function) }
 
-    scope :before_depth, ->(depth) { where("#{parentry_depth_function} - 1 < ?", depth + depth_offset) }
-    scope :to_depth, ->(depth) { where("#{parentry_depth_function} - 1 <= ?", depth + depth_offset) }
-    scope :at_depth, ->(depth) { where("#{parentry_depth_function} - 1 = ?", depth + depth_offset) }
-    scope :from_depth, ->(depth) { where("#{parentry_depth_function} - 1 >= ?", depth + depth_offset) }
-    scope :after_depth, ->(depth) { where("#{parentry_depth_function} - 1 > ?", depth + depth_offset) }
+    {
+      before_depth: Arel::Nodes::LessThan,
+      to_depth: Arel::Nodes::LessThanOrEqual,
+      at_depth: Arel::Nodes::Equality,
+      from_depth: Arel::Nodes::GreaterThanOrEqual,
+      after_depth: Arel::Nodes::GreaterThan
+    }.each do |name, node|
+      scope name, ->(depth) { where(node.new(parentry_depth_function, depth + depth_offset + 1)) }
+    end
 
-    scope :roots, -> { where("#{parentry_depth_function} = 1") }
+    scope :roots, -> { where(Arel::Nodes::Equality.new(parentry_depth_function, 1)) }
     scope :ancestors_of, ->(node) { where(node.ancestor_conditions).where.not(id: node.id) }
     scope :children_of, ->(node) { where(parent_id: node.id) }
     scope :descendants_of, ->(node) { subtree_of(node).where.not(id: node.id) }

data/parentry.gemspec

@@ -15,17 +15,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 3.1'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.add_dependency 'activerecord', '>= 5.1', '< 7.1'
-
-  spec.add_development_dependency 'bundler', '~> 2'
-  spec.add_development_dependency 'combustion', '~> 1.1'
-  spec.add_development_dependency 'database_cleaner', '~> 1.6'
-  spec.add_development_dependency 'pg', '~> 1.2'
-  spec.add_development_dependency 'pry', '~> 0.13'
-  spec.add_development_dependency 'rake', '~> 13'
-  spec.add_development_dependency 'rspec-rails', '~> 4.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.1'
-  spec.add_development_dependency 'simplecov', '~> 0.20'
+  spec.add_dependency 'activerecord', '>= 6.1', '< 8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parentry
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Hamed Asghari
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-19 00:00:00.000000000 Z
+date: 2024-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,146 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: combustion
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.20'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '8'
 description:
 email:
 - hasghari@gmail.com
@@ -176,16 +50,14 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/activerecord_5.1.5.gemfile
-- gemfiles/activerecord_5.1.5.gemfile.lock
-- gemfiles/activerecord_5.2.0.gemfile
-- gemfiles/activerecord_5.2.0.gemfile.lock
-- gemfiles/activerecord_6.0.0.gemfile
-- gemfiles/activerecord_6.0.0.gemfile.lock
 - gemfiles/activerecord_6.1.0.gemfile
 - gemfiles/activerecord_6.1.0.gemfile.lock
 - gemfiles/activerecord_7.0.0.gemfile
 - gemfiles/activerecord_7.0.0.gemfile.lock
+- gemfiles/activerecord_7.1.0.gemfile
+- gemfiles/activerecord_7.1.0.gemfile.lock
+- gemfiles/activerecord_7.2.0.gemfile
+- gemfiles/activerecord_7.2.0.gemfile.lock
 - lib/parentry.rb
 - lib/parentry/class_methods.rb
 - lib/parentry/instance_methods.rb
@@ -202,7 +74,8 @@ files:
 homepage: https://github.com/hasghari/parentry
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -211,14 +84,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: ActiveRecord adapter for the Postgres ltree module

data/gemfiles/activerecord_5.1.5.gemfile

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