cloudcannon-jekyll 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0407bacd5338d40b0e7b409eda06a76d37a9919783257247f1d3f3690e699efa
-  data.tar.gz: 06cff77745e8ac590eaad34a544323dd8ca268655b6a62006ffd9572c1e1b402
+  metadata.gz: 1622ca2b9f7eef0279882f94f4364c67ffdd9c403dbfc345bc882268ecd0f998
+  data.tar.gz: e3dab9c9f8fb8090c16c4c3c963566143bfe9a7d4fc18f674c1b33691c377575
 SHA512:
-  metadata.gz: 9261bb287f986877ac87f34ad50a4ed4102b84571a0595fab098021d17a06f7f8132e7e27ce98fa08597e392330db9b206f77f7f96c6e0caad573282776994f0
-  data.tar.gz: d0d882360b677dd594316b92cf0f4ec3798d35451248fc5ed5d13df002d3015f473463994bf85f9d977b8850a0b66995253c630ff5296aa98b1c045ff901ad00
+  metadata.gz: 748183e00870b67a650ce2cd0386519faffc651750504804bd66d0dd133576a714221d64405d7afc9729558ec6eb8719e3105ee349b4155c53c87af3fffc3351
+  data.tar.gz: e3d770a079ae5a349b7ceec3c1dc4db930bd294a3856c991520bdfe8624a901d00749f37b4fb825dbdfa1e56f67934179c8b0f0ac585968ec9cc30483e50d96b

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 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 +22,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/generator.rb

@@ -49,11 +49,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 +82,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)

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

@@ -167,7 +167,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

@@ -2,9 +2,9 @@
 
 require "jekyll"
 
-if !Jekyll::VERSION.start_with? "2."
+begin
   require_relative "readers/data-reader"
-else
+rescue NameError
   require_relative "readers/old-data-reader"
 end
 
@@ -18,27 +18,21 @@ module CloudCannonJekyll
     end
 
     def read_data(dir = "_data")
-      if Jekyll::VERSION.start_with? "2."
-        CloudCannonJekyll::OldDataReader.new(@site).read(dir)
-      else
-        CloudCannonJekyll::DataReader.new(@site).read(dir)
-      end
+      CloudCannonJekyll::DataReader.new(@site).read(dir)
+    rescue NameError # DataReader doesn't exist in old versions of Jekyll
+      CloudCannonJekyll::OldDataReader.new(@site).read(dir)
     end
 
     def read_drafts(dir = "")
-      if Jekyll::VERSION.start_with? "2."
-        @site.read_content(dir, "_drafts", Jekyll::Draft)
-      else
-        Jekyll::PostReader.new(@site).read_drafts(dir)
-      end
+      Jekyll::PostReader.new(@site).read_drafts(dir)
+    rescue NameError # PostReader doesn't exist in old versions of Jekyll
+      @site.read_content(dir, "_drafts", Jekyll::Draft)
     end
 
     def read_posts(dir = "")
-      if Jekyll::VERSION.start_with? "2."
-        @site.read_content(dir, "_posts", Jekyll::Post)
-      else
-        Jekyll::PostReader.new(@site).read_posts(dir)
-      end
+      Jekyll::PostReader.new(@site).read_posts(dir)
+    rescue NameError # PostReader doesn't exist in old versions of Jekyll
+      @site.read_content(dir, "_posts", Jekyll::Post)
     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.3"
 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.3
 platform: ruby
 authors:
 - CloudCannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll