jekyll 3.7.4 → 3.8.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b691b6dcd0dc56026736d18a916692f32aab72f8797725bc684624ebfe4cc4b2
-  data.tar.gz: 2c7b61a0c25f6acb41e19e066992b841efe049e8528993da12724b6c02c2d43f
+  metadata.gz: 3d8b3cb33faecac197557dfc43ba3a5e6b24053ecc42c9bb9ea3a733553f7eb4
+  data.tar.gz: 3af6b03a6c04a694adac3507d1e82048046d791ce6254d1b827fccea97db4367
 SHA512:
-  metadata.gz: dc23c577bd77f53fd39e36182607d56ececd41e14d703faf0b88f720b6a8cdc44e5c89b97ab7dc1c7d91b382c0250c3fcab1ea35f160ccc04b520a9579eea7f2
-  data.tar.gz: 844a42fcb469bcfa6aaca552ce4a7cdfc2bf7669734420f763ea9e2f03a24f2a2630efc999c122572c5fd041157dfaa201bb5d6bf9f966494d204355d5b945ba
+  metadata.gz: 6d2dbd4a413268950af60bb1cb3219bb48a6fcdaefdc76e0035e97fb20852759d6d293b0b1a10bb39ab40e8527befaec5f63d028f01056fabf6c88fe9e4e99a4
+  data.tar.gz: dc435a723327de90ff63432a53db4fca2f11e2240c1f661fc66f6871610f737aa9eb2947a7434dbddd148443afb69e01c17044104bf9a185ddbdff4697b41fec

data/lib/jekyll/cleaner.rb

@@ -57,9 +57,9 @@ module Jekyll
     #
     # Returns a Set with the file paths
     def new_files
-      files = Set.new
-      site.each_site_file { |item| files << item.destination(site.dest) }
-      files
+      @new_files ||= Set.new.tap do |files|
+        site.each_site_file { |item| files << item.destination(site.dest) }
+      end
     end
 
     # Private: The list of directories to be created when site is built.
@@ -67,7 +67,7 @@ module Jekyll
     #
     # Returns a Set with the directory paths
     def new_dirs
-      new_files.map { |file| parent_dirs(file) }.flatten.to_set
+      @new_dirs ||= new_files.map { |file| parent_dirs(file) }.flatten.to_set
     end
 
     # Private: The list of parent directories of a given file

data/lib/jekyll/collection.rb

@@ -210,12 +210,11 @@ module Jekyll
     private
 
     def read_document(full_path)
-      doc = Jekyll::Document.new(full_path, :site => site, :collection => self)
-      doc.read
-      if site.publisher.publish?(doc) || !write?
-        docs << doc
-      else
-        Jekyll.logger.debug "Skipped Publishing:", doc.relative_path
+      docs << Document.new(full_path, :site => site, :collection => self).tap do |doc|
+        doc.read
+        if !site.publisher.publish?(doc) && site.publisher.hidden_in_the_future?(doc)
+          Jekyll.logger.debug "Skip Publishing:", "#{doc.relative_path} has a future date"
+        end
       end
     end
 

data/lib/jekyll/commands/doctor.rb

@@ -41,9 +41,22 @@ module Jekyll
             !conflicting_urls(site),
             !urls_only_differ_by_case(site),
             proper_site_url?(site),
+            properly_gathered_posts?(site),
           ].all?
         end
 
+        def properly_gathered_posts?(site)
+          return true if site.config["collections_dir"].empty?
+          posts_at_root = site.in_source_dir("_posts")
+          return true unless File.directory?(posts_at_root)
+          Jekyll.logger.warn "Warning:",
+            "Detected '_posts' directory outside custom `collections_dir`!"
+          Jekyll.logger.warn "",
+            "Please move '#{posts_at_root}' into the custom directory at " \
+            "'#{site.in_source_dir(site.config["collections_dir"])}'"
+          false
+        end
+
         def deprecated_relative_permalinks(site)
           if site.config["relative_permalinks"]
             Jekyll::Deprecator.deprecation_message "Your site still uses relative" \

data/lib/jekyll/commands/new.rb

@@ -27,8 +27,9 @@ module Jekyll
           new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
           FileUtils.mkdir_p new_blog_path
           if preserve_source_location?(new_blog_path, options)
