parentry 1.0.0 → 1.4.0

data/gemfiles/activerecord_6.0.0.gemfile

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

data/gemfiles/activerecord_6.0.0.gemfile.lock

@@ -0,0 +1,143 @@
+PATH
+  remote: ..
+  specs:
+    parentry (1.3.0)
+      activerecord (>= 5.1, < 6.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activesupport (6.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.0)
+    builder (3.2.3)
+    coderay (1.1.2)
+    combustion (1.1.1)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
+    diff-lcs (1.3)
+    docile (1.3.2)
+    erubi (1.8.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
+    json (2.3.1)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (0.9.2)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nokogiri (1.10.7)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.19.1)
+    parser (2.7.0.2)
+      ast (~> 2.4.0)
+    pg (1.2.2)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.2.0)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rainbow (3.0.0)
+    rake (12.3.3)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    rubocop (0.79.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-rspec (1.37.1)
+      rubocop (>= 0.68.1)
+    ruby-progressbar (1.10.1)
+    simplecov (0.17.0)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.8)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.6.1)
+    zeitwerk (2.1.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 6.0.0)
+  appraisal
+  bundler (~> 2.1)
+  combustion (~> 1.1)
+  database_cleaner (~> 1.6)
+  parentry!
+  pg (~> 1.2)
+  pry (~> 0.10)
+  rake (~> 12.3)
+  rspec-rails (~> 3.7)
+  rubocop-rspec (~> 1.37)
+  simplecov (~> 0.16)
+
+BUNDLED WITH
+   2.1.4

data/gemfiles/activerecord_6.1.0.gemfile

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

data/gemfiles/activerecord_6.1.0.gemfile.lock

@@ -0,0 +1,147 @@
+PATH
+  remote: ..
+  specs:
+    parentry (1.3.0)
+      activerecord (>= 5.1, < 6.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activesupport (6.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    appraisal (2.3.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.1)
+    builder (3.2.4)
+    coderay (1.1.3)
+    combustion (1.3.1)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
+    database_cleaner (1.8.5)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    erubi (1.10.0)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    loofah (2.7.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    mini_portile2 (2.4.0)
+    minitest (5.14.2)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.20.0)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    pg (1.2.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rainbow (3.0.0)
+    rake (12.3.3)
+    regexp_parser (1.8.2)
+    rexml (3.2.4)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.4)
+    rubocop (0.93.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.1.1)
+      parser (>= 2.7.1.5)
+    rubocop-rspec (1.44.1)
+      rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
+    ruby-progressbar (1.10.1)
+    simplecov (0.19.1)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.8)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 6.0.0)
+  appraisal
+  bundler (~> 2.1)
+  combustion (~> 1.1)
+  database_cleaner (~> 1.6)
+  parentry!
+  pg (~> 1.2)
+  pry (~> 0.10)
+  rake (~> 12.3)
+  rspec-rails (~> 3.7)
+  rubocop-rspec (~> 1.37)
+  simplecov (~> 0.16)
+
+BUNDLED WITH
+   2.1.4

data/lib/parentry.rb

@@ -6,50 +6,49 @@ module Parentry
   autoload :Navigation, 'parentry/navigation'
   autoload :ClassMethods, 'parentry/class_methods'
 
-  def self.included(base)
-    base.class_eval do
-      mattr_accessor :parentry_strategy, :parentry_column, :depth_offset, :cache_depth, :touch_ancestors
-
-      belongs_to :parent, class_name: base_class.name
-      has_many :children, class_name: base_class.name, foreign_key: :parent_id, dependent: :destroy
-
-      validate do
-        unless parent.blank? || parent.persisted?
-          errors.add(:parent, 'must be persisted')
-        end
-      end
-
-      validate :prevent_circular_parentry
-
-      after_create :commit_parentry
-      before_update :assign_parentry, if: proc { changes[:parent_id].present? }
-      after_update :cascade_parentry, if: proc { saved_changes[parentry_column].present? }
-
-      before_validation :cache_parentry_depth, if: proc { cache_depth }
-      before_save :cache_parentry_depth, if: proc { cache_depth }
-
-      after_save :touch_ancestors_callback
-      after_touch :touch_ancestors_callback
-      after_destroy :touch_ancestors_callback
-
-      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) }
-
-      scope :roots, -> { where("#{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) }
-      scope :subtree_of, ->(node) { where(node.subtree_conditions) }
-      scope :siblings_of, ->(node) { where(parent_id: node.parent_id).where.not(id: node.id) }
+  extend ActiveSupport::Concern
+
+  # rubocop:disable Metrics/BlockLength
+  included do
+    include Navigation
+    include InstanceMethods
+
+    mattr_accessor :parentry_strategy, :parentry_column, :depth_offset, :cache_depth, :touch_ancestors
+
+    belongs_to :parent, class_name: base_class.name, optional: true
+    has_many :children, class_name: base_class.name, foreign_key: :parent_id, dependent: :destroy
+
+    validate do
+      errors.add(:parent, 'must be persisted') unless parent.blank? || parent.persisted?
     end
 
-    base.send :include, Navigation
-    base.send :include, InstanceMethods
-    base.extend ClassMethods
+    validate :prevent_circular_parentry
+
+    after_create :commit_parentry
+    before_update :assign_parentry, if: proc { changes[:parent_id].present? }
+    after_update :cascade_parentry, if: proc { saved_changes[parentry_column].present? }
+
+    before_validation :cache_parentry_depth, if: proc { cache_depth }
+    before_save :cache_parentry_depth, if: proc { cache_depth }
+
+    after_save :touch_ancestors_callback
+    after_touch :touch_ancestors_callback
+    after_destroy :touch_ancestors_callback
+
+    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) }
+
+    scope :roots, -> { where("#{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) }
+    scope :subtree_of, ->(node) { where(node.subtree_conditions) }
+    scope :siblings_of, ->(node) { where(parent_id: node.parent_id).where.not(id: node.id) }
   end
+  # rubocop:enable Metrics/BlockLength
 end

data/lib/parentry/class_methods.rb

@@ -11,12 +11,13 @@ module Parentry
       include Strategy::Array if parentry_strategy == 'array'
     end
 
+    # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
     def arrange(options = {})
       scope =
         if (order = options.delete(:order))
-          self.base_class.order_by_parentry.order(order)
+          base_class.order_by_parentry.order(order)
         else
-          self.base_class.order_by_parentry
+          base_class.order_by_parentry
         end
 
       scope.where(options).each_with_object(Hash.new { |h, k| h[k] = {} }) do |node, memo|
@@ -27,5 +28,6 @@ module Parentry
         insert_node[node] = {}
       end
     end
+    # rubocop:enable Metrics/AbcSize,Metrics/MethodLength
   end
 end

data/lib/parentry/instance_methods.rb

@@ -46,6 +46,7 @@ module Parentry
 
     def ancestor_ids_was
       return [] unless saved_changes[parentry_column]
+
       parse_parentry(saved_changes[parentry_column][0]).tap(&:pop)
     end
   end

data/lib/parentry/navigation.rb

@@ -33,9 +33,9 @@ module Parentry
     end
 
     def leaf?
-      children.size == 0
+      children.size.zero?
     end
-    alias_method :childless?, :leaf?
+    alias childless? leaf?
 
     def children?
       !leaf?
@@ -50,7 +50,7 @@ module Parentry
     end
 
     def siblings?
-      siblings.size > 0
+      siblings.size.positive?
     end
 
     def only_child?
@@ -80,6 +80,7 @@ module Parentry
     def depth
       return depth_offset if root?
       return parent.depth + 1 if changes[:parent_id].present?
+
       path_ids.size - 1 + depth_offset
     end