cloudcannon-jekyll 1.5.2 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0407bacd5338d40b0e7b409eda06a76d37a9919783257247f1d3f3690e699efa
-  data.tar.gz: 06cff77745e8ac590eaad34a544323dd8ca268655b6a62006ffd9572c1e1b402
+  metadata.gz: 3054f2fad52e25c68f74efaea8d7adaf4186eb3c553a1e4f0a8b0d8b7502a5dd
+  data.tar.gz: e4826cd5492f8081a32d6886b4d039ca65f464c8833d8653716a715c07112fcd
 SHA512:
-  metadata.gz: 9261bb287f986877ac87f34ad50a4ed4102b84571a0595fab098021d17a06f7f8132e7e27ce98fa08597e392330db9b206f77f7f96c6e0caad573282776994f0
-  data.tar.gz: d0d882360b677dd594316b92cf0f4ec3798d35451248fc5ed5d13df002d3015f473463994bf85f9d977b8850a0b66995253c630ff5296aa98b1c045ff901ad00
+  metadata.gz: a73fd3d4cf8f9a244ac744d05dabc6361972d9fbe669dfcfe13f651bfc1d6e71c6b5e5c1c7b172f46158fb9983df788d796dbe6da32fdb2d9a7ca440907f00fa
+  data.tar.gz: 2bfb1f2757052b0c30b2052765bd3ecedc7c1d8d5ee9c7eceeccad9a358facce4f1376b0a710aa07bc4d9dbe2968131149a11cd597f14351ccab087b12772261

data/HISTORY.md

@@ -1,3 +1,26 @@
+# 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
+
+# 1.5.3
+
+* Rework fallback for older versions of Jekyll when reading data, posts and drafts
+* Fix deprecation warning for `posts.map`
+
 # 1.5.2
 
 * Fix for empty collection configurations
@@ -17,6 +40,10 @@
 * Add `url` to static-pages
 * Normalise `_path` in static-pages
 
+# 1.4.3
+
+* Fix off-by-one depth for nested documents from last change
+
 # 1.4.2
 
 * Added max depth parameter for jsonify filter and increase it for array structures in config output

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|
@@ -49,11 +53,13 @@ module CloudCannonJekyll
       @site.config["data_dir"] || "_data"
     end
 
+    # rubocop:disable Metrics/AbcSize
     def add_category_folder_config(collections_config, posts_config = {})
       posts = @site.posts || @site.collections["posts"]
+      docs = posts.class.method_defined?(:docs) ? posts.docs : posts
       seen = {}
 
-      posts.map do |post|
+      docs.map do |post|
         parts = post.relative_path.split("/_posts/")
         path = parts.first
 
@@ -80,6 +86,7 @@ module CloudCannonJekyll
         path
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     # Add data to collections config if raw data files exist
     def add_data_config(collections_config)
@@ -92,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

@@ -107,7 +107,7 @@ module CloudCannonJekyll
     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)}",
@@ -120,6 +120,10 @@ module CloudCannonJekyll
         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
@@ -167,7 +171,7 @@ module CloudCannonJekyll
     def self.to_json(input, depth, max_depth = 9, key_swaps = {})
       depth += 1
 
-      if depth > max_depth || (depth > 2 && JsonifyFilter.document_type?(input))
+      if depth > max_depth || (depth > 3 && JsonifyFilter.document_type?(input))
         '"MAXIMUM_DEPTH"'
       elsif JsonifyFilter.simple_type?(input)
         input.to_json

data/lib/cloudcannon-jekyll/reader.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
 require "jekyll"
-
-if !Jekyll::VERSION.start_with? "2."
-  require_relative "readers/data-reader"
-else
-  require_relative "readers/old-data-reader"
-end
+require_relative "readers/old-data-reader"
+require_relative "readers/data-reader"
 
 module CloudCannonJekyll
   # Wraps read functions into one class
@@ -18,6 +14,7 @@ module CloudCannonJekyll
     end
 
     def read_data(dir = "_data")
+      # DataReader doesn't exist in old versions of Jekyll
       if Jekyll::VERSION.start_with? "2."
         CloudCannonJekyll::OldDataReader.new(@site).read(dir)
       else
@@ -26,6 +23,7 @@ module CloudCannonJekyll
     end
 
     def read_drafts(dir = "")
+      # PostReader doesn't exist in old versions of Jekyll
       if Jekyll::VERSION.start_with? "2."
         @site.read_content(dir, "_drafts", Jekyll::Draft)
       else
