jekyll 3.5.2 → 3.6.0.pre.beta1

data/lib/jekyll/entry_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class EntryFilter
     attr_reader :site

data/lib/jekyll/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Errors
     FatalException = Class.new(::RuntimeError)

data/lib/jekyll/excerpt.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Excerpt
     extend Forwardable
@@ -117,7 +119,7 @@ module Jekyll
       if tail.empty?
         head
       else
-        "" << head << "\n\n" << tail.scan(%r!^ {0,3}\[[^\]]+\]:.+$!).join("\n")
+        head.to_s.dup << "\n\n" << tail.scan(%r!^ {0,3}\[[^\]]+\]:.+$!).join("\n")
       end
     end
   end

data/lib/jekyll/external.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module External
     class << self

data/lib/jekyll/filters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "addressable/uri"
 require "json"
 require "date"

data/lib/jekyll/filters/grouping_filters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Filters
     module GroupingFilters

data/lib/jekyll/filters/url_filters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "addressable/uri"
 
 module Jekyll
@@ -12,7 +14,7 @@ module Jekyll
         return if input.nil?
         return input if Addressable::URI.parse(input.to_s).absolute?
         site = @context.registers[:site]
-        return relative_url(input).to_s if site.config["url"].nil?
+        return relative_url(input) if site.config["url"].nil?
         Addressable::URI.parse(
           site.config["url"].to_s + relative_url(input)
         ).normalize.to_s

data/lib/jekyll/frontmatter_defaults.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   # This class handles custom defaults for YAML frontmatter settings.
   # These are set in _config.yml and apply both to internal use (e.g. layout)

data/lib/jekyll/generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   Generator = Class.new(Plugin)
 end

data/lib/jekyll/hooks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Hooks
     DEFAULT_PRIORITY = 20

data/lib/jekyll/layout.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Layout
     include Convertible

data/lib/jekyll/liquid_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module LiquidExtensions
 

data/lib/jekyll/liquid_renderer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "jekyll/liquid_renderer/file"
 require "jekyll/liquid_renderer/table"
 
@@ -41,9 +43,6 @@ module Jekyll
     end
 
     def self.format_error(e, path)
-      if e.is_a? Tags::IncludeTagError
-        return "#{e.message} in #{e.path}, included in #{path}"
-      end
       "#{e.message} in #{path}"
     end
   end

data/lib/jekyll/liquid_renderer/file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class LiquidRenderer
     class File

data/lib/jekyll/liquid_renderer/table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class LiquidRenderer::Table
     def initialize(stats)
@@ -13,7 +15,7 @@ module Jekyll
     private
 
     def generate_table(data, widths)
-      str = "\n"
+      str = String.new("\n")
 
       table_head = data.shift
       str << generate_row(table_head, widths)
@@ -28,7 +30,7 @@ module Jekyll
     end
 
     def generate_table_head_border(row_data, widths)
-      str = ""
+      str = String.new("")
 
       row_data.each_index do |cell_index|
         str << "-" * widths[cell_index]
@@ -40,7 +42,7 @@ module Jekyll
     end
 
     def generate_row(row_data, widths)
-      str = ""
+      str = String.new("")
 
       row_data.each_with_index do |cell_data, cell_index|
         str << if cell_index.zero?

data/lib/jekyll/log_adapter.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Jekyll
   class LogAdapter
-    attr_reader :writer, :messages
+    attr_reader :writer, :messages, :level
 
     LOG_LEVELS = {
       :debug => ::Logger::DEBUG,
@@ -28,6 +30,7 @@ module Jekyll
     # Returns nothing
     def log_level=(level)
       writer.level = LOG_LEVELS.fetch(level)
+      @level = level
     end
 
     def adjust_verbosity(options = {})
@@ -46,8 +49,8 @@ module Jekyll
     # message - the message detail
     #
     # Returns nothing
-    def debug(topic, message = nil)
-      writer.debug(message(topic, message))
+    def debug(topic, message = nil, &block)
+      write(:debug, topic, message, &block)
     end
 
     # Public: Print a message
@@ -56,8 +59,8 @@ module Jekyll
     # message - the message detail
     #
     # Returns nothing
-    def info(topic, message = nil)
-      writer.info(message(topic, message))
+    def info(topic, message = nil, &block)
+      write(:info, topic, message, &block)
     end
 
     # Public: Print a message
@@ -66,8 +69,8 @@ module Jekyll
     # message - the message detail
     #
     # Returns nothing
-    def warn(topic, message = nil)
-      writer.warn(message(topic, message))
+    def warn(topic, message = nil, &block)
+      write(:warn, topic, message, &block)
     end
 
     # Public: Print an error message
@@ -76,8 +79,8 @@ module Jekyll
     # message - the message detail
     #
     # Returns nothing
-    def error(topic, message = nil)
-      writer.error(message(topic, message))
+    def error(topic, message = nil, &block)
+      write(:error, topic, message, &block)
     end
 
     # Public: Print an error message and immediately abort the process
@@ -86,8 +89,8 @@ module Jekyll
     # message - the message detail (can be omitted)
     #
     # Returns nothing
-    def abort_with(topic, message = nil)
-      error(topic, message)
+    def abort_with(topic, message = nil, &block)
+      error(topic, message, &block)
       abort
     end
 
@@ -97,19 +100,48 @@ module Jekyll
     # message - the message detail
     #
     # Returns the formatted message
-    def message(topic, message)
-      msg = formatted_topic(topic) + message.to_s.gsub(%r!\s+!, " ")
-      messages << msg
-      msg
+    def message(topic, message = nil)
+      raise ArgumentError, "block or message, not both" if block_given? && message
+
+      message = yield if block_given?
+      message = message.to_s.gsub(%r!\s+!, " ")
+      topic = formatted_topic(topic, block_given?)
+      out = topic + message
+      messages << out
+      out
     end
 
     # Internal: Format the topic
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # colon -
     #
     # Returns the formatted topic statement
-    def formatted_topic(topic)
-      "#{topic} ".rjust(20)
+    def formatted_topic(topic, colon = false)
+      "#{topic}#{colon ? ": " : " "}".rjust(20)
+    end
+
+    # Internal: Check if the message should be written given the log level.
+    #
+    # level_of_message - the Symbol level of message, one of :debug, :info, :warn, :error
+    #
+    # Returns whether the message should be written.
+    def write_message?(level_of_message)
+      LOG_LEVELS.fetch(level) <= LOG_LEVELS.fetch(level_of_message)
+    end
+
+    # Internal: Log a message.
+    #
+    # level_of_message - the Symbol level of message, one of :debug, :info, :warn, :error
+    # topic - the String topic or full message
+    # message - the String message (optional)
+    # block - a block containing the message (optional)
+    #
+    # Returns false if the message was not written, otherwise returns the value of calling
+    # the appropriate writer method, e.g. writer.info.
+    def write(level_of_message, topic, message = nil, &block)
+      return false unless write_message?(level_of_message)
+      writer.public_send(level_of_message, message(topic, message, &block))
     end
   end
 end

data/lib/jekyll/page.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Page
     include Convertible

data/lib/jekyll/plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Plugin
     PRIORITIES = {

data/lib/jekyll/plugin_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class PluginManager
     attr_reader :site

data/lib/jekyll/publisher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Publisher
     def initialize(site)

data/lib/jekyll/reader.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require "csv"
 

data/lib/jekyll/readers/collection_reader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class CollectionReader
     SPECIAL_COLLECTIONS = %w(posts data).freeze

data/lib/jekyll/readers/data_reader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class DataReader
     attr_reader :site, :content
@@ -68,8 +70,8 @@ module Jekyll
     end
 
     def sanitize_filename(name)
-      name.gsub!(%r![^\w\s-]+|(?<=^|\b\s)\s+(?=$|\s?\b)!, "".freeze)
-      name.gsub(%r!\s+!, "_")
+      name.gsub(%r![^\w\s-]+|(?<=^|\b\s)\s+(?=$|\s?\b)!, "")
+        .gsub(%r!\s+!, "_")
     end
   end
 end

data/lib/jekyll/readers/layout_reader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class LayoutReader
     attr_reader :site

data/lib/jekyll/readers/page_reader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class PageReader
     attr_reader :site, :dir, :unfiltered_content

data/lib/jekyll/readers/post_reader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class PostReader
     attr_reader :site, :unfiltered_content

data/lib/jekyll/readers/static_file_reader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class StaticFileReader
     attr_reader :site, :dir, :unfiltered_content

data/lib/jekyll/readers/theme_assets_reader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class ThemeAssetsReader
     attr_reader :site

data/lib/jekyll/regenerator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Regenerator
     attr_reader :site, :metadata, :cache

data/lib/jekyll/related_posts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class RelatedPosts
     class << self

data/lib/jekyll/renderer.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 module Jekyll
   class Renderer

data/lib/jekyll/site.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require "csv"
 
@@ -73,13 +74,11 @@ module Jekyll
       render
       cleanup
       write
-      print_stats
+      print_stats if config["profile"]
     end
 
     def print_stats
-      if @config["profile"]
-        puts @liquid_renderer.stats_table
-      end
+      puts @liquid_renderer.stats_table
     end
 
     # Reset Site details.

data/lib/jekyll/static_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class StaticFile
     extend Forwardable

data/lib/jekyll/stevenson.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   class Stevenson < ::Logger
     def initialize

data/lib/jekyll/tags/highlight.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Tags
     class HighlightBlock < Liquid::Block
@@ -109,10 +111,12 @@ eos
       end
 
       def render_rouge(code)
-        Jekyll::External.require_with_graceful_fail("rouge")
-        formatter = Rouge::Formatters::HTML.new(
+        formatter = Jekyll::Utils::Rouge.html_formatter(
           :line_numbers => @highlight_options[:linenos],
-          :wrap         => false
+          :wrap         => false,
+          :css_class    => "highlight",
+          :gutter_class => "gutter",
+          :code_class   => "code"
         )
         lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
         formatter.format(lexer.lex(code))