cloudcannon-jekyll 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa855266f0cf697d2c9933a087c363ee3f1b81659a71f0b9dbdc2d36d42d5c29
-  data.tar.gz: d43d27f97b01e437f4ca6e4f73b066cd7fa53aa67623637a43edfa6b9931cf28
+  metadata.gz: 34076270fab6ebafaa9530d0898bc08274f902cc86e6fb2e13890d4a69440854
+  data.tar.gz: 4036d2f037e7c36e31c112fcf4b296bd4afbb44f8d643aba36909108893b3b86
 SHA512:
-  metadata.gz: 8e9dc486faa0469d5a93b68a48f8c9bbc36330db04e383ac6e801491581a768aa0c57705b09274a4585d1b796ae4b7a097d1209b17cfa6fc5150b57e680a7af9
-  data.tar.gz: 37973b235d6ba9c4e30590d25b01de05cc027f90539ca51bc3438b1a09fc510323bbd19cb58e6083e89c683b27caab655f8be0233d6c27e8b282d4cf830f40cc
+  metadata.gz: 5ebaeaf4c7678a09859d0a845b1e4280c88ca1606099cf3e19ab7cc5a4d5a0ee2d2b18b5e827204d528915ed6d5281b089d9aa2baec4e0537d8efe5e0c263223
+  data.tar.gz: 63e881e3242696fa1faad9ae166a0e121ab58a5895782c2eb2d3c474401da7993c7a40cf138cb22195bfcdf8c092a3ba446f1de4f0fd1eb5b50ca0469b8e72c0

data/HISTORY.md

@@ -1,3 +1,17 @@
+# 2.1.0
+
+* Add `_instance_values` to global scope
+
+# 2.0.2
+
+* Add `_enabled_editors` to global scope
+* Increase max jsonify depth
+* Remove unused key swaps
+
+# 2.0.1
+
+* Fix potential for null keys in cc_jsonify filter
+
 # 2.0.0
 
 * Rename a number of top level configuration keys to match source keys

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

@@ -17,7 +17,7 @@
 	{% if config.timezone %}
 		"timezone": {{ config.timezone | cc_jsonify }},
 	{% endif %}
-	"collections-config": {{ collections_config | cc_jsonify: 'collections' }},
+	"collections-config": {{ collections_config | cc_jsonify }},
 	"collections": {
 		"drafts": {{ drafts | cc_jsonify }},
 		"posts": {{ site.posts | reverse | cc_jsonify }}{% if site.collections.size > 0 %},{% endif %}
@@ -26,16 +26,19 @@
 	},
 	"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 %}
 	{% if config._comments %}
 		"_comments": {{ config._comments | cc_jsonify }},
 	{% endif %}
+	{% if config._enabled_editors %}
+		"_enabled_editors": {{ config._enabled_editors | cc_jsonify }},
+	{% endif %}
+	{% if config._instance_values %}
+		"_instance_values": {{ config._instance_values | cc_jsonify }},
+	{% endif %}
 	{% if config._options %}
 		"_options": {{ config._options | cc_jsonify }},
 	{% endif %}
@@ -63,7 +66,7 @@
 		"layouts": {{ config.layouts_dir | cc_jsonify }}
 	},
 	{% if config._array_structures %}
-		"_array_structures": {{ config._array_structures | cc_jsonify: nil, 50 }},
+		"_array_structures": {{ config._array_structures | cc_jsonify: 50 }},
 	{% endif %}
 	{% assign select_data = config | cc_select_data_jsonify %}
 	{% if select_data %}

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

@@ -17,7 +17,7 @@
 	{% if config.timezone %}
 		"timezone": {{ config.timezone | cc_jsonify }},
 	{% endif %}
-	"collections-config": {{ collections_config | cc_jsonify: 'collections' }},
+	"collections-config": {{ collections_config | cc_jsonify }},
 	"collections": {
 		"drafts": {{ drafts | cc_jsonify }}{% if site.collections.size > 0 %},{% endif %}
 		{% for collection in site.collections %}"{{ collection.label | xml_escape }}": {{ collection.docs | cc_jsonify }}{% unless forloop.last %},{% endunless %}
@@ -25,16 +25,19 @@
 	},
 	"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 %}
 	{% if config._comments %}
 		"_comments": {{ config._comments | cc_jsonify }},
 	{% endif %}
+	{% if config._enabled_editors %}
+		"_enabled_editors": {{ config._enabled_editors | cc_jsonify }},
+	{% endif %}
+	{% if config._instance_values %}
+		"_instance_values": {{ config._instance_values | cc_jsonify }},
+	{% endif %}
 	{% if config._options %}
 		"_options": {{ config._options | cc_jsonify }},
 	{% endif %}
@@ -62,7 +65,7 @@
 		"layouts": {{ config.layouts_dir | cc_jsonify }}
 	},
 	{% if config._array_structures %}
-		"_array_structures": {{ config._array_structures | cc_jsonify: nil, 50 }},
+		"_array_structures": {{ config._array_structures | cc_jsonify: 50 }},
 	{% endif %}
 	{% assign select_data = config | cc_select_data_jsonify %}
 	{% if select_data %}

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

@@ -17,7 +17,7 @@
 	{% if config.timezone -%}
 		"timezone": {{ config.timezone | cc_jsonify }},
 	{%- endif %}
-	"collections-config": {{ collections_config | cc_jsonify: 'collections' }},
+	"collections-config": {{ collections_config | cc_jsonify }},
 	"collections": {
 		"drafts": {{ drafts | cc_jsonify }}{% if site.collections.size > 0 %},{% endif %}
 		{%- for collection in site.collections -%}
@@ -27,27 +27,19 @@
 	},
 	"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 %}
 	{% if config._comments -%}
 		"_comments": {{ config._comments | cc_jsonify }},
 	{%- endif %}