@@ -34,6 +32,7 @@ module CloudCannonJekyll
     end
 
     def read_posts(dir = "")
+      # PostReader doesn't exist in old versions of Jekyll
       if Jekyll::VERSION.start_with? "2."
         @site.read_content(dir, "_posts", Jekyll::Post)
       else

data/lib/cloudcannon-jekyll/readers/data-reader.rb

@@ -1,18 +1,20 @@
 # frozen_string_literal: true
 
-require "jekyll"
+unless Jekyll::VERSION.start_with? "2."
+  require "jekyll"
 
-module CloudCannonJekyll
-  # Reads data files and creates a collections-style hash representation
-  class DataReader < Jekyll::DataReader
-    # Determines how to read a data file.
-    # This is overridden return a hash instead of reading the file.
-    #
-    # Returns a hash with the path to the data file.
-    def read_data_file(path)
-      {
-        "path" => path,
-      }
+  module CloudCannonJekyll
+    # Reads data files and creates a collections-style hash representation
+    class DataReader < Jekyll::DataReader
+      # Determines how to read a data file.
+      # This is overridden return a hash instead of reading the file.
+      #
+      # Returns a hash with the path to the data file.
+      def read_data_file(path)
+        {
+          "path" => path,
+        }
+      end
     end
   end
 end

data/lib/cloudcannon-jekyll/readers/old-data-reader.rb

@@ -1,55 +1,57 @@
 # frozen_string_literal: true
 
-require "jekyll"
-
-module CloudCannonJekyll
-  # Reads data files and creates a collections-style hash representation
-  # Aims to replicate the data reading logic in Jekyll 2.5
-  class OldDataReader
-    attr_reader :site
-
-    def initialize(site)
-      @site = site
-      @safe = site.safe
-      @content = {}
-    end
+if Jekyll::VERSION.start_with? "2."
+  require "jekyll"
+
+  module CloudCannonJekyll
+    # Reads data files and creates a collections-style hash representation
+    # Aims to replicate the data reading logic in Jekyll 2.5
+    class OldDataReader
+      attr_reader :site
+
+      def initialize(site)
+        @site = site
+        @safe = site.safe
+        @content = {}
+      end
 
-    def read(dir)
-      base = Jekyll.sanitized_path(@site.source, dir)
-      read_data_to(base, @content)
-      @content
-    end
+      def read(dir)
+        base = Jekyll.sanitized_path(@site.source, dir)
+        read_data_to(base, @content)
+        @content
+      end
 
-    def read_data_to(dir, data)
-      return unless File.directory?(dir) && (!@safe || !File.symlink?(dir))
+      def read_data_to(dir, data)
+        return unless File.directory?(dir) && (!@safe || !File.symlink?(dir))
 
-      entries = Dir.chdir(dir) do
-        Dir["*.{yaml,yml,json,csv}"] + Dir["*"].select { |fn| File.directory?(fn) }
-      end
+        entries = Dir.chdir(dir) do
+          Dir["*.{yaml,yml,json,csv}"] + Dir["*"].select { |fn| File.directory?(fn) }
+        end
 
-      entries.each do |entry|
-        path = Jekyll.sanitized_path(dir, entry)
-        next if File.symlink?(path) && @safe
+        entries.each do |entry|
+          path = Jekyll.sanitized_path(dir, entry)
+          next if File.symlink?(path) && @safe
 
-        key = sanitize_filename(File.basename(entry, ".*"))
-        if File.directory?(path)
-          read_data_to(path, data[key] = {})
-        else
-          data[key] = read_data_file(path)
+          key = sanitize_filename(File.basename(entry, ".*"))
+          if File.directory?(path)
+            read_data_to(path, data[key] = {})
+          else
+            data[key] = read_data_file(path)
+          end
         end
       end
-    end
 
-    def read_data_file(path)
-      {
-        "path" => path,
-      }
-    end
+      def read_data_file(path)
+        {
+          "path" => path,
+        }
+      end
 
-    def sanitize_filename(name)
-      name.gsub!(%r![^\w\s_-]+!, "")
-      name.gsub!(%r!(^|\b\s)\s+($|\s?\b)!, '\\1\\2')
-      name.gsub(%r!\s+!, "_")
+      def sanitize_filename(name)
+        name.gsub!(%r![^\w\s_-]+!, "")
+        name.gsub!(%r!(^|\b\s)\s+($|\s?\b)!, '\\1\\2')
+        name.gsub(%r!\s+!, "_")
+      end
     end
   end
 end

data/lib/cloudcannon-jekyll/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.7
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll