jekyll 3.8.3 → 3.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c71d2ab96becf45cf452ef5d75a3bda56f748cf1
-  data.tar.gz: e85756fdfebef019f13b142f3651aee2b726168f
+SHA256:
+  metadata.gz: d1f18811c89301d6ac1f83c43a4d2c1780bbe1e69e15c660ddef08048826bed5
+  data.tar.gz: ad03fafa2fc29fbdcd80f517ccef5f07eb109e79c83334c1aa7142a5b2561f64
 SHA512:
-  metadata.gz: 3c508885c5de7efc01f089b4b522e2b69e9e8c2d12d557c4d73308fcb92a15d66c49267bb6b2d4af97b44ccd7e77dfbb8295c5925fbad5d70e22090db2f220da
-  data.tar.gz: 7f2b541eef16a03084917a0a311c5fe703c089f41c8b9ec4b432d04e45c612dd5d45ad7ab411bee0f5d2845519f591d838f7a4063a2c8691f9515bd8e1b77650
+  metadata.gz: a8b270aaeff77e73442f5f6094c063254716873107b5aacaef68b992a9c15bedca1c5b4921965de784cdb823abdbe37f9af504c82d566bded0a831c80b674161
+  data.tar.gz: 7cfb965920cf1ddf96d515c94ce25b0595a9d23ff434607f70aba4ea668dfc1e7e2e46f19d0ebe03c1f733360eb0d7c9c9616210396623f884111be656942d61

data/.rubocop.yml

@@ -53,6 +53,8 @@ Layout/EmptyComment:
   Enabled: false
 Layout/EndAlignment:
   Severity: error
+Lint/SplatKeywordArguments:
+  Enabled: false
 Lint/UnreachableCode:
   Severity: error
 Lint/UselessAccessModifier:

data/lib/jekyll/commands/new.rb

@@ -88,11 +88,22 @@ group :jekyll_plugins do
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+# and associated library.
+install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
+  gem "tzinfo", "~> 1.2"
+  gem "tzinfo-data"
+end
 
 # Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.0" if Gem.win_platform?
+gem "wdm", "~> 0.1.0", :install_if => Gem.win_platform?
+
+# kramdown v2 ships without the gfm parser by default. If you're using
+# kramdown v1, comment out this line.
+gem "kramdown-parser-gfm"
 
+# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem
+# do not have a Java counterpart.
+gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
 RUBY
         end
 

data/lib/jekyll/commands/serve/mime_types_charset.json

@@ -0,0 +1,71 @@
+{
+  "application/javascript": "UTF-8",
+  "application/json": "UTF-8",
+  "application/manifest+json": "UTF-8",
+  "application/vnd.syncml+xml": "UTF-8",
+  "application/vnd.syncml.dm+wbxml": "UTF-8",
+  "application/vnd.syncml.dm+xml": "UTF-8",
+  "application/vnd.syncml.dmddf+xml": "UTF-8",
+  "application/vnd.wap.wbxml": "UTF-8",
+  "text/cache-manifest": "UTF-8",
+  "text/calendar": "UTF-8",
+  "text/coffeescript": "UTF-8",
+  "text/css": "UTF-8",
+  "text/csv": "UTF-8",
+  "text/html": "UTF-8",
+  "text/jade": "UTF-8",
+  "text/jsx": "UTF-8",
+  "text/less": "UTF-8",
+  "text/markdown": "UTF-8",
+  "text/mathml": "UTF-8",
+  "text/mdx": "UTF-8",
+  "text/n3": "UTF-8",
+  "text/plain": "UTF-8",
+  "text/prs.lines.tag": "UTF-8",
+  "text/richtext": "UTF-8",
+  "text/sgml": "UTF-8",
+  "text/shex": "UTF-8",
+  "text/slim": "UTF-8",
+  "text/spdx": "UTF-8",
+  "text/stylus": "UTF-8",
+  "text/tab-separated-values": "UTF-8",
+  "text/troff": "UTF-8",
+  "text/turtle": "UTF-8",
+  "text/uri-list": "UTF-8",
+  "text/vcard": "UTF-8",
+  "text/vnd.curl": "UTF-8",
+  "text/vnd.curl.dcurl": "UTF-8",
+  "text/vnd.curl.mcurl": "UTF-8",
+  "text/vnd.curl.scurl": "UTF-8",
+  "text/vnd.familysearch.gedcom": "UTF-8",
+  "text/vnd.fly": "UTF-8",
+  "text/vnd.fmi.flexstor": "UTF-8",
+  "text/vnd.graphviz": "UTF-8",
+  "text/vnd.in3d.3dml": "UTF-8",
+  "text/vnd.in3d.spot": "UTF-8",
+  "text/vnd.sun.j2me.app-descriptor": "UTF-8",
+  "text/vnd.wap.wml": "UTF-8",
+  "text/vnd.wap.wmlscript": "UTF-8",
+  "text/vtt": "UTF-8",
+  "text/x-asm": "UTF-8",
+  "text/x-c": "UTF-8",
+  "text/x-component": "UTF-8",
+  "text/x-fortran": "UTF-8",
+  "text/x-handlebars-template": "UTF-8",
+  "text/x-java-source": "UTF-8",
+  "text/x-lua": "UTF-8",
+  "text/x-markdown": "UTF-8",
+  "text/x-nfo": "UTF-8",
+  "text/x-opml": "UTF-8",
+  "text/x-pascal": "UTF-8",
+  "text/x-processing": "UTF-8",
+  "text/x-sass": "UTF-8",
+  "text/x-scss": "UTF-8",
+  "text/x-setext": "UTF-8",
+  "text/x-sfv": "UTF-8",
+  "text/x-suse-ymp": "UTF-8",
+  "text/x-uuencode": "UTF-8",
+  "text/x-vcalendar": "UTF-8",
+  "text/x-vcard": "UTF-8",
+  "text/yaml": "UTF-8"
+}

data/lib/jekyll/commands/serve/servlet.rb

@@ -137,6 +137,7 @@ module Jekyll
         def initialize(server, root, callbacks)
           # So we can access them easily.
           @jekyll_opts = server.config[:JekyllOptions]
+          @mime_types_charset = server.config[:MimeTypesCharset]
           set_defaults
           super
         end
@@ -172,27 +173,28 @@ module Jekyll
             end
           end
 
-          validate_and_ensure_charset(req, res)
+          conditionally_inject_charset(res)
           res.header.merge!(@headers)
           rtn
         end
         # rubocop:enable Naming/MethodName
 
-        #
-
         private
-        def validate_and_ensure_charset(_req, res)
-          key = res.header.keys.grep(%r!content-type!i).first
-          typ = res.header[key]
 
-          unless typ =~ %r!;\s*charset=!
-            res.header[key] = "#{typ}; charset=#{@jekyll_opts["encoding"]}"
-          end
+        #
+        # Inject charset based on Jekyll config only if our mime-types database contains
+        # the charset metadata.
+        #
+        # Refer `script/vendor-mimes` in the repository for further details.
+        def conditionally_inject_charset(res)
+          typ = res.header["content-type"]
+          return unless @mime_types_charset.key?(typ)
+          return if %r!;\s*charset=!.match?(typ)
+
+          res.header["content-type"] = "#{typ}; charset=#{@jekyll_opts["encoding"]}"
         end
 
         #
-
-        private
         def set_defaults
           hash_ = @jekyll_opts.fetch("webrick", {}).fetch("headers", {})
           DEFAULTS.each_with_object(@headers = hash_) do |(key, val), hash|

data/lib/jekyll/commands/serve.rb

@@ -202,6 +202,7 @@ module Jekyll
             :JekyllOptions      => opts,
             :DoNotReverseLookup => true,
             :MimeTypes          => mime_types,
+            :MimeTypesCharset   => mime_types_charset,
             :DocumentRoot       => opts["destination"],
             :StartCallback      => start_callback(opts["detach"]),
             :StopCallback       => stop_callback(opts["detach"]),
@@ -379,6 +380,11 @@ module Jekyll
         end
 
         private
+
+        def mime_types_charset
+          SafeYAML.load_file(File.expand_path("serve/mime_types_charset.json", __dir__))
+        end
+
         def read_file(source_dir, file_path)
           File.read(Jekyll.sanitized_path(source_dir, file_path))
         end

data/lib/jekyll/configuration.rb

@@ -81,6 +81,7 @@ module Jekyll
         "smart_quotes"  => "lsquo,rsquo,ldquo,rdquo",
         "input"         => "GFM",
         "hard_wrap"     => false,
+        "guess_lang"    => true,
         "footnote_nr"   => 1,
         "show_warnings" => false,
       },

data/lib/jekyll/converters/markdown/kramdown_parser.rb

@@ -18,6 +18,7 @@ module Jekyll
           @config = config["kramdown"] || {}
           @highlighter = nil
           setup
+          load_dependencies
         end
 
         # Setup and normalize the configuration:
@@ -30,6 +31,8 @@ module Jekyll
         def setup
           @config["syntax_highlighter"] ||= highlighter
           @config["syntax_highlighter_opts"] ||= {}
+          @config["syntax_highlighter_opts"]["default_lang"] ||= "plaintext"
+          @config["syntax_highlighter_opts"]["guess_lang"] = @config["guess_lang"]
           @config["coderay"] ||= {} # XXX: Legacy.
           modernize_coderay_config
           make_accessible
@@ -47,6 +50,24 @@ module Jekyll
         end
 
         private
+
+        def load_dependencies
+          return if Kramdown::VERSION.to_i < 2
+          if @config["input"] == "GFM"
+            Jekyll::External.require_with_graceful_fail("kramdown-parser-gfm")
+          end
+
+          if highlighter == "coderay"
+            Jekyll::External.require_with_graceful_fail("kramdown-syntax-coderay")
+          end
+
+          # `mathjax` emgine is bundled within kramdown-2.x and will be handled by
+          # kramdown itself.
+          if (math_engine = @config["math_engine"]) && math_engine != "mathjax"
+            Jekyll::External.require_with_graceful_fail("kramdown-math-#{math_engine}")
+          end
+        end
+
         def make_accessible(hash = @config)
           hash.keys.each do |key|
             hash[key.to_sym] = hash[key]

data/lib/jekyll/convertible.rb

@@ -39,7 +39,7 @@ module Jekyll
 
       begin
         self.content = File.read(@path || site.in_source_dir(base, name),
-                                 Utils.merged_file_read_opts(site, opts))
+                                 **Utils.merged_file_read_opts(site, opts))
         if content =~ Document::YAML_FRONT_MATTER_REGEXP
           self.content = $POSTMATCH
           self.data = SafeYAML.load(Regexp.last_match(1))

data/lib/jekyll/document.rb

@@ -266,7 +266,7 @@ module Jekyll
       else
         begin
           merge_defaults
-          read_content(opts)
+          read_content(**opts)
           read_post_data
         rescue StandardError => e
           handle_read_error(e)
@@ -445,8 +445,8 @@ module Jekyll
     end
 
     private
-    def read_content(opts)
-      self.content = File.read(path, Utils.merged_file_read_opts(site, opts))
+    def read_content(**opts)
+      self.content = File.read(path, **Utils.merged_file_read_opts(site, opts))
       if content =~ YAML_FRONT_MATTER_REGEXP
         self.content = $POSTMATCH
         data_file = SafeYAML.load(Regexp.last_match(1))

data/lib/jekyll/drops/site_drop.rb

@@ -8,8 +8,7 @@ module Jekyll
       mutable false
 
       def_delegator  :@obj, :site_data, :data
-      def_delegators :@obj, :time, :pages, :static_files, :documents,
-                            :tags, :categories
+      def_delegators :@obj, :time, :pages, :static_files, :tags, :categories
 
       private def_delegator :@obj, :config, :fallback_data
 
@@ -39,6 +38,16 @@ module Jekyll
         @site_collections ||= @obj.collections.values.sort_by(&:label).map(&:to_liquid)
       end
 
+      # `Site#documents` cannot be memoized so that `Site#docs_to_write` can access the
+      # latest state of the attribute.
+      #
+      # Since this method will be called after `Site#pre_render` hook,
+      # the `Site#documents` array shouldn't thereafter change and can therefore be
+      # safely memoized to prevent additional computation of `Site#documents`.
+      def documents
+        @documents ||= @obj.documents
+      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.

data/lib/jekyll/entry_filter.rb

@@ -31,9 +31,12 @@ module Jekyll
 
     def filter(entries)
       entries.reject do |e|
-        unless included?(e)
-          special?(e) || backup?(e) || excluded?(e) || symlink?(e)
-        end
+        # 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)
       end
     end
 

data/lib/jekyll/excerpt.rb

@@ -128,36 +128,47 @@ module Jekyll
     #
     # Returns excerpt String
 
-    LIQUID_TAG_REGEX = %r!{%-?\s*(\w+).+\s*-?%}!m
+    LIQUID_TAG_REGEX = %r!{%-?\s*(\w+)\s*.*?-?%}!m
     MKDWN_LINK_REF_REGEX = %r!^ {0,3}\[[^\]]+\]:.+$!
 
     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 =~ LIQUID_TAG_REGEX
-        tag_name = Regexp.last_match(1)
+      # append appropriate closing tag(s) (for each Liquid block), to the `head`
+      # if the partitioning resulted in leaving the closing tag somewhere
+      # in the `tail` partition.
 
-        if liquid_block?(tag_name) && head.match(%r!{%-?\s*end#{tag_name}\s*-?%}!).nil?
-          print_build_warning
+      if head.include?("{%")
+        modified  = false
+        tag_names = head.scan(LIQUID_TAG_REGEX)
+        tag_names.flatten!
+        tag_names.reverse_each do |tag_name|
+          next unless liquid_block?(tag_name)
+          next if head =~ endtag_regex_stash(tag_name)
+
+          modified = true
           head << "\n{% end#{tag_name} %}"
         end
+        print_build_warning if modified
       end
 
-      if tail.empty?
-        head
-      else
-        head.to_s.dup << "\n\n" << tail.scan(MKDWN_LINK_REF_REGEX).join("\n")
-      end
+      return head if tail.empty?
+
+      head << "\n\n" << tail.scan(MKDWN_LINK_REF_REGEX).join("\n")
     end
 
     private
 
+    def endtag_regex_stash(tag_name)
+      @endtag_regex_stash ||= {}
+      @endtag_regex_stash[tag_name] ||= %r!{%-?\s*end#{tag_name}.*?\s*-?%}!m
+    end
+
     def liquid_block?(tag_name)
-      Liquid::Template.tags[tag_name].superclass == Liquid::Block
+      return false unless tag_name.is_a?(String)
+      return false unless Liquid::Template.tags[tag_name]
+
+      Liquid::Template.tags[tag_name].ancestors.include?(Liquid::Block)
     rescue NoMethodError
       Jekyll.logger.error "Error:",
         "A Liquid tag in the excerpt of #{doc.relative_path} couldn't be " \
@@ -167,12 +178,13 @@ module Jekyll
 
     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."
+      Jekyll.logger.warn "", "Found a Liquid block containing the excerpt separator" \
+                         " #{doc.excerpt_separator.inspect}. "
+      Jekyll.logger.warn "", "The block 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/liquid_renderer.rb

@@ -53,7 +53,9 @@ module Jekyll
     private
 
     def filename_regex
-      @filename_regex ||= %r!\A(#{source_dir}/|#{theme_dir}/|\W*)(.*)!i
+      @filename_regex ||= begin
+        %r!\A(#{Regexp.escape(source_dir)}/|#{Regexp.escape(theme_dir.to_s)}/|/*)(.*)!i
+      end
     end
 
     def new_profile_hash