6 files changed, 95 insertions, 40 deletions

diff --git a/Gemfile b/Gemfile
index 13bb4ca..d136eb5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,9 +44,6 @@ gem 'will_paginate',  '~> 3.0'
 gem 'acts-as-taggable-on',
     git:    'https://github.com/mbleigh/acts-as-taggable-on.git',
     branch: 'master'
-gem 'awesome_nested_set',
-    git:    'https://github.com/collectiveidea/awesome_nested_set.git',
-    branch: 'main'
 
 # ── XML / parsing ─────────────────────────────────────────────────────────────
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e9a1ce..02c71ff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,4 @@
 GIT
-  remote: https://github.com/collectiveidea/awesome_nested_set.git
-  revision: 7a642749af74519b4bf3642d939061beb36835e1
-  branch: main
-  specs:
-    awesome_nested_set (3.9.0)
-      activerecord (>= 4.0.0, < 8.2)
-
-GIT
   remote: https://github.com/erdgeist/chaoscalendar.git
   revision: 48fe5c517ae3895cc78d9d2fefbdd35b90d52ba7
   branch: erdgeist-ruby1.9
@@ -335,7 +327,6 @@ PLATFORMS
 DEPENDENCIES
   acts-as-taggable-on!
   acts_as_list
-  awesome_nested_set!
   chaos_calendar!
   coffee-rails (~> 4.0)
   concurrent-ruby (~> 1.3)
@@ -374,7 +365,6 @@ CHECKSUMS
   activesupport (8.1.3) sha256=21a5e0dfbd4c3ddd9e1317ec6a4d782fa226e7867dc70b0743acda81a1dca20e
   acts-as-taggable-on (13.0.0)
   acts_as_list (1.2.6) sha256=8345380900b7bee620c07ad00991ccee59af3d8c9e8574f426e321da2865fdc8
-  awesome_nested_set (3.9.0)
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index bfc6cd8..3fa0519 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -15,12 +15,10 @@ class AdminController < ApplicationController
       Time.now, Time.now - 14.days
     ).limit(50).order("updated_at desc")
 
-    all_nodes = Node.root.self_and_descendants
+    ordered_with_level = Node.root.self_and_descendants_ordered_with_level
     @sitemap_depth = {}
-    Node.each_with_level(all_nodes) do |node, level|
-      @sitemap_depth[node.id] = level
-    end
-    @sitemap = all_nodes.to_a.sort! { |node1,node2| node1.lft <=> node2.lft }.delete_if { |node| node.update? }
+    ordered_with_level.each { |node, level| @sitemap_depth[node.id] = level }
+    @sitemap = ordered_with_level.map(&:first).reject(&:update?)
 
     @mypages = Page.where("user_id = ? or editor_id = ?", @current_user, @current_user)
 
diff --git a/app/models/concerns/nested_tree.rb b/app/models/concerns/nested_tree.rb
new file mode 100644
index 0000000..9a2eb0e
--- /dev/null
+++ b/app/models/concerns/nested_tree.rb
@@ -0,0 +1,86 @@
+# app/models/concerns/nested_tree.rb
+#
+# Minimal parent_id-based replacement for the tree-traversal subset of
+# awesome_nested_set actually used by this app (descendants, ancestors,
+# level, root, move_to_child_of)
+module NestedTree
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :parent, class_name: name, foreign_key: :parent_id, optional: true, inverse_of: :children
+    has_many :children, -> { order(:id) }, class_name: name, foreign_key: :parent_id, inverse_of: :parent
+
+    before_destroy :delete_descendants
+  end
+
+  class_methods do
+    def root
+      roots.first
+    end
+
+    def roots
+      where(parent_id: nil)
+    end
+
+    def valid?
+      # Every non-root row's parent_id must point at a real, existing row.
+      where.not(parent_id: nil).where.missing(:parent).none?
+    end
+  end
+
+  def root?
+    parent_id.nil?
+  end
+
+  def ancestors
+    result = []
+    current = parent
+    while current
+      result << current
+      current = current.parent
+    end
+    result
+  end
+
+  def level
+    ancestors.size
+  end
+
+  def descendants
+    ids = []
+    queue = self.class.where(parent_id: id).pluck(:id)
+    until queue.empty?
+      ids.concat(queue)
+      queue = self.class.where(parent_id: queue).pluck(:id)
+    end
+    self.class.where(id: ids)
+  end
+
+  def self_and_descendants
+    self.class.where(id: [id] + descendants.pluck(:id))
+  end
+
+  def self_and_descendants_ordered_with_level
+    nodes = [self] + descendants.to_a
+    children_by_parent = nodes.group_by(&:parent_id)
+    children_by_parent.each_value { |list| list.sort_by!(&:id) }
+
+    result = []
+    visit = ->(node, level) do
+      result << [node, level]
+      (children_by_parent[node.id] || []).each { |child| visit.call(child, level + 1) }
+    end
+    visit.call(self, 0)
+    result
+  end
+
+  def move_to_child_of(new_parent)
+    update!(parent_id: new_parent.id)
+  end
+
+  private
+
+  def delete_descendants
+    self.class.where(id: descendants.pluck(:id)).delete_all
+  end
+end
diff --git a/app/models/node.rb b/app/models/node.rb
index 2177f15..fc23dc1 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,6 +1,6 @@
 class Node < ApplicationRecord
   # Mixins and Plugins
-  acts_as_nested_set
+  include NestedTree
 
   # Associations
   has_many    :pages, -> { order("revision ASC") }, :dependent => :destroy
@@ -21,16 +21,6 @@ class Node < ApplicationRecord
   validates_uniqueness_of :slug, :scope => :parent_id, :unless => -> { parent_id.nil? }
   validates_presence_of   :parent_id,                  :unless => -> { Node.root.nil? }
 
-  validate :borders       # This should never ever happen.
-
-  # Index for Fulltext Search
-  # define_index do
-  #   indexes head.translations.title
-  #   indexes slug
-  #   indexes unique_name
-  #   indexes head.translations.body
-  # end
-
   # Class methods
 
   # Returns a page for a given node. If no revision is supplied, it returns
@@ -254,10 +244,13 @@ class Node < ApplicationRecord
     # Watch out recursion ahead! update_unique_name itself triggers this
     # after_save callback which invokes update_unique_name on its children.
     # Hopefully until no childrens occur
+    #
+    # Queries parent_id directly rather than the NestedTree#children
+    # association out of habit from the old awesome_nested_set-avoidance
+    # workaround - no longer strictly necessary now that children is
+    # equally safe, but left as-is since it already works correctly.
     def update_unique_names_of_children
       unless root?
-        # Use parent_id-based traversal instead of lft/rgt descendants
-        # due to awesome_nested_set not refreshing parent lft/rgt in memory
         Node.where(:parent_id => self.id).each do |child|
           child.reload
           child.update_unique_name
@@ -265,10 +258,4 @@ class Node < ApplicationRecord
         end
       end
     end
-
-    def borders
-      if lft && rgt && (lft > rgt)
-        errors.add("Fuck!. lft should never be smaller than rgt")
-      end
-    end
 end
diff --git a/db/seeds/chapters.rb b/db/seeds/chapters.rb
index bebc8da..4d81e3c 100644
--- a/db/seeds/chapters.rb
+++ b/db/seeds/chapters.rb
@@ -1409,6 +1409,3 @@ puts "Nodes flagged for review:"
 (erfas + chaostreffs).select { |e| e[:review] }.each do |e|
   puts "  #{e[:slug]}"
 end
-
-Node.rebuild!(false)
-