cloudcannon-jekyll 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1622ca2b9f7eef0279882f94f4364c67ffdd9c403dbfc345bc882268ecd0f998
-  data.tar.gz: e3dab9c9f8fb8090c16c4c3c963566143bfe9a7d4fc18f674c1b33691c377575
+  metadata.gz: 176cf49b411a0986cc9b6ac1721ce6fcf2b7be830e39a28a4ecefd932d1bc393
+  data.tar.gz: 1528f083504f444305ad7361b3d9f3bd3638259271a9e71b27dc0711e4348078
 SHA512:
-  metadata.gz: 748183e00870b67a650ce2cd0386519faffc651750504804bd66d0dd133576a714221d64405d7afc9729558ec6eb8719e3105ee349b4155c53c87af3fffc3351
-  data.tar.gz: e3d770a079ae5a349b7ceec3c1dc4db930bd294a3856c991520bdfe8624a901d00749f37b4fb825dbdfa1e56f67934179c8b0f0ac585968ec9cc30483e50d96b
+  metadata.gz: 39dc2b3e26908d529d95b76789b147eb6c6f3265fb6d86f179faa96e6620897275c638a6f86f4fe6eb6411006debfac3f4f6e53280aff736aa4c8263cf9bd2ef
+  data.tar.gz: eb61277cf35e5729631962cd3e66162ee3d202d38e69f134b56f28d539d238b83daf1781167031bab059f46b86dba7154560824996bc456b45a253f62f11ea62

data/HISTORY.md

@@ -1,3 +1,7 @@
+# 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

data/lib/cloudcannon-jekyll/reader.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
 require "jekyll"
-
-begin
-  require_relative "readers/data-reader"
-rescue NameError
-  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,21 +14,30 @@ module CloudCannonJekyll
     end
 
     def read_data(dir = "_data")
-      CloudCannonJekyll::DataReader.new(@site).read(dir)
-    rescue NameError # DataReader doesn't exist in old versions of Jekyll
-      CloudCannonJekyll::OldDataReader.new(@site).read(dir)
+      # DataReader doesn't exist in old versions of Jekyll
+      if Jekyll::VERSION.start_with? "2."
+        CloudCannonJekyll::OldDataReader.new(@site).read(dir)
+      else
+        CloudCannonJekyll::DataReader.new(@site).read(dir)
+      end
     end
 
     def read_drafts(dir = "")
-      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)
+      # PostReader doesn't exist in old versions of Jekyll
+      if Jekyll::VERSION.start_with? "2."
+        @site.read_content(dir, "_drafts", Jekyll::Draft)
+      else
+        Jekyll::PostReader.new(@site).read_drafts(dir)
+      end
     end
 
     def read_posts(dir = "")
-      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)
+      # PostReader doesn't exist in old versions of Jekyll
+      if Jekyll::VERSION.start_with? "2."
+        @site.read_content(dir, "_posts", Jekyll::Post)
+      else
+        Jekyll::PostReader.new(@site).read_posts(dir)
+      end
     end
   end
 end

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.3"
+  VERSION = "1.5.4"
 end

metadata

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