-            Jekyll.logger.abort_with "Conflict:",
-                      "#{new_blog_path} exists and is not empty."
+            Jekyll.logger.error "Conflict:", "#{new_blog_path} exists and is not empty."
+            Jekyll.logger.abort_with "", "Ensure #{new_blog_path} is empty or else " \
+                      "try again with `--force` to proceed and overwrite any files."
           end
 
           if options["blank"]

data/lib/jekyll/configuration.rb

@@ -61,7 +61,9 @@ module Jekyll
       "defaults"            => [],
 
       "liquid"              => {
-        "error_mode" => "warn",
+        "error_mode"       => "warn",
+        "strict_filters"   => false,
+        "strict_variables" => false,
       },
 
       "rdiscount"           => {

data/lib/jekyll/convertible.rb

@@ -165,9 +165,9 @@ module Jekyll
 
     # Determine whether the file should be rendered with Liquid.
     #
-    # Always returns true.
+    # Returns true if the file has Liquid Tags or Variables, false otherwise.
     def render_with_liquid?
-      true
+      Jekyll::Utils.has_liquid_construct?(content)
     end
 
     # Determine whether the file should be placed into layouts.
@@ -227,6 +227,7 @@ module Jekyll
     def write(dest)
       path = destination(dest)
       FileUtils.mkdir_p(File.dirname(path))
+      Jekyll.logger.debug "Writing:", path
       File.write(path, output, :mode => "wb")
       Jekyll::Hooks.trigger hook_owner, :post_write, self
     end

data/lib/jekyll/document.rb

@@ -83,15 +83,14 @@ module Jekyll
     # Returns a String path which represents the relative path from the collections_dir
     # to this document.
     def relative_path
-      @relative_path ||=
-        Pathutil.new(path).relative_path_from(site.collections_path).to_s
+      @relative_path ||= path.sub("#{site.collections_path}/", "")
     end
 
     # The output extension of the document.
     #
     # Returns the output extension
     def output_ext
-      Jekyll::Renderer.new(site, self).output_ext
+      @output_ext ||= Jekyll::Renderer.new(site, self).output_ext
     end
 
     # The base filename of the document, without the file extname.
@@ -157,9 +156,10 @@ module Jekyll
     # Determine whether the file should be rendered with Liquid.
     #
     # Returns false if the document is either an asset file or a yaml file,
+    #   or if the document doesn't contain any Liquid Tags or Variables,
     #   true otherwise.
     def render_with_liquid?
-      !(coffeescript_file? || yaml_file?)
+      !(coffeescript_file? || yaml_file? || !Utils.has_liquid_construct?(content))
     end
 
     # Determine whether the file should be rendered with a layout.
@@ -239,6 +239,7 @@ module Jekyll
     def write(dest)
       path = destination(dest)
       FileUtils.mkdir_p(File.dirname(path))
+      Jekyll.logger.debug "Writing:", path
       File.write(path, output, :mode => "wb")
 
       trigger_hooks(:post_write)
@@ -311,9 +312,10 @@ module Jekyll
     # Based on the Collection to which it belongs.
     #
     # True if the document has a collection and if that collection's #write?
-    #   method returns true, otherwise false.
+    # method returns true, and if the site's Publisher will publish the document.
+    # False otherwise.
     def write?
-      collection && collection.write?
+      collection && collection.write? && site.publisher.publish?(self)
     end
 
     # The Document excerpt_separator, from the YAML Front-Matter or site
@@ -358,7 +360,7 @@ module Jekyll
     #
     # Returns an Array of related Posts.
     def related_posts
-      Jekyll::RelatedPosts.new(self).build
+      @related_posts ||= Jekyll::RelatedPosts.new(self).build
     end
 
     # Override of normal respond_to? to match method_missing's logic for
@@ -417,7 +419,7 @@ module Jekyll
     def merge_categories!(other)
       if other.key?("categories") && !other["categories"].nil?
         if other["categories"].is_a?(String)
-          other["categories"] = other["categories"].split(%r!\s+!).map(&:strip)
+          other["categories"] = other["categories"].split
         end
         other["categories"] = (data["categories"] || []) | other["categories"]
       end

data/lib/jekyll/drops/collection_drop.rb

@@ -11,12 +11,11 @@ module Jekyll
       def_delegators :@obj, :label, :docs, :files, :directory,
                             :relative_directory
 
+      private def_delegator :@obj, :metadata, :fallback_data
+
       def to_s
         docs.to_s
       end
-
-      private
-      def_delegator :@obj, :metadata, :fallback_data
     end
   end
 end

data/lib/jekyll/drops/document_drop.rb

@@ -14,6 +14,8 @@ module Jekyll
       def_delegator :@obj, :relative_path, :path
       def_delegators :@obj, :id, :output, :content, :to_s, :relative_path, :url
 
+      private def_delegator :@obj, :data, :fallback_data
+
       def collection
         @obj.collection.label
       end
@@ -61,9 +63,6 @@ module Jekyll
           result[key] = doc[key] unless NESTED_OBJECT_FIELD_BLACKLIST.include?(key)
         end
       end
-
-      private
-      def_delegator :@obj, :data, :fallback_data
     end
   end
 end

data/lib/jekyll/drops/site_drop.rb

@@ -11,6 +11,8 @@ module Jekyll
       def_delegators :@obj, :time, :pages, :static_files, :documents,
                             :tags, :categories
 
+      private def_delegator :@obj, :config, :fallback_data
+
       def [](key)
         if @obj.collections.key?(key) && key != "posts"
           @obj.collections[key].docs
@@ -37,11 +39,18 @@ module Jekyll
         @site_collections ||= @obj.collections.values.sort_by(&:label).map(&:to_liquid)
       end
 
+      # `{{ site.related_posts }}` is how posts can get posts related to
+      # them, either through LSI if it's enabled, or through the most
+      # recent posts.
+      # We should remove this in 4.0 and switch to `{{ post.related_posts }}`.
+      def related_posts
+        return nil unless @current_document.is_a?(Jekyll::Document)
+        @current_document.related_posts
+      end
+      attr_writer :current_document
+
       # return nil for `{{ site.config }}` even if --config was passed via CLI
       def config; end
-
-      private
-      def_delegator :@obj, :config, :fallback_data
     end
   end
 end

data/lib/jekyll/drops/static_file_drop.rb

@@ -6,8 +6,9 @@ module Jekyll
       extend Forwardable
       def_delegators :@obj, :name, :extname, :modified_time, :basename
       def_delegator :@obj, :relative_path, :path
-      def_delegator :@obj, :data, :fallback_data
       def_delegator :@obj, :type, :collection
+
+      private def_delegator :@obj, :data, :fallback_data
     end
   end
 end

data/lib/jekyll/entry_filter.rb

@@ -31,12 +31,9 @@ module Jekyll
 
     def filter(entries)
       entries.reject do |e|
-        # Reject this entry if it is a symlink.
-        next true if symlink?(e)
-        # Do not reject this entry if it is included.
-        next false if included?(e)
-        # Reject this entry if it is special, a backup file, or excluded.
-        special?(e) || backup?(e) || excluded?(e)
+        unless included?(e)
+          special?(e) || backup?(e) || excluded?(e) || symlink?(e)
+        end
       end
     end
 

data/lib/jekyll/excerpt.rb

@@ -8,7 +8,7 @@ module Jekyll
     attr_accessor :content, :ext
     attr_writer   :output
 
-    def_delegators :@doc, :site, :name, :ext, :relative_path, :extname,
+    def_delegators :@doc, :site, :name, :ext, :extname,
                           :render_with_liquid?, :collection, :related_posts,
                           :url, :next_doc, :previous_doc
 
@@ -41,6 +41,13 @@ module Jekyll
       File.join(doc.path, "#excerpt")
     end
 
+    # 'Relative Path' of the excerpt.
+    #
+    # Returns the relative_path for the doc this excerpt belongs to with #excerpt appended
+    def relative_path
+      File.join(doc.relative_path, "#excerpt")
+    end
+
     # Check if excerpt includes a string
     #
     # Returns true if the string passed in
@@ -116,11 +123,40 @@ module Jekyll
     def extract_excerpt(doc_content)
       head, _, tail = doc_content.to_s.partition(doc.excerpt_separator)
 
+      # append appropriate closing tag (to a Liquid block), to the "head" if the
+      # partitioning resulted in leaving the closing tag somewhere in the "tail"
+      # partition.
+      if head.include?("{%")
+        head =~ %r!{%\s*(\w+).+\s*%}!
+        tag_name = Regexp.last_match(1)
+
+        if liquid_block?(tag_name) && head.match(%r!{%\s*end#{tag_name}\s*%}!).nil?
+          print_build_warning
+          head << "\n{% end#{tag_name} %}"
+        end
+      end
+
       if tail.empty?
         head
       else
         head.to_s.dup << "\n\n" << tail.scan(%r!^ {0,3}\[[^\]]+\]:.+$!).join("\n")
       end
     end
+
+    private
+
+    def liquid_block?(tag_name)
+      Liquid::Template.tags[tag_name].superclass == Liquid::Block
+    end
+
+    def print_build_warning
+      Jekyll.logger.warn "Warning:", "Excerpt modified in #{doc.relative_path}!"
+      Jekyll.logger.warn "",
+        "Found a Liquid block containing separator '#{doc.excerpt_separator}' and has " \
+        "been modified with the appropriate closing tag."
+      Jekyll.logger.warn "",
+        "Feel free to define a custom excerpt or excerpt_separator in the document's " \
+        "Front Matter if the generated excerpt is unsatisfactory."
+    end
   end
 end

data/lib/jekyll/filters.rb

@@ -2,7 +2,6 @@
 
 require "addressable/uri"
 require "json"
-require "date"
 require "liquid"
 
 require_all "jekyll/filters"
@@ -11,6 +10,7 @@ module Jekyll
   module Filters
     include URLFilters
     include GroupingFilters
+    include DateFilters
 
     # Convert a Markdown string into HTML output.
     #
@@ -67,55 +67,6 @@ module Jekyll
       Utils.slugify(input, :mode => mode)
     end
 
-    # Format a date in short format e.g. "27 Jan 2011".
-    #
-    # date - the Time to format.
-    #
-    # Returns the formatting String.
-    def date_to_string(date)
-      time(date).strftime("%d %b %Y")
-    end
-
-    # Format a date in long format e.g. "27 January 2011".
-    #
-    # date - The Time to format.
-    #
-    # Returns the formatted String.
-    def date_to_long_string(date)
-      return date if date.to_s.empty?
-      time(date).strftime("%d %B %Y")
-    end
-
-    # Format a date for use in XML.
-    #
-    # date - The Time to format.
-    #
-    # Examples
-    #
-    #   date_to_xmlschema(Time.now)
-    #   # => "2011-04-24T20:34:46+08:00"
-    #
-    # Returns the formatted String.
-    def date_to_xmlschema(date)
-      return date if date.to_s.empty?
-      time(date).xmlschema
-    end
-
-    # Format a date according to RFC-822
-    #
-    # date - The Time to format.
-    #
-    # Examples
-    #
-    #   date_to_rfc822(Time.now)
-    #   # => "Sun, 24 Apr 2011 12:34:46 +0000"
-    #
-    # Returns the formatted String.
-    def date_to_rfc822(date)
-      return date if date.to_s.empty?
-      time(date).rfc822
-    end
-
     # XML escape a string for use. Replaces any special characters with
     # appropriate HTML entity replacements.
     #
@@ -223,7 +174,7 @@ module Jekyll
       return input unless input.respond_to?(:select)
       input = input.values if input.is_a?(Hash)
       input.select do |object|
-        Array(item_property(object, property)).map(&:to_s).include?(value.to_s)
+        Array(item_property(object, property)).map!(&:to_s).include?(value.to_s)
       end || []
     end
 
@@ -357,16 +308,6 @@ module Jekyll
         .map!(&:last)
     end
 
-    private
-    def time(input)
-      date = Liquid::Utils.to_date(input)
-      unless date.respond_to?(:to_time)
-        raise Errors::InvalidDateError,
-          "Invalid Date: '#{input.inspect}' is not a valid datetime."
-      end
-      date.to_time.dup.localtime
-    end
-
     private
     def item_property(item, property)
       if item.respond_to?(:to_liquid)

data/lib/jekyll/filters/date_filters.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Filters
+    module DateFilters
+      # Format a date in short format e.g. "27 Jan 2011".
+      # Ordinal format is also supported, in both the UK
+      # (e.g. "27th Jan 2011") and US ("e.g. Jan 27th, 2011") formats.
+      # UK format is the default.
+      #
+      # date - the Time to format.
+      # type - if "ordinal" the returned String will be in ordinal format
+      # style - if "US" the returned String will be in US format.
+      #         Otherwise it will be in UK format.
+      #
+      # Returns the formatting String.
+      def date_to_string(date, type = nil, style = nil)
+        stringify_date(date, "%b", type, style)
+      end
+
+      # Format a date in long format e.g. "27 January 2011".
+      # Ordinal format is also supported, in both the UK
+      # (e.g. "27th January 2011") and US ("e.g. January 27th, 2011") formats.
+      # UK format is the default.
+      #
+      # date - the Time to format.
+      # type - if "ordinal" the returned String will be in ordinal format
+      # style - if "US" the returned String will be in US format.
+      #         Otherwise it will be in UK format.
+      #
+      # Returns the formatted String.
+      def date_to_long_string(date, type = nil, style = nil)
+        stringify_date(date, "%B", type, style)
+      end
+
+      # Format a date for use in XML.
+      #
+      # date - The Time to format.
+      #
+      # Examples
+      #
+      #   date_to_xmlschema(Time.now)
+      #   # => "2011-04-24T20:34:46+08:00"
+      #
+      # Returns the formatted String.
+      def date_to_xmlschema(date)
+        return date if date.to_s.empty?
+        time(date).xmlschema
+      end
+
+      # Format a date according to RFC-822
+      #
+      # date - The Time to format.
+      #
+      # Examples
+      #
+      #   date_to_rfc822(Time.now)
+      #   # => "Sun, 24 Apr 2011 12:34:46 +0000"
+      #
+      # Returns the formatted String.
+      def date_to_rfc822(date)
+        return date if date.to_s.empty?
+        time(date).rfc822
+      end
+
+      private
+      # month_type: Notations that evaluate to 'Month' via `Time#strftime` ("%b", "%B")
+      # type: nil (default) or "ordinal"
+      # style: nil (default) or "US"
+      #
+      # Returns a stringified date or the empty input.
+      def stringify_date(date, month_type, type = nil, style = nil)
+        return date if date.to_s.empty?
+        time = time(date)
+        if type == "ordinal"
+          day = time.day
+          ordinal_day = "#{day}#{ordinal(day)}"
+          return time.strftime("#{month_type} #{ordinal_day}, %Y") if style == "US"
+          return time.strftime("#{ordinal_day} #{month_type} %Y")
+        end
+        time.strftime("%d #{month_type} %Y")
+      end
+
+      private
+      def ordinal(number)
+        return "th" if (11..13).cover?(number)
+
+        case number % 10
+        when 1 then "st"
+        when 2 then "nd"
+        when 3 then "rd"
+        else "th"
+        end
+      end
+
+      private
+      def time(input)
+        date = Liquid::Utils.to_date(input)
+        unless date.respond_to?(:to_time)
+          raise Errors::InvalidDateError,
+            "Invalid Date: '#{input.inspect}' is not a valid datetime."
+        end
+        date.to_time.dup.localtime
+      end
+    end
+  end
+end

data/lib/jekyll/liquid_renderer.rb

@@ -5,6 +5,11 @@ require_relative "liquid_renderer/table"
 
 module Jekyll
   class LiquidRenderer
+    extend Forwardable
+
+    def_delegator :@site, :in_source_dir, :source_dir
+    def_delegator :@site, :in_theme_dir, :theme_dir
+
     def initialize(site)
       @site = site
       Liquid::Template.error_mode = @site.config["liquid"]["error_mode"].to_sym
@@ -16,11 +21,13 @@ module Jekyll
     end
 
     def file(filename)
-      filename = @site.in_source_dir(filename).sub(
-        %r!\A#{Regexp.escape(@site.source)}/!,
-        ""
-      )
-
+      filename.match(filename_regex)
+      filename =
+        if Regexp.last_match(1) == theme_dir("")
+          ::File.join(Regexp.last_match(1).split("/")[-1], Regexp.last_match(2))
+        else
+          Regexp.last_match(2)
+        end
       LiquidRenderer::File.new(self, filename).tap do
         @stats[filename] ||= new_profile_hash
         @stats[filename][:count] += 1
@@ -44,6 +51,11 @@ module Jekyll
     end
 
     private
+
+    def filename_regex
+      %r!\A(#{source_dir}/|#{theme_dir}/|\W*)(.*)!oi
+    end
+
     def new_profile_hash
       Hash.new { |hash, key| hash[key] = 0 }
     end

data/lib/jekyll/reader.rb

@@ -63,8 +63,8 @@ module Jekyll
     # Returns nothing.
     def retrieve_posts(dir)
       return if outside_configured_directory?(dir)
-      site.posts.docs.concat(PostReader.new(site).read_posts(dir))
-      site.posts.docs.concat(PostReader.new(site).read_drafts(dir)) if site.show_drafts
+      site.posts.docs.concat(post_reader.read_posts(dir))
+      site.posts.docs.concat(post_reader.read_drafts(dir)) if site.show_drafts
     end
 
     # Recursively traverse directories with the read_directories function.
@@ -78,7 +78,7 @@ module Jekyll
       dot_dirs.each do |file|
         dir_path = site.in_source_dir(dir, file)
         rel_path = File.join(dir, file)
-        unless @site.dest.sub(%r!/$!, "") == dir_path
+        unless @site.dest.chomp("/") == dir_path
           @site.reader.read_directories(rel_path)
         end
       end
@@ -146,5 +146,11 @@ module Jekyll
       collections_dir = site.config["collections_dir"]
       !collections_dir.empty? && !dir.start_with?("/#{collections_dir}")
     end
+
+    # Create a single PostReader instance to retrieve drafts and posts from all valid
+    # directories in current site.
+    def post_reader
+      @post_reader ||= PostReader.new(site)
+    end
   end
 end

data/lib/jekyll/regenerator.rb

@@ -120,6 +120,7 @@ module Jekyll
     # Returns nothing.
     def write_metadata
       unless disabled?
+        Jekyll.logger.debug "Writing Metadata:", ".jekyll-metadata"
         File.binwrite(metadata_file, Marshal.dump(metadata))
       end
     end

data/lib/jekyll/related_posts.rb

@@ -46,7 +46,7 @@ module Jekyll
     end
 
     def most_recent_posts
-      @most_recent_posts ||= (site.posts.docs.reverse - [post]).first(10)
+      @most_recent_posts ||= (site.posts.docs.last(11).reverse - [post]).first(10)
     end
   end
 end

data/lib/jekyll/renderer.rb

@@ -52,7 +52,7 @@ module Jekyll
       Jekyll.logger.debug "Rendering:", document.relative_path
 
       assign_pages!
-      assign_related_posts!
+      assign_current_document!
       assign_highlighter_options!
       assign_layout_data!
 
@@ -68,8 +68,11 @@ module Jekyll
     # rubocop: disable AbcSize
     def render_document
       info = {
-        :registers => { :site => site, :page => payload["page"] },
+        :registers        => { :site => site, :page => payload["page"] },
+        :strict_filters   => liquid_options["strict_filters"],
+        :strict_variables => liquid_options["strict_variables"],
       }
+
       output = document.content
       if document.render_with_liquid?
         Jekyll.logger.debug "Rendering Liquid:", document.relative_path
@@ -77,7 +80,7 @@ module Jekyll
       end
 
       Jekyll.logger.debug "Rendering Markup:", document.relative_path
-      output = convert(output)
+      output = convert(output.to_s)
       document.content = output
 
       if document.place_in_layout?
@@ -169,12 +172,16 @@ module Jekyll
     # Returns nothing
     private
     def validate_layout(layout)
-      return unless invalid_layout?(layout)
-      Jekyll.logger.warn(
-        "Build Warning:",
-        "Layout '#{document.data["layout"]}' requested "\
-        "in #{document.relative_path} does not exist."
-      )
+      if invalid_layout?(layout)
+        Jekyll.logger.warn(
+          "Build Warning:",
+          "Layout '#{document.data["layout"]}' requested "\
+          "in #{document.relative_path} does not exist."
+        )
+      elsif !layout.nil?
+        layout_source = layout.path.start_with?(site.source) ? :site : :theme
+        Jekyll.logger.debug "Layout source:", layout_source
+      end
     end
 
     # Render layout content into document.output
@@ -217,12 +224,8 @@ module Jekyll
     #
     # Returns nothing
     private
-    def assign_related_posts!
-      if document.is_a?(Document) && document.collection.label == "posts"
-        payload["site"]["related_posts"] = document.related_posts
-      else
-        payload["site"]["related_posts"] = nil
-      end
+    def assign_current_document!
+      payload["site"].current_document = document
     end
 
     # Set highlighter prefix and suffix
@@ -244,8 +247,9 @@ module Jekyll
 
     private
     def permalink_ext
-      if document.permalink && !document.permalink.end_with?("/")
-        permalink_ext = File.extname(document.permalink)
+      document_permalink = document.permalink
+      if document_permalink && !document_permalink.end_with?("/")
+        permalink_ext = File.extname(document_permalink)
         permalink_ext unless permalink_ext.empty?
       end
     end
@@ -265,5 +269,10 @@ module Jekyll
         c.output_ext(document.extname)
       end.compact
     end
+
+    private
+    def liquid_options
+      @liquid_options ||= site.config["liquid"]
+    end
   end
 end

data/lib/jekyll/site.rb

@@ -93,9 +93,12 @@ module Jekyll
       self.pages = []
       self.static_files = []
       self.data = {}
+      @site_data = nil
       @collections = nil
+      @docs_to_write = nil
       @regenerator.clear_cache
       @liquid_renderer.reset
+      @site_cleaner = nil
 
       if limit_posts < 0
         raise ArgumentError, "limit_posts must be a non-negative number"
@@ -252,7 +255,7 @@ module Jekyll
     #
     # Returns the Hash to be hooked to site.data.
     def site_data
-      config["data"] || data
+      @site_data ||= (config["data"] || data)
     end
 
     # The Hash payload containing site-wide data.
@@ -311,7 +314,7 @@ module Jekyll
     #
     # Returns an Array of Documents which should be written
     def docs_to_write
-      documents.select(&:write?)
+      @docs_to_write ||= documents.select(&:write?)
     end
 
     # Get all the documents
@@ -458,10 +461,7 @@ module Jekyll
     def render_docs(payload)
       collections.each_value do |collection|
         collection.docs.each do |document|
-          if regenerator.regenerate?(document)
-            document.output = Jekyll::Renderer.new(self, document, payload).run
-            document.trigger_hooks(:post_render)
-          end
+          render_regenerated(document, payload)
         end
       end
     end
@@ -469,11 +469,15 @@ module Jekyll
     private
     def render_pages(payload)
       pages.flatten.each do |page|
-        if regenerator.regenerate?(page)
-          page.output = Jekyll::Renderer.new(self, page, payload).run
-          page.trigger_hooks(:post_render)
-        end
+        render_regenerated(page, payload)
       end
     end
+
+    private
+    def render_regenerated(document, payload)
+      return unless regenerator.regenerate?(document)
+      document.output = Jekyll::Renderer.new(self, document, payload).run
+      document.trigger_hooks(:post_render)
+    end
   end
 end

data/lib/jekyll/static_file.rb

@@ -137,7 +137,7 @@ module Jekyll
                    :template     => @collection.url_template,
                    :placeholders => placeholders,
                  })
-               end.to_s.gsub(%r!/$!, "")
+               end.to_s.chomp("/")
     end
 
     # Returns the type of the collection if present, nil otherwise.

data/lib/jekyll/tags/include.rb

@@ -19,7 +19,11 @@ module Jekyll
       VARIABLE_SYNTAX = %r!
         (?<variable>[^{]*(\{\{\s*[\w\-\.]+\s*(\|.*)?\}\}[^\s{}]*)+)
         (?<params>.*)
-      !x
+      !mx
+
+      FULL_VALID_SYNTAX = %r!\A\s*(?:#{VALID_SYNTAX}(?=\s|\z)\s*)*\z!
+      VALID_FILENAME_CHARS = %r!^[\w/\.-]+$!
+      INVALID_SEQUENCES = %r![./]{2,}!
 
       def initialize(tag_name, markup, tokens)
         super
@@ -59,7 +63,7 @@ module Jekyll
       end
 
       def validate_file_name(file)
-        if file !~ %r!^[a-zA-Z0-9_/\.-]+$! || file =~ %r!\./! || file =~ %r!/\.!
+        if file =~ INVALID_SEQUENCES || file !~ VALID_FILENAME_CHARS
           raise ArgumentError, <<-MSG
 Invalid syntax for include tag. File contains invalid characters or sequences:
 
@@ -74,8 +78,7 @@ MSG
       end
 
       def validate_params
-        full_valid_syntax = %r!\A\s*(?:#{VALID_SYNTAX}(?=\s|\z)\s*)*\z!
-        unless @params =~ full_valid_syntax
+        unless @params =~ FULL_VALID_SYNTAX
           raise ArgumentError, <<-MSG
 Invalid syntax for include tag:
 
@@ -96,7 +99,7 @@ MSG
 
       # Render the variable if required
       def render_variable(context)
-        if @file.match(VARIABLE_SYNTAX)
+        if @file =~ VARIABLE_SYNTAX
           partial = context.registers[:site]
             .liquid_renderer
             .file("(variable)")

data/lib/jekyll/theme.rb

@@ -8,6 +8,8 @@ module Jekyll
 
     def initialize(name)
       @name = name.downcase.strip
+      Jekyll.logger.debug "Theme:", name
+      Jekyll.logger.debug "Theme source:", root
       configure_sass
     end
 
@@ -21,19 +23,19 @@ module Jekyll
     end
 
     def includes_path
-      path_for "_includes".freeze
+      @includes_path ||= path_for "_includes".freeze
     end
 
     def layouts_path
-      path_for "_layouts".freeze
+      @layouts_path ||= path_for "_layouts".freeze
     end
 
     def sass_path
-      path_for "_sass".freeze
+      @sass_path ||= path_for "_sass".freeze
     end
 
     def assets_path
-      path_for "assets".freeze
+      @assets_path ||= path_for "assets".freeze
     end
 
     def configure_sass
@@ -56,6 +58,7 @@ module Jekyll
     def realpath_for(folder)
       File.realpath(Jekyll.sanitized_path(root, folder.to_s))
     rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP
+      Jekyll.logger.warn "Invalid theme folder:", folder
       nil
     end
 

data/lib/jekyll/theme_builder.rb

@@ -8,7 +8,7 @@ class Jekyll::ThemeBuilder
   attr_reader :name, :path, :code_of_conduct
 
   def initialize(theme_name, opts)
-    @name = theme_name.to_s.tr(" ", "_").gsub(%r!_+!, "_")
+    @name = theme_name.to_s.tr(" ", "_").squeeze("_")
     @path = Pathname.new(File.expand_path(name, Dir.pwd))
     @code_of_conduct = !!opts["code_of_conduct"]
   end

data/lib/jekyll/url.rb

@@ -72,9 +72,9 @@ module Jekyll
         break result if result.index(":").nil?
         if token.last.nil?
           # Remove leading "/" to avoid generating urls with `//`
-          result.gsub(%r!/:#{token.first}!, "")
+          result.gsub("/:#{token.first}", "")
         else
-          result.gsub(%r!:#{token.first}!, self.class.escape_path(token.last))
+          result.gsub(":#{token.first}", self.class.escape_path(token.last))
         end
       end
     end
@@ -109,14 +109,14 @@ module Jekyll
         replacement = self.class.escape_path(value)
 
         match.sub(":#{winner}", replacement)
-      end.gsub(%r!//!, "/".freeze)
+      end.squeeze("/")
     end
 
     # Returns a sanitized String URL, stripping "../../" and multiples of "/",
     # as well as the beginning "/" so we can enforce and ensure it.
 
     def sanitize_url(str)
-      "/" + str.gsub(%r!/{2,}!, "/").gsub(%r!\.+/|\A/+!, "")
+      "/#{str}".gsub("..", "/").gsub("./", "").squeeze("/")
     end
 
     # Escapes a path to be a valid URL path segment

data/lib/jekyll/utils.rb

@@ -147,6 +147,14 @@ module Jekyll
     rescue EOFError
       false
     end
+
+    # Determine whether the given content string contains Liquid Tags or Vaiables
+    #
+    # Returns true is the string contains sequences of `{%` or `{{`
+    def has_liquid_construct?(content)
+      return false if content.nil? || content.empty?
+      content.include?("{%") || content.include?("{{")
+    end
     # rubocop: enable PredicateName
 
     # Slugify a filename or title.

data/lib/jekyll/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.7.4".freeze
+  VERSION = "3.8.0.pre.rc1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.7.4
+  version: 3.8.0.pre.rc1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -237,6 +237,7 @@ files:
 - lib/jekyll/excerpt.rb
 - lib/jekyll/external.rb
 - lib/jekyll/filters.rb
+- lib/jekyll/filters/date_filters.rb
 - lib/jekyll/filters/grouping_filters.rb
 - lib/jekyll/filters/url_filters.rb
 - lib/jekyll/frontmatter_defaults.rb
@@ -322,12 +323,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 2
 summary: A simple, blog aware, static site generator.