cloudcannon-jekyll 4.0.4 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f8cf0b736a3578323fa400e6e891886eb0bad2aa3710136f6bf7baa7ec3f2ab
-  data.tar.gz: 8a65016f4eba1af443c3e4b9fbaaa168e106264b005512bb3b3329a42d996367
+  metadata.gz: cf62c33f7f7b5a78549efbaf6945f4e9d5fbb0578d953e737a58ea6bceba9492
+  data.tar.gz: e1e61ffc1dfd7353cced1f759fc3644722d8fae8cb8b0448fb038a756a84a394
 SHA512:
-  metadata.gz: 32cf8db70549016d4c0bee8805ea61ca23cef66576fac26111d8111658cc4e58605d3b6b7683f143e36f62d19611bdfcbd0184ebd0fe8cf37e4db20eb4b33674
-  data.tar.gz: 81617011ea53c32ec1185f0f5db3d8270c35ce1b749a587af77b52eb17aea6ac528aa13915baed6448f3eb2eb06663e0d96492e14556e56c7acae0620e94e60b
+  metadata.gz: c4b4b5404c75e793969dfef2b070cfd3689c0886e8c518d4a0a7ea1acf899e97a360cae4bbc6966a968f239d2932c5b1cce1b4440e35a12c570bc9190ff0a987
+  data.tar.gz: 3c9cd1e8a71d6544435a63d9169a95d3202700a4f91a898d8cee8226f143df4b020e12e18374ba435746d15f2fb12dcc0872bf82d5bfbcb69df763e053bb580d

data/HISTORY.md

@@ -1,3 +1,12 @@
+# 4.0.6
+
+* Remove auto-discovered collections with duplicate paths
+* Update Jekyll 4 test version to 4.3.2
+
+# 4.0.5
+
+* Fix builds breaking on one unparseable file
+
 # 4.0.4
 
 * Fix PageWithoutAFile check for Jekyll ~v3.6

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

@@ -106,6 +106,10 @@ module CloudCannonJekyll
         collections_config[key] = defaults.merge(collections_config[key] || {})
       end
 
+      # Remove auto-discovered collections with duplicate paths
+      set_paths = collections_config.filter_map { |_, v| v['path'] unless v['auto_discovered'] }
+      collections_config.delete_if { |_, v| v['auto_discovered'] && set_paths.include?(v['path']) }
+
       collections_config
     end
 
@@ -149,7 +153,15 @@ module CloudCannonJekyll
         end
 
         collections[key] ||= []
-        collections[key].push(document_to_json(doc, key))
+
+        begin
+          jsonified = document_to_json(doc, key)
+          JSON.generate(jsonified) # this is here to catch JSON errors per file
+          collections[key].push(jsonified)
+        rescue
+          Logger.warn "⚠️ Failed to parse #{doc.relative_path.bold}"
+        end
+
 
         assigned_pages[doc.relative_path] = true if doc.instance_of?(Jekyll::Page)
       end

data/lib/cloudcannon-jekyll/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudCannonJekyll
-  VERSION = '4.0.4'
+  VERSION = '4.0.6'
 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.3.1 bundle update && $(dirname "$0")/test
+JEKYLL_VERSION=4.3.2 bundle update && $(dirname "$0")/test
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.6
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.14
 signing_key: 
 specification_version: 4
 summary: CloudCannon Jekyll integration