cloudcannon-jekyll 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 400439f9c6fb804aca466171d82c98d2b9925547ea3b4e2b0d08eafe92b3c8dd
-  data.tar.gz: 5867df83dfb8e2adecb88812e285db78582be51b52f7809a25931e8cd7bdc815
+  metadata.gz: 34076270fab6ebafaa9530d0898bc08274f902cc86e6fb2e13890d4a69440854
+  data.tar.gz: 4036d2f037e7c36e31c112fcf4b296bd4afbb44f8d643aba36909108893b3b86
 SHA512:
-  metadata.gz: 7caed857729fb823104ffad2a2e6229dd9009a5522eb13a945d2bb3fee43cad093547740ba862d98749da7a3686f520f0e738786b220e2243ebbe61e551fb725
-  data.tar.gz: 5036b4de220e4624312952d2c67b27ed77784ef74c4f3e36baee1367f5dc8251854a3529c4c9e80655406c9fe65b8e682782d137e52f649e2f8d0dbcc474a2e8
+  metadata.gz: 5ebaeaf4c7678a09859d0a845b1e4280c88ca1606099cf3e19ab7cc5a4d5a0ee2d2b18b5e827204d528915ed6d5281b089d9aa2baec4e0537d8efe5e0c263223
+  data.tar.gz: 63e881e3242696fa1faad9ae166a0e121ab58a5895782c2eb2d3c474401da7993c7a40cf138cb22195bfcdf8c092a3ba446f1de4f0fd1eb5b50ca0469b8e72c0

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

@@ -26,10 +26,7 @@
 	},
 	"pages": {{ site.html_pages | cc_jsonify }},
 	"static-pages": {{ site.static_files | cc_static_files_jsonify }},
-	{% if site.cloudcannon.data.first %}{% assign data_seen = false %}
-	"data": {
-		{% for data in site.data %}{% assign key = data[0] %}{% if site.cloudcannon.data[key] %}{% if data_seen %},{% endif %}{{ data[0] | cc_jsonify }}: {{ data[1] | cc_jsonify }}{% assign data_seen = true %}{% endif %}{% endfor %}},
-	{% elsif site.cloudcannon.data %}"data": {{ site.data | cc_jsonify }},{% endif %}
+	"data": {{ data | cc_jsonify }},
 	{% if config.baseurl %}
 		"base-url": {{ config.baseurl | cc_jsonify }},
 	{% endif %}

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

@@ -25,10 +25,7 @@
 	},
 	"pages": {{ site.html_pages | cc_jsonify }},
 	"static-pages": {{ site.static_files | cc_static_files_jsonify }},
-	{% if site.cloudcannon.data.first %}{% assign data_seen = false %}
-	"data": {
-		{% for data in site.data %}{% assign key = data[0] %}{% if site.cloudcannon.data[key] %}{% if data_seen %},{% endif %}{{ data[0] | cc_jsonify }}: {{ data[1] | cc_jsonify }}{% assign data_seen = true %}{% endif %}{% endfor %}},
-	{% elsif site.cloudcannon.data %}"data": {{ site.data | cc_jsonify }},{% endif %}
+	"data": {{ data | cc_jsonify }},
 	{% if config.baseurl %}
 		"base-url": {{ config.baseurl | cc_jsonify }},
 	{% endif %}

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

@@ -27,21 +27,7 @@
 	},
 	"pages": {{ site.html_pages | cc_jsonify }},
 	"static-pages": {{ site.static_files | cc_static_files_jsonify }},
-	{% if site.cloudcannon.data.first -%}
-		"data": {
-			{%- assign data_seen = false %}
-			{%- for data in site.data %}
-				{%- assign key = data[0] %}
-				{%- if site.cloudcannon.data[key] %}
-					{%- if data_seen %},{% endif -%}
-					{{ data[0] | cc_jsonify }}: {{ data[1] | cc_jsonify }}
-					{%- assign data_seen = true %}
-				{%- endif %}
-			{%- endfor -%}
-		},
-	{% elsif site.cloudcannon.data -%}
-		"data": {{ site.data | cc_jsonify }},
-	{%- endif %}
+	"data": {{ data | cc_jsonify }},
 	{% if config.baseurl -%}
 		"base-url": {{ config.baseurl | cc_jsonify }},
 	{%- endif %}

data/lib/cloudcannon-jekyll/generator.rb

@@ -18,6 +18,7 @@ module CloudCannonJekyll
       @reader = Reader.new(@site)
 
       collections_config = process_collections_config
+      data = process_data
 
       payload = @site.site_payload.merge({
         "gem_version" => CloudCannonJekyll::VERSION,
@@ -33,6 +34,7 @@ module CloudCannonJekyll
         "config"             => @site.config,
         "collections_config" => collections_config,
         "drafts"             => drafts,
+        "data"               => data,
       }))
     end
 
@@ -55,6 +57,20 @@ module CloudCannonJekyll
       @site.config["collections_dir"] || ""
     end
 
+    def process_data
+      cc_data = @site.config.dig("cloudcannon", "data")
+      data = if cc_data == true
+               @site.data&.dup
+             elsif cc_data&.is_a?(Hash)
+               @site.data&.select { |key, _| cc_data.key?(key) }
+             end
+
+      data ||= {}
+      data["categories"] ||= @site.categories.keys
+      data["tags"] ||= @site.tags.keys
+      data
+    end
+
     def data_dir
       @site.config["data_dir"] || "_data"
     end

data/lib/cloudcannon-jekyll/version.rb

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

metadata

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