cloudcannon-jekyll 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83d8c10e1f93435eb7f8cf67d63b3cf94c35ca24a4f6b02de64c11925f829213
-  data.tar.gz: 178b75ec1c4984773ef897967e7973997811806237deefeca61dc906ab7a1bc2
+  metadata.gz: 8469ad33191e42fbfa3e312dac3a38716024939bda6075fe140a2b0ee9ffaa8c
+  data.tar.gz: c8bbbfc8368845ea01036ae19df5469956489d5872a8ca2a465071a4c38b44f1
 SHA512:
-  metadata.gz: d38402f61598857b9b6dba32c67d1ca44dd575dd93591a4944af0bd52bc5fb322cb5b2c9013c534a6031bed72d17583288f699bfb92c1853182b1bf4152c48be
-  data.tar.gz: 6a79c497b8718283e72d65a8b415d77808470777df547701a30f1f564fb5d5b73e20e5ba7be17868b542ab79cc16791f3cfd556e6fa20d5dde75031d52b62e66
+  metadata.gz: 7b330dbb5b5e81875c25378e127ddb1696ecd6efb93e94f9b583c2c1d6885b773eb237597a227d4a1e2a19fb3c98d05c9da606e55c167cfdf170742886964633
+  data.tar.gz: eb8c85ac91e6c55fad55bd15e39c6e37093f267bad5e1e75e91667d529180d70b0c4a92ecf3ec0f4931cb7e27937481fcc30c31ee823f2fa3b56c29fd25d9a5b

data/HISTORY.md

@@ -1,6 +1,12 @@
+# 0.3.2
+
+* Rework fallback for older versions of Jekyll when reading data, posts and drafts
+* Fix deprecation warning for `posts.map`
+
 # 0.3.1
 
 * Fix for empty collection configurations
+* Added max depth parameter for jsonify filter and increase it for array structures in config output
 
 # 0.3.0
 
@@ -13,7 +19,6 @@
 * Renamed static to static-pages in details and removed `robots.txt` and `sitemap.xml` exceptions
 * Add `url` to static-pages
 * Normalise `_path` in static-pages
-* Added max depth parameter for jsonify filter and increase it for array structures in config output
 
 # 0.2.2
 

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

@@ -168,7 +168,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 = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudcannon-jekyll
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 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