scribo 1.0.40 → 1.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2038388c9a53be7434cab9d09df117b3f6754bb2b58caa6725fb90e1dcc5f850
-  data.tar.gz: 481ba9937602ced2dbde21c2082707e6f2b49af8eeb0847d473dd5b4bc01a05b
+  metadata.gz: b8d2faa173e2061b2cd692143e967c54c698703b7cf73dded3ab099ce90d4acb
+  data.tar.gz: 64192e917ef3cb45d88dacb9b379d055498880ffc016c752b91fb59b76f99d8a
 SHA512:
-  metadata.gz: c19a2c507c6c58f2591e638f87015d12e2394e7185ba5271fc0f70f899cf44d61f70f81faed86a190fb84a1676e460252ba6b0d7093e842104a8e39b7a958d38
-  data.tar.gz: 6296a79e4e9d8a1a519bd4d1139f1a70329b9d6e67694e69784a4d4f3abb7ca375692dd124927b977a4192c2d3919a8f80c69fc3433f1e05d3de564da1fba92f
+  metadata.gz: 94026a265b5a827cfb849e4ab89a761824df95be4f53f16c341cea9e3eead02a82ccc36214621c1765c08262ced4ca51f5b6c4e063228cc755b3822bd1dce7a2
+  data.tar.gz: 7a6f297f8c9153d6651ebbac27c33db3c1fa72d7397efb68fa79e1524c2929e2155edebcbfab0d324ed19336842304a8c2bdee388b6316a872244c15b7701296

data/Gemfile

@@ -26,6 +26,8 @@ gem 'key_path', github: 'entdec/keypath-ruby.git', branch: 'master'
 gem 'rubocop'
 gem 'signum'
 
+gem 'closure_tree'
+
 group :test do
   gem 'pry-rails'
 end

data/app/models/scribo/content.rb

@@ -5,7 +5,7 @@ require_dependency 'scribo/application_record'
 module Scribo
   # Represents any content in the system
   class Content < ApplicationRecord
-    has_ancestry(primary_key_format: /\A[\w\-]+(\/[\w\-]+)*\z/, counter_cache: true, cache_depth: true) 
+    has_closure_tree
     belongs_to :site, class_name: 'Site', foreign_key: 'scribo_site_id'
     has_one_attached :asset
 
@@ -293,7 +293,7 @@ module Scribo
     end
 
     def store_full_path(force = false)
-      if force || saved_changes.include?(:path) || saved_changes.include?(:ancestry)
+      if force || saved_changes.include?(:path) || saved_changes.include?(:parent_id)
         if post?
           result = categories.join('/') + '/'
           result += date.strftime('%Y/%m/%d/') if date
@@ -310,10 +310,10 @@ module Scribo
         children.reload.each do |child|
           child.store_full_path(true)
         end
-
       end
     end
 
+
     def tree_path
       result = (ancestors.map(&:path) << path).join('/')
       result = '/' + result unless result.start_with?('/')

data/app/services/scribo/site_import_service.rb

@@ -31,7 +31,7 @@ module Scribo
                        site.contents.located(File.dirname(name), restricted: false).first
                      end
             content = parent.children.find_by(path: File.basename(name))  if parent  
-            content = site.contents.find_by(path: File.basename(name), ancestry: nil)  if parent.nil? && content.nil? 
+            content = site.contents.find_by(path: File.basename(name), parent_id: nil)  if parent.nil? && content.nil?
             content = site.contents.create!(path: File.basename(name), parent: parent) if content.nil? 
             if File.directory?(name)
               content.kind = 'folder'

data/db/migrate/20240603090353_add_parent_id_to_scribo_contents.rb

@@ -0,0 +1,5 @@
+class AddParentIdToScriboContents < ActiveRecord::Migration[7.1]
+  def change
+    add_column :scribo_contents, :parent_id, :uuid
+  end
+end

data/db/migrate/20240625131154_create_scribo_content_hierarchies.rb

@@ -0,0 +1,16 @@
+class CreateScriboContentHierarchies < ActiveRecord::Migration[7.1]
+  def change
+    create_table :scribo_content_hierarchies, id: false do |t|
+      t.uuid :ancestor_id, null: false
+      t.uuid :descendant_id, null: false
+      t.integer :generations, null: false
+    end
+
+    add_index :scribo_content_hierarchies, [:ancestor_id, :descendant_id, :generations],
+      unique: true,
+      name: "content_anc_desc_idx"
+
+    add_index :scribo_content_hierarchies, [:descendant_id],
+      name: "content_desc_idx"
+  end
+end

data/lib/scribo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Scribo
-  VERSION = '1.0.40'
+  VERSION = '1.0.41'
 end

data/lib/scribo.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ancestry'
+require 'closure_tree'
 require 'down'
 require 'kaminari'
 require 'liquid'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scribo
 version: !ruby/object:Gem::Version
-  version: 1.0.40
+  version: 1.0.41
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-25 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ancestry
@@ -1074,6 +1074,8 @@ files:
 - db/migrate/20200123095630_initial_scribo.rb
 - db/migrate/20220919124119_add_ancestry_to_scribo_contents.rb
 - db/migrate/20220919124749_remove_parent_id_from_scribo_contents.rb
+- db/migrate/20240603090353_add_parent_id_to_scribo_contents.rb
+- db/migrate/20240625131154_create_scribo_content_hierarchies.rb
 - docs/content.md
 - docs/editor.png
 - docs/features.md