jekyll 4.0.1 → 4.2.1

data/lib/jekyll/liquid_renderer/table.rb

@@ -1,75 +1,55 @@
-# frozen_string_literal: true
-
-module Jekyll
-  class LiquidRenderer
-    class Table
-      GAUGES = [:count, :bytes, :time].freeze
-
-      def initialize(stats)
-        @stats = stats
-      end
-
-      def to_s(num_of_rows = 50)
-        tabulate(data_for_table(num_of_rows))
-      end
-
-      private
-
-      def tabulate(data)
-        require "terminal-table"
-
-        header = data.shift
-        footer = data.pop
-        output = +"\n"
-
-        table = Terminal::Table.new do |t|
-          t << header
-          t << :separator
-          data.each { |row| t << row }
-          t << :separator
-          t << footer
-          t.style = { :alignment => :right, :border_top => false, :border_bottom => false }
-          t.align_column(0, :left)
-        end
-
-        output << table.to_s << "\n"
-      end
-
-      # rubocop:disable Metrics/AbcSize
-      def data_for_table(num_of_rows)
-        sorted = @stats.sort_by { |_, file_stats| -file_stats[:time] }
-        sorted = sorted.slice(0, num_of_rows)
-
-        table  = [header_labels]
-        totals = Hash.new { |hash, key| hash[key] = 0 }
-
-        sorted.each do |filename, file_stats|
-          GAUGES.each { |gauge| totals[gauge] += file_stats[gauge] }
-          row = []
-          row << filename
-          row << file_stats[:count].to_s
-          row << format_bytes(file_stats[:bytes])
-          row << format("%.3f", file_stats[:time])
-          table << row
-        end
-
-        footer = []
-        footer << "TOTAL (for #{sorted.size} files)"
-        footer << totals[:count].to_s
-        footer << format_bytes(totals[:bytes])
-        footer << format("%.3f", totals[:time])
-        table  << footer
-      end
-      # rubocop:enable Metrics/AbcSize
-
-      def header_labels
-        GAUGES.map { |gauge| gauge.to_s.capitalize }.unshift("Filename")
-      end
-
-      def format_bytes(bytes)
-        bytes /= 1024.0
-        format("%.2fK", bytes)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  class LiquidRenderer
+    class Table
+      GAUGES = [:count, :bytes, :time].freeze
+
+      def initialize(stats)
+        @stats = stats
+      end
+
+      def to_s(num_of_rows = 50)
+        Jekyll::Profiler.tabulate(data_for_table(num_of_rows))
+      end
+
+      private
+
+      # rubocop:disable Metrics/AbcSize
+      def data_for_table(num_of_rows)
+        sorted = @stats.sort_by { |_, file_stats| -file_stats[:time] }
+        sorted = sorted.slice(0, num_of_rows)
+
+        table  = [header_labels]
+        totals = Hash.new { |hash, key| hash[key] = 0 }
+
+        sorted.each do |filename, file_stats|
+          GAUGES.each { |gauge| totals[gauge] += file_stats[gauge] }
+          row = []
+          row << filename
+          row << file_stats[:count].to_s
+          row << format_bytes(file_stats[:bytes])
+          row << format("%.3f", file_stats[:time])
+          table << row
+        end
+
+        footer = []
+        footer << "TOTAL (for #{sorted.size} files)"
+        footer << totals[:count].to_s
+        footer << format_bytes(totals[:bytes])
+        footer << format("%.3f", totals[:time])
+        table  << footer
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      def header_labels
+        GAUGES.map { |gauge| gauge.to_s.capitalize }.unshift("Filename")
+      end
+
+      def format_bytes(bytes)
+        bytes /= 1024.0
+        format("%.2fK", bytes)
+      end
+    end
+  end
+end

data/lib/jekyll/liquid_renderer.rb

@@ -1,77 +1,80 @@
-# frozen_string_literal: true
-
-require_relative "liquid_renderer/file"
-require_relative "liquid_renderer/table"
-
-module Jekyll
-  class LiquidRenderer
-    extend Forwardable
-
-    private def_delegator :@site, :in_source_dir, :source_dir
-    private def_delegator :@site, :in_theme_dir, :theme_dir
-
-    def initialize(site)
-      @site = site
-      Liquid::Template.error_mode = @site.config["liquid"]["error_mode"].to_sym
-      reset
-    end
-
-    def reset
-      @stats = {}
-      @cache = {}
-    end
-
-    def file(filename)
-      filename.match(filename_regex)
-      filename =
-        if Regexp.last_match(1) == theme_dir("")
-          ::File.join(::File.basename(Regexp.last_match(1)), Regexp.last_match(2))
-        else
-          Regexp.last_match(2)
-        end
-      LiquidRenderer::File.new(self, filename).tap do
-        @stats[filename] ||= new_profile_hash
-      end
-    end
-
-    def increment_bytes(filename, bytes)
-      @stats[filename][:bytes] += bytes
-    end
-
-    def increment_time(filename, time)
-      @stats[filename][:time] += time
-    end
-
-    def increment_count(filename)
-      @stats[filename][:count] += 1
-    end
-
-    def stats_table(num_of_rows = 50)
-      LiquidRenderer::Table.new(@stats).to_s(num_of_rows)
-    end
-
-    def self.format_error(error, path)
-      "#{error.message} in #{path}"
-    end
-
-    # A persistent cache to store and retrieve parsed templates based on the filename
-    # via `LiquidRenderer::File#parse`
-    #
-    # It is emptied when `self.reset` is called.
-    def cache
-      @cache ||= {}
-    end
-
-    private
-
-    def filename_regex
-      @filename_regex ||= begin
-        %r!\A(#{Regexp.escape(source_dir)}/|#{Regexp.escape(theme_dir.to_s)}/|/*)(.*)!i
-      end
-    end
-
-    def new_profile_hash
-      Hash.new { |hash, key| hash[key] = 0 }
-    end
-  end
-end
+# frozen_string_literal: true
+
+require_relative "liquid_renderer/file"
+require_relative "liquid_renderer/table"
+
+module Jekyll
+  class LiquidRenderer
+    def initialize(site)
+      @site = site
+      Liquid::Template.error_mode = @site.config["liquid"]["error_mode"].to_sym
+      reset
+    end
+
+    def reset
+      @stats = {}
+      @cache = {}
+    end
+
+    def file(filename)
+      filename = normalize_path(filename)
+      LiquidRenderer::File.new(self, filename).tap do
+        @stats[filename] ||= new_profile_hash
+      end
+    end
+
+    def increment_bytes(filename, bytes)
+      @stats[filename][:bytes] += bytes
+    end
+
+    def increment_time(filename, time)
+      @stats[filename][:time] += time
+    end
+
+    def increment_count(filename)
+      @stats[filename][:count] += 1
+    end
+
+    def stats_table(num_of_rows = 50)
+      LiquidRenderer::Table.new(@stats).to_s(num_of_rows)
+    end
+
+    def self.format_error(error, path)
+      "#{error.message} in #{path}"
+    end
+
+    # A persistent cache to store and retrieve parsed templates based on the filename
+    # via `LiquidRenderer::File#parse`
+    #
+    # It is emptied when `self.reset` is called.
+    def cache
+      @cache ||= {}
+    end
+
+    private
+
+    def normalize_path(filename)
+      @normalize_path ||= {}
+      @normalize_path[filename] ||= begin
+        theme_dir = @site.theme&.root
+        case filename
+        when %r!\A(#{Regexp.escape(@site.source)}/)(?<rest>.*)!io
+          Regexp.last_match(:rest)
+        when %r!(/gems/.*)*/gems/(?<dirname>[^/]+)(?<rest>.*)!,
+             %r!(?<dirname>[^/]+/lib)(?<rest>.*)!
+          "#{Regexp.last_match(:dirname)}#{Regexp.last_match(:rest)}"
+        when theme_dir && %r!\A#{Regexp.escape(theme_dir)}/(?<rest>.*)!io
+          PathManager.join(@site.theme.basename, Regexp.last_match(:rest))
+        when %r!\A/(.*)!
+          Regexp.last_match(1)
+        else
+          filename
+        end
+      end
+    end
+
+    def new_profile_hash
+      Hash.new { |hash, key| hash[key] = 0 }
+    end
+  end
+end

data/lib/jekyll/log_adapter.rb

@@ -1,151 +1,151 @@
-# frozen_string_literal: true
-
-module Jekyll
-  class LogAdapter
-    attr_reader :writer, :messages, :level
-
-    LOG_LEVELS = {
-      :debug => ::Logger::DEBUG,
-      :info  => ::Logger::INFO,
-      :warn  => ::Logger::WARN,
-      :error => ::Logger::ERROR,
-    }.freeze
-
-    # Public: Create a new instance of a log writer
-    #
-    # writer - Logger compatible instance
-    # log_level - (optional, symbol) the log level
-    #
-    # Returns nothing
-    def initialize(writer, level = :info)
-      @messages = []
-      @writer = writer
-      self.log_level = level
-    end
-
-    # Public: Set the log level on the writer
-    #
-    # level - (symbol) the log level
-    #
-    # Returns nothing
-    def log_level=(level)
-      writer.level = level if level.is_a?(Integer) && level.between?(0, 3)
-      writer.level = LOG_LEVELS[level] ||
-        raise(ArgumentError, "unknown log level")
-      @level = level
-    end
-
-    def adjust_verbosity(options = {})
-      # Quiet always wins.
-      if options[:quiet]
-        self.log_level = :error
-      elsif options[:verbose]
-        self.log_level = :debug
-      end
-      debug "Logging at level:", LOG_LEVELS.key(writer.level).to_s
-      debug "Jekyll Version:", Jekyll::VERSION
-    end
-
-    # Public: Print a debug message
-    #
-    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
-    # message - the message detail
-    #
-    # Returns nothing
-    def debug(topic, message = nil, &block)
-      write(:debug, topic, message, &block)
-    end
-
-    # Public: Print a message
-    #
-    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
-    # message - the message detail
-    #
-    # Returns nothing
-    def info(topic, message = nil, &block)
-      write(:info, topic, message, &block)
-    end
-
-    # Public: Print a message
-    #
-    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
-    # message - the message detail
-    #
-    # Returns nothing
-    def warn(topic, message = nil, &block)
-      write(:warn, topic, message, &block)
-    end
-
-    # Public: Print an error message
-    #
-    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
-    # message - the message detail
-    #
-    # Returns nothing
-    def error(topic, message = nil, &block)
-      write(:error, topic, message, &block)
-    end
-
-    # Public: Print an error message and immediately abort the process
-    #
-    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
-    # message - the message detail (can be omitted)
-    #
-    # Returns nothing
-    def abort_with(topic, message = nil, &block)
-      error(topic, message, &block)
-      abort
-    end
-
-    # Internal: Build a topic method
-    #
-    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
-    # message - the message detail
-    #
-    # Returns the formatted message
-    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, 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
+# frozen_string_literal: true
+
+module Jekyll
+  class LogAdapter
+    attr_reader :writer, :messages, :level
+
+    LOG_LEVELS = {
+      :debug => ::Logger::DEBUG,
+      :info  => ::Logger::INFO,
+      :warn  => ::Logger::WARN,
+      :error => ::Logger::ERROR,
+    }.freeze
+
+    # Public: Create a new instance of a log writer
+    #
+    # writer - Logger compatible instance
+    # log_level - (optional, symbol) the log level
+    #
+    # Returns nothing
+    def initialize(writer, level = :info)
+      @messages = []
+      @writer = writer
+      self.log_level = level
+    end
+
+    # Public: Set the log level on the writer
+    #
+    # level - (symbol) the log level
+    #
+    # Returns nothing
+    def log_level=(level)
+      writer.level = level if level.is_a?(Integer) && level.between?(0, 3)
+      writer.level = LOG_LEVELS[level] ||
+        raise(ArgumentError, "unknown log level")
+      @level = level
+    end
+
+    def adjust_verbosity(options = {})
+      # Quiet always wins.
+      if options[:quiet]
+        self.log_level = :error
+      elsif options[:verbose]
+        self.log_level = :debug
+      end
+      debug "Logging at level:", LOG_LEVELS.key(writer.level).to_s
+      debug "Jekyll Version:", Jekyll::VERSION
+    end
+
+    # Public: Print a debug message
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns nothing
+    def debug(topic, message = nil, &block)
+      write(:debug, topic, message, &block)
+    end
+
+    # Public: Print a message
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns nothing
+    def info(topic, message = nil, &block)
+      write(:info, topic, message, &block)
+    end
+
+    # Public: Print a message
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns nothing
+    def warn(topic, message = nil, &block)
+      write(:warn, topic, message, &block)
+    end
+
+    # Public: Print an error message
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns nothing
+    def error(topic, message = nil, &block)
+      write(:error, topic, message, &block)
+    end
+
+    # Public: Print an error message and immediately abort the process
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail (can be omitted)
+    #
+    # Returns nothing
+    def abort_with(topic, message = nil, &block)
+      error(topic, message, &block)
+      abort
+    end
+
+    # Internal: Build a topic method
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns the formatted message
+    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, 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