jekyll 4.3.4 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36a2e136e304048a4cd7cc196e2aed55eb12f143e9132181462ded47f80973b1
-  data.tar.gz: a3f4d3438d8ba9179740dacc2eb89ecc7d0770927a1628fc2ac410010bea0c7b
+  metadata.gz: 6d429ecde97ed33aec9c33b132f24904b49af207540708c32f63a4643733dda9
+  data.tar.gz: b8241219e23446e5ea9bf4a16e1a27189257bc38c01e1cc1578668c9638bf36f
 SHA512:
-  metadata.gz: c37c4db936253fd9307605f04af32d0a869839699b3056bae5dab4f1941ee7016e8d520f77f20a5d45026424fee68ff070e3029b81b4b0aafc0835cf4fe92528
-  data.tar.gz: 0437ed64aa93cd10d3c751897bdf52b5de2d1d50bd52282588cee37a86d9a56d13fdad0ee32bfabb55336dcb5b2796c13857d9870700d071043869eb188e5711
+  metadata.gz: 7cf4e479b58a21659d7ca74e2ec3bb8ed24f89916048a0573f2e1c15fa7f44cfa7a535130e9e6233ac831f55ccf14250e686fbb039c64f14e8e03669b144d31c
+  data.tar.gz: 4320b2998e0f80d2afb4a8d6c10f16625ca3fc2f91a380c6ad88ee82e9589f8928fbdcaa89a121ae4c94dd3a8d823c611a3ae1dd75c9799c097c5c10ec4fee28

data/.rubocop.yml

@@ -1,35 +1,53 @@
----
-inherit_from: .rubocop_todo.yml
+# -----------------------------------------------------------------------------
+# This file has been formatted via a Rake Task configuring cops from
+# RuboCop v1.57.2.
+#
+# To add more cops, paste configurations at the end of the file and run
+# the rake task via `bundle exec rake rubocop:format_config`.
+# -----------------------------------------------------------------------------
 
-require:
-  - rubocop-minitest
-  - rubocop-performance
-  - rubocop-rake
-  - rubocop-rspec
-  - ./rubocop/jekyll
+inherit_from: ".rubocop_todo.yml"
 
-Jekyll/NoPutsAllowed:
-  Exclude:
-    - rake/*.rake
+require:
+- "./rubocop/jekyll"
+- rubocop-minitest
+- rubocop-performance
+- rubocop-rake
+- rubocop-rspec
 
+# Directive for all cops
 AllCops:
   TargetRubyVersion: 2.7
   Include:
-    - lib/**/*.rb
-    - test/**/*.rb
+  - lib/**/*.rb
+  - test/**/*.rb
+  Exclude:
+  - benchmark/**/*
+  - bin/**/*
+  - exe/**/*
+  - script/**/*
+  - tmp/**/*
+  - vendor/**/*
+
+# Configure custom cop
+Jekyll/NoPutsAllowed:
   Exclude:
-    - bin/**/*
-    - exe/**/*
-    - benchmark/**/*
-    - script/**/*
-    - vendor/**/*
-    - tmp/**/*
+  - rake/*.rake
+
+# Configure built-in cops
+# =======================
 
+# Gemspec cops
+# ----------------------------------------
 Gemspec/DeprecatedAttributeAssignment:
   Enabled: true
+Gemspec/DevelopmentDependencies:
+  Enabled: false
 Gemspec/RequireMFA:
   Enabled: false
 
+# Layout cops
+# ----------------------------------------
 Layout/BeginEndAlignment:
   Enabled: true
 Layout/EmptyComment:
@@ -38,6 +56,8 @@ Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true
 Layout/EndAlignment:
   Severity: error
+Layout/EndOfLine:
+  Enabled: false
 Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 Layout/FirstHashElementIndentation:
@@ -54,10 +74,10 @@ Layout/LineEndStringConcatenationIndentation:
   Enabled: true
 Layout/LineLength:
   Exclude:
-    - !ruby/regexp /features\/.*.rb/
-    - Rakefile
-    - rake/*.rake
-    - Gemfile
+  - Gemfile
+  - Rakefile
+  - features/**/*.rb
+  - rake/**/*.rake
   Max: 100
   Severity: warning
 Layout/MultilineMethodCallIndentation:
@@ -71,8 +91,10 @@ Layout/SpaceBeforeBrackets:
 Layout/SpaceInsideHashLiteralBraces:
   Enabled: true
   Exclude:
-    - test/**/*.rb
+  - test/**/*.rb
 
+# Lint cops
+# ----------------------------------------
 Lint/AmbiguousAssignment:
   Enabled: true
 Lint/AmbiguousOperatorPrecedence:
@@ -84,7 +106,7 @@ Lint/BinaryOperatorWithIdenticalOperands:
 Lint/ConstantDefinitionInBlock:
   Enabled: true
   Exclude:
-    - test/**/*.rb
+  - test/**/*.rb
 Lint/ConstantOverwrittenInRescue:
   Enabled: true
 Lint/DeprecatedConstants:
@@ -95,6 +117,10 @@ Lint/DuplicateBranch:
   Enabled: true
 Lint/DuplicateElsifCondition:
   Enabled: true
+Lint/DuplicateMagicComment:
+  Enabled: true
+Lint/DuplicateMatchPattern:
+  Enabled: true
 Lint/DuplicateRegexpCharacterClassElement:
   Enabled: true
 Lint/DuplicateRequire:
@@ -119,11 +145,13 @@ Lint/LambdaWithoutLiteralBlock:
   Enabled: true
 Lint/MissingSuper:
   Enabled: false
+Lint/MixedCaseRange:
+  Enabled: true
 Lint/MixedRegexpCaptureTypes:
   Enabled: false
 Lint/NestedPercentLiteral:
   Exclude:
-    - test/test_site.rb
+  - test/test_site.rb
 Lint/NoReturnInBeginEndBlocks:
   Enabled: true
 Lint/NumberedParameterAssignment:
@@ -136,8 +164,12 @@ Lint/RaiseException:
   Enabled: true
 Lint/RedundantDirGlobSort:
   Enabled: true
+Lint/RedundantRegexpQuantifiers:
+  Enabled: true
 Lint/RedundantSafeNavigation:
   Enabled: true
+Lint/RefinementImportMethods:
+  Enabled: true
 Lint/RequireRangeParentheses:
   Enabled: true
 Lint/RequireRelativeSelfPath:
@@ -166,32 +198,38 @@ Lint/UnreachableLoop:
   Enabled: true
 Lint/UselessMethodDefinition:
   Enabled: true
+Lint/UselessRuby2Keywords:
+  Enabled: true
 Lint/UselessTimes:
   Enabled: true
 Lint/Void:
   Exclude:
-    - lib/jekyll/site.rb
+  - lib/jekyll/site.rb
 
+# Metrics cops
+# ----------------------------------------
 Metrics/AbcSize:
   Max: 23
 Metrics/BlockLength:
   Exclude:
-    - test/**/*.rb
-    - lib/jekyll/configuration.rb
-    - rake/*.rake
+  - lib/jekyll/configuration.rb
+  - rake/**/*.rake
+  - test/**/*.rb
 Metrics/ClassLength:
   Exclude:
-    - !ruby/regexp /features\/.*.rb$/
-    - !ruby/regexp /test\/.*.rb$/
-    - lib/jekyll/document.rb
-    - lib/jekyll/site.rb
-    - lib/jekyll/commands/serve.rb
-    - lib/jekyll/configuration.rb
+  - features/**/*.rb
+  - lib/jekyll/commands/serve.rb
+  - lib/jekyll/configuration.rb
+  - lib/jekyll/document.rb
+  - lib/jekyll/site.rb
+  - test/**/*.rb
   Max: 240
+Metrics/CollectionLiteralLength:
+  Enabled: true
 Metrics/CyclomaticComplexity:
   Exclude:
-    - lib/jekyll/utils.rb
-    - lib/jekyll/commands/serve.rb
+  - lib/jekyll/commands/serve.rb
+  - lib/jekyll/utils.rb
   Max: 11
 Metrics/MethodLength:
   CountComments: false
@@ -199,58 +237,102 @@ Metrics/MethodLength:
   Severity: error
 Metrics/ModuleLength:
   Exclude:
-    - lib/jekyll/filters.rb
+  - lib/jekyll/filters.rb
   Max: 240
 Metrics/ParameterLists:
   Max: 4
 Metrics/PerceivedComplexity:
   Max: 13
 
+# Minitest cops
+# ----------------------------------------
 Minitest/AssertEmptyLiteral:
   Enabled: false
 Minitest/AssertInDelta:
   Enabled: true
-Minitest/AssertionInLifecycleHook:
-  Enabled: true
 Minitest/AssertKindOf:
   Enabled: true
+Minitest/AssertOperator:
+  Enabled: false
 Minitest/AssertOutput:
   Enabled: true
 Minitest/AssertPathExists:
   Enabled: true
+Minitest/AssertPredicate:
+  Enabled: false
+Minitest/AssertRaisesWithRegexpArgument:
+  Enabled: true
+Minitest/AssertSame:
+  Enabled: true
 Minitest/AssertSilent:
   Enabled: true
 Minitest/AssertWithExpectedArgument:
   Enabled: true
-Minitest/LiteralAsActualArgument:
+Minitest/AssertionInLifecycleHook:
   Enabled: true
-Minitest/TestMethodName:
+Minitest/DuplicateTestRun:
+  Enabled: true
+Minitest/EmptyLineBeforeAssertionMethods:
   Enabled: false
+Minitest/LifecycleHooksOrder:
+  Enabled: true
+Minitest/LiteralAsActualArgument:
+  Enabled: true
 Minitest/MultipleAssertions:
   Enabled: true
+Minitest/NonExecutableTestMethod:
+  Enabled: true
+Minitest/NonPublicTestMethod:
+  Enabled: true
+Minitest/RedundantMessageArgument:
+  Enabled: true
 Minitest/RefuteInDelta:
   Enabled: true
 Minitest/RefuteKindOf:
   Enabled: true
+Minitest/RefuteOperator:
+  Enabled: false
 Minitest/RefutePathExists:
   Enabled: true
+Minitest/RefutePredicate:
+  Enabled: false
+Minitest/RefuteSame:
+  Enabled: true
+Minitest/ReturnInTestMethod:
+  Enabled: true
+Minitest/SkipEnsure:
+  Enabled: true
+Minitest/SkipWithoutReason:
+  Enabled: true
+Minitest/TestFileName:
+  Enabled: true
+  Exclude:
+  - test/helper.rb
+Minitest/TestMethodName:
+  Enabled: false
 Minitest/UnreachableAssertion:
   Enabled: true
 Minitest/UnspecifiedException:
   Enabled: true
+Minitest/UselessAssertion:
+  Enabled: true
 
+# Naming cops
+# ----------------------------------------
 Naming/FileName:
   Enabled: false
 Naming/HeredocDelimiterNaming:
   Exclude:
-    - test/**/*.rb
+  - test/**/*.rb
 Naming/MemoizedInstanceVariableName:
   Exclude:
-    - lib/jekyll/convertible.rb
-    - lib/jekyll/drops/site_drop.rb
-    - lib/jekyll/drops/unified_payload_drop.rb
-    - lib/jekyll/page_without_a_file.rb
+  - lib/jekyll/convertible.rb
+  - lib/jekyll/drops/site_drop.rb
+  - lib/jekyll/drops/unified_payload_drop.rb
+  - lib/jekyll/page_without_a_file.rb
 
+# Performance cops
+# ----------------------------------------
 Performance/AncestorsInclude:
   Enabled: false
 Performance/ArraySemiInfiniteRangeSlice:
@@ -267,6 +349,8 @@ Performance/ConstantRegexp:
   Enabled: true
 Performance/MapCompact:
   Enabled: true
+Performance/MapMethodChain:
+  Enabled: true
 Performance/MethodObjectAsBlock:
   Enabled: true
 Performance/RedundantEqualityComparisonBlock:
@@ -288,23 +372,27 @@ Performance/StringIdentifierArgument:
 Performance/StringInclude:
   Enabled: true
   Exclude:
-    - lib/jekyll/utils/platforms.rb
+  - lib/jekyll/utils/platforms.rb
 Performance/Sum:
   Enabled: true
 
+# Security cops
+# ----------------------------------------
 Security/CompoundHash:
   Enabled: true
 Security/IoMethods:
   Enabled: true
 Security/MarshalLoad:
   Exclude:
-    - !ruby/regexp /test\/.*.rb$/
-    - lib/jekyll/regenerator.rb
+  - lib/jekyll/regenerator.rb
+  - test/**/*.rb
 Security/YAMLLoad:
   Exclude:
-    - !ruby/regexp /features\/.*.rb/
-    - !ruby/regexp /test\/.*.rb$/
+  - features/**/*.rb
+  - test/**/*.rb
 
+# Style cops
+# ----------------------------------------
 Style/AccessModifierDeclarations:
   Enabled: false
 Style/AccessorGrouping:
@@ -317,21 +405,25 @@ Style/ArgumentsForwarding:
   Enabled: false
 Style/ArrayCoercion:
   Enabled: true
+Style/ArrayIntersect:
+  Enabled: true
 Style/BisectedAttrAccessor:
   Enabled: true
 Style/CaseLikeIf:
   Enabled: true
-Style/StringChars:
-  Enabled: true
 Style/ClassAndModuleChildren:
   Exclude:
-    - test/**/*.rb
+  - test/**/*.rb
 Style/ClassEqualityComparison:
   Enabled: true
 Style/CollectionCompact:
   Enabled: true
 Style/CombinableLoops:
   Enabled: true
+Style/ConcatArrayLiterals:
+  Enabled: true
+Style/DirEmpty:
+  Enabled: true
 Style/DocumentDynamicEvalDefinition:
   Enabled: true
 Style/Documentation:
@@ -342,25 +434,29 @@ Style/EmptyHeredoc:
   Enabled: true
 Style/EndlessMethod:
   Enabled: true
+Style/EnvHome:
+  Enabled: true
+Style/ExactRegexpMatch:
+  Enabled: true
 Style/ExplicitBlockArgument:
   Enabled: false
 Style/ExponentialNotation:
   Enabled: true
-Style/EnvHome:
-  Enabled: true
 Style/FetchEnvVar:
   Enabled: false
+Style/FileEmpty:
+  Enabled: true
 Style/FileRead:
   Enabled: false
+Style/FileWrite:
+  Enabled: true
 Style/FormatStringToken:
   Exclude:
-    - lib/jekyll/utils/ansi.rb
-    - lib/jekyll/liquid_renderer/table.rb
-    - lib/jekyll/profiler.rb
+  - lib/jekyll/liquid_renderer/table.rb
+  - lib/jekyll/profiler.rb
+  - lib/jekyll/utils/ansi.rb
 Style/FrozenStringLiteralComment:
   EnforcedStyle: always
-Style/FileWrite:
-  Enabled: true
 Style/GlobalStdStream:
   Enabled: true
 Style/GuardClause:
@@ -368,7 +464,7 @@ Style/GuardClause:
 Style/HashAsLastArrayItem:
   Enabled: true
 Style/HashConversion:
-  Enabled: true  
+  Enabled: true
 Style/HashEachMethods:
   Enabled: true
 Style/HashExcept:
@@ -392,9 +488,11 @@ Style/MapCompactWithConditionalBlock:
   Enabled: true
 Style/MapToHash:
   Enabled: true
+Style/MinMaxComparison:
+  Enabled: true
 Style/MixinUsage:
   Exclude:
-    - test/helper.rb
+  - test/helper.rb
 Style/ModuleFunction:
   Enabled: false
 Style/MultilineTernaryOperator:
@@ -405,61 +503,94 @@ Style/NestedFileDirname:
   Enabled: true
 Style/NilLambda:
   Enabled: true
+Style/ObjectThen:
+  Enabled: true
+Style/OperatorMethodCall:
+  Enabled: true
 Style/OptionalBooleanParameter:
   Enabled: true
   Exclude:
-    - lib/jekyll/log_adapter.rb
+  - lib/jekyll/log_adapter.rb
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     "%Q": "{}"
-    "%W": ()
+    "%W": "()"
     "%q": "{}"
     "%r": "!!"
-    "%s": ()
-    "%w": ()
-    "%x": ()
+    "%s": "()"
+    "%w": "()"
+    "%x": "()"
 Style/QuotedSymbols:
   Enabled: true
 Style/RedundantArgument:
   Enabled: true
+Style/RedundantArrayConstructor:
+  Enabled: true
 Style/RedundantAssignment:
   Enabled: true
+Style/RedundantConstantBase:
+  Enabled: true
+Style/RedundantCurrentDirectoryInPath:
+  Enabled: true
+Style/RedundantDoubleSplatHashBraces:
+  Enabled: true
+Style/RedundantEach:
+  Enabled: true
 Style/RedundantFetchBlock:
   Enabled: false
 Style/RedundantFileExtensionInRequire:
   Enabled: true
+Style/RedundantFilterChain:
+  Enabled: true
+Style/RedundantHeredocDelimiterQuotes:
+  Enabled: true
 Style/RedundantInitialize:
   Enabled: true
   Exclude:
-    - lib/jekyll/plugin.rb
+  - lib/jekyll/plugin.rb
+Style/RedundantLineContinuation:
+  Enabled: true
+Style/RedundantRegexpArgument:
+  Enabled: true
 Style/RedundantRegexpCharacterClass:
   Enabled: true
+Style/RedundantRegexpConstructor:
+  Enabled: true
 Style/RedundantRegexpEscape:
   Enabled: true
 Style/RedundantSelfAssignment:
   Enabled: true
 Style/RedundantSelfAssignmentBranch:
   Enabled: true
+Style/RedundantStringEscape:
+  Enabled: true
 Style/RegexpLiteral:
   EnforcedStyle: percent_r
 Style/RescueModifier:
   Enabled: false
+Style/ReturnNilInPredicateMethodDefinition:
+  Enabled: true
 Style/SafeNavigation:
   Exclude:
-    - lib/jekyll/document.rb
+  - lib/jekyll/document.rb
+  - lib/jekyll/page.rb
 Style/SignalException:
   EnforcedStyle: only_raise
 Style/SingleArgumentDig:
   Enabled: true
+Style/SingleLineDoEndBlock:
+  Enabled: true
 Style/SlicingWithRange:
   Enabled: false
 Style/SoleNestedConditional:
   Enabled: true
+Style/StringChars:
+  Enabled: true
 Style/StringConcatenation:
   Enabled: true
   Exclude:
-    - lib/jekyll/commands/*.rb
-    - test/**/*.rb
+  - lib/jekyll/commands/*.rb
+  - test/**/*.rb
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 Style/StringLiteralsInInterpolation:

data/lib/jekyll/commands/serve.rb

@@ -28,7 +28,7 @@ module Jekyll
                                      "the server is started.",],
           "livereload"           => ["-l", "--livereload",
                                      "Use LiveReload to automatically refresh browsers",],
-          "livereload_ignore"    => ["--livereload-ignore ignore GLOB1[,GLOB2[,...]]",
+          "livereload_ignore"    => ["--livereload-ignore GLOB1[,GLOB2[,...]]",
                                      Array,
                                      "Files for LiveReload to ignore. " \
                                      "Remember to quote the values so your shell " \
@@ -71,7 +71,6 @@ module Jekyll
             end
 
             cmd.action do |_, opts|
-              opts["livereload_port"] ||= LIVERELOAD_PORT
               opts["serving"] = true
               opts["watch"]   = true unless opts.key?("watch")
 
@@ -94,6 +93,7 @@ module Jekyll
           opts = configuration_from_options(opts)
           destination = opts["destination"]
           if opts["livereload"]
+            opts["livereload_port"] ||= LIVERELOAD_PORT
             validate_options(opts)
             register_reload_hooks(opts)
           end
@@ -138,7 +138,6 @@ module Jekyll
           end
         end
 
-        # rubocop:disable Metrics/AbcSize
         def register_reload_hooks(opts)
           require_relative "serve/live_reload_reactor"
           @reload_reactor = LiveReloadReactor.new
@@ -160,7 +159,7 @@ module Jekyll
             if @changed_pages && @reload_reactor && @reload_reactor.running?
               ignore, @changed_pages = @changed_pages.partition do |p|
                 Array(opts["livereload_ignore"]).any? do |filter|
-                  File.fnmatch(filter, Jekyll.sanitized_path(p.relative_path))
+                  File.fnmatch(filter, p.relative_path)
                 end
               end
               Jekyll.logger.debug "LiveReload:", "Ignoring #{ignore.map(&:relative_path)}"
@@ -169,7 +168,6 @@ module Jekyll
             @changed_pages = nil
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         # Do a base pre-setup of WEBRick so that everything is in place
         # when we get ready to party, checking for an setting up an error page
@@ -274,12 +272,19 @@ module Jekyll
         def boot_or_detach(server, opts)
           if opts["detach"]
             pid = Process.fork do
+              # Detach the process from controlling terminal
+              $stdin.reopen("/dev/null", "r")
+              $stdout.reopen("/dev/null", "w")
+              $stderr.reopen("/dev/null", "w")
               server.start
             end
 
             Process.detach(pid)
             Jekyll.logger.info "Server detached with pid '#{pid}'.",
                                "Run `pkill -f jekyll' or `kill -9 #{pid}' to stop the server."
+
+            # Exit without running `at_exit` inherited by the forked process.
+            Process.exit! 0
           else
             t = Thread.new { server.start }
             trap("INT") { server.shutdown }

data/lib/jekyll/drops/drop.rb

@@ -280,7 +280,8 @@ module Jekyll
         return self[key] if key?(key)
         raise KeyError, %(key not found: "#{key}") if default.nil? && block.nil?
         return yield(key) unless block.nil?
-        return default unless default.nil?
+
+        default unless default.nil?
       end
 
       private

data/lib/jekyll/filters.rb

@@ -441,6 +441,14 @@ module Jekyll
       property.split(".").reduce(liquid_data) do |data, key|
         data.respond_to?(:[]) && data[key]
       end
+    rescue TypeError => e
+      msg = if liquid_data.is_a?(Array)
+              "Error accessing object (#{liquid_data.to_s[0...20]}) with given key. Expected an " \
+                "integer but got #{property.inspect} instead."
+            else
+              e.message
+            end
+      raise e, msg
     end
 
     FLOAT_LIKE   = %r!\A\s*-?(?:\d+\.?\d*|\.\d+)\s*\Z!.freeze

data/lib/jekyll/frontmatter_defaults.rb

@@ -109,7 +109,7 @@ module Jekyll
       sanitized_path = sanitize_path(path)
 
       if rel_scope_path.include?("*")
-        glob_scope(sanitized_path, rel_scope_path)
+        File.fnmatch?(strip_collections_dir(rel_scope_path), sanitized_path)
       else
         path_is_subpath?(sanitized_path, strip_collections_dir(rel_scope_path))
       end

data/lib/jekyll/plugin_manager.rb

@@ -83,7 +83,7 @@ module Jekyll
     # Returns an array of strings, each string being the name of a gem name
     #   that is allowed to be used.
     def whitelist
-      @whitelist ||= Array[site.config["whitelist"]].flatten
+      @whitelist ||= [site.config["whitelist"]].flatten
     end
 
     # Require all .rb files if safe mode is off

data/lib/jekyll/site.rb

@@ -49,7 +49,7 @@ module Jekyll
 
       %w(safe lsi highlighter baseurl exclude include future unpublished
          show_drafts limit_posts keep_files).each do |opt|
-        send("#{opt}=", config[opt])
+        send(:"#{opt}=", config[opt])
       end
 
       # keep using `gems` to avoid breaking change
@@ -486,7 +486,7 @@ module Jekyll
     # Returns nothing
     def limit_posts!
       if limit_posts.positive?
-        limit = posts.docs.length < limit_posts ? posts.docs.length : limit_posts
+        limit = [posts.docs.length, limit_posts].min
         posts.docs = posts.docs[-limit, limit]
       end
     end

data/lib/jekyll/static_file.rb

@@ -4,7 +4,9 @@ module Jekyll
   class StaticFile
     extend Forwardable
 
-    attr_reader :relative_path, :extname, :name
+    attr_reader :relative_path, :extname,
+                :type, # Returns the type of the collection if present, nil otherwise.
+                :name
 
     def_delegator :to_liquid, :to_json, :to_json
 
@@ -34,6 +36,7 @@ module Jekyll
       @collection = collection
       @relative_path = File.join(*[@dir, @name].compact)
       @extname = File.extname(@name)
+      @type = @collection&.label&.to_sym
     end
     # rubocop: enable Metrics/ParameterLists
 
@@ -171,11 +174,6 @@ module Jekyll
       end
     end
 
-    # Returns the type of the collection if present, nil otherwise.
-    def type
-      @type ||= @collection.nil? ? nil : @collection.label.to_sym
-    end
-
     # Returns the front matter defaults defined for the file's URL and/or type
     # as defined in _config.yml.
     def defaults

data/lib/jekyll/tags/highlight.rb

@@ -23,7 +23,9 @@ module Jekyll
 
             #{markup}
 
-            Valid syntax: highlight <lang> [linenos]
+            Valid syntax: highlight <lang> [linenos] [mark_lines="3 4 5"]
+
+            See https://jekyllrb.com/docs/liquid/tags/#code-snippet-highlighting for more details.
           MSG
         end
       end
@@ -80,32 +82,45 @@ module Jekyll
 
       def render_rouge(code)
         require "rouge"
-        formatter = ::Rouge::Formatters::HTML.new
-        if @highlight_options[:linenos]
-          formatter = ::Rouge::Formatters::HTMLTable.new(
-            formatter,
-            {
-              :css_class    => "highlight",
-              :gutter_class => "gutter",
-              :code_class   => "code",
-            }
-          )
-        end
-        lexer = ::Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
+        formatter = Rouge::Formatters::HTML.new
+        formatter = line_highlighter_formatter(formatter) if @highlight_options[:mark_lines]
+        formatter = table_formatter(formatter) if @highlight_options[:linenos]
+
+        lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
         formatter.format(lexer.lex(code))
       end
 
+      def line_highlighter_formatter(formatter)
+        Rouge::Formatters::HTMLLineHighlighter.new(
+          formatter,
+          :highlight_lines => mark_lines
+        )
+      end
+
+      def mark_lines
+        value = @highlight_options[:mark_lines]
+        return value.map(&:to_i) if value.is_a?(Array)
+
+        raise SyntaxError, "Syntax Error for mark_lines declaration. Expected a " \
+                           "double-quoted list of integers."
+      end
+
+      def table_formatter(formatter)
+        Rouge::Formatters::HTMLTable.new(
+          formatter,
+          :css_class    => "highlight",
+          :gutter_class => "gutter",
+          :code_class   => "code"
+        )
+      end
+
       def render_codehighlighter(code)
         h(code).strip
       end
 
       def add_code_tag(code)
-        code_attributes = [
-          "class=\"language-#{@lang.to_s.tr("+", "-")}\"",
-          "data-lang=\"#{@lang}\"",
-        ].join(" ")
-        "<figure class=\"highlight\"><pre><code #{code_attributes}>" \
-          "#{code.chomp}</code></pre></figure>"
+        code_attrs = %(class="language-#{@lang.tr("+", "-")}" data-lang="#{@lang}")
+        %(<figure class="highlight"><pre><code #{code_attrs}>#{code.chomp}</code></pre></figure>)
       end
     end
   end

data/lib/jekyll/version.rb

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

data/lib/site_template/404.html

@@ -1,6 +1,6 @@
 ---
 permalink: /404.html
-layout: default
+layout: page
 ---
 
 <style type="text/css" media="screen">

data/rubocop/jekyll/assert_equal_literal_actual.rb

@@ -26,8 +26,11 @@ module RuboCop
       #     @alpha.omega
       #   )
       #
-      class AssertEqualLiteralActual < Cop
-        MSG = "Provide the 'expected value' as the first argument to `assert_equal`.".freeze
+      class AssertEqualLiteralActual < Base
+        extend AutoCorrector
+
+        MSG = "Provide the 'expected value' as the first argument to `assert_equal`."
+        RESTRICT_ON_SEND = %i[assert_equal].freeze
 
         SIMPLE_LITERALS = %i(
           true
@@ -61,12 +64,10 @@ module RuboCop
 
         def on_send(node)
           return unless literal_actual?(node) || literal_actual_with_msg?(node)
-          add_offense(node, location: :expression)
-        end
 
-        def autocorrect(node)
-          lambda do |corrector|
-            corrector.replace(node.loc.expression, replacement(node))
+          range = node.loc.expression
+          add_offense(range) do |corrector|
+            corrector.replace(range, replacement(node))
           end
         end
 

data/rubocop/jekyll/no_p_allowed.rb

@@ -1,20 +1,19 @@
 # frozen_string_literal: true
 
-require "rubocop"
-
 module RuboCop
   module Cop
     module Jekyll
-      class NoPAllowed < Cop
-        MSG = "Avoid using `p` to print things. Use `Jekyll.logger` instead.".freeze
+      class NoPAllowed < Base
+        MSG = "Avoid using `p` to print things. Use `Jekyll.logger` instead."
+        RESTRICT_ON_SEND = %i[p].freeze
 
         def_node_search :p_called?, <<-PATTERN
-        (send _ :p _)
+          (send _ :p _)
         PATTERN
 
         def on_send(node)
           if p_called?(node)
-            add_offense(node, :location => :selector)
+            add_offense(node.loc.selector)
           end
         end
       end

data/rubocop/jekyll/no_puts_allowed.rb

@@ -1,20 +1,19 @@
 # frozen_string_literal: true
 
-require "rubocop"
-
 module RuboCop
   module Cop
     module Jekyll
-      class NoPutsAllowed < Cop
-        MSG = "Avoid using `puts` to print things. Use `Jekyll.logger` instead.".freeze
+      class NoPutsAllowed < Base
+        MSG = "Avoid using `puts` to print things. Use `Jekyll.logger` instead."
+        RESTRICT_ON_SEND = %i[puts].freeze
 
         def_node_search :puts_called?, <<-PATTERN
-        (send nil? :puts _)
+          (send nil? :puts _)
         PATTERN
 
         def on_send(node)
           if puts_called?(node)
-            add_offense(node, :location => :selector)
+            add_offense(node.loc.selector)
           end
         end
       end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 4.3.4
+  version: 4.4.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 - Parker Moore
 - Matt Rogers
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 2025-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -26,6 +26,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: colorator
   requirement: !ruby/object:Gem::Requirement
@@ -40,6 +54,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +130,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -154,22 +196,22 @@ dependencies:
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pathutil
   requirement: !ruby/object:Gem::Requirement
@@ -394,7 +436,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:
@@ -403,7 +445,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -411,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A simple, blog aware, static site generator.
 test_files: []