cloudcannon-jekyll 3.2.4 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0136aa6c6cd6d254318f43c1f2eca85a938e6be5fd037e5aedcb315fa594928c
-  data.tar.gz: 30e81c35553da31c3bfb5aeaa747a31f545942d5b4600a2ea8239cd5b39a15d6
+  metadata.gz: 7be8e0835f8eaa063ec3669eaf538951304a13e66173335c66ff8ef0de99fb9a
+  data.tar.gz: 4fb906e15c40bb8c63f678074e65f61a1d6557217e339d03b9610d01238f513e
 SHA512:
-  metadata.gz: 9dd73df6c6ee9afc0ff3932ad4d592fe5da17601fe870b27dc138ac2f17a89fba2f74cf8f3069ca6fe40f34fee5f1f4797a471b2a346153204f1335bba2199ae
-  data.tar.gz: d2ccc7e9ca1fc3c0330d776e8b14dfa29ba9c47f0067393e3cc194e03948ce028d224294c8ceb5518bc07b9c30938fc0a7f98b3a8553294cc97d90dc333ade03
+  metadata.gz: e8c195eaa6969fc92b4bb5a3d6439ba5b2f7d7d83cf68bea3286079deb2049bfb138c31180ac011be5acaadc3280482438cc4c7e3ef3917a1eadf838938b4643
+  data.tar.gz: ca5ddb63afde7d94efe7b3833010da1501031fe54b16167672fbf661fe6e40e3c9168f5214ae9a7df3d821bd03b39fa97320454b6d8a18f6bc1771439beb1069

data/HISTORY.md

@@ -1,3 +1,11 @@
+# 4.0.1
+
+* Fix nested post and draft collection mapping
+
+# 4.0.0
+
+* Assign files to collections based on paths rather than matching Jekyll collection
+
 # 3.2.4
 
 * Revert changes to Jekyll Paginate behaviour

data/lib/cloudcannon-jekyll/generators/collections.rb

@@ -22,10 +22,19 @@ module CloudCannonJekyll
       @split_drafts = group_by_category_folder(all_drafts, 'drafts')
     end
 
+    def generate_collections_config_path(key)
+      if key.end_with?("/posts")
+        File.join(@collections_dir, key.sub(/\/posts$/, "/_posts"))
+      elsif key.end_with?("/drafts")
+        File.join(@collections_dir, key.sub(/\/drafts$/, "/_drafts"))
+      else
+        File.join(@collections_dir, "_#{key}")
+      end
+    end
+
     def generate_collections_config
       collections = @site.config['collections'] || {}
-      input_collections_config = @config['collections_config'] || {}
-      collections_config = input_collections_config.reject { |_, v| v == false }
+      collections_config = @config['collections_config'] || {}
 
       return collections_config if @config['collections_config_override']
 
@@ -54,18 +63,16 @@ module CloudCannonJekyll
         }
       end
 
-      collection_keys = (defaults.keys + collections.keys).uniq
+      collection_keys = (collections_config.keys + defaults.keys + collections.keys).uniq
 
       collection_keys.each do |key|
-        next if input_collections_config[key] == false
-
         processed = (defaults[key] || {})
                     .merge(collections[key] || {})
                     .merge(collections_config[key] || {})
 
         processed['output'] ||= false
         processed['auto_discovered'] = !collections_config.key?(key)
-        processed['path'] ||= File.join(@collections_dir, "_#{key}")
+        processed['path'] ||= generate_collections_config_path(key)
         processed['path'] = processed['path'].sub(%r{^/+}, '')
 
         Config.rename_legacy_collection_config_keys(processed)
@@ -74,8 +81,6 @@ module CloudCannonJekyll
       end
 
       @split_posts.each_key do |key|
-        next if input_collections_config[key] == false
-
         posts_path = @split_posts[key]&.first&.relative_path&.sub(%r{(^|/)_posts.*}, '\1_posts')
         next unless posts_path
 
@@ -89,8 +94,6 @@ module CloudCannonJekyll
       end
 
       @split_drafts.each_key do |key|
-        next if input_collections_config[key] == false
-
         drafts_path = @split_drafts[key]&.first&.relative_path&.sub(%r{(^|/)_drafts.*}, '\1_drafts')
         next unless drafts_path
 
@@ -114,33 +117,53 @@ module CloudCannonJekyll
       paths.empty? ? [File.join('/', @collections_dir, '_drafts')] : paths
     end
 
+    def each_document(&block)
+      @site.pages.each(&block)
+      @site.static_files.each(&block)
+      @site.collections.each_value { |coll| coll.docs.each(&block) }
+      all_drafts.each(&block)
+
+      # Jekyll 2.x.x doesn't have posts in site.collections
+      all_posts.each(&block) if IS_JEKYLL_2_X_X
+    end
+
     def generate_collections(collections_config)
+      assigned_pages = {}
       collections = {}
 
-      collections_config.each_key do |key|
-        next if key == 'data'
+      path_map = collections_config_path_map(collections_config)
+
+      each_document do |doc|
+        next unless allowed_document?(doc)
+
+        key = document_collection_key(doc, path_map)
+
+        unless key
+          Logger.warn "⚠️ No collection for #{doc.relative_path.bold}"
+          next
+        end
+
+        if collections_config.dig(key, 'parser') == false
+          Logger.warn "⚠️ Ignoring #{doc.relative_path.bold} in #{key.bold} collection"
+          next
+        end
 
         collections[key] ||= []
+        collections[key].push(document_to_json(doc, key))
 
-        next if collections_config.dig(key, 'parser') == false
+        assigned_pages[doc.relative_path] = true if doc.instance_of?(Jekyll::Page)
+      end
 
-        collections[key] = if key == 'posts' || key.end_with?('/posts')
-                             @split_posts[key]
-                           elsif key == 'drafts' || key.end_with?('/drafts')
-                             @split_drafts[key]
-                           else
-                             @site.collections[key]&.docs
-                           end
+      collections_config.each_key do |key|
+        next if key == 'data'
 
         collections[key] ||= []
-        collections[key] = collections[key].map do |doc|
-          document_to_json(doc, key)
-        end
       end
 
       if collections.key?('pages') && collections['pages'].empty?
-        collections['pages'] = all_pages.map do |doc|
-          document_to_json(doc, 'pages')
+        all_pages.each do |page|
+          assigned = assigned_pages[page.relative_path]
+          collections['pages'].push(document_to_json(page, 'pages')) unless assigned
         end
       end
 
@@ -152,7 +175,7 @@ module CloudCannonJekyll
         should_delete = if key == 'data'
                           !data_files?
                         else
-                          collections[key].empty? && collection_config['auto_discovered']
+                          collections[key]&.empty? && collection_config['auto_discovered']
                         end
 
         if should_delete
@@ -177,6 +200,27 @@ module CloudCannonJekyll
       end
     end
 
+    def collections_config_path_map(collections_config)
+      unsorted = collections_config.map do |key, collection_config|
+        {
+          key: key,
+          path: "/#{collection_config['path']}/".sub(%r{/+}, '/')
+        }
+      end
+
+      unsorted.sort_by { |pair| pair[:path].length }.reverse
+    end
+
+    def document_collection_key(doc, path_map)
+      path = "/#{File.join(@collections_dir, doc.relative_path)}/".sub(%r{/+}, '/')
+
+      collection_path_pair = path_map.find do |pair|
+        path.start_with? pair[:path]
+      end
+
+      collection_path_pair[:key] if collection_path_pair
+    end
+
     def legacy_document_data(doc)
       legacy_data = {}
       legacy_data['categories'] = doc.categories if doc.respond_to?(:categories)
@@ -247,15 +291,27 @@ module CloudCannonJekyll
     end
 
     def all_pages
-      html_pages = @site.pages.select do |page|
-        page.html? || page.url.end_with?('/')
-      end
+      pages = @site.pages.select { |doc| allowed_page?(doc) }
+      static_pages = @site.static_files.select { |doc| allowed_static_file?(doc) }
+      pages + static_pages
+    end
 
-      static_pages = @site.static_files.select do |static_page|
-        STATIC_EXTENSIONS.include?(static_page.extname)
+    def allowed_document?(doc)
+      if doc.instance_of?(Jekyll::Page)
+        allowed_page?(doc)
+      elsif doc.instance_of?(Jekyll::StaticFile)
+        allowed_static_file?(doc)
+      else
+        true
       end
+    end
+
+    def allowed_page?(page)
+      page.html? || page.url.end_with?('/')
+    end
 
-      html_pages + static_pages
+    def allowed_static_file?(static_file)
+      STATIC_EXTENSIONS.include?(static_file.extname)
     end
 
     def data_files?

data/lib/cloudcannon-jekyll/logger.rb

@@ -8,5 +8,9 @@ module CloudCannonJekyll
     def self.info(str)
       Jekyll.logger.info('CloudCannon:', str)
     end
+
+    def self.warn(str)
+      Jekyll.logger.warn('CloudCannon:', str)
+    end
   end
 end

data/lib/cloudcannon-jekyll/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudCannonJekyll
-  VERSION = '3.2.4'
+  VERSION = '4.0.1'
 end

data/script/test-all-versions

@@ -6,5 +6,5 @@ JEKYLL_VERSION=2.4.0 bundle update && $(dirname "$0")/test &&
 JEKYLL_VERSION=3.0.0 bundle update && $(dirname "$0")/test &&
 JEKYLL_VERSION=3.3.1 bundle update && $(dirname "$0")/test &&
 JEKYLL_VERSION=3.8.5 bundle update && $(dirname "$0")/test &&
-JEKYLL_VERSION=4.2.1 bundle update && $(dirname "$0")/test
+JEKYLL_VERSION=4.3.1 bundle update && $(dirname "$0")/test
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 4.0.1
 platform: ruby
 authors:
 - CloudCannon
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -105,7 +105,7 @@ homepage: https://github.com/cloudcannon/cloudcannon-jekyll
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: CloudCannon Jekyll integration
 test_files: []