jekyll 4.0.1 → 4.2.1

data/lib/jekyll/readers/layout_reader.rb

@@ -1,61 +1,62 @@
-# frozen_string_literal: true
-
-module Jekyll
-  class LayoutReader
-    attr_reader :site
-    def initialize(site)
-      @site = site
-      @layouts = {}
-    end
-
-    def read
-      layout_entries.each do |layout_file|
-        @layouts[layout_name(layout_file)] = \
-          Layout.new(site, layout_directory, layout_file)
-      end
-
-      theme_layout_entries.each do |layout_file|
-        @layouts[layout_name(layout_file)] ||= \
-          Layout.new(site, theme_layout_directory, layout_file)
-      end
-
-      @layouts
-    end
-
-    def layout_directory
-      @layout_directory ||= site.in_source_dir(site.config["layouts_dir"])
-    end
-
-    def theme_layout_directory
-      @theme_layout_directory ||= site.theme.layouts_path if site.theme
-    end
-
-    private
-
-    def layout_entries
-      entries_in layout_directory
-    end
-
-    def theme_layout_entries
-      theme_layout_directory ? entries_in(theme_layout_directory) : []
-    end
-
-    def entries_in(dir)
-      entries = []
-      within(dir) do
-        entries = EntryFilter.new(site).filter(Dir["**/*.*"])
-      end
-      entries
-    end
-
-    def layout_name(file)
-      file.split(".")[0..-2].join(".")
-    end
-
-    def within(directory)
-      return unless File.exist?(directory)
-
-      Dir.chdir(directory) { yield }
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  class LayoutReader
+    attr_reader :site
+
+    def initialize(site)
+      @site = site
+      @layouts = {}
+    end
+
+    def read
+      layout_entries.each do |layout_file|
+        @layouts[layout_name(layout_file)] = \
+          Layout.new(site, layout_directory, layout_file)
+      end
+
+      theme_layout_entries.each do |layout_file|
+        @layouts[layout_name(layout_file)] ||= \
+          Layout.new(site, theme_layout_directory, layout_file)
+      end
+
+      @layouts
+    end
+
+    def layout_directory
+      @layout_directory ||= site.in_source_dir(site.config["layouts_dir"])
+    end
+
+    def theme_layout_directory
+      @theme_layout_directory ||= site.theme.layouts_path if site.theme
+    end
+
+    private
+
+    def layout_entries
+      entries_in layout_directory
+    end
+
+    def theme_layout_entries
+      theme_layout_directory ? entries_in(theme_layout_directory) : []
+    end
+
+    def entries_in(dir)
+      entries = []
+      within(dir) do
+        entries = EntryFilter.new(site).filter(Dir["**/*.*"])
+      end
+      entries
+    end
+
+    def layout_name(file)
+      file.split(".")[0..-2].join(".")
+    end
+
+    def within(directory)
+      return unless File.exist?(directory)
+
+      Dir.chdir(directory) { yield }
+    end
+  end
+end

data/lib/jekyll/readers/page_reader.rb

@@ -1,24 +1,25 @@
-# frozen_string_literal: true
-
-module Jekyll
-  class PageReader
-    attr_reader :site, :dir, :unfiltered_content
-    def initialize(site, dir)
-      @site = site
-      @dir = dir
-      @unfiltered_content = []
-    end
-
-    # Create a new `Jekyll::Page` object for each entry in a given array.
-    #
-    # files - An array of file names inside `@dir`
-    #
-    # Returns an array of publishable `Jekyll::Page` objects.
-    def read(files)
-      files.each do |page|
-        @unfiltered_content << Page.new(@site, @site.source, @dir, page)
-      end
-      @unfiltered_content.select { |page| site.publisher.publish?(page) }
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  class PageReader
+    attr_reader :site, :dir, :unfiltered_content
+
+    def initialize(site, dir)
+      @site = site
+      @dir = dir
+      @unfiltered_content = []
+    end
+
+    # Create a new `Jekyll::Page` object for each entry in a given array.
+    #
+    # files - An array of file names inside `@dir`
+    #
+    # Returns an array of publishable `Jekyll::Page` objects.
+    def read(files)
+      files.each do |page|
+        @unfiltered_content << Page.new(@site, @site.source, @dir, page)
+      end
+      @unfiltered_content.select { |page| site.publisher.publish?(page) }
+    end
+  end
+end

data/lib/jekyll/readers/post_reader.rb

@@ -1,84 +1,85 @@
-# frozen_string_literal: true
-
-module Jekyll
-  class PostReader
-    attr_reader :site, :unfiltered_content
-    def initialize(site)
-      @site = site
-    end
-
-    # Read all the files in <source>/<dir>/_drafts and create a new
-    # Document object with each one.
-    #
-    # dir - The String relative path of the directory to read.
-    #
-    # Returns nothing.
-    def read_drafts(dir)
-      read_publishable(dir, "_drafts", Document::DATELESS_FILENAME_MATCHER)
-    end
-
-    # Read all the files in <source>/<dir>/_posts and create a new Document
-    # object with each one.
-    #
-    # dir - The String relative path of the directory to read.
-    #
-    # Returns nothing.
-    def read_posts(dir)
-      read_publishable(dir, "_posts", Document::DATE_FILENAME_MATCHER)
-    end
-
-    # Read all the files in <source>/<dir>/<magic_dir> and create a new
-    # Document object with each one insofar as it matches the regexp matcher.
-    #
-    # dir - The String relative path of the directory to read.
-    #
-    # Returns nothing.
-    def read_publishable(dir, magic_dir, matcher)
-      read_content(dir, magic_dir, matcher)
-        .tap { |docs| docs.each(&:read) }
-        .select { |doc| processable?(doc) }
-    end
-
-    # Read all the content files from <source>/<dir>/magic_dir
-    #   and return them with the type klass.
-    #
-    # dir - The String relative path of the directory to read.
-    # magic_dir - The String relative directory to <dir>,
-    #   looks for content here.
-    # klass - The return type of the content.
-    #
-    # Returns klass type of content files
-    def read_content(dir, magic_dir, matcher)
-      @site.reader.get_entries(dir, magic_dir).map do |entry|
-        next unless matcher.match?(entry)
-
-        path = @site.in_source_dir(File.join(dir, magic_dir, entry))
-        Document.new(path,
-                     :site       => @site,
-                     :collection => @site.posts)
-      end.reject(&:nil?)
-    end
-
-    private
-
-    def processable?(doc)
-      if doc.content.nil?
-        Jekyll.logger.debug "Skipping:", "Content in #{doc.relative_path} is nil"
-        false
-      elsif !doc.content.valid_encoding?
-        Jekyll.logger.debug "Skipping:", "#{doc.relative_path} is not valid UTF-8"
-        false
-      else
-        publishable?(doc)
-      end
-    end
-
-    def publishable?(doc)
-      site.publisher.publish?(doc).tap do |will_publish|
-        if !will_publish && site.publisher.hidden_in_the_future?(doc)
-          Jekyll.logger.warn "Skipping:", "#{doc.relative_path} has a future date"
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  class PostReader
+    attr_reader :site, :unfiltered_content
+
+    def initialize(site)
+      @site = site
+    end
+
+    # Read all the files in <source>/<dir>/_drafts and create a new
+    # Document object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read_drafts(dir)
+      read_publishable(dir, "_drafts", Document::DATELESS_FILENAME_MATCHER)
+    end
+
+    # Read all the files in <source>/<dir>/_posts and create a new Document
+    # object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read_posts(dir)
+      read_publishable(dir, "_posts", Document::DATE_FILENAME_MATCHER)
+    end
+
+    # Read all the files in <source>/<dir>/<magic_dir> and create a new
+    # Document object with each one insofar as it matches the regexp matcher.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read_publishable(dir, magic_dir, matcher)
+      read_content(dir, magic_dir, matcher)
+        .tap { |docs| docs.each(&:read) }
+        .select { |doc| processable?(doc) }
+    end
+
+    # Read all the content files from <source>/<dir>/magic_dir
+    #   and return them with the type klass.
+    #
+    # dir - The String relative path of the directory to read.
+    # magic_dir - The String relative directory to <dir>,
+    #   looks for content here.
+    # klass - The return type of the content.
+    #
+    # Returns klass type of content files
+    def read_content(dir, magic_dir, matcher)
+      @site.reader.get_entries(dir, magic_dir).map do |entry|
+        next unless matcher.match?(entry)
+
+        path = @site.in_source_dir(File.join(dir, magic_dir, entry))
+        Document.new(path,
+                     :site       => @site,
+                     :collection => @site.posts)
+      end.tap(&:compact!)
+    end
+
+    private
+
+    def processable?(doc)
+      if doc.content.nil?
+        Jekyll.logger.debug "Skipping:", "Content in #{doc.relative_path} is nil"
+        false
+      elsif !doc.content.valid_encoding?
+        Jekyll.logger.debug "Skipping:", "#{doc.relative_path} is not valid UTF-8"
+        false
+      else
+        publishable?(doc)
+      end
+    end
+
+    def publishable?(doc)
+      site.publisher.publish?(doc).tap do |will_publish|
+        if !will_publish && site.publisher.hidden_in_the_future?(doc)
+          Jekyll.logger.warn "Skipping:", "#{doc.relative_path} has a future date"
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/readers/static_file_reader.rb

@@ -1,24 +1,25 @@
-# frozen_string_literal: true
-
-module Jekyll
-  class StaticFileReader
-    attr_reader :site, :dir, :unfiltered_content
-    def initialize(site, dir)
-      @site = site
-      @dir = dir
-      @unfiltered_content = []
-    end
-
-    # Create a new StaticFile object for every entry in a given list of basenames.
-    #
-    # files - an array of file basenames.
-    #
-    # Returns an array of static files.
-    def read(files)
-      files.each do |file|
-        @unfiltered_content << StaticFile.new(@site, @site.source, @dir, file)
-      end
-      @unfiltered_content
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  class StaticFileReader
+    attr_reader :site, :dir, :unfiltered_content
+
+    def initialize(site, dir)
+      @site = site
+      @dir = dir
+      @unfiltered_content = []
+    end
+
+    # Create a new StaticFile object for every entry in a given list of basenames.
+    #
+    # files - an array of file basenames.
+    #
+    # Returns an array of static files.
+    def read(files)
+      files.each do |file|
+        @unfiltered_content << StaticFile.new(@site, @site.source, @dir, file)
+      end
+      @unfiltered_content
+    end
+  end
+end

data/lib/jekyll/readers/theme_assets_reader.rb

@@ -1,51 +1,52 @@
-# frozen_string_literal: true
-
-module Jekyll
-  class ThemeAssetsReader
-    attr_reader :site
-    def initialize(site)
-      @site = site
-    end
-
-    def read
-      return unless site.theme&.assets_path
-
-      Find.find(site.theme.assets_path) do |path|
-        next if File.directory?(path)
-
-        if File.symlink?(path)
-          Jekyll.logger.warn "Theme reader:", "Ignored symlinked asset: #{path}"
-        else
-          read_theme_asset(path)
-        end
-      end
-    end
-
-    private
-
-    def read_theme_asset(path)
-      base = site.theme.root
-      dir = File.dirname(path.sub("#{site.theme.root}/", ""))
-      name = File.basename(path)
-
-      if Utils.has_yaml_header?(path)
-        append_unless_exists site.pages,
-                             Jekyll::Page.new(site, base, dir, name)
-      else
-        append_unless_exists site.static_files,
-                             Jekyll::StaticFile.new(site, base, "/#{dir}", name)
-      end
-    end
-
-    def append_unless_exists(haystack, new_item)
-      if haystack.any? { |file| file.relative_path == new_item.relative_path }
-        Jekyll.logger.debug "Theme:",
-                            "Ignoring #{new_item.relative_path} in theme due to existing file " \
-                            "with that path in site."
-        return
-      end
-
-      haystack << new_item
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  class ThemeAssetsReader
+    attr_reader :site
+
+    def initialize(site)
+      @site = site
+    end
+
+    def read
+      return unless site.theme&.assets_path
+
+      Find.find(site.theme.assets_path) do |path|
+        next if File.directory?(path)
+
+        if File.symlink?(path)
+          Jekyll.logger.warn "Theme reader:", "Ignored symlinked asset: #{path}"
+        else
+          read_theme_asset(path)
+        end
+      end
+    end
+
+    private
+
+    def read_theme_asset(path)
+      base = site.theme.root
+      dir = File.dirname(path.sub("#{site.theme.root}/", ""))
+      name = File.basename(path)
+
+      if Utils.has_yaml_header?(path)
+        append_unless_exists site.pages,
+                             Jekyll::Page.new(site, base, dir, name)
+      else
+        append_unless_exists site.static_files,
+                             Jekyll::StaticFile.new(site, base, "/#{dir}", name)
+      end
+    end
+
+    def append_unless_exists(haystack, new_item)
+      if haystack.any? { |file| file.relative_path == new_item.relative_path }
+        Jekyll.logger.debug "Theme:",
+                            "Ignoring #{new_item.relative_path} in theme due to existing file " \
+                            "with that path in site."
+        return
+      end
+
+      haystack << new_item
+    end
+  end
+end