cloudcannon-jekyll 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 71e33735df4c89f5a837224c14fc5830262d6296
-  data.tar.gz: 748068f64fd86fb1514533a9b84f8576c7cd79e1
+SHA256:
+  metadata.gz: 9ae3c8abe082ec3f37215dec374610ec9afdbcfdf657088948285375e847410f
+  data.tar.gz: 44974881ddba3a62062337da11a56d1fbdd406fa04cead477b216866d88bf5cc
 SHA512:
-  metadata.gz: '0872a4182a09614927851140c865ad761c5f2ee41c8e79798ad27efc08ef270b1ec9acf60c75da436aea327cf4e11cade050f308921807116fb18e8d8d07fbe5'
-  data.tar.gz: 6f9207baa8d6084af8a968c2aad4f3d7c9e16e1ec6283408c372e5db156cc890b75e9f22cd98e59619f37172d4981fb859b728f5935d0d3fac40ad17b589ee0e
+  metadata.gz: 8d894aea066bba58238ac0a2dbcc277eee56c84d3aeddea107089db51717266f313001d187ac6f5bf077f3f46c044b5842e3e02afa96a0d38fcc8f967889a1c2
+  data.tar.gz: f51833d3e91c35ca0e2fa0020b4844a0727c969bf026d01f83922c384ec5b4a0bc68afa11032434a8947281664daf0f5b89f44066d4fb0b76969e8a056486923

data/.rubocop.yml

@@ -4,7 +4,7 @@ inherit_gem:
   rubocop-jekyll: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.4
   Include:
     - lib/**/*.rb
 
@@ -20,13 +20,33 @@ AllCops:
     - script/**/*
     - vendor/**/*
     - gemfiles/**/*
-    - lib/cloudcannon-jekyll/safe-jsonify-filter.rb # TODO remove this and fix warnings
 
 Naming/MemoizedInstanceVariableName:
   Exclude:
     - lib/cloudcannon-jekyll/page-without-a-file.rb
 
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - lib/cloudcannon-jekyll/jsonify-filter.rb # TODO remove this and fix warnings
+
+Metrics/PerceivedComplexity:
+  Exclude:
+    - lib/cloudcannon-jekyll/jsonify-filter.rb # TODO remove this and fix warnings
+
+Metrics/MethodLength:
+  Exclude:
+    - lib/cloudcannon-jekyll/jsonify-filter.rb # TODO remove this and fix warnings
+
+Metrics/AbcSize:
+  Exclude:
+    - lib/cloudcannon-jekyll/jsonify-filter.rb # TODO remove this and fix warnings
+
 # This is excluded since the ruby target is 2.3.8 which doesn't support String.match?(Regexp)
 Performance/RegexpMatch:
   Exclude:
     - lib/cloudcannon-jekyll/generator.rb
+
+# This is excluded since Jekyll used this and we need to check for it
+Lint/UnifiedInteger:
+  Exclude:
+    - lib/cloudcannon-jekyll/jsonify-filter.rb

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec

data/HISTORY.md

@@ -1,3 +1,10 @@
+# 0.2.1
+
+* Add gem information and time to output config file
+* Fix missing in-place compact
+* Fix source being output as full path on disk
+* Read content for output config file directly from site config
+
 # 0.2.0
 
 * Add defaults and input-options keys to config output

data/cloudcannon-jekyll.gemspec

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "cloudcannon-jekyll/version"
@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "jekyll", ">= 2.4.0", "< 4"
 
+  spec.add_development_dependency "json_schemer", "~> 0.2.4"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "rubocop", "~> 0.80"
   spec.add_development_dependency "rubocop-jekyll", "~> 0.11"
-  spec.add_development_dependency "json_schemer", "~> 0.2.4"
 end

data/lib/cloudcannon-jekyll.rb

@@ -5,10 +5,10 @@ require "jekyll"
 require_relative "cloudcannon-jekyll/page-without-a-file"
 require_relative "cloudcannon-jekyll/generator"
 require_relative "cloudcannon-jekyll/configuration"
-require_relative "cloudcannon-jekyll/safe-jsonify-filter"
+require_relative "cloudcannon-jekyll/jsonify-filter"
 require_relative "cloudcannon-jekyll/version"
 
-Liquid::Template.register_filter(CloudCannonJekyll::SafeJsonifyFilter)
+Liquid::Template.register_filter(CloudCannonJekyll::JsonifyFilter)
 
 # Hooks didn't exist in Jekyll 2 so we monkey patch to get an :after_reset hook
 if Jekyll::VERSION.start_with? "2"

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

@@ -1,45 +1,35 @@
 {
-	{% if site.timezone %}"timezone": {{ site.timezone | jsonify }},{% endif %}
-	"include": {{ site.include | jsonify }},
-	"exclude": {{ site.exclude | jsonify }},
-	{% if site.baseurl %}"base-url": {{ site.baseurl | jsonify }},{% endif %}
-	"collections": {
-		{% for collection in site.collections %}
-		"{{ collection[0] | xml_escape }}": {
-			"output": {{ collection[1].output | jsonify }},
-			"_sort-key": {{ collection[1]._sort_key | jsonify }},
-			"_subtext-key": {{ collection[1]._subtext_key | jsonify }},
-			"_image-key": {{ collection[1]._image_key | jsonify }},
-			"_image-size": {{ collection[1]._image_size | jsonify }},
-			"_singular-name": {{ collection[1]._singular_name | jsonify }},
-			"_singular-key": {{ collection[1]._singular_key | jsonify }},
-			"_disable-add": {{ collection[1]._disable_add | jsonify }},
-			"_icon": {{ collection[1]._icon | jsonify }},
-			"_add-options": {{ collection[1]._add_options | cc_safe_jsonify }}
-		}{% unless forloop.last %},{% endunless %}
-		{% endfor %}
+	"time": {{ site.time | cc_jsonify }},
+	"cloudcannon": {
+		"name": "cloudcannon-jekyll",
+		"version": {{ gem_version | cc_jsonify }}
 	},
-	{% if site._comments %}"comments": {{ site._comments | cc_safe_jsonify }},{% endif %}
-	{% if site._options %}"input-options": {{ site._options | cc_safe_jsonify }},{% endif %}
-	{% if site.defaults %}"defaults": {{ site.defaults | cc_safe_jsonify }},{% endif %}
-	{% if site._editor %}"editor": {
-		"default-path": {{ site._editor.default_path | jsonify }}
+	{% if config.timezone %}"timezone": {{ config.timezone | cc_jsonify }},{% endif %}
+	"include": {{ config.include | cc_jsonify }},
+	"exclude": {{ config.exclude | cc_jsonify }},
+	{% if config.baseurl %}"base-url": {{ config.baseurl | cc_jsonify }},{% endif %}
+	{% if config.collections %}"comments": {{ config.collections | cc_jsonify: 'collections' }},{% endif %}
+	{% if config._comments %}"comments": {{ config._comments | cc_jsonify }},{% endif %}
+	{% if config._options %}"input-options": {{ config._options | cc_jsonify }},{% endif %}
+	{% if config.defaults %}"defaults": {{ config.defaults | cc_jsonify }},{% endif %}
+	{% if config._editor %}"editor": {
+		"default-path": {{ config._editor.default_path | cc_jsonify }}
 	},{% endif %}
-	{% if site._source_editor %}"source-editor": {
-		"tab-size": {{ site._source_editor.tab_size | jsonify }},
-		"show-gutter": {{ site._source_editor.show_gutter | jsonify }},
-		"theme": {{ site._source_editor.theme | jsonify }}
+	{% if config._source_editor %}"source-editor": {
+		"tab-size": {{ config._source_editor.tab_size | cc_jsonify }},
+		"show-gutter": {{ config._source_editor.show_gutter | cc_jsonify }},
+		"theme": {{ config._source_editor.theme | cc_jsonify }}
 	},{% endif %}
-	{% if site._explore %}"explore": {{ site._explore | cc_safe_jsonify }},{% endif %}
+	{% if config._explore %}"explore": {{ config._explore | cc_jsonify }},{% endif %}
 	"paths": {
-		"uploads": {{ site.uploads_dir | jsonify }},
-		"plugins": {{ site.plugins_dir | jsonify }},
-		"data": {{ site.data_dir | jsonify }},
-		"collections": {{ site.collections_dir | jsonify }},
-		"includes": {{ site.includes_dir | jsonify }},
-		"layouts": {{ site.layouts_dir | jsonify }}
+		"uploads": {{ config.uploads_dir | cc_jsonify }},
+		"plugins": {{ config.plugins_dir | cc_jsonify }},
+		"data": {{ config.data_dir | cc_jsonify }},
+		"collections": {{ config.collections_dir | cc_jsonify }},
+		"includes": {{ config.includes_dir | cc_jsonify }},
+		"layouts": {{ config.layouts_dir | cc_jsonify }}
 	},
-	{% if site._array_structures %}"array-structures": {{ site._array_structures | cc_safe_jsonify }},{% endif %}
-	{% assign select_data = site | cc_site_select_data_jsonify %}{% if select_data %}"select-data": {{ select_data }},{% endif %}
-	"source": {{ site.source | jsonify }}
+	{% if config._array_structures %}"array-structures": {{ config._array_structures | cc_jsonify }},{% endif %}
+	{% assign select_data = config | cc_select_data_jsonify %}{% if select_data %}"select-data": {{ select_data }},{% endif %}
+	"source": {{ config.source | replace: pwd, "" | cc_jsonify }}
 }

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

@@ -1,45 +1,35 @@
 {
-	{% if site.timezone %}"timezone": {{ site.timezone | jsonify }},{% endif %}
-	"include": {{ site.include | jsonify }},
-	"exclude": {{ site.exclude | jsonify }},
-	{% if site.baseurl %}"base-url": {{ site.baseurl | jsonify }},{% endif %}
-	"collections": {
-		{% for collection in site.collections %}
-		"{{ collection.label | xml_escape }}": {
-			"output": {{ collection.output | jsonify }},
-			"_sort-key": {{ collection._sort_key | jsonify }},
-			"_subtext-key": {{ collection._subtext_key | jsonify }},
-			"_image-key": {{ collection._image_key | jsonify }},
-			"_image-size": {{ collection._image_size | jsonify }},
-			"_singular-name": {{ collection._singular_name | jsonify }},
-			"_singular-key": {{ collection._singular_key | jsonify }},
-			"_disable-add": {{ collection._disable_add | jsonify }},
-			"_icon": {{ collection._icon | jsonify }},
-			"_add-options": {{ collection._add_options | cc_safe_jsonify }}
-		}{% unless forloop.last %},{% endunless %}
-		{% endfor %}
+	"time": {{ site.time | cc_jsonify }},
+	"cloudcannon": {
+		"name": "cloudcannon-jekyll",
+		"version": {{ gem_version | cc_jsonify }}
 	},
-	{% if site._comments %}"comments": {{ site._comments | cc_safe_jsonify }},{% endif %}
-	{% if site._options %}"input-options": {{ site._options | cc_safe_jsonify }},{% endif %}
-	{% if site.defaults %}"defaults": {{ site.defaults | cc_safe_jsonify }},{% endif %}
-	{% if site._editor %}"editor": {
-		"default-path": {{ site._editor.default_path | jsonify }}
+	{% if config.timezone %}"timezone": {{ config.timezone | cc_jsonify }},{% endif %}
+	"include": {{ config.include | cc_jsonify }},
+	"exclude": {{ config.exclude | cc_jsonify }},
+	{% if config.baseurl %}"base-url": {{ config.baseurl | cc_jsonify }},{% endif %}
+	{% if config.collections %}"comments": {{ config.collections | cc_jsonify: 'collections' }},{% endif %}
+	{% if config._comments %}"comments": {{ config._comments | cc_jsonify }},{% endif %}
+	{% if config._options %}"input-options": {{ config._options | cc_jsonify }},{% endif %}
+	{% if config.defaults %}"defaults": {{ config.defaults | cc_jsonify }},{% endif %}
+	{% if config._editor %}"editor": {
+		"default-path": {{ config._editor.default_path | cc_jsonify }}
 	},{% endif %}
-	{% if site._source_editor %}"source-editor": {
-		"tab-size": {{ site._source_editor.tab_size | jsonify }},
-		"show-gutter": {{ site._source_editor.show_gutter | jsonify }},
-		"theme": {{ site._source_editor.theme | jsonify }}
+	{% if config._source_editor %}"source-editor": {
+		"tab-size": {{ config._source_editor.tab_size | cc_jsonify }},
+		"show-gutter": {{ config._source_editor.show_gutter | cc_jsonify }},
+		"theme": {{ config._source_editor.theme | cc_jsonify }}
 	},{% endif %}
-	{% if site._explore %}"explore": {{ site._explore | cc_safe_jsonify }},{% endif %}
+	{% if config._explore %}"explore": {{ config._explore | cc_jsonify }},{% endif %}
 	"paths": {
-		"uploads": {{ site.uploads_dir | jsonify }},
-		"plugins": {{ site.plugins_dir | jsonify }},
-		"data": {{ site.data_dir | jsonify }},
-		"collections": {{ site.collections_dir | jsonify }},
-		"includes": {{ site.includes_dir | jsonify }},
-		"layouts": {{ site.layouts_dir | jsonify }}
+		"uploads": {{ config.uploads_dir | cc_jsonify }},
+		"plugins": {{ config.plugins_dir | cc_jsonify }},
+		"data": {{ config.data_dir | cc_jsonify }},
+		"collections": {{ config.collections_dir | cc_jsonify }},
+		"includes": {{ config.includes_dir | cc_jsonify }},
+		"layouts": {{ config.layouts_dir | cc_jsonify }}
 	},
-	{% if site._array_structures %}"array-structures": {{ site._array_structures | cc_safe_jsonify }},{% endif %}
-	{% assign select_data = site | cc_site_select_data_jsonify %}{% if select_data %}"select-data": {{ select_data }},{% endif %}
-	"source": {{ site.source | jsonify }}
+	{% if config._array_structures %}"array-structures": {{ config._array_structures | cc_jsonify }},{% endif %}
+	{% assign select_data = config | cc_select_data_jsonify %}{% if select_data %}"select-data": {{ select_data }},{% endif %}
+	"source": {{ config.source | replace: pwd, "" | cc_jsonify }}
 }

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

@@ -1,67 +1,58 @@
 {
-	{% if site.timezone -%}
-		"timezone": {{ site.timezone | jsonify }},
+	"time": {{ site.time | cc_jsonify }},
+	"cloudcannon": {
+		"name": "cloudcannon-jekyll",
+		"version": {{ gem_version | cc_jsonify }}
+	},
+	{% if config.timezone -%}
+		"timezone": {{ config.timezone | cc_jsonify }},
 	{%- endif %}
-	"include": {{ site.include | jsonify }},
-	"exclude": {{ site.exclude | jsonify }},
-	{% if site.baseurl -%}
-		"base-url": {{ site.baseurl | jsonify }},
+	"include": {{ config.include | cc_jsonify }},
+	"exclude": {{ config.exclude | cc_jsonify }},
+	{% if config.baseurl -%}
+		"base-url": {{ config.baseurl | cc_jsonify }},
 	{%- endif %}
-	"collections": {
-		{%- for collection in site.collections -%}
-			"{{ collection.label | xml_escape }}": {
-				"output": {{ collection.output | jsonify }},
-				"_sort-key": {{ collection._sort_key | jsonify }},
-				"_subtext-key": {{ collection._subtext_key | jsonify }},
-				"_image-key": {{ collection._image_key | jsonify }},
-				"_image-size": {{ collection._image_size | jsonify }},
-				"_singular-name": {{ collection._singular_name | jsonify }},
-				"_singular-key": {{ collection._singular_key | jsonify }},
-				"_disable-add": {{ collection._disable_add | jsonify }},
-				"_icon": {{ collection._icon | jsonify }},
-				"_add-options": {{ collection._add_options | cc_safe_jsonify }}
-			}
-			{%- unless forloop.last %},{% endunless %}
-		{%- endfor -%}
-	},
-	{% if site._comments -%}
-		"comments": {{ site._comments | cc_safe_jsonify }},
+	{% if config.collections -%}
+		"collections": {{ config.collections | cc_jsonify: 'collections' }},
+	{%- endif %}
+	{% if config._comments -%}
+		"comments": {{ config._comments | cc_jsonify }},
 	{%- endif %}
-	{% if site._options -%}
-		"input-options": {{ site._options | cc_safe_jsonify }},
+	{% if config._options -%}
+		"input-options": {{ config._options | cc_jsonify }},
 	{%- endif %}
-	{% if site.defaults -%}
-		"defaults": {{ site.defaults | cc_safe_jsonify }},
+	{% if config.defaults -%}
+		"defaults": {{ config.defaults | cc_jsonify }},
 	{%- endif %}
-	{% if site._editor -%}
+	{% if config._editor -%}
 		"editor": {
-			"default-path": {{ site._editor.default_path | jsonify }}
+			"default-path": {{ config._editor.default_path | cc_jsonify }}
 		},
 	{%- endif %}
-	{% if site._source_editor -%}
+	{% if config._source_editor -%}
 		"source-editor": {
-			"tab-size": {{ site._source_editor.tab_size | jsonify }},
-			"show-gutter": {{ site._source_editor.show_gutter | jsonify }},
-			"theme": {{ site._source_editor.theme | jsonify }}
+			"tab-size": {{ config._source_editor.tab_size | cc_jsonify }},
+			"show-gutter": {{ config._source_editor.show_gutter | cc_jsonify }},
+			"theme": {{ config._source_editor.theme | cc_jsonify }}
 		},
 	{%- endif %}
-	{% if site._explore -%}
-		"explore": {{ site._explore | cc_safe_jsonify }},
+	{% if config._explore -%}
+		"explore": {{ config._explore | cc_jsonify }},
 	{%- endif %}
 	"paths": {
-		"uploads": {{ site.uploads_dir | jsonify }},
-		"plugins": {{ site.plugins_dir | jsonify }},
-		"data": {{ site.data_dir | jsonify }},
-		"collections": {{ site.collections_dir | jsonify }},
-		"includes": {{ site.includes_dir | jsonify }},
-		"layouts": {{ site.layouts_dir | jsonify }}
+		"uploads": {{ config.uploads_dir | cc_jsonify }},
+		"plugins": {{ config.plugins_dir | cc_jsonify }},
+		"data": {{ config.data_dir | cc_jsonify }},
+		"collections": {{ config.collections_dir | cc_jsonify }},
+		"includes": {{ config.includes_dir | cc_jsonify }},
+		"layouts": {{ config.layouts_dir | cc_jsonify }}
 	},
-	{% if site._array_structures -%}
-		"array-structures": {{ site._array_structures | cc_safe_jsonify }},
+	{% if config._array_structures -%}
+		"array-structures": {{ config._array_structures | cc_jsonify }},
 	{%- endif %}
-	{% assign select_data = site | cc_site_select_data_jsonify -%}
+	{% assign select_data = config | cc_select_data_jsonify -%}
 	{% if select_data -%}
 		"select-data": {{ select_data }},
 	{%- endif %}
-	"source": {{ site.source | jsonify }}
+	"source": {{ config.source | replace: pwd, "" | cc_jsonify }}
 }

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

@@ -1,27 +1,27 @@
 {
-	"time": {{ site.time | jsonify }},
+	"time": {{ site.time | cc_jsonify }},
 	"cloudcannon": {
 		"name": "cloudcannon-jekyll",
-		"version": {{ gem_version | jsonify }}
+		"version": {{ gem_version | cc_jsonify }}
 	},
 	"generator": {
 		"name": "jekyll",
-		"version": {{ jekyll.version | jsonify }},
-		"environment": {{ jekyll.env | jsonify }},
+		"version": {{ jekyll.version | cc_jsonify }},
+		"environment": {{ jekyll.env | cc_jsonify }},
 		"metadata": {
-			"markdown": {{ site.markdown | cc_safe_jsonify }},
-			"kramdown": {{ site.kramdown | cc_safe_jsonify }},
-			"commonmark": {{ site.commonmark | cc_safe_jsonify }}
+			"markdown": {{ site.markdown | cc_jsonify }},
+			"kramdown": {{ site.kramdown | cc_jsonify }},
+			"commonmark": {{ site.commonmark | cc_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_safe_jsonify }}: {{ data[1] | cc_safe_jsonify }}{% assign data_seen = true %}{% endif %}{% endfor %}},
-	{% elsif site.cloudcannon.data %}"data": {{ site.data | cc_safe_jsonify }},{% endif %}
+		{% 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 %}
 	"collections": {
-		"posts": {{ site.posts | reverse | cc_safe_jsonify }}{% if site.collections.size > 0 %},{% endif %}
-		{% for collection in site.collections %}"{{ collection[0] | xml_escape }}": {{ collection[1].docs | cc_safe_jsonify }}{% unless forloop.last %},{% endunless %}
+		"posts": {{ site.posts | reverse | cc_jsonify }}{% if site.collections.size > 0 %},{% endif %}
+		{% for collection in site.collections %}"{{ collection[0] | xml_escape }}": {{ collection[1].docs | cc_jsonify }}{% unless forloop.last %},{% endunless %}
 		{% endfor %}
 	},
-	"pages": {{ site.pages | cc_safe_jsonify }},
+	"pages": {{ site.pages | cc_jsonify }},
 	"static": {{ site.static_files | cc_static_files_jsonify }}
 }

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

@@ -1,26 +1,26 @@
 {
-	"time": {{ site.time | jsonify }},
+	"time": {{ site.time | cc_jsonify }},
 	"cloudcannon": {
 		"name": "cloudcannon-jekyll",
-		"version": {{ gem_version | jsonify }}
+		"version": {{ gem_version | cc_jsonify }}
 	},
 	"generator": {
 		"name": "jekyll",
-		"version": {{ jekyll.version | jsonify }},
-		"environment": {{ jekyll.env | jsonify }},
+		"version": {{ jekyll.version | cc_jsonify }},
+		"environment": {{ jekyll.env | cc_jsonify }},
 		"metadata": {
-			"markdown": {{ site.markdown | cc_safe_jsonify }},
-			"kramdown": {{ site.kramdown | cc_safe_jsonify }},
-			"commonmark": {{ site.commonmark | cc_safe_jsonify }}
+			"markdown": {{ site.markdown | cc_jsonify }},
+			"kramdown": {{ site.kramdown | cc_jsonify }},
+			"commonmark": {{ site.commonmark | cc_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_safe_jsonify }}: {{ data[1] | cc_safe_jsonify }}{% assign data_seen = true %}{% endif %}{% endfor %}},
-	{% elsif site.cloudcannon.data %}"data": {{ site.data | cc_safe_jsonify }},{% endif %}
+		{% 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 %}
 	"collections": {
-		{% for collection in site.collections %}"{{ collection.label | xml_escape }}": {{ collection.docs | cc_safe_jsonify }}{% unless forloop.last %},{% endunless %}
+		{% for collection in site.collections %}"{{ collection.label | xml_escape }}": {{ collection.docs | cc_jsonify }}{% unless forloop.last %},{% endunless %}
 		{% endfor %}
 	},
-	"pages": {{ site.pages | cc_safe_jsonify }},
+	"pages": {{ site.pages | cc_jsonify }},
 	"static": {{ site.static_files | cc_static_files_jsonify }}
 }

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

@@ -1,17 +1,17 @@
 {
-	"time": {{ site.time | jsonify }},
+	"time": {{ site.time | cc_jsonify }},
 	"cloudcannon": {
 		"name": "cloudcannon-jekyll",
-		"version": {{ gem_version | jsonify }}
+		"version": {{ gem_version | cc_jsonify }}
 	},
 	"generator": {
 		"name": "jekyll",
-		"version": {{ jekyll.version | jsonify }},
-		"environment": {{ jekyll.env | jsonify }},
+		"version": {{ jekyll.version | cc_jsonify }},
+		"environment": {{ jekyll.env | cc_jsonify }},
 		"metadata": {
-			"markdown": {{ site.markdown | cc_safe_jsonify }},
-			"kramdown": {{ site.kramdown | cc_safe_jsonify }},
-			"commonmark": {{ site.commonmark | cc_safe_jsonify }}
+			"markdown": {{ site.markdown | cc_jsonify }},
+			"kramdown": {{ site.kramdown | cc_jsonify }},
+			"commonmark": {{ site.commonmark | cc_jsonify }}
 		}
 	},
 	{% if site.cloudcannon.data.first -%}
@@ -21,20 +21,20 @@
 				{%- assign key = data[0] %}
 				{%- if site.cloudcannon.data[key] %}
 					{%- if data_seen %},{% endif -%}
-					{{ data[0] | cc_safe_jsonify }}: {{ data[1] | cc_safe_jsonify }}
+					{{ data[0] | cc_jsonify }}: {{ data[1] | cc_jsonify }}
 					{%- assign data_seen = true %}
 				{%- endif %}
 			{%- endfor -%}
 		},
 	{% elsif site.cloudcannon.data -%}
-		"data": {{ site.data | cc_safe_jsonify }},
+		"data": {{ site.data | cc_jsonify }},
 	{%- endif %}
 	"collections": {
 		{%- for collection in site.collections -%}
-			"{{ collection.label | xml_escape }}": {{ collection.docs | cc_safe_jsonify }}
+			"{{ collection.label | xml_escape }}": {{ collection.docs | cc_jsonify }}
 			{%- unless forloop.last %},{% endunless %}
 		{%- endfor -%}
 	},
-	"pages": {{ site.pages | cc_safe_jsonify }},
+	"pages": {{ site.pages | cc_jsonify }},
 	"static": {{ site.static_files | cc_static_files_jsonify }}
 }

data/lib/cloudcannon-jekyll/generator.rb

@@ -10,10 +10,14 @@ module CloudCannonJekyll
     def generate(site)
       @site = site
 
-      details_data = { "gem_version" => CloudCannonJekyll::VERSION }
-
-      generate_file("details", @site.site_payload.merge(details_data))
-      generate_file("config", @site.site_payload)
+      payload = @site.site_payload.merge({
+        "gem_version" => CloudCannonJekyll::VERSION,
+        "pwd"         => Dir.pwd,
+        "config"      => @site.config,
+      })
+
+      generate_file("details", payload)
+      generate_file("config", payload)
 
       @site.keep_files ||= []
       @site.keep_files << path("details")

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

@@ -0,0 +1,218 @@
+# frozen_string_literal: true
+
+require "jekyll"
+
+module CloudCannonJekyll
+  module JsonifyFilter
+    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,
+      Integer,
+      Float,
+      Date,
+      Time,
+      NilClass,
+      Object.const_defined?("Fixnum") ? Fixnum : nil,
+    ].compact.freeze
+
+    @document_types = [
+      Jekyll::Document,
+      Jekyll::Page,
+      Jekyll::VERSION.start_with?("2.") ? Jekyll::Post : nil,
+    ].compact.freeze
+
+    def self.document_type?(input)
+      @document_types.include?(input.class)
+    end
+
+    def self.simple_type?(input)
+      @simple_types.include?(input.class) || [true, false].include?(input)
+    end
+
+    def self.static_file_to_json(input, depth)
+      out = [
+        "\"extname\": #{JsonifyFilter.to_json(input.extname, depth + 1)}",
+        "\"path\": #{JsonifyFilter.to_json(input.relative_path, depth + 1)}",
+      ]
+
+      # modified_time isn't defined in Jekyll 2.4.0
+      if input.respond_to? :modified_time
+        out.push("\"modified_time\": #{JsonifyFilter.to_json(input.modified_time, depth + 1)}")
+      end
+
+      "{#{out.join(",")}}"
+    end
+
+    def self.document_data_to_json(data, out, prevent, depth)
+      prevent += %w(content output next previous excerpt)
+
+      data.each do |key, value|
+        next if prevent.include? key
+
+        prevent.push key
+        out.push("#{key.to_json}: #{JsonifyFilter.to_json(value, depth + 1)}")
+      end
+
+      "{#{out.join(",")}}"
+    end
+
+    def self.legacy_post_to_json(input, depth)
+      prevent = %w(dir name path url date id categories tags)
+
+      out = [
+        "\"dir\": #{JsonifyFilter.to_json(input.dir, depth + 1)}",
+        "\"name\": #{JsonifyFilter.to_json(input.name, depth + 1)}",
+        "\"path\": #{JsonifyFilter.to_json(input.path, depth + 1)}",
+        "\"url\": #{JsonifyFilter.to_json(input.url, depth + 1)}",
+        "\"date\": #{JsonifyFilter.to_json(input.date, depth + 1)}",
+        "\"id\": #{JsonifyFilter.to_json(input.id, depth + 1)}",
+        "\"categories\": #{JsonifyFilter.to_json(input.categories, depth + 1)}",
+        "\"tags\": #{JsonifyFilter.to_json(input.tags, depth + 1)}",
+      ]
+
+      JsonifyFilter.document_data_to_json(input.data, out, prevent, depth)
+    end
+
+    def self.page_to_json(input, depth)
+      prevent = %w(dir name path url)
+
+      out = [
+        "\"dir\": #{JsonifyFilter.to_json(input.dir, depth + 1)}",
+        "\"name\": #{JsonifyFilter.to_json(input.name, depth + 1)}",
+        "\"path\": #{JsonifyFilter.to_json(input.path, depth + 1)}",
+        "\"url\": #{JsonifyFilter.to_json(input.url, depth + 1)}",
+      ]
+
+      # Merge Jekyll Defaults into data for pages (missing at v3.8.5)
+      defaults = input.site.frontmatter_defaults.all(input.relative_path, :pages).tap do |h|
+        h.delete("date")
+      end
+
+      data = Jekyll::Utils.deep_merge_hashes(defaults, input.data)
+      JsonifyFilter.document_data_to_json(data, out, prevent, depth)
+    end
+
+    def self.document_to_json(input, depth)
+      prevent = %w(dir id relative_path url collection)
+
+      out = [
+        "\"path\": #{JsonifyFilter.to_json(input.relative_path, depth + 1)}",
+        "\"relative_path\": #{JsonifyFilter.to_json(input.relative_path, depth + 1)}",
+        "\"url\": #{JsonifyFilter.to_json(input.url, depth + 1)}",
+      ]
+
+      unless input.collection.nil?
+        out.push("\"collection\": #{JsonifyFilter.to_json(input.collection.label, depth + 1)}")
+      end
+
+      # id isn't defined in Jekyll 2.4.0
+      out.push("\"id\": #{JsonifyFilter.to_json(input.id, depth + 1)}") if input.respond_to? :id
+
+      JsonifyFilter.document_data_to_json(input.data, out, prevent, depth)
+    end
+
+    def self.array_to_json(input, depth, key_swaps = {})
+      array = input.map do |value|
+        JsonifyFilter.to_json(value, depth + 1, key_swaps)
+      end
+
+      "[#{array.join(",")}]"
+    end
+
+    def self.hash_to_json(input, depth, key_swaps = {})
+      hash = input.map do |key, value|
+        "#{(key_swaps[key] || key).to_json}: #{JsonifyFilter.to_json(value, depth + 1, key_swaps)}"
+      end
+
+      "{#{hash.join(",")}}"
+    end
+
+    def self.config_to_select_data_json(input, depth)
+      prevent = %w(source destination collections_dir cache_dir plugins_dir layouts_dir data_dir
+                   includes_dir collections safe include exclude keep_files encoding markdown_ext
+                   strict_front_matter show_drafts limit_posts future unpublished whitelist
+                   plugins markdown highlighter lsi excerpt_separator incremental detach port host
+                   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)
+
+      out = input.map do |key, value|
+        next unless value.is_a?(Array) || value.is_a?(Hash)
+        next if prevent.include? key
+
+        prevent.push key
+        "#{key.to_json}: #{JsonifyFilter.to_json(value, depth + 1)}"
+      end
+
+      out.compact!
+
+      "{#{out.join(",")}}" if out.any?
+    end
+
+    def self.to_json(input, depth, key_swaps = {})
+      if depth > 8 || (depth > 2 && JsonifyFilter.document_type?(input))
+        '"MAXIMUM_DEPTH"'
+      elsif JsonifyFilter.simple_type?(input)
+        input.to_json
+      elsif input.is_a?(Jekyll::StaticFile)
+        JsonifyFilter.static_file_to_json(input, depth)
+      elsif input.is_a?(Jekyll::Page)
+        JsonifyFilter.page_to_json(input, depth)
+      elsif Jekyll::VERSION.start_with?("2.") && input.is_a?(Jekyll::Post)
+        JsonifyFilter.legacy_post_to_json(input, depth)
+      elsif input.is_a?(Jekyll::Document)
+        JsonifyFilter.document_to_json(input, depth)
+      elsif input.is_a?(Array)
+        JsonifyFilter.array_to_json(input, depth, key_swaps)
+      elsif input.is_a?(Hash)
+        JsonifyFilter.hash_to_json(input, depth, key_swaps)
+      else
+        input.class.to_s.prepend("UNSUPPORTED:").to_json
+      end
+    end
+
+    def cc_static_files_jsonify(input)
+      out = []
+      input.each do |page|
+        next if page.extname != ".html" &&
+          page.extname != ".htm" &&
+          page.path != "/robots.txt" &&
+          page.path != "/sitemap.xml"
+
+        out.push(JsonifyFilter.to_json(page, 1))
+      end
+
+      "[#{out.join(",")}]"
+    end
+
+    def cc_select_data_jsonify(input)
+      if input.key? "_select_data"
+        JsonifyFilter.to_json(input["_select_data"], 0)
+      else
+        JsonifyFilter.config_to_select_data_json(input, 0)
+      end
+    end
+
+    def cc_jsonify(input, key_swaps_key = nil)
+      if CC_JSONIFY_KEY_SWAPS.key? key_swaps_key
+        JsonifyFilter.to_json(input, 0, CC_JSONIFY_KEY_SWAPS[key_swaps_key])
+      else
+        JsonifyFilter.to_json(input, 0)
+      end
+    end
+  end
+end

data/lib/cloudcannon-jekyll/version.rb

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

data/script/ci-smoke-test

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -ex
+
+# Checks to see the build is likely to fail on Travis.
+# Duplicated the versions from .travis.yml
+
+JEKYLL_VERSION=2.4.0 bundle update && $(dirname "$0")/test &&
+JEKYLL_VERSION=3.0.0 bundle update && $(dirname "$0")/test &&
+JEKYLL_VERSION=3.2.1 bundle update && $(dirname "$0")/test

data/script/cibuild

@@ -2,6 +2,5 @@
 
 set -ex
 
-bundle exec rspec "$@"
-bundle exec rubocop -S
+$(dirname "$0")/test
 bundle exec gem build cloudcannon-jekyll.gemspec

data/script/test

@@ -3,3 +3,4 @@
 set -ex
 
 bundle exec rspec "$@"
+bundle exec rubocop -S

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - CloudCannon
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: json_schemer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +100,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
-- !ruby/object:Gem::Dependency
-  name: json_schemer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
 description: Creates CloudCannon editor details for Jekyll
 email:
 - support@cloudcannon.com
@@ -126,9 +126,10 @@ files:
 - lib/cloudcannon-jekyll/_cloudcannon/details.json
 - lib/cloudcannon-jekyll/configuration.rb
 - lib/cloudcannon-jekyll/generator.rb
+- lib/cloudcannon-jekyll/jsonify-filter.rb
 - lib/cloudcannon-jekyll/page-without-a-file.rb
-- lib/cloudcannon-jekyll/safe-jsonify-filter.rb
 - lib/cloudcannon-jekyll/version.rb
+- script/ci-smoke-test
 - script/cibuild
 - script/release
 - script/test
@@ -136,7 +137,7 @@ homepage: https://github.com/cloudcannon/cloudcannon-jekyll
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -151,9 +152,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.5.2.3
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: CloudCannon Jekyll integration
 test_files: []

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

@@ -1,216 +0,0 @@
-# frozen_string_literal: true
-
-require "jekyll"
-
-module CloudCannonJekyll
-  module SafeJsonifyFilter
-    @simple_types = [
-      String,
-      Numeric,
-      Integer,
-      Float,
-      Date,
-      Time,
-      NilClass,
-      Object.const_defined?("Fixnum") ? Fixnum : nil,
-    ].compact.freeze
-
-    @document_types = [
-      Jekyll::Document,
-      Jekyll::Page,
-      Jekyll::VERSION.start_with?("2.") ? Jekyll::Post : nil,
-    ].compact.freeze
-
-    def self.document_type?(input)
-      @document_types.include?(input.class)
-    end
-
-    def self.simple_type?(input)
-      @simple_types.include?(input.class) || [true, false].include?(input)
-    end
-
-    def self.static_file_to_json(input, depth)
-      out = [
-        "\"extname\": #{SafeJsonifyFilter.to_json(input.extname, depth + 1)}",
-        "\"path\": #{SafeJsonifyFilter.to_json(input.relative_path, depth + 1)}",
-      ]
-
-      # modified_time isn't defined in Jekyll 2.4.0
-      if input.respond_to? :modified_time
-        out.push("\"modified_time\": #{SafeJsonifyFilter.to_json(input.modified_time, depth + 1)}")
-      end
-
-      "{#{out.join(",")}}"
-    end
-
-    def self.document_data_to_json(data, out, prevent, depth)
-      prevent += %w(content output next previous excerpt)
-
-      data.each { |key, value|
-        next if prevent.include? key
-        prevent.push key
-        out.push("#{key.to_json}: #{SafeJsonifyFilter.to_json(value, depth + 1)}")
-      }
-
-      "{#{out.join(",")}}"
-    end
-
-    def self.legacy_post_to_json(input, depth)
-      prevent = %w(dir name path url date id categories tags)
-
-      out = [
-        "\"dir\": #{SafeJsonifyFilter.to_json(input.dir, depth + 1)}",
-        "\"name\": #{SafeJsonifyFilter.to_json(input.name, depth + 1)}",
-        "\"path\": #{SafeJsonifyFilter.to_json(input.path, depth + 1)}",
-        "\"url\": #{SafeJsonifyFilter.to_json(input.url, depth + 1)}",
-        "\"date\": #{SafeJsonifyFilter.to_json(input.date, depth + 1)}",
-        "\"id\": #{SafeJsonifyFilter.to_json(input.id, depth + 1)}",
-        "\"categories\": #{SafeJsonifyFilter.to_json(input.categories, depth + 1)}",
-        "\"tags\": #{SafeJsonifyFilter.to_json(input.tags, depth + 1)}",
-      ]
-
-      SafeJsonifyFilter.document_data_to_json(input.data, out, prevent, depth)
-    end
-
-    def self.page_to_json(input, depth)
-      prevent = %w(dir name path url)
-
-      out = [
-        "\"dir\": #{SafeJsonifyFilter.to_json(input.dir, depth + 1)}",
-        "\"name\": #{SafeJsonifyFilter.to_json(input.name, depth + 1)}",
-        "\"path\": #{SafeJsonifyFilter.to_json(input.path, depth + 1)}",
-        "\"url\": #{SafeJsonifyFilter.to_json(input.url, depth + 1)}",
-      ]
-
-      # Merge Jekyll Defaults into data for pages (missing at v3.8.5)
-      defaults = input.site.frontmatter_defaults.all(input.relative_path, :pages).tap do |h|
-        h.delete("date")
-      end
-
-      data = Jekyll::Utils.deep_merge_hashes(defaults, input.data)
-      SafeJsonifyFilter.document_data_to_json(data, out, prevent, depth)
-    end
-
-    def self.document_to_json(input, depth)
-      prevent = %w(dir id relative_path url collection)
-
-      out = [
-        "\"path\": #{SafeJsonifyFilter.to_json(input.relative_path, depth + 1)}",
-        "\"relative_path\": #{SafeJsonifyFilter.to_json(input.relative_path, depth + 1)}",
-        "\"url\": #{SafeJsonifyFilter.to_json(input.url, depth + 1)}",
-      ]
-
-      unless input.collection.nil?
-        out.push("\"collection\": #{SafeJsonifyFilter.to_json(input.collection.label, depth + 1)}")
-      end
-
-      # id isn't defined in Jekyll 2.4.0
-      out.push("\"id\": #{SafeJsonifyFilter.to_json(input.id, depth + 1)}") if input.respond_to? :id
-
-      SafeJsonifyFilter.document_data_to_json(input.data, out, prevent, depth)
-    end
-
-    def self.array_to_json(input, depth)
-      array = input.map do |value|
-        SafeJsonifyFilter.to_json(value, depth + 1)
-      end
-
-      "[#{array.join(",")}]"
-    end
-
-    def self.hash_to_json(input, depth)
-      hash = input.map do |key, value|
-        "#{key.to_json}: #{SafeJsonifyFilter.to_json(value, depth + 1)}"
-      end
-
-      "{#{hash.join(",")}}"
-    end
-
-    def self.site_drop_legacy_select_data_to_json(input, depth)
-      prevent = %w(config time related_posts destination cache_dir safe
-        keep_files encoding markdown_ext strict_front_matter show_drafts
-        limit_posts future unpublished whitelist maruku markdown highlighter
-        lsi excerpt_separator incremental detach port host show_dir_listing
-        permalink paginate_path quiet verbose defaults liquid kramdown title
-        url description categories data tags static_files html_pages pages
-        documents posts related_posts time source timezone include exclude
-        baseurl collections _comments _editor _source_editor _explore
-        uploads_dir plugins_dir data_dir collections_dir includes_dir
-        layouts_dir _array_structures _options cloudcannon rdiscount redcarpet
-        redcloth jekyll-archives archives)
-
-      if Jekyll::VERSION.start_with?("2.")
-        prevent.push "gems"
-        prevent = prevent.concat input["collections"].keys
-      elsif %r!3\.[0-4]\.! =~ Jekyll::VERSION
-        prevent.push "gems"
-        prevent.push "plugins"
-        prevent = prevent.concat(input["collections"].map { |c| c["label"] })
-      else
-        prevent.push "plugins"
-        prevent = prevent.concat(input.content_methods).uniq
-      end
-
-      out = []
-
-      input.each_key { |key|
-        next if prevent.include? key
-        prevent.push key
-
-        next unless input[key].is_a?(Array) || input[key].is_a?(Hash)
-
-        out << "#{key.to_json}: #{SafeJsonifyFilter.to_json(input[key], depth + 1)}"
-      }
-
-      "{#{out.join(",")}}" if out.any?
-    end
-
-    def self.to_json(input, depth)
-      if depth > 8 || (depth > 2 && SafeJsonifyFilter.document_type?(input))
-        '"MAXIMUM_DEPTH"'
-      elsif SafeJsonifyFilter.simple_type?(input)
-        input.to_json
-      elsif input.is_a?(Jekyll::StaticFile)
-        SafeJsonifyFilter.static_file_to_json(input, depth)
-      elsif input.is_a?(Jekyll::Page)
-        SafeJsonifyFilter.page_to_json(input, depth)
-      elsif Jekyll::VERSION.start_with?("2.") && input.is_a?(Jekyll::Post)
-        SafeJsonifyFilter.legacy_post_to_json(input, depth)
-      elsif input.is_a?(Jekyll::Document)
-        SafeJsonifyFilter.document_to_json(input, depth)
-      elsif input.is_a?(Array)
-        SafeJsonifyFilter.array_to_json(input, depth)
-      elsif input.is_a?(Hash)
-        SafeJsonifyFilter.hash_to_json(input, depth)
-      else
-        input.class.to_s.prepend("UNSUPPORTED:").to_json
-      end
-    end
-
-    def cc_static_files_jsonify(input)
-      out = []
-      input.each do |page|
-        next if page.extname != ".html" &&
-          page.extname != ".htm" &&
-          page.path != "/robots.txt" &&
-          page.path != "/sitemap.xml"
-
-        out.push(SafeJsonifyFilter.to_json(page, 1))
-      end
-
-      "[#{out.join(",")}]"
-    end
-
-    def cc_site_select_data_jsonify(input)
-      if input.key? "_select_data"
-        SafeJsonifyFilter.to_json(input["_select_data"], 0)
-      else
-        SafeJsonifyFilter.site_drop_legacy_select_data_to_json(input, 0)
-      end
-    end
-
-    def cc_safe_jsonify(input)
-      SafeJsonifyFilter.to_json(input, 0)
-    end
-  end
-end