cloudcannon-jekyll 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37060b4654f27c7236d0952625b91b56b081c6be24c1a76c034036a80ba1735d
-  data.tar.gz: 055c7dbc77a247c254b05bcecedf5a45a9595c0b4ceae671676ec32fa1f771c3
+  metadata.gz: 0fed35269d24b4a1fd24b64ff5d89264e69e31b4d2b1451923824ae994ed43df
+  data.tar.gz: 3f0338deb85d35b56f577f90408ad11660479a05d203ce4b5a17588b44439e0c
 SHA512:
-  metadata.gz: 4b9536ca8a4097fa234c35a30226a9c17bd9a020e5d883ef82f38883a9a93d6e8f6afbfe17197b949468baec9d6a077f3467ec9b3a23fdaf19740590ce28ba1b
-  data.tar.gz: 89bdca52d720c403ddcaf8dc3d20debc1e1da51664874585b132332b199ef444c20c5104686b7ab576b0b5a6ccfad4cabd91157bc38e08a78ca5300e313ea211
+  metadata.gz: 20e086e703f86bf8221b88cc9e419b7f1715976a42fa736a0e0d08df2a1e062b583f0bfdb201f2ee5bfde4cbd1e8a2a8bb0f23436eaba8e5b3275467fec9e08e
+  data.tar.gz: 728c3feb864fcc8eed871fd188d4304870733e66074657af3a5ceeef4760d4f38478b59dacfa606c454adde6ff8ba15e45f0da82082535858316cc666d76b027

data/HISTORY.md

@@ -1,3 +1,16 @@
+# 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
+
 # 3.0.0
 
 * Add `collections_config_override`

data/README.md

@@ -12,7 +12,7 @@ create a JSON file used to automatically integrate the site with CloudCannon.
 
 - [Installation](#installation)
 - [Configuration](#configuration)
-- [Development](#plugin-options)
+- [Development](#development)
 - [License](#license)
 
 ***

data/lib/cloudcannon-jekyll/config.rb

@@ -55,7 +55,7 @@ module CloudCannonJekyll
     end
 
     def config_file(path)
-      loaded = YAML.safe_load(File.read(path)) # Also works for JSON
+      loaded = YAML.safe_load(File.read(path), aliases: true) # Also loads JSON
       Logger.info "⚙️ Using config file at #{path.bold}"
       loaded
     rescue Errno::ENOENT
@@ -88,11 +88,11 @@ module CloudCannonJekyll
         '_inputs' => @site_config['_inputs'],
         '_editables' => @site_config['_editables'],
         '_structures' => @site_config['_structures'],
+        '_enabled_editors' => @site_config['_enabled_editors'],
 
         # Deprecated keys
         '_array_structures' => @site_config['_array_structures'],
         '_comments' => @site_config['_comments'],
-        '_enabled_editors' => @site_config['_enabled_editors'],
         '_instance_values' => @site_config['_instance_values'],
         '_options' => @site_config['_options']
       }

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudCannonJekyll
-  VERSION = '3.0.0'
+  VERSION = '3.1.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.0
+  version: 3.1.0
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-12 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