jekyll 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8de141f536d43289d9c0f6dcea9282eca345760cb15208d11971128f0e9c9b23
-  data.tar.gz: d3f2ed7b92cc8a96b1c56c183912247d60399fb13bf899b874093797d1b8c574
+  metadata.gz: b74631944252558b9ad068a1df651f0890577d11c6ac24d06050fe76e9a41d60
+  data.tar.gz: c34826fe92efe4fe968692fa3517c4f8ddf600b9c99af1776d305804e313a1fe
 SHA512:
-  metadata.gz: 188a24d699ba093c3a55048cacb969158cb027a4df37cdc62bd31c22dd8223c8c8b138a190b5eaee85fb811be771fa3e8256bde4b1c8f6fdfbac8a69dbc221c4
-  data.tar.gz: d2eb7caccefdaebfeec3cce77f749d4ade2d463eb39d85ab9f3fe9a54afadc193fcfc7218692124e217843443f0ae9b0a3ee71a9ffb6ececc245fc063c370f1e
+  metadata.gz: d89ea1ca35864a53aa21d21847ef357d33a28f8e094bc4c39bc519c2895ea6e8a87d86669252af4b9431a23634209bf38e909ea7b0686ba22bcac898a43488cc
+  data.tar.gz: 950488593a4b255d8196baf07dfdd04a85bd062cf7b612531b6253eb4118d77ab8209290f535621dd2dc6aec2a73f8079092d243aaa002411e855b6264a5c33a

data/.rubocop.yml

@@ -56,6 +56,8 @@ Lint/NestedPercentLiteral:
     - test/test_site.rb
 Lint/DeprecatedOpenSSLConstant:
   Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: false
 Lint/RaiseException:
   Enabled: true
 Lint/StructNewOverride:
@@ -86,6 +88,7 @@ Metrics/CyclomaticComplexity:
   Exclude:
     - lib/jekyll/utils.rb
     - lib/jekyll/commands/serve.rb
+  Max: 11
 Metrics/MethodLength:
   CountComments: false
   Max: 20
@@ -169,6 +172,12 @@ Style/PercentLiteralDelimiters:
     "%w": "()"
     "%W": "()"
     "%x": "()"
+Style/RedundantFetchBlock:
+  Enabled: false
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
 Style/RegexpLiteral:
   EnforcedStyle: percent_r
 Style/RescueModifier:

data/lib/jekyll/cleaner.rb

@@ -3,7 +3,7 @@
 module Jekyll
   # Handles the cleanup of a site's destination before it is built.
   class Cleaner
-    HIDDEN_FILE_REGEX = %r!\/\.{1,2}$!.freeze
+    HIDDEN_FILE_REGEX = %r!/\.{1,2}$!.freeze
     attr_reader :site
 
     def initialize(site)
@@ -105,7 +105,7 @@ module Jekyll
     #
     # Returns the regular expression
     def keep_file_regex
-      %r!\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.keep_files).source})!
+      %r!\A#{Regexp.quote(site.dest)}/(#{Regexp.union(site.keep_files).source})!
     end
   end
 end

data/lib/jekyll/collection.rb

@@ -166,7 +166,7 @@ module Jekyll
     #
     # Returns a sanitized version of the label.
     def sanitize_label(label)
-      label.gsub(%r![^a-z0-9_\-\.]!i, "")
+      label.gsub(%r![^a-z0-9_\-.]!i, "")
     end
 
     # Produce a representation of this Collection for use in Liquid.

data/lib/jekyll/entry_filter.rb

@@ -28,7 +28,6 @@ module Jekyll
       )
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity
     def filter(entries)
       entries.reject do |e|
         # Reject this entry if it is just a "dot" representation.
@@ -51,7 +50,6 @@ module Jekyll
         special?(e) || backup?(e)
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
 
     def included?(entry)
       glob_include?(site.include, entry) ||

data/lib/jekyll/filters.rb

@@ -399,7 +399,6 @@ module Jekyll
 
     # `where` filter helper
     #
-    # rubocop:disable Metrics/CyclomaticComplexity
     # rubocop:disable Metrics/PerceivedComplexity
     def compare_property_vs_target(property, target)
       case target
@@ -421,7 +420,7 @@ module Jekyll
 
       false
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
+
     # rubocop:enable Metrics/PerceivedComplexity
 
     def item_property(item, property)

data/lib/jekyll/page.rb

@@ -49,6 +49,7 @@ module Jekyll
 
       process(name)
       read_yaml(PathManager.join(base, dir), name)
+      generate_excerpt if site.config["page_excerpts"]
 
       data.default_proc = proc do |_, key|
         site.frontmatter_defaults.find(relative_path, type, key)
@@ -71,38 +72,6 @@ module Jekyll
       end
     end
 
-    # For backwards-compatibility in subclasses that do not redefine
-    # the `:to_liquid` method, stash existing definition under a new name
-    #
-    # TODO: Remove in Jekyll 5.0
-    alias_method :legacy_to_liquid, :to_liquid
-    private :legacy_to_liquid
-
-    # Private
-    # Subclasses can choose to optimize their `:to_liquid` method by wrapping
-    # it around this definition.
-    #
-    # TODO: Remove in Jekyll 5.0
-    def liquid_drop
-      @liquid_drop ||= begin
-        defaults = site.frontmatter_defaults.all(relative_path, type)
-        unless defaults.empty?
-          Utils.deep_merge_hashes!(data, Utils.deep_merge_hashes!(defaults, data))
-        end
-        Drops::PageDrop.new(self)
-      end
-    end
-    private :liquid_drop
-
-    # Public
-    #
-    # Liquid representation of current page
-    #
-    # TODO: Remove optional parameter in Jekyll 5.0
-    def to_liquid(attrs = nil)
-      self.class == Jekyll::Page ? liquid_drop : legacy_to_liquid(attrs)
-    end
-
     # The full path and filename of the post. Defined in the YAML of the post
     # body.
     #
@@ -178,7 +147,7 @@ module Jekyll
 
     # The path to the page source file, relative to the site source
     def relative_path
-      @relative_path ||= File.join(*[@dir, @name].map(&:to_s).reject(&:empty?)).sub(%r!\A\/!, "")
+      @relative_path ||= File.join(*[@dir, @name].map(&:to_s).reject(&:empty?)).sub(%r!\A/!, "")
     end
 
     # Obtain destination path.
@@ -221,9 +190,21 @@ module Jekyll
     end
 
     def excerpt
-      return data["excerpt"] unless self.class == Jekyll::Page
+      return @excerpt if defined?(@excerpt)
+
+      @excerpt = data["excerpt"]&.to_s
+    end
+
+    def generate_excerpt?
+      !excerpt_separator.empty? && self.class == Jekyll::Page && html?
+    end
+
+    private
+
+    def generate_excerpt
+      return unless generate_excerpt?
 
-      data["excerpt"] ||= Jekyll::PageExcerpt.new(self).to_liquid unless excerpt_separator.empty?
+      data["excerpt"] ||= Jekyll::PageExcerpt.new(self)
     end
   end
 end

data/lib/jekyll/page_excerpt.rb

@@ -2,15 +2,14 @@
 
 module Jekyll
   class PageExcerpt < Excerpt
-    attr_reader :output, :doc
+    attr_reader :doc
     alias_method :id, :relative_path
 
-    # The Liquid representation of this instance is simply the rendered output string.
-    alias_method :to_liquid, :output
+    EXCERPT_ATTRIBUTES = (Page::ATTRIBUTES_FOR_LIQUID - %w(excerpt)).freeze
+    private_constant :EXCERPT_ATTRIBUTES
 
-    def initialize(doc)
-      super
-      self.output = Renderer.new(site, self, site.site_payload).run
+    def to_liquid
+      @to_liquid ||= doc.to_liquid(EXCERPT_ATTRIBUTES)
     end
 
     def render_with_liquid?

data/lib/jekyll/tags/include.rb

@@ -5,15 +5,15 @@ module Jekyll
     class IncludeTag < Liquid::Tag
       VALID_SYNTAX = %r!
         ([\w-]+)\s*=\s*
-        (?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))
+        (?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w.-]+))
       !x.freeze
       VARIABLE_SYNTAX = %r!
-        (?<variable>[^{]*(\{\{\s*[\w\-\.]+\s*(\|.*)?\}\}[^\s{}]*)+)
+        (?<variable>[^{]*(\{\{\s*[\w\-.]+\s*(\|.*)?\}\}[^\s{}]*)+)
         (?<params>.*)
       !mx.freeze
 
       FULL_VALID_SYNTAX = %r!\A\s*(?:#{VALID_SYNTAX}(?=\s|\z)\s*)*\z!.freeze
-      VALID_FILENAME_CHARS = %r!^[\w/\.-]+$!.freeze
+      VALID_FILENAME_CHARS = %r!^[\w/.-]+$!.freeze
       INVALID_SEQUENCES = %r![./]{2,}!.freeze
 
       def initialize(tag_name, markup, tokens)

data/lib/jekyll/utils.rb

@@ -215,7 +215,7 @@ module Jekyll
       slug = replace_character_sequence_with_hyphen(string, :mode => mode)
 
       # Remove leading/trailing hyphen
-      slug.gsub!(%r!^\-|\-$!i, "")
+      slug.gsub!(%r!^-|-$!i, "")
 
       slug.downcase! unless cased
       Jekyll.logger.warn("Warning:", "Empty `slug` generated for '#{string}'.") if slug.empty?

data/lib/jekyll/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Tom Preston-Werner
 - Parker Moore
 - Matt Rogers
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -257,7 +257,6 @@ files:
 - lib/jekyll/drops/drop.rb
 - lib/jekyll/drops/excerpt_drop.rb
 - lib/jekyll/drops/jekyll_drop.rb
-- lib/jekyll/drops/page_drop.rb
 - lib/jekyll/drops/site_drop.rb
 - lib/jekyll/drops/static_file_drop.rb
 - lib/jekyll/drops/unified_payload_drop.rb
@@ -349,7 +348,7 @@ metadata:
   bug_tracker_uri: https://github.com/jekyll/jekyll/issues
   changelog_uri: https://github.com/jekyll/jekyll/releases
   homepage_uri: https://jekyllrb.com
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -366,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A simple, blog aware, static site generator.
 test_files: []

data/lib/jekyll/drops/page_drop.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module Drops
-    class PageDrop < Drop
-      extend Forwardable
-
-      mutable false
-
-      def_delegators :@obj, :content, :dir, :name, :path, :url, :excerpt
-      private def_delegator :@obj, :data, :fallback_data
-
-      def title
-        @obj.data["title"]
-      end
-    end
-  end
-end