cloudcannon-jekyll 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53ae411ed9f49f16499909a76dac7d5ed5b2081e5bfe68f689bab9d50579f5f3
-  data.tar.gz: 8a7706bf17a6f5ccb3b2c7d25d2b13ba32b4e957e2f190cf2cdc889f641cb16e
+  metadata.gz: 8ba3dd6e0f966b1e258e25c63e10ca6b38d6b1fa5eef20867e35f4e1d3679584
+  data.tar.gz: 6cc8bc3ecc01cabcbce3e9f9691a9acf296a8e703651f1c9e6defd59c9467660
 SHA512:
-  metadata.gz: f86f4d41b7ad221de5008fe53d1ff81e0f3d74b2e096d41169db2b311ecbc12d62fe176d285171f2a0a54e4ac33eb3b8a6011296e52c2792b89e11f0fa0d7c56
-  data.tar.gz: 9b0ff63a9a2753e8195b99c05607c08225f33636898ae31eb082c77ad930c7c6308c4393c019e0a74484eb9acb53c3d12ad50b923da47773e7a6342dc6a32441
+  metadata.gz: 0df6f5ab7cef31e3481b85a0485bddebbd088a7211dc5a82bd7487964c5650963ed583feaf8674603c8831fef5f00b5e4376dc6d5377bf05da6c9c0653a0046e
+  data.tar.gz: 80ad95aa7b61d49a41f908f834d616b493d027d5f9c2feaf38205db236895a19be9d320c8736f7a8d2ec01909e357d012615d2b09d6f565c5772607ed2c13638

data/HISTORY.md

@@ -1,3 +1,9 @@
+# 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

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 %}
@@ -36,6 +36,9 @@
 	{% if config._comments %}
 		"_comments": {{ config._comments | cc_jsonify }},
 	{% endif %}
+	{% if config._enabled_editors %}
+		"_enabled_editors": {{ config._enabled_editors | 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 %}
@@ -35,6 +35,9 @@
 	{% if config._comments %}
 		"_comments": {{ config._comments | cc_jsonify }},
 	{% endif %}
+	{% if config._enabled_editors %}
+		"_enabled_editors": {{ config._enabled_editors | 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 -%}
@@ -48,6 +48,9 @@
 	{% if config._comments -%}
 		"_comments": {{ config._comments | cc_jsonify }},
 	{%- endif %}
+	{% if config._enabled_editors -%}
+		"_enabled_editors": {{ config._enabled_editors | cc_jsonify }},
+	{%- endif %}
 	{% if config._options -%}
 		"_options": {{ config._options | cc_jsonify }},
 	{%- endif %}
@@ -75,7 +78,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/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,
@@ -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,7 +150,7 @@ 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)
 
       out = input.map do |key, value|
         next unless value.is_a?(Array) || value.is_a?(Hash)
@@ -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.1"
+  VERSION = "2.0.2"
 end

metadata

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