cloudcannon-jekyll 3.0.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 726de702565cba929f871a0f61317b250f691ca552b6175b466fc84ef9ea3edd
-  data.tar.gz: 1313e07afea85c8d6f2db84ee5a826ca8270eefc31f8becf963f9526046c8b40
+  metadata.gz: 9baa033589ad0787d46384652694369f7c248193077e52f716247f3082e7495d
+  data.tar.gz: 41c931e79f60de4b039009e9149f29df7e9eb77680ace64f393adc98a565feba
 SHA512:
-  metadata.gz: 10f106d6cd9e49c319383d7789c589f9d27b64c53b4b3514d6a90d1ecbeccc881c15d65e531f3061ffbe8832ad5d5b41f05f714e8c4611d8f2262f8d43e5aa34
-  data.tar.gz: 44bdfbbfea06be2b1c8bb77031aafb0ad777905fab94e004e55b548e55d8508253cf70e019923d40dd933bfbef020566080221b3b00338a910c03cad3ef6dae4
+  metadata.gz: 850dc955f1fe35f6b2cce96ef442ca6cd85f4db8f6a7451970fed196f04872a130e152f702bec6401dea979e205009fb431d545fb4b275cc6de0e8004ae18234
+  data.tar.gz: fec4d32d0a6e270839e1d8b8acd1e336e639f9040fd3340684fec906cf7ef1285e8e29d5e1d86daf20b9b37deedca409704e75bb882aebe8bcddc60eb9099b14

data/HISTORY.md

@@ -1,3 +1,16 @@
+# 3.2.0
+
+* Add dam_uploads and dam_static to paths
+
+# 3.1.0
+
+* Add options for ignoring and preventing parsing collections
+* Fix potential null reference
+
+# 3.0.2
+
+* Remove excerpt from output
+
 # 3.0.1
 
 * Support aliases in YAML configuration files

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')
@@ -157,7 +168,7 @@ module CloudCannonJekyll
     def document_type(doc)
       if IS_JEKYLL_2_X_X && (doc.instance_of?(Jekyll::Post) || doc.instance_of?(Jekyll::Draft))
         :posts
-      elsif doc.respond_to? :type
+      elsif doc.respond_to?(:type)
         doc.type
       elsif doc.respond_to?(:collection)
         doc.collection.label.to_sym
@@ -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
@@ -188,11 +197,12 @@ module CloudCannonJekyll
       data = if legacy_doc?(doc)
                legacy_document_data(doc)
              elsif doc.respond_to?(:data)
-               doc.data
+               doc.data.dup
              else
                {}
              end
 
+      data.delete('excerpt')
       defaults = @site.frontmatter_defaults.all(doc.relative_path, document_type(doc))
       defaults.merge(data)
     end

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

@@ -70,6 +70,8 @@ module CloudCannonJekyll
       {
         static: '',
         uploads: @config.dig('paths', 'uploads') || 'uploads',
+        dam_uploads: @config.dig('paths', 'dam_uploads') || '',
+        dam_static: @config.dig('paths', 'dam_static') || '',
         data: @data_dir,
         collections: @collections_dir,
         layouts: @site_config['layouts_dir'] || '_layouts'

data/lib/cloudcannon-jekyll/version.rb

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

data/script/test-all-versions

@@ -4,6 +4,7 @@ set -ex
 
 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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.2.0
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-08-30 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