jekyll 3.2.0.pre.beta1 → 3.2.0.pre.beta2

data/lib/jekyll/hooks.rb

@@ -4,38 +4,38 @@ module Jekyll
 
     # compatibility layer for octopress-hooks users
     PRIORITY_MAP = {
-      :low => 10,
+      :low    => 10,
       :normal => 20,
-      :high => 30
+      :high   => 30
     }.freeze
 
     # initial empty hooks
     @registry = {
-      :site => {
-        :after_init => [],
+      :site      => {
+        :after_init  => [],
         :after_reset => [],
-        :post_read => [],
-        :pre_render => [],
+        :post_read   => [],
+        :pre_render  => [],
         :post_render => [],
-        :post_write => []
+        :post_write  => []
       },
-      :pages => {
-        :post_init => [],
-        :pre_render => [],
+      :pages     => {
+        :post_init   => [],
+        :pre_render  => [],
         :post_render => [],
-        :post_write => []
+        :post_write  => []
       },
-      :posts => {
-        :post_init => [],
-        :pre_render => [],
+      :posts     => {
+        :post_init   => [],
+        :pre_render  => [],
         :post_render => [],
-        :post_write => []
+        :post_write  => []
       },
       :documents => {
-        :post_init => [],
-        :pre_render => [],
+        :post_init   => [],
+        :pre_render  => [],
         :post_render => [],
-        :post_write => []
+        :post_write  => []
       }
     }
 
@@ -61,10 +61,10 @@ module Jekyll
     # register a single hook to be called later, internal API
     def self.register_one(owner, event, priority, &block)
       @registry[owner] ||={
-        :post_init => [],
-        :pre_render => [],
+        :post_init   => [],
+        :pre_render  => [],
         :post_render => [],
-        :post_write => []
+        :post_write  => []
       }
 
       unless @registry[owner][event]

data/lib/jekyll/layout.rb

@@ -58,7 +58,9 @@ module Jekyll
     # Returns a String path which represents the relative path
     #   from the site source to this layout
     def relative_path
-      @relative_path ||= Pathname.new(path).relative_path_from(Pathname.new(@base_dir)).to_s
+      @relative_path ||= Pathname.new(path).relative_path_from(
+        Pathname.new(@base_dir)
+      ).to_s
     end
   end
 end

data/lib/jekyll/liquid_renderer.rb

@@ -1,10 +1,11 @@
-require 'jekyll/liquid_renderer/file'
-require 'jekyll/liquid_renderer/table'
+require "jekyll/liquid_renderer/file"
+require "jekyll/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
 
@@ -13,7 +14,10 @@ module Jekyll
     end
 
     def file(filename)
-      filename = @site.in_source_dir(filename).sub(/\A#{Regexp.escape(@site.source)}\//, '')
+      filename = @site.in_source_dir(filename).sub(
+        %r!\A#{Regexp.escape(@site.source)}/!,
+        ""
+      )
 
       LiquidRenderer::File.new(self, filename).tap do
         @stats[filename] ||= {}

data/lib/jekyll/liquid_renderer/file.rb

@@ -8,7 +8,7 @@ module Jekyll
 
       def parse(content)
         measure_time do
-          @template = Liquid::Template.parse(content, line_numbers: true)
+          @template = Liquid::Template.parse(content, :line_numbers => true)
         end
 
         self

data/lib/jekyll/liquid_renderer/table.rb

@@ -31,8 +31,8 @@ module Jekyll
       str = ""
 
       row_data.each_index do |cell_index|
-        str << '-' * widths[cell_index]
-        str << '-+-' unless cell_index == row_data.length-1
+        str << "-" * widths[cell_index]
+        str << "-+-" unless cell_index == row_data.length-1
       end
 
       str << "\n"
@@ -40,16 +40,16 @@ module Jekyll
     end
 
     def generate_row(row_data, widths)
-      str = ''
+      str = ""
 
       row_data.each_with_index do |cell_data, cell_index|
-        if cell_index == 0
-          str << cell_data.ljust(widths[cell_index], ' ')
-        else
-          str << cell_data.rjust(widths[cell_index], ' ')
-        end
+        str << if cell_index == 0
+                 cell_data.ljust(widths[cell_index], " ")
+               else
+                 cell_data.rjust(widths[cell_index], " ")
+               end
 
-        str << ' | ' unless cell_index == row_data.length-1
+        str << " | " unless cell_index == row_data.length-1
       end
 
       str << "\n"
@@ -79,7 +79,7 @@ module Jekyll
         row << filename
         row << file_stats[:count].to_s
         row << format_bytes(file_stats[:bytes])
-        row << "%.3f" % file_stats[:time]
+        row << format("%.3f", file_stats[:time])
         table << row
       end
 
@@ -88,7 +88,7 @@ module Jekyll
 
     def format_bytes(bytes)
       bytes /= 1024.0
-      "%.2fK" % bytes
+      format("%.2fK", bytes)
     end
   end
 end

data/lib/jekyll/log_adapter.rb

@@ -7,7 +7,7 @@ module Jekyll
       :info  => ::Logger::INFO,
       :warn  => ::Logger::WARN,
       :error => ::Logger::ERROR
-    }
+    }.freeze
 
     # Public: Create a new instance of a log writer
     #
@@ -98,7 +98,7 @@ module Jekyll
     #
     # Returns the formatted message
     def message(topic, message)
-      msg = formatted_topic(topic) + message.to_s.gsub(/\s+/, ' ')
+      msg = formatted_topic(topic) + message.to_s.gsub(%r!\s+!, " ")
       messages << msg
       msg
     end

data/lib/jekyll/page.rb

@@ -9,7 +9,7 @@ module Jekyll
 
     alias_method :extname, :ext
 
-    FORWARD_SLASH = '/'.freeze
+    FORWARD_SLASH = "/".freeze
 
     # Attributes for Liquid templates
     ATTRIBUTES_FOR_LIQUID = %w(
@@ -18,16 +18,16 @@ module Jekyll
       name
       path
       url
-    )
+    ).freeze
 
     # A set of extensions that are considered HTML or HTML-like so we
     # should not alter them,  this includes .xhtml through XHTM5.
 
-    HTML_EXTENSIONS = %W(
+    HTML_EXTENSIONS = %w(
       .html
       .xhtml
       .htm
-    )
+    ).freeze
 
     # Initialize a new Page.
     #
@@ -71,7 +71,7 @@ module Jekyll
     #
     # Returns the String permalink or nil if none has been set.
     def permalink
-      data.nil? ? nil : data['permalink']
+      data.nil? ? nil : data["permalink"]
     end
 
     # The template of the permalink.
@@ -92,9 +92,9 @@ module Jekyll
     # Returns the String url.
     def url
       @url ||= URL.new({
-        :template => template,
+        :template     => template,
         :placeholders => url_placeholders,
-        :permalink => permalink
+        :permalink    => permalink
       }).to_s
     end
 
@@ -135,12 +135,12 @@ module Jekyll
     #
     # Returns the path to the source file
     def path
-      data.fetch('path') { relative_path.sub(/\A\//, '') }
+      data.fetch("path") { relative_path }
     end
 
     # The path to the page source file, relative to the site source
     def relative_path
-      File.join(*[@dir, @name].map(&:to_s).reject(&:empty?))
+      File.join(*[@dir, @name].map(&:to_s).reject(&:empty?)).sub(%r!\A\/!, "")
     end
 
     # Obtain destination path.
@@ -167,7 +167,7 @@ module Jekyll
 
     # Returns the Boolean of whether this Page is an index file or not.
     def index?
-      basename == 'index'
+      basename == "index"
     end
 
     def trigger_hooks(hook_name, *args)

data/lib/jekyll/plugin.rb

@@ -1,12 +1,12 @@
 module Jekyll
   class Plugin
     PRIORITIES = {
-      :low => -10,
+      :low     => -10,
       :highest => 100,
-      :lowest => -100,
-      :normal => 0,
-      :high => 10
-    }
+      :lowest  => -100,
+      :normal  => 0,
+      :high    => 10
+    }.freeze
 
     #
 

data/lib/jekyll/plugin_manager.rb

@@ -24,7 +24,9 @@ module Jekyll
     #
     # Returns nothing.
     def require_gems
-      Jekyll::External.require_with_graceful_fail(site.gems.select { |gem| plugin_allowed?(gem) })
+      Jekyll::External.require_with_graceful_fail(
+        site.gems.select { |gem| plugin_allowed?(gem) }
+      )
     end
 
     def self.require_from_bundler
@@ -33,7 +35,8 @@ module Jekyll
 
         Bundler.setup
         required_gems = Bundler.require(:jekyll_plugins)
-        Jekyll.logger.debug("PluginManager:", "Required #{required_gems.map(&:name).join(', ')}")
+        message = "Required #{required_gems.map(&:name).join(", ")}"
+        Jekyll.logger.debug("PluginManager:", message)
         ENV["JEKYLL_NO_BUNDLER_REQUIRE"] = "true"
 
         true
@@ -57,7 +60,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 ||= Array[site.config["whitelist"]].flatten
     end
 
     # Require all .rb files if safe mode is off
@@ -76,16 +79,17 @@ module Jekyll
     #
     # Returns an Array of plugin search paths
     def plugins_path
-      if site.config['plugins_dir'] == Jekyll::Configuration::DEFAULTS['plugins_dir']
-        [site.in_source_dir(site.config['plugins_dir'])]
+      if site.config["plugins_dir"].eql? Jekyll::Configuration::DEFAULTS["plugins_dir"]
+        [site.in_source_dir(site.config["plugins_dir"])]
       else
-        Array(site.config['plugins_dir']).map { |d| File.expand_path(d) }
+        Array(site.config["plugins_dir"]).map { |d| File.expand_path(d) }
       end
     end
 
     def deprecation_checks
-      pagination_included = (site.config['gems'] || []).include?('jekyll-paginate') || defined?(Jekyll::Paginate)
-      if site.config['paginate'] && !pagination_included
+      pagination_included = (site.config["gems"] || []).include?("jekyll-paginate") ||
+        defined?(Jekyll::Paginate)
+      if site.config["paginate"] && !pagination_included
         Jekyll::Deprecator.deprecation_message "You appear to have pagination " \
           "turned on, but you haven't included the `jekyll-paginate` gem. " \
           "Ensure you have `gems: [jekyll-paginate]` in your configuration file."

data/lib/jekyll/publisher.rb

@@ -15,7 +15,7 @@ module Jekyll
     private
 
     def can_be_published?(thing)
-      thing.data.fetch('published', true) || @site.unpublished
+      thing.data.fetch("published", true) || @site.unpublished
     end
   end
 end

data/lib/jekyll/reader.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'csv'
+require "csv"
 
 module Jekyll
   class Reader
@@ -16,7 +16,7 @@ module Jekyll
       @site.layouts = LayoutReader.new(site).read
       read_directories
       sort_files!
-      @site.data = DataReader.new(site).read(site.config['data_dir'])
+      @site.data = DataReader.new(site).read(site.config["data_dir"])
       CollectionReader.new(site).read
     end
 
@@ -34,13 +34,15 @@ module Jekyll
     # dir - The String relative path of the directory to read. Default: ''.
     #
     # Returns nothing.
-    def read_directories(dir = '')
+    def read_directories(dir = "")
       base = site.in_source_dir(dir)
 
-      dot = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
+      dot = Dir.chdir(base) { filter_entries(Dir.entries("."), base) }
       dot_dirs = dot.select { |file| File.directory?(@site.in_source_dir(base, file)) }
       dot_files = (dot - dot_dirs)
-      dot_pages = dot_files.select { |file| Utils.has_yaml_header?(@site.in_source_dir(base, file)) }
+      dot_pages = dot_files.select do |file|
+        Utils.has_yaml_header?(@site.in_source_dir(base, file))
+      end
       dot_static_files = dot_files - dot_pages
 
       retrieve_posts(dir)
@@ -71,7 +73,9 @@ module Jekyll
       dot_dirs.map do |file|
         dir_path = site.in_source_dir(dir, file)
         rel_path = File.join(dir, file)
-        @site.reader.read_directories(rel_path) unless @site.dest.sub(/\/$/, '') == dir_path
+        unless @site.dest.sub(%r!/$!, "") == dir_path
+          @site.reader.read_directories(rel_path)
+        end
       end
     end
 
@@ -119,7 +123,7 @@ module Jekyll
     def get_entries(dir, subfolder)
       base = site.in_source_dir(dir, subfolder)
       return [] unless File.exist?(base)
-      entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) }
+      entries = Dir.chdir(base) { filter_entries(Dir["**/*"], base) }
       entries.delete_if { |e| File.directory?(site.in_source_dir(base, e)) }
     end
   end

data/lib/jekyll/readers/data_reader.rb

@@ -30,14 +30,14 @@ module Jekyll
       return unless File.directory?(dir) && !@entry_filter.symlink?(dir)
 
       entries = Dir.chdir(dir) do
-        Dir['*.{yaml,yml,json,csv}'] + Dir['*'].select { |fn| File.directory?(fn) }
+        Dir["*.{yaml,yml,json,csv}"] + Dir["*"].select { |fn| File.directory?(fn) }
       end
 
       entries.each do |entry|
         path = @site.in_source_dir(dir, entry)
         next if @entry_filter.symlink?(path)
 
-        key = sanitize_filename(File.basename(entry, '.*'))
+        key = sanitize_filename(File.basename(entry, ".*"))
         if File.directory?(path)
           read_data_to(path, data[key] = {})
         else
@@ -51,20 +51,20 @@ module Jekyll
     # Returns the contents of the data file.
     def read_data_file(path)
       case File.extname(path).downcase
-      when '.csv'
+      when ".csv"
         CSV.read(path, {
-                         :headers => true,
-                         :encoding => site.config['encoding']
-                     }).map(&:to_hash)
+          :headers  => true,
+          :encoding => site.config["encoding"]
+        }).map(&:to_hash)
       else
         SafeYAML.load_file(path)
       end
     end
 
     def sanitize_filename(name)
-      name.gsub!(/[^\w\s-]+/, '')
-      name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
-      name.gsub(/\s+/, '_')
+      name.gsub!(%r![^\w\s-]+!, "")
+      name.gsub!(%r!(^|\b\s)\s+($|\s?\b)!, '\\1\\2')
+      name.gsub(%r!\s+!, "_")
     end
   end
 end

data/lib/jekyll/readers/layout_reader.rb

@@ -8,11 +8,13 @@ module Jekyll
 
     def read
       layout_entries.each do |layout_file|
-        @layouts[layout_name(layout_file)] = Layout.new(site, layout_directory, layout_file)
+        @layouts[layout_name(layout_file)] = \
+          Layout.new(site, layout_directory, layout_file)
       end
 
       theme_layout_entries.each do |layout_file|
-        @layouts[layout_name(layout_file)] ||= Layout.new(site, theme_layout_directory, layout_file)
+        @layouts[layout_name(layout_file)] ||= \
+          Layout.new(site, theme_layout_directory, layout_file)
       end
 
       @layouts
@@ -39,7 +41,7 @@ module Jekyll
     def entries_in(dir)
       entries = []
       within(dir) do
-        entries = EntryFilter.new(site).filter(Dir['**/*.*'])
+        entries = EntryFilter.new(site).filter(Dir["**/*.*"])
       end
       entries
     end
@@ -54,15 +56,13 @@ module Jekyll
     end
 
     def layout_directory_inside_source
-      site.in_source_dir(site.config['layouts_dir'])
+      site.in_source_dir(site.config["layouts_dir"])
     end
 
     def layout_directory_in_cwd
-      dir = Jekyll.sanitized_path(Dir.pwd, site.config['layouts_dir'])
+      dir = Jekyll.sanitized_path(Dir.pwd, site.config["layouts_dir"])
       if File.directory?(dir) && !site.safe
         dir
-      else
-        nil
       end
     end
   end