+	{% if config._enabled_editors -%}
+		"_enabled_editors": {{ config._enabled_editors | cc_jsonify }},
+	{%- endif %}
+	{% if config._instance_values -%}
+		"_instance_values": {{ config._instance_values | cc_jsonify }},
+	{%- endif %}
 	{% if config._options -%}
 		"_options": {{ config._options | cc_jsonify }},
 	{%- endif %}
@@ -75,7 +67,7 @@
 		"layouts": {{ config.layouts_dir | cc_jsonify }}
 	},
 	{% if config._array_structures -%}
-		"_array_structures": {{ config._array_structures | cc_jsonify: nil, 50 }},
+		"_array_structures": {{ config._array_structures | cc_jsonify: 50 }},
 	{%- endif %}
 	{% assign select_data = config | cc_select_data_jsonify -%}
 	{% if select_data -%}

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/jsonify-filter.rb

@@ -7,19 +7,6 @@ module CloudCannonJekyll
   module JsonifyFilter
     STATIC_EXTENSIONS = [".html", ".htm"].freeze
 
-    CC_JSONIFY_KEY_SWAPS = {
-      "collections" => {
-        "_sort_key"      => "_sort-key",
-        "_subtext_key"   => "_subtext-key",
-        "_image_key"     => "_image-key",
-        "_image_size"    => "_image-size",
-        "_singular_name" => "_singular-name",
-        "_singular_key"  => "_singular-key",
-        "_disable_add"   => "_disable-add",
-        "_add_options"   => "_add-options",
-      },
-    }.freeze
-
     @simple_types = [
       String,
       Numeric,
@@ -60,7 +47,7 @@ module CloudCannonJekyll
       prevent += %w(content output next previous excerpt)
 
       out = data.map do |key, value|
-        next if prevent.include? key
+        next if prevent.include?(key) || key.nil?
 
         prevent.push key
         next_max_depth = key == "_array_structures" ? 20 : max_depth
@@ -137,19 +124,19 @@ module CloudCannonJekyll
       "{#{out.join(",")}}"
     end
 
-    def self.array_to_json(input, depth, max_depth, key_swaps = {})
+    def self.array_to_json(input, depth, max_depth)
       array = input.map do |value|
-        JsonifyFilter.to_json(value, depth, max_depth, key_swaps)
+        JsonifyFilter.to_json(value, depth, max_depth)
       end
 
       "[#{array.join(",")}]"
     end
 
-    def self.hash_to_json(input, depth, max_depth, key_swaps = {})
+    def self.hash_to_json(input, depth, max_depth)
       out = input.map do |key, value|
         next_max_depth = key == "_array_structures" ? 20 : max_depth
-        string_key = (key_swaps[key] || key).to_s.to_json
-        "#{string_key}: #{JsonifyFilter.to_json(value, depth, next_max_depth, key_swaps)}"
+        string_key = key.to_s.to_json
+        "#{string_key}: #{JsonifyFilter.to_json(value, depth, next_max_depth)}"
       end
 
       "{#{out.join(",")}}"
@@ -163,11 +150,11 @@ module CloudCannonJekyll
                    baseurl show_dir_listing permalink paginate_path timezone quiet verbose defaults
                    liquid kramdown title url description uploads_dir _comments _options _editor
                    _explore _source_editor _array_structures maruku redcloth rdiscount redcarpet
-                   gems plugins cloudcannon _collection_groups)
+                   gems plugins cloudcannon _collection_groups _enabled_editors _instance_values)
 
       out = input.map do |key, value|
         next unless value.is_a?(Array) || value.is_a?(Hash)
-        next if prevent.include? key
+        next if prevent.include?(key) || key.nil?
 
         prevent.push key
         "#{key.to_s.to_json}: #{JsonifyFilter.to_json(value, depth)}"
@@ -178,7 +165,7 @@ module CloudCannonJekyll
       "{#{out.join(",")}}" if out.any?
     end
 
-    def self.to_json(input, depth, max_depth = 9, key_swaps = {})
+    def self.to_json(input, depth, max_depth = 12)
       depth += 1
 
       if depth > max_depth || (depth > 3 && JsonifyFilter.document_type?(input))
@@ -194,9 +181,9 @@ module CloudCannonJekyll
       elsif input.is_a?(Jekyll::Document)
         JsonifyFilter.document_to_json(input, depth, max_depth)
       elsif input.is_a?(Array)
-        JsonifyFilter.array_to_json(input, depth, max_depth, key_swaps)
+        JsonifyFilter.array_to_json(input, depth, max_depth)
       elsif input.is_a?(Hash)
-        JsonifyFilter.hash_to_json(input, depth, max_depth, key_swaps)
+        JsonifyFilter.hash_to_json(input, depth, max_depth)
       else
         input.class.to_s.prepend("UNSUPPORTED:").to_json
       end
@@ -220,12 +207,8 @@ module CloudCannonJekyll
       end
     end
 
-    def cc_jsonify(input, key_swaps_key = nil, max_depth = 8)
-      if CC_JSONIFY_KEY_SWAPS.key? key_swaps_key
-        JsonifyFilter.to_json(input, 0, max_depth, CC_JSONIFY_KEY_SWAPS[key_swaps_key])
-      else
-        JsonifyFilter.to_json(input, 0, max_depth)
-      end
+    def cc_jsonify(input, max_depth = 12)
+      JsonifyFilter.to_json(input, 0, max_depth)
     end
   end
 end

data/lib/cloudcannon-jekyll/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudCannonJekyll
-  VERSION = "2.0.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.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll