cloudcannon-jekyll 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 513b1c1c89c2e6e713b7d1f82496400f8f5f6e60c765c0b68561b5e8cd809f34
-  data.tar.gz: 1b2b100c5841ff0d833c82b50d64615b81c07f8cab17dd1bede470f55a2a9b4e
+  metadata.gz: 0fed35269d24b4a1fd24b64ff5d89264e69e31b4d2b1451923824ae994ed43df
+  data.tar.gz: 3f0338deb85d35b56f577f90408ad11660479a05d203ce4b5a17588b44439e0c
 SHA512:
-  metadata.gz: 1fbc774784b2c71e1d6bce5e4b0ee9dbee6b2c830b860a3d52a33cf49d14fedd1567bb041c201ad8400a1e05fabe82a8d2daee787e4d5255b7b00df0716df078
-  data.tar.gz: 2715611c238b1fdf22896bbc4a07b0070209149f03e38e075ab1db4eaae49243344a21a8774312996fb8e27eba9c9d59b0494ce0f73cba7cba60551175291f64
+  metadata.gz: 20e086e703f86bf8221b88cc9e419b7f1715976a42fa736a0e0d08df2a1e062b583f0bfdb201f2ee5bfde4cbd1e8a2a8bb0f23436eaba8e5b3275467fec9e08e
+  data.tar.gz: 728c3feb864fcc8eed871fd188d4304870733e66074657af3a5ceeef4760d4f38478b59dacfa606c454adde6ff8ba15e45f0da82082535858316cc666d76b027

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 3.1.0
+
+* Add options for ignoring and preventing parsing collections
+* Fix potential null reference
+
 # 3.0.2
 
 * Remove excerpt from output

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

@@ -24,7 +24,8 @@ module CloudCannonJekyll
 
     def generate_collections_config
       collections = @site.config['collections'] || {}
-      collections_config = @config['collections_config']&.dup || {}
+      input_collections_config = @config['collections_config'] || {}
+      collections_config = input_collections_config.reject { |_, v| v == false }
 
       return collections_config if @config['collections_config_override']
 
@@ -56,6 +57,8 @@ module CloudCannonJekyll
       collection_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] || {})
@@ -71,6 +74,8 @@ 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
 
@@ -84,6 +89,8 @@ 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
 
@@ -113,6 +120,10 @@ module CloudCannonJekyll
       collections_config.each_key do |key|
         next if key == 'data'
 
+        collections[key] ||= []
+
+        next if collections_config.dig(key, 'parser') == false
+
         collections[key] = if key == 'posts' || key.end_with?('/posts')
                              @split_posts[key]
                            elsif key == 'drafts' || key.end_with?('/drafts')
@@ -167,14 +178,12 @@ module CloudCannonJekyll
     end
 
     def legacy_document_data(doc)
-      data = doc.data.merge(
-        {
-          categories: doc.categories,
-          tags: doc.tags,
-          date: doc.date
-        }
-      )
+      legacy_data = {}
+      legacy_data['categories'] = doc.categories if doc.respond_to?(:categories)
+      legacy_data['tags'] = doc.tags if doc.respond_to?(:tags)
+      legacy_data['date'] = doc.date if doc.respond_to?(:date)
 
+      data = doc.data.merge(legacy_data)
       data['slug'] = doc.slug if doc.respond_to?(:slug)
       data
     end

data/lib/cloudcannon-jekyll/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-04-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.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: CloudCannon Jekyll integration