cloudcannon-jekyll 3.2.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d93973921d4a4f673b82f8b23f7e67b563e550bf62708631310ad0cc92a21e9c
-  data.tar.gz: c1fbf58e6378b8b66703a9f25d0db3e9399b3a5324605ef891aaf009799abe02
+  metadata.gz: c513d1410254af59fed1d369d9852c77b0aa59474cf374f538a6557e5d0445f3
+  data.tar.gz: bfdcbdf270b02d3ab9f5b8c869650f46c4f8eb06a73f30f821fbeb9611fe0480
 SHA512:
-  metadata.gz: cf473d7f0222da25f2bfe7c3b04065b474fec51d9c2820e27966b5d50d49369e8f41c854ad19e21ae330a585869e08e724c9ee7daec1f8c0fb1db00612758a19
-  data.tar.gz: ea1826a618609914b83cc038ee058e453e8ca60400bd36d454bee5a891932a6970a36ed1d26fead1b57ed358dbecc4e6544038175642d4745bd3656e57dc49a9
+  metadata.gz: 9dbf04c9447ce64b41394dfc7ed33924f089542506a054a46da581940efe44be5e2f7bca61014855dacb62efc46d86bdc3e9ac37e470f7c94f411aeec54bf05c
+  data.tar.gz: 9993038e810b3509f39aeadb41e77d2b29635481469c331daed39ce0154b5a8c2320fed85c301fc182088de93eb6a74b3f77eb5bd1c5ce574c65017567f4e811

data/HISTORY.md

@@ -1,3 +1,11 @@
+# 4.0.0
+
+* Assign files to collections based on paths rather than matching Jekyll collection
+
+# 3.2.4
+
+* Revert changes to Jekyll Paginate behaviour
+
 # 3.2.3
 
 * Fixed malformed paths on index pages caused by jekyll-paginate-v2

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

@@ -20,13 +20,11 @@ module CloudCannonJekyll
       @data_dir = Paths.data_dir(site)
       @split_posts = group_by_category_folder(all_posts, 'posts')
       @split_drafts = group_by_category_folder(all_drafts, 'drafts')
-      @uses_jekyll_paginate_v2 = defined?(Jekyll::PaginateV2::Generator::PaginationPage) == 'constant'
     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']
 
@@ -55,11 +53,9 @@ 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] || {})
@@ -75,8 +71,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
 
@@ -90,8 +84,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
 
@@ -115,33 +107,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
 
@@ -153,7 +165,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
@@ -178,6 +190,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)
@@ -215,9 +248,6 @@ module CloudCannonJekyll
     def document_path(doc)
       path = if doc.respond_to?(:collection) && doc.collection
                File.join(@collections_dir, doc.relative_path)
-             elsif @uses_jekyll_paginate_v2 && doc.is_a?(Jekyll::PaginateV2::Generator::PaginationPage)
-               parts = doc.relative_path.split(File::SEPARATOR).drop(1)
-               File.join('/', *parts)
              else
                doc.relative_path
              end
@@ -251,15 +281,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.3'
+  VERSION = '4.0.0'
 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.3
+  version: 4.0.0
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll