cloudcannon-jekyll 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 9af7a56d0f7ae1c2fbf46678eef968a8ea4d906a88394b2704093b8d6a375017
-  data.tar.gz: ed492b3cc15a707238dc083be5063c20f7e9c6664fb545f8e4fc7bed54c90b05
+SHA1:
+  metadata.gz: 71e33735df4c89f5a837224c14fc5830262d6296
+  data.tar.gz: 748068f64fd86fb1514533a9b84f8576c7cd79e1
 SHA512:
-  metadata.gz: a38d6d1a314062fe832fed516f188da8d0a299f0e8a41e3701b1cf1166d50b88a5ef34a1828eec093993803be5c8ac21937da77b876d6f0840610e28ac7593fd
-  data.tar.gz: b49cec3b53386c5422cffc485d610d386c0cb692078890abf1b030f764afc55b3329d5ebe53c28815a73d5b2e55bcb7127d02945cb16d230e03ef7cdefc5e031
+  metadata.gz: '0872a4182a09614927851140c865ad761c5f2ee41c8e79798ad27efc08ef270b1ec9acf60c75da436aea327cf4e11cade050f308921807116fb18e8d8d07fbe5'
+  data.tar.gz: 6f9207baa8d6084af8a968c2aad4f3d7c9e16e1ec6283408c372e5db156cc890b75e9f22cd98e59619f37172d4981fb859b728f5935d0d3fac40ad17b589ee0e

data/.rubocop.yml

@@ -25,3 +25,8 @@ AllCops:
 Naming/MemoizedInstanceVariableName:
   Exclude:
     - lib/cloudcannon-jekyll/page-without-a-file.rb
+
+# 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

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.6
+  - 2.3.8
 
 before_install:
   - gem update --system
@@ -15,3 +15,4 @@ env:
   matrix:
     - JEKYLL_VERSION="2.4.0"
     - JEKYLL_VERSION="3.0.0"
+    - JEKYLL_VERSION="3.2.1"

data/HISTORY.md

@@ -1,3 +1,10 @@
+# 0.2.0
+
+* Add defaults and input-options keys to config output
+* Add more ignore keys for legacy select data filter
+* Reduce methods added from other plugins clashing
+* Fix invalid output when unsupported class found
+
 # 0.1.0
 
 * Add output config file

data/cloudcannon-jekyll.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   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.13"
+  spec.add_development_dependency "json_schemer", "~> 0.2.4"
 end

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

@@ -20,6 +20,8 @@
 		{% endfor %}
 	},
 	{% 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 }}
 	},{% endif %}

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

@@ -20,6 +20,8 @@
 		{% endfor %}
 	},
 	{% 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 }}
 	},{% endif %}

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

@@ -27,6 +27,12 @@
 	{% 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 }}

data/lib/cloudcannon-jekyll/generator.rb

@@ -28,7 +28,7 @@ module CloudCannonJekyll
 
     def version_path_suffix
       return "-2.x" if Jekyll::VERSION.start_with? "2."
-      return "-3.0-4.x" if Jekyll::VERSION.match? %r!3\.[0-4]\.!
+      return "-3.0-4.x" if %r!3\.[0-4]\.! =~ Jekyll::VERSION
 
       ""
     end

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

@@ -136,25 +136,31 @@ module CloudCannonJekyll
         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 cloudcannon rdiscount redcarpet redcloth)
+        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"
-      elsif Jekyll::VERSION.match?(%r!3\.[0-4]\.!)
-        prevent = prevent.concat input["collections"].map { |c| c["label"] }
-        prevent = prevent.concat %w(plugins 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.map { |key, value|
-        next unless value.is_a?(Array) || value.is_a?(Hash)
+      out = []
+
+      input.each_key { |key|
         next if prevent.include? key
         prevent.push key
 
-        "#{key.to_json}: #{SafeJsonifyFilter.to_json(value, depth + 1)}"
-      }.compact
+        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
@@ -177,7 +183,7 @@ module CloudCannonJekyll
       elsif input.is_a?(Hash)
         SafeJsonifyFilter.hash_to_json(input, depth)
       else
-        "\"UNSUPPORTED:#{input.class.to_json}\""
+        input.class.to_s.prepend("UNSUPPORTED:").to_json
       end
     end
 

data/lib/cloudcannon-jekyll/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - CloudCannon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.13
+        version: 0.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.13
+        version: 0.2.4
 description: Creates CloudCannon editor details for Jekyll
 email:
 - support@cloudcannon.com
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 2.5.2.3
 signing_key:
 specification_version: 4
 summary: CloudCannon Jekyll integration