cloudcannon-jekyll 2.3.0 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a8badc065e548c467c7c794747e3f7147eeb8b200f19fe73aef583a026ab657
-  data.tar.gz: e6fa47b31b8801e4f6b106574cf15584a56299be5dff80128a2c12b325d6d77e
+  metadata.gz: '09003d2ad672bafc2165e8a667a19c2a730651ddba0fd201904a8575e4c5bba0'
+  data.tar.gz: 5988731017bdd55c1d2600409ee8e0380847552a79bdc6ef0ff445e810132715
 SHA512:
-  metadata.gz: 60a58b7deaeaff3265a13ad0b14b1fe68229b53f1b413a08d7859167c3acc3da2ecef016372b08f630705edd14040167be6e9b15323344948e6856f4666c3bf6
-  data.tar.gz: 5c3d1b8402f2178eea44a03743d9d3985a19984795ff320dc9e34e106c3d19e0d34782e34f8d6905d039b36917a87bfe57dfe88f4288b4bf2575fe3fddc13acf
+  metadata.gz: beabc519bea263502f085226ffb98b27d6aa2cd882ca5efe710f63287afaaaeb80f47eea3f118447bbed3d1f89c51c17f6d77134adc5a3f7e11a983ce969e53e
+  data.tar.gz: d77019b69275bb04a010fa7ce8a0c3763e7a9e1ce449741f62a9e945a5454ffb03fb7395c463cc4434722653156f989a4be81bdac6781bc0efa495c7afc2a2be

data/HISTORY.md

@@ -1,3 +1,20 @@
+# 2.3.4
+
+* Add `_editables`
+
+# 2.3.3
+
+* Add `_structures`
+
+# 2.3.2
+
+* Add `_inputs`
+
+# 2.3.1
+
+* Fix issue where pages config overwrites default
+* Fix issue when a site has no pages
+
 # 2.3.0
 
 * Fix output for drafts collection config

data/lib/cloudcannon-jekyll/_cloudcannon/info-2.x.json

@@ -38,6 +38,12 @@
 	{% if config._options %}
 		"_options": {{ config._options | cc_jsonify }},
 	{% endif %}
+	{% if config._inputs %}
+		"_inputs": {{ config._inputs | cc_jsonify }},
+	{% endif %}
+	{% if config._editables %}
+		"_editables": {{ config._editables | cc_jsonify }},
+	{% endif %}
 	{% if config._collection_groups %}
 		"_collection_groups": {{ config._collection_groups | cc_jsonify }},
 	{% endif %}
@@ -60,6 +66,9 @@
 		"collections": {{ config.collections_dir | cc_jsonify }},
 		"layouts": {{ config.layouts_dir | cc_jsonify }}
 	},
+	{% if config._structures %}
+		"_structures": {{ config._structures | cc_jsonify: 50 }},
+	{% endif %}
 	{% if config._array_structures %}
 		"_array_structures": {{ config._array_structures | cc_jsonify: 50 }},
 	{% endif %}

data/lib/cloudcannon-jekyll/_cloudcannon/info-3.0-4.x.json

@@ -38,6 +38,12 @@
 	{% if config._options %}
 		"_options": {{ config._options | cc_jsonify }},
 	{% endif %}
+	{% if config._inputs %}
+		"_inputs": {{ config._inputs | cc_jsonify }},
+	{% endif %}
+	{% if config._editables %}
+		"_editables": {{ config._editables | cc_jsonify }},
+	{% endif %}
 	{% if config._collection_groups %}
 		"_collection_groups": {{ config._collection_groups | cc_jsonify }},
 	{% endif %}
@@ -60,6 +66,9 @@
 		"collections": {{ config.collections_dir | cc_jsonify }},
 		"layouts": {{ config.layouts_dir | cc_jsonify }}
 	},
+	{% if config._structures %}
+		"_structures": {{ config._structures | cc_jsonify: 50 }},
+	{% endif %}
 	{% if config._array_structures %}
 		"_array_structures": {{ config._array_structures | cc_jsonify: 50 }},
 	{% endif %}

data/lib/cloudcannon-jekyll/_cloudcannon/info.json

@@ -41,6 +41,12 @@
 	{% if config._options -%}
 		"_options": {{ config._options | cc_jsonify }},
 	{%- endif %}
+	{% if config._inputs -%}
+		"_inputs": {{ config._inputs | cc_jsonify }},
+	{%- endif %}
+	{% if config._editables -%}
+		"_editables": {{ config._editables | cc_jsonify }},
+	{%- endif %}
 	{% if config._collection_groups -%}
 		"_collection_groups": {{ config._collection_groups | cc_jsonify }},
 	{%- endif %}
@@ -63,6 +69,9 @@
 		"collections": {{ config.collections_dir | cc_jsonify }},
 		"layouts": {{ config.layouts_dir | cc_jsonify }}
 	},
+	{% if config._structures -%}
+		"_structures": {{ config._structures | cc_jsonify: 50 }},
+	{%- endif %}
 	{% if config._array_structures -%}
 		"_array_structures": {{ config._array_structures | cc_jsonify: 50 }},
 	{%- endif %}

data/lib/cloudcannon-jekyll/generator.rb

@@ -44,6 +44,7 @@ module CloudCannonJekyll
     end
     # rubocop:enable Metrics/MethodLength
 
+    # rubocop:disable Metrics/CyclomaticComplexity
     def generate_collections_config(pages)
       collections = @site.config["collections"]&.dup || {}
       collections_config = @site.config.dig("cloudcannon", "collections")&.dup || {}
@@ -54,18 +55,20 @@ module CloudCannonJekyll
         collections_config[key] = (collections_config[key] || {}).merge(defaults)
       end
 
-      unless pages.empty?
-        collections_config["pages"] ||= {
+      unless pages.empty? || collections.key?("pages")
+        pages_defaults = {
           "output" => true,
           "filter" => "strict",
           "path"   => "",
         }
+
+        collections_config["pages"] = pages_defaults.merge(collections_config["pages"] || {})
       end
 
       collections_config
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def generate_collections(collections_config, pages, drafts)
       split_posts = group_by_category_folder(all_posts, "posts")
       split_drafts = group_by_category_folder(drafts, "drafts")
@@ -83,9 +86,11 @@ module CloudCannonJekyll
         collections[key] ||= []
       end
 
-      collections["pages"] = pages if collections["pages"].empty? && !pages.empty?
+      has_collection_pages = collections.key?("pages") && !collections["pages"].empty?
+      collections["pages"] = pages unless pages.empty? || has_collection_pages
       collections
     end
+    # rubocop:enable Metrics/PerceivedComplexity
     # rubocop:enable Metrics/CyclomaticComplexity
 
     def generate_data

data/lib/cloudcannon-jekyll/jsonify-filter.rb

@@ -50,7 +50,7 @@ module CloudCannonJekyll
         next if prevent.include?(key) || key.nil?
 
         prevent.push key
-        next_max_depth = key == "_array_structures" ? 20 : max_depth
+        next_max_depth = %w(_array_structures _structures).include?(key) ? 20 : max_depth
         "#{key.to_json}: #{JsonifyFilter.to_json(value, depth, next_max_depth)}"
       end
 
@@ -134,7 +134,7 @@ module CloudCannonJekyll
 
     def self.hash_to_json(input, depth, max_depth)
       out = input.map do |key, value|
-        next_max_depth = key == "_array_structures" ? 20 : max_depth
+        next_max_depth = %w(_array_structures _structures).include?(key) ? 20 : max_depth
         string_key = key.to_s.to_json
         "#{string_key}: #{JsonifyFilter.to_json(value, depth, next_max_depth)}"
       end

data/lib/cloudcannon-jekyll/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudCannonJekyll
-  VERSION = "2.3.0"
+  VERSION = "2.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.4
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-07 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll