cloudcannon-jekyll 1.5.4 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 176cf49b411a0986cc9b6ac1721ce6fcf2b7be830e39a28a4ecefd932d1bc393
-  data.tar.gz: 1528f083504f444305ad7361b3d9f3bd3638259271a9e71b27dc0711e4348078
+  metadata.gz: a266498a3b883dfc9855310c042b181cef8b0949feab77d8918e345e9c72fe68
+  data.tar.gz: d4884d8ca59e5cddb15e395fc9c058667e28c82fbd25b953b8cae4feaace2b82
 SHA512:
-  metadata.gz: 39dc2b3e26908d529d95b76789b147eb6c6f3265fb6d86f179faa96e6620897275c638a6f86f4fe6eb6411006debfac3f4f6e53280aff736aa4c8263cf9bd2ef
-  data.tar.gz: eb61277cf35e5729631962cd3e66162ee3d202d38e69f134b56f28d539d238b83daf1781167031bab059f46b86dba7154560824996bc456b45a253f62f11ea62
+  metadata.gz: 43d10a91998d62ff91e67935912d752415212cf3c6162731c761af6fcf1a4af967b51a3f711c815a8b8a3c8a5407818fd927ec7cd6444561a3efa6d2171f5bc9
+  data.tar.gz: 23b4eae55f04f524c949856a264818548159567c3b121f892ee86776fe582cf7d9817e646222ea7a68a6ff2fbd88749435b260951d8cd26bb0384997cdcd5de7

data/.gitignore

@@ -1,7 +1,7 @@
 Gemfile.lock
 spec/dest/
-spec/fixtures/.jekyll-cache/
-spec/fixtures/.jekyll-metadata
+spec/fixtures/**/.jekyll-cache/
+spec/fixtures/**/.jekyll-metadata
 spec/fixtures/_site/
 gemfiles/.bundle/
 gemfiles/*.gemfile.lock

data/HISTORY.md

@@ -1,3 +1,25 @@
+# 1.6.1
+
+* Increase max depth for array structures defined outside of global
+
+# 1.6.0
+
+* Add `collections_dir` to details collection item paths
+
+# 1.5.7
+
+* Fix pages collection clash with built-in pages
+* Fixed posts collection config data overwriting drafts data
+
+# 1.5.6
+
+* Force generator to run after other lowest priority plugins
+
+# 1.5.5
+
+* Re-add id field for documents
+* Fix for potential nil reference
+
 # 1.5.4
 
 * Rework fallback for older versions of Jekyll when reading data, posts and drafts again

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

@@ -23,6 +23,6 @@
 		{% for collection in site.collections %}"{{ collection[0] | xml_escape }}": {{ collection[1].docs | cc_jsonify }}{% unless forloop.last %},{% endunless %}
 		{% endfor %}
 	},
-	"pages": {{ site.pages | cc_jsonify }},
+	"pages": {{ site.html_pages | cc_jsonify }},
 	"static-pages": {{ site.static_files | cc_static_files_jsonify }}
 }

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

@@ -22,6 +22,6 @@
 		{% for collection in site.collections %}"{{ collection.label | xml_escape }}": {{ collection.docs | cc_jsonify }}{% unless forloop.last %},{% endunless %}
 		{% endfor %}
 	},
-	"pages": {{ site.pages | cc_jsonify }},
+	"pages": {{ site.html_pages | cc_jsonify }},
 	"static-pages": {{ site.static_files | cc_static_files_jsonify }}
 }

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

@@ -36,6 +36,6 @@
 			{%- unless forloop.last %},{% endunless %}
 		{%- endfor -%}
 	},
-	"pages": {{ site.pages | cc_jsonify }},
+	"pages": {{ site.html_pages | cc_jsonify }},
 	"static-pages": {{ site.static_files | cc_static_files_jsonify }}
 }

data/lib/cloudcannon-jekyll/generator.rb

@@ -7,13 +7,17 @@ require_relative "reader"
 module CloudCannonJekyll
   # Generates JSON files containing build config and build output details
   class Generator < Jekyll::Generator
+    # Override the Jekyll::Plugin spaceship to push our plugin to the very end
     priority :lowest
+    def self.<=>(*)
+      1
+    end
 
     def generate(site)
       @site = site
       @reader = Reader.new(@site)
 
-      collections_config = @site.config["collections"].dup || {}
+      collections_config = @site.config["collections"]&.dup || {}
 
       # Workaround for empty collection configurations
       collections_config.each_key do |key|
@@ -95,9 +99,7 @@ module CloudCannonJekyll
       collections_config["posts"] = { "output" => true } if Jekyll::VERSION.start_with? "2."
       drafts = @reader.read_drafts(collections_dir)
 
-      if collections_config.key?("posts")
-        collections_config["drafts"] = collections_config["posts"].dup
-      elsif drafts.any?
+      if (collections_config.key?("posts") && !collections_config.key?("drafts")) || drafts.any?
         collections_config["drafts"] = {}
       end
 

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

@@ -63,7 +63,8 @@ module CloudCannonJekyll
         next if prevent.include? key
 
         prevent.push key
-        "#{key.to_json}: #{JsonifyFilter.to_json(value, depth, max_depth)}"
+        next_max_depth = key == "_array_structures" ? 20 : max_depth
+        "#{key.to_json}: #{JsonifyFilter.to_json(value, depth, next_max_depth)}"
       end
 
       out.compact
@@ -106,20 +107,32 @@ module CloudCannonJekyll
       "{#{out.join(",")}}"
     end
 
+    def self.document_path(input)
+      collections_dir = input.site.config["collections_dir"] || ""
+      if input.collection && !collections_dir.empty?
+        "#{collections_dir}/#{input.relative_path}"
+      else
+        input.relative_path
+      end
+    end
+
     def self.document_to_json(input, depth, max_depth)
-      prevent = %w(dir id relative_path url collection)
+      prevent = %w(dir relative_path url collection)
 
       out = [
-        "\"path\": #{JsonifyFilter.to_json(input.relative_path, depth, max_depth)}",
+        "\"path\": #{JsonifyFilter.to_json(JsonifyFilter.document_path(input), depth, max_depth)}",
         "\"url\": #{JsonifyFilter.to_json(input.url, depth, max_depth)}",
       ]
 
-      collection = input.collection
-      unless collection.nil?
-        collection_json = JsonifyFilter.to_json(collection.label, depth, max_depth)
+      unless input.collection.nil?
+        collection_json = JsonifyFilter.to_json(input.collection.label, depth, max_depth)
         out.push("\"collection\": #{collection_json}")
       end
 
+      if input.respond_to? :id
+        out.push("\"id\": #{JsonifyFilter.to_json(input.id, depth, max_depth)}")
+      end
+
       out += JsonifyFilter.document_data_to_a(input.data, prevent, depth, max_depth)
       "{#{out.join(",")}}"
     end
@@ -134,8 +147,9 @@ module CloudCannonJekyll
 
     def self.hash_to_json(input, depth, max_depth, key_swaps = {})
       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, max_depth, key_swaps)}"
+        "#{string_key}: #{JsonifyFilter.to_json(value, depth, next_max_depth, key_swaps)}"
       end
 
       "{#{out.join(",")}}"

data/lib/cloudcannon-jekyll/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.1
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-13 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll