cloudcannon-jekyll 4.0.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c513d1410254af59fed1d369d9852c77b0aa59474cf374f538a6557e5d0445f3
-  data.tar.gz: bfdcbdf270b02d3ab9f5b8c869650f46c4f8eb06a73f30f821fbeb9611fe0480
+  metadata.gz: 787bae32d731d9cae9e4449fb385f7fed6f9457e682c78830c291ecf79294b2c
+  data.tar.gz: 29d1786c961cd6d2c6d12bc34cd2259c1389c84e139a473ab5123bf76f8a843a
 SHA512:
-  metadata.gz: 9dbf04c9447ce64b41394dfc7ed33924f089542506a054a46da581940efe44be5e2f7bca61014855dacb62efc46d86bdc3e9ac37e470f7c94f411aeec54bf05c
-  data.tar.gz: 9993038e810b3509f39aeadb41e77d2b29635481469c331daed39ce0154b5a8c2320fed85c301fc182088de93eb6a74b3f77eb5bd1c5ce574c65017567f4e811
+  metadata.gz: 9b019fcb347c49cbbf5ec77553031c4a81d1820bbf96a43201b310275608847e7ccfd06e46950461ee355c579dbc2cecad455b08707759b1db6d8ad6e1af85a6
+  data.tar.gz: f0bbbe7ada0c89c63fe115b282a9313d3f577d8e6c140f101d770df72300dd6806bea2ca4f2d7c4f2feaa3d3e46c92fc0b4cf7cc20bcaea1d09e565e3dce8970

data/HISTORY.md

@@ -1,3 +1,11 @@
+# 4.0.2
+
+* Prevent reading PageWithoutAFile documents
+
+# 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

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

@@ -22,6 +22,16 @@ 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'] || {}
       collections_config = @config['collections_config'] || {}
@@ -62,7 +72,7 @@ module CloudCannonJekyll
 
         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)
@@ -287,7 +297,9 @@ module CloudCannonJekyll
     end
 
     def allowed_document?(doc)
-      if doc.instance_of?(Jekyll::Page)
+      if !IS_JEKYLL_2_X_X && !IS_JEKYLL_3_04_X && doc.instance_of?(Jekyll::PageWithoutAFile)
+        false
+      elsif doc.instance_of?(Jekyll::Page)
         allowed_page?(doc)
       elsif doc.instance_of?(Jekyll::StaticFile)
         allowed_static_file?(doc)

data/lib/cloudcannon-jekyll/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.2
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll