scribo 1.0.42 → 1.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfdf854f4af1cbef3ce4d1f082fac4e96ab0c88b2145c0cead51b36a4f63054a
-  data.tar.gz: c9b6463328bb7e409e105a8f776526b409fea24407f06059b4e358a02c6e6e26
+  metadata.gz: 1afdd24cf12cb2306dad841425f948bbed9c5d0180478433841d83044efcb349
+  data.tar.gz: 8372cb65bbdbd763320b4136578eb4170273822b4694efe085096b2e1235fc19
 SHA512:
-  metadata.gz: 2a5e675b556debd8974f7c773d3296ddc7ce1b809edc5a4f15a420c08be675db2069ea1d1a8cf39e14294ef7ad26229f491a6d6b1fc5464a55df3c037f845857
-  data.tar.gz: 926c0bcb1ef6ec1035386f7976a9232381ca26e4f60974924d0169f8a0457ffdaeca50be4da39607bf78f68df9d06f96fff1a5f155f1832352a4dc10354a3119
+  metadata.gz: 9fec9b1dca212ef7eefb1e1ccb2d82e43680e43b466b632e20d1f10f3b9c3295503b504be63b06e3b98d1a1cc0edeabbfcb6a53131656195f4cb578160c4912a
+  data.tar.gz: '059c41eb871820ce584a9f2539370c78026472c853ffd90bf4cf64fa645eebbb8eb16d31c67e36bd63dbd43c6884384a9067a7f2358ac02fe48926384590da07'

data/Gemfile.lock

@@ -9,9 +9,9 @@ GIT
 PATH
   remote: .
   specs:
-    scribo (1.0.38)
-      ancestry
+    scribo (1.0.43)
       babel-transpiler (~> 0.7)
+      closure_tree
       down (~> 5.2)
       importmap-rails
       kaminari
@@ -107,8 +107,6 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    ancestry (4.3.3)
-      activerecord (>= 5.2.6)
     ansi (1.5.0)
     ast (2.4.2)
     auxilium (3.0.24)
@@ -135,6 +133,9 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
+    closure_tree (7.4.0)
+      activerecord (>= 4.2.10)
+      with_advisory_lock (>= 4.0.0)
     coderay (1.1.3)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
@@ -143,7 +144,7 @@ GEM
       capybara (~> 3.0)
       ferrum (~> 0.14.0)
     date (3.3.4)
-    down (5.4.1)
+    down (5.4.2)
       addressable (~> 2.8)
     drb (2.2.1)
     erubi (1.12.0)
@@ -153,7 +154,7 @@ GEM
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (>= 0.6, < 0.8)
-    ffi (1.16.3)
+    ffi (1.17.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.1)
@@ -187,19 +188,20 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    liquid (5.1.0)
-    liquidum (1.0.17)
+    liquid (5.3.0)
+    liquidum (1.2.1)
       addressable (~> 2)
       babel-transpiler (~> 0.7)
       i18n (~> 1.8)
       kramdown (~> 2.1)
       kramdown-parser-gfm (~> 1.0)
-      liquid (= 5.1.0)
+      liquid (< 5.4)
       parslet
       pg
       rails (>= 5.2)
       sassc (~> 2.2)
-      slim-rails (~> 3.2.0)
+      slim-rails (~> 3.6)
+    logger (1.6.1)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -211,9 +213,10 @@ GEM
     marcel (1.0.4)
     matrix (0.4.2)
     method_source (1.0.0)
-    mime-types (3.5.2)
+    mime-types (3.6.0)
+      logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0206)
+    mime-types-data (3.2024.1001)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
@@ -337,29 +340,28 @@ GEM
       pg
       rails (> 6.0)
       state_machines-activemodel
-    slim (4.1.0)
-      temple (>= 0.7.6, < 0.9)
-      tilt (>= 2.0.6, < 2.1)
-    slim-rails (3.2.0)
+    slim (5.2.1)
+      temple (~> 0.10.0)
+      tilt (>= 2.1.0)
+    slim-rails (3.6.3)
       actionpack (>= 3.1)
       railties (>= 3.1)
-      slim (>= 3.0, < 5.0)
+      slim (>= 3.0, < 6.0, != 5.0.0)
     state_machines (0.6.0)
     state_machines-activemodel (0.9.0)
       activemodel (>= 6.0)
       state_machines (>= 0.6.0)
-    stimulus-rails (1.3.3)
+    stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.1.0)
-    tailwindcss-rails (2.3.0)
-      railties (>= 6.0.0)
-    temple (0.8.2)
+    tailwindcss-rails (2.7.7)
+      railties (>= 7.0.0)
+    temple (0.10.3)
     thor (1.3.1)
-    tilt (2.0.11)
+    tilt (2.4.0)
     timeout (0.4.1)
-    turbo-rails (2.0.4)
+    turbo-rails (2.0.10)
       actionpack (>= 6.0.0)
-      activejob (>= 6.0.0)
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -369,6 +371,9 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
+    with_advisory_lock (5.1.0)
+      activerecord (>= 6.1)
+      zeitwerk (>= 2.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.6.13)
@@ -379,6 +384,7 @@ PLATFORMS
 DEPENDENCIES
   auxilium (~> 3.0)
   capybara
+  closure_tree
   cuprite
   jbuilder
   key_path!

data/app/assets/stylesheets/scribo/components/file-icons.css

@@ -40,7 +40,7 @@
   .name[data-path="LICENSE"] {
     background-image: url("scribo/icons/markdown.svg");
   }
-  // script
+  /* script */
   .name[data-path$=".js"] {
     background-image: url("scribo/icons/javascript.svg");
   }
@@ -54,7 +54,7 @@
     background-image: url("scribo/icons/ruby.svg");
   }
 
-  // image
+  /* image */
   .name[data-path$=".png"] {
     background-image: url("scribo/icons/image.svg");
   }
@@ -80,7 +80,7 @@
     background-image: url("scribo/icons/image.svg");
   }
 
-  // video
+  /* video */
   .name[data-path$=".webm"] {
     background-image: url("scribo/icons/video.svg");
   }
@@ -91,7 +91,7 @@
     background-image: url("scribo/icons/video.svg");
   }
 
-  // audio
+  /* audio */
   .name[data-path$=".midi"] {
     background-image: url("scribo/icons/audio.svg");
   }
@@ -105,7 +105,7 @@
     background-image: url("scribo/icons/audio.svg");
   }
 
-  // document
+  /* document */
   .name[data-path$=".doc"] {
     background-image: url("scribo/icons/word.svg");
   }
@@ -134,7 +134,7 @@
     background-image: url("scribo/icons/zip.svg");
   }
 
-  // font
+  /* font */
   .name[data-path$=".eot"] {
     background-image: url("scribo/icons/font.svg");
   }
@@ -151,7 +151,7 @@
     background-image: url("scribo/icons/font.svg");
   }
 
-  // other
+  /* other */
   .name[data-path$=".link"] {
     background-image: url("scribo/icons/http.svg");
   }

data/app/assets/stylesheets/scribo/components/tree-view.css

@@ -201,15 +201,17 @@
   background-size: 18px 18px;
 }
 
-// .tree-view .entry.selected:before {
-//   content: '';
-//   position: absolute;
-//   left: 0;
-//   right: 0;
-//   height: 25px;
-//   background-color: #f5f5f5;
-//   z-index: -1;
-// }
+/* 
+.tree-view .entry.selected:before {
+   content: '';
+   position: absolute;
+   left: 0;
+   right: 0;
+   height: 25px;
+   background-color: #f5f5f5;
+   z-index: -1;
+ } 
+*/
 
 .tree-view .directory.closed > ul {
   display: none;

data/app/models/scribo/content.rb

@@ -9,6 +9,8 @@ module Scribo
     belongs_to :site, class_name: 'Site', foreign_key: 'scribo_site_id'
     has_one_attached :asset
 
+
+
     validate :post_path
     validate :layout_cant_be_current_content
 
@@ -18,6 +20,8 @@ module Scribo
     after_save -> { store_full_path(true) }
     after_update -> {store_full_path(true)}
 
+
+
     scope :layouts, -> { in_folder('_layouts') }
     scope :posts, -> { in_folder('_posts') }
     scope :pages, -> { not_in_folder('_posts').restricted.where(kind: 'text') }
@@ -301,7 +305,7 @@ module Scribo
         elsif part_of_collection? && site.output_collection?(collection_name)
           result = "#{collection_name}/#{path}"
         else
-          result = (ancestors.map(&:path) << path).join('/')
+          result = (ancestors.reverse.map(&:path) << path).join('/')
         end
         result = '/' + result unless result.start_with?('/')
 
@@ -313,9 +317,8 @@ module Scribo
       end
     end
 
-
     def tree_path
-      result = (ancestors.map(&:path) << path).join('/')
+      result = (ancestors.reverse.map(&:path) << path).join('/')
       result = '/' + result unless result.start_with?('/')
       result
     end

data/app/services/scribo/site_export_service.rb

@@ -26,6 +26,8 @@ module Scribo
 
           zio.put_next_entry(base_path + content_path)
           zio.write content.data_with_frontmatter
+        rescue StandardError => e
+          Rails.logger.error "Error while exporting content #{content.id}: #{e.message}"
         end
       end
 

data/lib/scribo/version.rb

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

data/scribo.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
 
-  s.add_dependency 'ancestry'
+  s.add_dependency 'closure_tree'
   s.add_dependency 'babel-transpiler', '~> 0.7'
   s.add_dependency 'down', '~> 5.2'
   s.add_dependency 'kaminari'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: scribo
 version: !ruby/object:Gem::Version
-  version: 1.0.42
+  version: 1.0.44
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ancestry
+  name: closure_tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="