jekyll 3.8.0.pre.rc1 → 3.8.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d8b3cb33faecac197557dfc43ba3a5e6b24053ecc42c9bb9ea3a733553f7eb4
-  data.tar.gz: 3af6b03a6c04a694adac3507d1e82048046d791ce6254d1b827fccea97db4367
+  metadata.gz: 11fddf298655ecad13b88d1e7a5fdd6ee54a8379c8724ad17a5d07dcb895a304
+  data.tar.gz: 2aa7a239d6bb42e3975e495ee074c999b85d7f6e0e652b349bbd3bc213df973b
 SHA512:
-  metadata.gz: 6d2dbd4a413268950af60bb1cb3219bb48a6fcdaefdc76e0035e97fb20852759d6d293b0b1a10bb39ab40e8527befaec5f63d028f01056fabf6c88fe9e4e99a4
-  data.tar.gz: dc435a723327de90ff63432a53db4fca2f11e2240c1f661fc66f6871610f737aa9eb2947a7434dbddd148443afb69e01c17044104bf9a185ddbdff4697b41fec
+  metadata.gz: 676bce947226ac467d5d036b181b3f652d4867098a0f3b62ee1405fa737c727c0fc9038dcce3c894ff805a7ca115374a1b1545f662a889cf64c35eda93d3cac2
+  data.tar.gz: 3322935bfadd96623322592f1c4aeefcdf56dcb4932f02278c90a822370726364fd80e0262f13d4b5e09e49853eca30d61a777e332a32bd612a2e496ff6ea6c9

data/.rubocop.yml

@@ -46,8 +46,13 @@ Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
+Lint/NestedPercentLiteral:
+  Exclude:
+    - test/test_site.rb
 Layout/SpaceInsideBrackets:
   Enabled: false
+Layout/EmptyComment:
+  Enabled: false
 Lint/EndAlignment:
   Severity: error
 Lint/UnreachableCode:
@@ -94,6 +99,14 @@ Naming/FileName:
   Enabled: false
 Naming/HeredocDelimiterNaming:
   Enabled: false
+Naming/MemoizedInstanceVariableName:
+  Exclude:
+    - lib/jekyll/page_without_a_file.rb
+    - lib/jekyll/drops/unified_payload_drop.rb
+    - lib/jekyll/drops/site_drop.rb
+Naming/UncommunicativeMethodParamName:
+  AllowedNames:
+    - _
 Security/MarshalLoad:
   Exclude:
     - !ruby/regexp /test\/.*.rb$/
@@ -118,6 +131,9 @@ Style/Documentation:
     - !ruby/regexp /features\/.*.rb$/
 Style/DoubleNegation:
   Enabled: false
+Style/FormatStringToken:
+  Exclude:
+    - lib/jekyll/utils/ansi.rb
 Style/GuardClause:
   Enabled: false
 Style/HashSyntax:
@@ -127,6 +143,9 @@ Style/IfUnlessModifier:
   Enabled: false
 Style/InverseMethods:
   Enabled: false
+Style/MixinUsage:
+  Exclude:
+    - test/helper.rb
 Style/ModuleFunction:
   Enabled: false
 Style/MultilineTernaryOperator:
@@ -158,5 +177,7 @@ Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 Style/SymbolArray:
   Enabled: false
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma

data/lib/jekyll.rb

@@ -18,7 +18,6 @@ end
 require "rubygems"
 
 # stdlib
-require "pathutil"
 require "forwardable"
 require "fileutils"
 require "time"
@@ -26,8 +25,12 @@ require "English"
 require "pathname"
 require "logger"
 require "set"
+require "csv"
+require "json"
 
 # 3rd party
+require "pathutil"
+require "addressable/uri"
 require "safe_yaml/load"
 require "liquid"
 require "kramdown"

data/lib/jekyll/cleaner.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
-
 module Jekyll
   # Handles the cleanup of a site's destination before it is built.
   class Cleaner

data/lib/jekyll/command.rb

@@ -45,31 +45,31 @@ module Jekyll
 
       # Add common options to a command for building configuration
       #
-      # c - the Jekyll::Command to add these options to
+      # cmd - the Jekyll::Command to add these options to
       #
       # Returns nothing
       # rubocop:disable Metrics/MethodLength
-      def add_build_options(c)
-        c.option "config", "--config CONFIG_FILE[,CONFIG_FILE2,...]",
+      def add_build_options(cmd)
+        cmd.option "config", "--config CONFIG_FILE[,CONFIG_FILE2,...]",
           Array, "Custom configuration file"
-        c.option "destination", "-d", "--destination DESTINATION",
+        cmd.option "destination", "-d", "--destination DESTINATION",
           "The current folder will be generated into DESTINATION"
-        c.option "source", "-s", "--source SOURCE", "Custom source directory"
-        c.option "future", "--future", "Publishes posts with a future date"
-        c.option "limit_posts", "--limit_posts MAX_POSTS", Integer,
+        cmd.option "source", "-s", "--source SOURCE", "Custom source directory"
+        cmd.option "future", "--future", "Publishes posts with a future date"
+        cmd.option "limit_posts", "--limit_posts MAX_POSTS", Integer,
           "Limits the number of posts to parse and publish"
-        c.option "watch", "-w", "--[no-]watch", "Watch for changes and rebuild"
-        c.option "baseurl", "-b", "--baseurl URL",
+        cmd.option "watch", "-w", "--[no-]watch", "Watch for changes and rebuild"
+        cmd.option "baseurl", "-b", "--baseurl URL",
           "Serve the website from the given base URL"
-        c.option "force_polling", "--force_polling", "Force watch to use polling"
-        c.option "lsi", "--lsi", "Use LSI for improved related posts"
-        c.option "show_drafts", "-D", "--drafts", "Render posts in the _drafts folder"
-        c.option "unpublished", "--unpublished",
+        cmd.option "force_polling", "--force_polling", "Force watch to use polling"
+        cmd.option "lsi", "--lsi", "Use LSI for improved related posts"
+        cmd.option "show_drafts", "-D", "--drafts", "Render posts in the _drafts folder"
+        cmd.option "unpublished", "--unpublished",
           "Render posts that were marked as unpublished"
-        c.option "quiet", "-q", "--quiet", "Silence output."
-        c.option "verbose", "-V", "--verbose", "Print verbose output."
-        c.option "incremental", "-I", "--incremental", "Enable incremental rebuild."
-        c.option "strict_front_matter", "--strict_front_matter",
+        cmd.option "quiet", "-q", "--quiet", "Silence output."
+        cmd.option "verbose", "-V", "--verbose", "Print verbose output."
+        cmd.option "incremental", "-I", "--incremental", "Enable incremental rebuild."
+        cmd.option "strict_front_matter", "--strict_front_matter",
           "Fail if errors are present in front matter"
       end
       # rubocop:enable Metrics/MethodLength

data/lib/jekyll/commands/doctor.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "addressable/uri"
-
 module Jekyll
   module Commands
     class Doctor < Command

data/lib/jekyll/commands/serve.rb

@@ -70,7 +70,7 @@ module Jekyll
             cmd.action do |_, opts|
               opts["livereload_port"] ||= LIVERELOAD_PORT
               opts["serving"] = true
-              opts["watch"  ] = true unless opts.key?("watch")
+              opts["watch"]   = true unless opts.key?("watch")
 
               start(opts)
             end
@@ -173,6 +173,7 @@ 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
@@ -336,7 +337,7 @@ module Jekyll
           require "webrick/https"
 
           opts[:SSLCertificate] = OpenSSL::X509::Certificate.new(read_file(src, cert))
-          opts[:SSLPrivateKey ] = OpenSSL::PKey::RSA.new(read_file(src, key))
+          opts[:SSLPrivateKey]  = OpenSSL::PKey::RSA.new(read_file(src, key))
           opts[:SSLEnable] = true
         end
 

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "json"
 require "em-websocket"
 
 require_relative "websockets"
@@ -31,11 +30,11 @@ module Jekyll
           EM.reactor_running?
         end
 
-        def handle_websockets_event(ws)
-          ws.onopen { |handshake| connect(ws, handshake) }
-          ws.onclose { disconnect(ws) }
-          ws.onmessage { |msg| print_message(msg) }
-          ws.onerror { |error| log_error(error) }
+        def handle_websockets_event(websocket)
+          websocket.onopen { |handshake| connect(websocket, handshake) }
+          websocket.onclose { disconnect(websocket) }
+          websocket.onmessage { |msg| print_message(msg) }
+          websocket.onerror { |error| log_error(error) }
         end
 
         def start(opts)
@@ -82,14 +81,14 @@ module Jekyll
         end
 
         private
-        def connect(ws, handshake)
+        def connect(websocket, handshake)
           @connections_count += 1
           if @connections_count == 1
             message = "Browser connected"
             message += " over SSL/TLS" if handshake.secure?
             Jekyll.logger.info "LiveReload:", message
           end
-          ws.send(
+          websocket.send(
             JSON.dump(
               :command    => "hello",
               :protocols  => ["http://livereload.com/protocols/official-7"],
@@ -97,12 +96,12 @@ module Jekyll
             )
           )
 
-          @websockets << ws
+          @websockets << websocket
         end
 
         private
-        def disconnect(ws)
-          @websockets.delete(ws)
+        def disconnect(websocket)
+          @websockets.delete(websocket)
         end
 
         private
@@ -116,10 +115,10 @@ module Jekyll
         end
 
         private
-        def log_error(e)
+        def log_error(error)
           Jekyll.logger.error "LiveReload experienced an error. " \
             "Run with --trace for more information."
-          raise e
+          raise error
         end
       end
     end

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

@@ -88,6 +88,7 @@ module Jekyll
           end
           @new_body = @new_body.join
         end
+        # rubocop:enable Metrics/MethodLength
 
         def template
           # Unclear what "snipver" does. Doc at
@@ -175,6 +176,7 @@ module Jekyll
           res.header.merge!(@headers)
           rtn
         end
+        # rubocop:enable Naming/MethodName
 
         #
 

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

@@ -74,6 +74,7 @@ module Jekyll
             close_connection_after_writing
           end
         end
+        # rubocop:enable Metrics/MethodLength
       end
     end
   end

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

@@ -14,9 +14,6 @@ module Jekyll
         }.freeze
 
         def initialize(config)
-          unless defined?(Kramdown)
-            Jekyll::External.require_with_graceful_fail "kramdown"
-          end
           @main_fallback_highlighter = config["highlighter"] || "rouge"
           @config = config["kramdown"] || {}
           @highlighter = nil
@@ -50,14 +47,12 @@ module Jekyll
         end
 
         private
-        # rubocop:disable Performance/HashEachMethods
         def make_accessible(hash = @config)
           hash.keys.each do |key|
             hash[key.to_sym] = hash[key]
             make_accessible(hash[key]) if hash[key].is_a?(Hash)
           end
         end
-        # rubocop:enable Performance/HashEachMethods
 
         # config[kramdown][syntax_higlighter] >
         #   config[kramdown][enable_coderay] >

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

@@ -22,9 +22,9 @@ module Jekyll
         end
 
         private
-        def replace_generated_toc(rd, html, toc_token)
-          if rd.generate_toc && html.include?(toc_token)
-            utf8_toc = rd.toc_content
+        def replace_generated_toc(rd_instance, html, toc_token)
+          if rd_instance.generate_toc && html.include?(toc_token)
+            utf8_toc = rd_instance.toc_content
             utf8_toc.force_encoding("utf-8") if utf8_toc.respond_to?(:force_encoding)
             html.gsub(toc_token, utf8_toc)
           else

data/lib/jekyll/convertible.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
-
 # Convertible provides methods for converting a pagelike item
 # from a certain type of markup into actual content
 #
@@ -109,7 +107,6 @@ module Jekyll
     def render_liquid(content, payload, info, path)
       _renderer.render_liquid(content, payload, info, path)
     end
-    # rubocop: enable RescueException
 
     # Convert this Convertible's data to a Hash suitable for use by Liquid.
     #

data/lib/jekyll/drops/drop.rb

@@ -137,7 +137,6 @@ module Jekyll
       #
       # Returns a pretty generation of the hash representation of the Drop.
       def inspect
-        require "json"
         JSON.pretty_generate to_h
       end
 
@@ -155,7 +154,6 @@ module Jekyll
       #
       # Returns a JSON representation of the Drop in a String.
       def to_json(state = nil)
-        require "json"
         JSON.generate(hash_for_json(state), state)
       end
 

data/lib/jekyll/drops/jekyll_drop.rb

@@ -25,7 +25,6 @@ module Jekyll
       end
 
       def to_json(state = nil)
-        require "json"
         JSON.generate(to_h, state)
       end
     end

data/lib/jekyll/entry_filter.rb

@@ -86,8 +86,8 @@ module Jekyll
     # Check if an entry matches a specific pattern and return true,false.
     # Returns true if path matches against any glob pattern.
     # --
-    def glob_include?(enum, e)
-      entry = Pathutil.new(site.in_source_dir).join(e)
+    def glob_include?(enum, entry)
+      entry_path = Pathutil.new(site.in_source_dir).join(entry)
       enum.any? do |exp|
         # Users who send a Regexp knows what they want to
         # exclude, so let them send a Regexp to exclude files,
@@ -95,7 +95,7 @@ module Jekyll
         # on them at this point.
 
         if exp.is_a?(Regexp)
-          entry =~ exp
+          entry_path =~ exp
 
         else
           item = Pathutil.new(site.in_source_dir).join(exp)
@@ -105,14 +105,14 @@ module Jekyll
           # see if the entry falls within that path and
           # exclude it if that's the case.
 
-          if e.end_with?("/")
-            entry.in_path?(
+          if entry.end_with?("/")
+            entry_path.in_path?(
               item
             )
 
           else
-            File.fnmatch?(item, entry) ||
-              entry.to_path.start_with?(
+            File.fnmatch?(item, entry_path) ||
+              entry_path.to_path.start_with?(
                 item
               )
           end

data/lib/jekyll/excerpt.rb

@@ -120,6 +120,10 @@ module Jekyll
     # Excerpts are rendered same time as content is rendered.
     #
     # Returns excerpt String
+
+    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)
 
@@ -127,7 +131,7 @@ module Jekyll
       # partitioning resulted in leaving the closing tag somewhere in the "tail"
       # partition.
       if head.include?("{%")
-        head =~ %r!{%\s*(\w+).+\s*%}!
+        head =~ LIQUID_TAG_REGEX
         tag_name = Regexp.last_match(1)
 
         if liquid_block?(tag_name) && head.match(%r!{%\s*end#{tag_name}\s*%}!).nil?
@@ -139,7 +143,7 @@ module Jekyll
       if tail.empty?
         head
       else
-        head.to_s.dup << "\n\n" << tail.scan(%r!^ {0,3}\[[^\]]+\]:.+$!).join("\n")
+        head.to_s.dup << "\n\n" << tail.scan(MKDWN_LINK_REF_REGEX).join("\n")
       end
     end
 

data/lib/jekyll/filters.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "addressable/uri"
-require "json"
-require "liquid"
-
 require_all "jekyll/filters"
 
 module Jekyll
@@ -18,9 +14,9 @@ module Jekyll
     #
     # Returns the HTML formatted String.
     def markdownify(input)
-      site = @context.registers[:site]
-      converter = site.find_converter_instance(Jekyll::Converters::Markdown)
-      converter.convert(input.to_s)
+      @context.registers[:site].find_converter_instance(
+        Jekyll::Converters::Markdown
+      ).convert(input.to_s)
     end
 
     # Convert quotes into smart quotes.
@@ -29,9 +25,9 @@ module Jekyll
     #
     # Returns the smart-quotified String.
     def smartify(input)
-      site = @context.registers[:site]
-      converter = site.find_converter_instance(Jekyll::Converters::SmartyPants)
-      converter.convert(input.to_s)
+      @context.registers[:site].find_converter_instance(
+        Jekyll::Converters::SmartyPants
+      ).convert(input.to_s)
     end
 
     # Convert a Sass string into CSS output.
@@ -40,9 +36,9 @@ module Jekyll
     #
     # Returns the CSS formatted String.
     def sassify(input)
-      site = @context.registers[:site]
-      converter = site.find_converter_instance(Jekyll::Converters::Sass)
-      converter.convert(input)
+      @context.registers[:site].find_converter_instance(
+        Jekyll::Converters::Sass
+      ).convert(input)
     end
 
     # Convert a Scss string into CSS output.
@@ -51,9 +47,9 @@ module Jekyll
     #
     # Returns the CSS formatted String.
     def scssify(input)
-      site = @context.registers[:site]
-      converter = site.find_converter_instance(Jekyll::Converters::Scss)
-      converter.convert(input)
+      @context.registers[:site].find_converter_instance(
+        Jekyll::Converters::Scss
+      ).convert(input)
     end
 
     # Slugify a filename or title.
@@ -171,11 +167,23 @@ module Jekyll
     #
     # Returns the filtered array of objects
     def where(input, property, value)
+      return input if property.nil? || value.nil?
       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)
-      end || []
+      input    = input.values if input.is_a?(Hash)
+      input_id = input.hash
+
+      # implement a hash based on method parameters to cache the end-result
+      # for given parameters.
+      @where_filter_cache ||= {}
+      @where_filter_cache[input_id] ||= {}
+      @where_filter_cache[input_id][property] ||= {}
+
+      # stash or retrive results to return
+      @where_filter_cache[input_id][property][value] ||= begin
+        input.select do |object|
+          Array(item_property(object, property)).map!(&:to_s).include?(value.to_s)
+        end || []
+      end
     end
 
     # Filters an array of objects against an expression

data/lib/jekyll/filters/url_filters.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "addressable/uri"
-
 module Jekyll
   module Filters
     module URLFilters

data/lib/jekyll/frontmatter_defaults.rb

@@ -207,11 +207,14 @@ module Jekyll
     end
 
     # Sanitizes the given path by removing a leading and adding a trailing slash
+
+    SANITIZATION_REGEX = %r!\A/|(?<=[^/])\z!
+
     def sanitize_path(path)
       if path.nil? || path.empty?
         ""
       else
-        path.gsub(%r!\A/|(?<=[^/])\z!, "".freeze)
+        path.gsub(SANITIZATION_REGEX, "")
       end
     end
   end

data/lib/jekyll/liquid_renderer.rb

@@ -7,8 +7,8 @@ module Jekyll
   class LiquidRenderer
     extend Forwardable
 
-    def_delegator :@site, :in_source_dir, :source_dir
-    def_delegator :@site, :in_theme_dir, :theme_dir
+    private def_delegator :@site, :in_source_dir, :source_dir
+    private def_delegator :@site, :in_theme_dir, :theme_dir
 
     def initialize(site)
       @site = site
@@ -24,7 +24,7 @@ module Jekyll
       filename.match(filename_regex)
       filename =
         if Regexp.last_match(1) == theme_dir("")
-          ::File.join(Regexp.last_match(1).split("/")[-1], Regexp.last_match(2))
+          ::File.join(::File.basename(Regexp.last_match(1)), Regexp.last_match(2))
         else
           Regexp.last_match(2)
         end
@@ -42,18 +42,18 @@ module Jekyll
       @stats[filename][:time] += time
     end
 
-    def stats_table(n = 50)
-      LiquidRenderer::Table.new(@stats).to_s(n)
+    def stats_table(num_of_rows = 50)
+      LiquidRenderer::Table.new(@stats).to_s(num_of_rows)
     end
 
-    def self.format_error(e, path)
-      "#{e.message} in #{path}"
+    def self.format_error(error, path)
+      "#{error.message} in #{path}"
     end
 
     private
 
     def filename_regex
-      %r!\A(#{source_dir}/|#{theme_dir}/|\W*)(.*)!oi
+      @filename_regex ||= %r!\A(#{source_dir}/|#{theme_dir}/|\W*)(.*)!i
     end
 
     def new_profile_hash

data/lib/jekyll/liquid_renderer/table.rb

@@ -6,8 +6,8 @@ module Jekyll
       @stats = stats
     end
 
-    def to_s(n = 50)
-      data = data_for_table(n)
+    def to_s(num_of_rows = 50)
+      data = data_for_table(num_of_rows)
       widths = table_widths(data)
       generate_table(data, widths)
     end
@@ -63,16 +63,16 @@ module Jekyll
 
       data.each do |row|
         row.each_with_index do |cell, index|
-          widths[index] = [ cell.length, widths[index] ].compact.max
+          widths[index] = [cell.length, widths[index]].compact.max
         end
       end
 
       widths
     end
 
-    def data_for_table(n)
+    def data_for_table(num_of_rows)
       sorted = @stats.sort_by { |_, file_stats| -file_stats[:time] }
-      sorted = sorted.slice(0, n)
+      sorted = sorted.slice(0, num_of_rows)
 
       table = [%w(Filename Count Bytes Time)]
 

data/lib/jekyll/reader.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "csv"
-
 module Jekyll
   class Reader
     attr_reader :site

data/lib/jekyll/regenerator.rb

@@ -20,6 +20,7 @@ module Jekyll
     #
     # Returns a boolean.
     def regenerate?(document)
+      return true if disabled
       case document
       when Page
         regenerate_page?(document)

data/lib/jekyll/site.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "csv"
-
 module Jekyll
   class Site
     attr_reader   :source, :dest, :config
@@ -279,10 +277,12 @@ module Jekyll
     # Get the implementation class for the given Converter.
     # Returns the Converter instance implementing the given Converter.
     # klass - The Class of the Converter to fetch.
-
     def find_converter_instance(klass)
-      converters.find { |klass_| klass_.instance_of?(klass) } || \
-        raise("No Converters found for #{klass}")
+      @find_converter_instance ||= {}
+      @find_converter_instance[klass] ||= begin
+        converters.find { |converter| converter.instance_of?(klass) } || \
+          raise("No Converters found for #{klass}")
+      end
     end
 
     # klass - class or module containing the subclasses.

data/lib/jekyll/tags/include.rb

@@ -216,8 +216,15 @@ MSG
         if context.registers[:page].nil?
           context.registers[:site].source
         else
-          current_doc_dir = File.dirname(context.registers[:page]["path"])
-          context.registers[:site].in_source_dir current_doc_dir
+          site = context.registers[:site]
+          page_payload  = context.registers[:page]
+          resource_path = \
+            if page_payload["collection"].nil?
+              page_payload["path"]
+            else
+              File.join(site.config["collections_dir"], page_payload["path"])
+            end
+          site.in_source_dir File.dirname(resource_path)
         end
       end
     end

data/lib/jekyll/url.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "addressable/uri"
-
 # Public: Methods that generate a URL for a resource such as a Post or a Page.
 #
 # Examples

data/lib/jekyll/utils/platforms.rb

@@ -69,7 +69,7 @@ module Jekyll
 
       private
       def proc_version
-        @cached_proc_version ||= begin
+        @proc_version ||= begin
           Pathutil.new(
             "/proc/version"
           ).read

data/lib/jekyll/utils/rouge.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
+Jekyll::External.require_with_graceful_fail("rouge")
+
 module Jekyll
   module Utils
     module Rouge
 
       def self.html_formatter(*args)
-        Jekyll::External.require_with_graceful_fail("rouge") unless defined?(::Rouge)
         if old_api?
           ::Rouge::Formatters::HTML.new(*args)
         else

data/lib/jekyll/version.rb

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

data/lib/site_template/index.md

@@ -1,6 +1,6 @@
 ---
-# You don't need to edit this file, it's empty on purpose.
-# Edit theme's home layout instead if you wanna make some changes
-# See: https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+# Feel free to add content and custom Front Matter to this file.
+# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
+
 layout: home
 ---

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.8.0.pre.rc1
+  version: 3.8.0.pre.rc2
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable