jekyll 3.4.5 → 3.5.0

data/lib/jekyll/reader.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 require "csv"
 
 module Jekyll

data/lib/jekyll/readers/data_reader.rb

@@ -19,7 +19,7 @@ module Jekyll
       @content
     end
 
-    # Read and parse all .yaml, .yml, .json, and .csv
+    # Read and parse all .yaml, .yml, .json, .csv and .tsv
     # files under <dir> and add them to the <data> variable.
     #
     # dir - The string absolute path of the directory to read.
@@ -30,7 +30,7 @@ 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,tsv}"] + Dir["*"].select { |fn| File.directory?(fn) }
       end
 
       entries.each do |entry|
@@ -56,6 +56,12 @@ module Jekyll
           :headers  => true,
           :encoding => site.config["encoding"],
         }).map(&:to_hash)
+      when ".tsv"
+        CSV.read(path, {
+          :col_sep  => "\t",
+          :headers  => true,
+          :encoding => site.config["encoding"],
+        }).map(&:to_hash)
       else
         SafeYAML.load_file(path)
       end

data/lib/jekyll/readers/theme_assets_reader.rb

@@ -29,7 +29,7 @@ module Jekyll
           Jekyll::Page.new(site, base, dir, name)
       else
         append_unless_exists site.static_files,
-          Jekyll::StaticFile.new(site, base, dir, name)
+          Jekyll::StaticFile.new(site, base, "/#{dir}", name)
       end
     end
 

data/lib/jekyll/renderer.rb

@@ -33,50 +33,44 @@ module Jekyll
     # Determine which converters to use based on this document's
     # extension.
     #
-    # Returns an array of Converter instances.
+    # Returns Array of Converter instances.
     def converters
       @converters ||= site.converters.select { |c| c.matches(document.extname) }.sort
     end
 
     # Determine the extname the outputted file should have
     #
-    # Returns the output extname including the leading period.
+    # Returns String the output extname including the leading period.
     def output_ext
       @output_ext ||= (permalink_ext || converter_output_ext)
     end
 
-    ######################
-    ## DAT RENDER THO
-    ######################
-
+    # Prepare payload and render the document
+    #
+    # Returns String rendered document output
     def run
       Jekyll.logger.debug "Rendering:", document.relative_path
 
-      payload["page"] = document.to_liquid
-
-      if document.respond_to? :pager
-        payload["paginator"] = document.pager.to_liquid
-      end
-
-      if document.is_a?(Document) && document.collection.label == "posts"
-        payload["site"]["related_posts"] = document.related_posts
-      else
-        payload["site"]["related_posts"] = nil
-      end
-
-      # render and transform content (this becomes the final content of the object)
-      payload["highlighter_prefix"] = converters.first.highlighter_prefix
-      payload["highlighter_suffix"] = converters.first.highlighter_suffix
+      assign_pages!
+      assign_related_posts!
+      assign_highlighter_options!
+      assign_layout_data!
 
       Jekyll.logger.debug "Pre-Render Hooks:", document.relative_path
       document.trigger_hooks(:pre_render, payload)
 
+      render_document
+    end
+
+    # Render the document.
+    #
+    # Returns String rendered document output
+    # rubocop: disable AbcSize
+    def render_document
       info = {
-        :registers => { :site => site, :page => payload["page"] }
+        :registers => { :site => site, :page => payload["page"] },
       }
-
       output = document.content
-
       if document.render_with_liquid?
         Jekyll.logger.debug "Rendering Liquid:", document.relative_path
         output = render_liquid(output, payload, info, document.path)
@@ -88,21 +82,16 @@ module Jekyll
 
       if document.place_in_layout?
         Jekyll.logger.debug "Rendering Layout:", document.relative_path
-        place_in_layouts(
-          output,
-          payload,
-          info
-        )
-      else
-        output
+        output = place_in_layouts(output, payload, info)
       end
+
+      output
     end
+    # rubocop: enable AbcSize
 
-    # Convert the given content using the converters which match this renderer's document.
-    #
-    # content - the raw, unconverted content
+    # Convert the document using the converters which match this renderer's document.
     #
-    # Returns the converted content.
+    # Returns String the converted content.
     def convert(content)
       converters.reduce(content) do |output, converter|
         begin
@@ -124,7 +113,7 @@ module Jekyll
     # info    -
     # path    - (optional) the path to the file, for use in ex
     #
-    # Returns the content, rendered by Liquid.
+    # Returns String the content, rendered by Liquid.
     def render_liquid(content, payload, info, path = nil)
       template = site.liquid_renderer.file(path).parse(content)
       template.warnings.each do |e|
@@ -144,26 +133,18 @@ module Jekyll
     #
     # layout - the layout to check
     #
-    # Returns true if the layout is invalid, false if otherwise
+    # Returns Boolean true if the layout is invalid, false if otherwise
     def invalid_layout?(layout)
       !document.data["layout"].nil? && layout.nil? && !(document.is_a? Jekyll::Excerpt)
     end
 
-    # Render layouts and place given content inside.
+    # Render layouts and place document content inside.
     #
-    # content - the content to be placed in the layout
-    #
-    #
-    # Returns the content placed in the Liquid-rendered layouts
+    # Returns String rendered content
     def place_in_layouts(content, payload, info)
       output = content.dup
       layout = layouts[document.data["layout"]]
-
-      Jekyll.logger.warn(
-        "Build Warning:",
-        "Layout '#{document.data["layout"]}' requested in "\
-        "#{document.relative_path} does not exist."
-      ) if invalid_layout? layout
+      validate_layout(layout)
 
       used = Set.new([layout])
 
@@ -171,33 +152,97 @@ module Jekyll
       payload["layout"] = nil
 
       while layout
-        payload["content"] = output
-        payload["layout"]  = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
-
-        output = render_liquid(
-          layout.content,
-          payload,
-          info,
-          layout.relative_path
-        )
-
-        # Add layout to dependency tree
-        site.regenerator.add_dependency(
-          site.in_source_dir(document.path),
-          site.in_source_dir(layout.path)
-        ) if document.write?
-
-        if (layout = layouts[layout.data["layout"]])
+        output = render_layout(output, layout, info)
+        add_regenerator_dependencies(layout)
+
+        if (layout = site.layouts[layout.data["layout"]])
           break if used.include?(layout)
           used << layout
         end
       end
-
       output
     end
 
+    # Checks if the layout specified in the document actually exists
+    #
+    # layout - the layout to check
+    # Returns nothing
     private
+    def validate_layout(layout)
+      return unless invalid_layout?(layout)
+      Jekyll.logger.warn(
+        "Build Warning:",
+        "Layout '#{document.data["layout"]}' requested "\
+        "in #{document.relative_path} does not exist."
+      )
+    end
 
+    # Render layout content into document.output
+    #
+    # Returns String rendered content
+    private
+    def render_layout(output, layout, info)
+      payload["content"] = output
+      payload["layout"]  = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
+
+      render_liquid(
+        layout.content,
+        payload,
+        info,
+        layout.relative_path
+      )
+    end
+
+    private
+    def add_regenerator_dependencies(layout)
+      return unless document.write?
+      site.regenerator.add_dependency(
+        site.in_source_dir(document.path),
+        site.in_source_dir(layout.path)
+      )
+    end
+
+    # Set page content to payload and assign pager if document has one.
+    #
+    # Returns nothing
+    private
+    def assign_pages!
+      payload["page"] = document.to_liquid
+      payload["paginator"] = if document.respond_to?(:pager)
+                               document.pager.to_liquid
+                             end
+    end
+
+    # Set related posts to payload if document is a post.
+    #
+    # Returns nothing
+    private
+    def assign_related_posts!
+      if document.is_a?(Document) && document.collection.label == "posts"
+        payload["site"]["related_posts"] = document.related_posts
+      else
+        payload["site"]["related_posts"] = nil
+      end
+    end
+
+    # Set highlighter prefix and suffix
+    #
+    # Returns nothing
+    private
+    def assign_highlighter_options!
+      payload["highlighter_prefix"] = converters.first.highlighter_prefix
+      payload["highlighter_suffix"] = converters.first.highlighter_suffix
+    end
+
+    private
+    def assign_layout_data!
+      layout = layouts[document.data["layout"]]
+      if layout
+        payload["layout"] = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
+      end
+    end
+
+    private
     def permalink_ext
       if document.permalink && !document.permalink.end_with?("/")
         permalink_ext = File.extname(document.permalink)
@@ -205,6 +250,7 @@ module Jekyll
       end
     end
 
+    private
     def converter_output_ext
       if output_exts.size == 1
         output_exts.last
@@ -213,6 +259,7 @@ module Jekyll
       end
     end
 
+    private
     def output_exts
       @output_exts ||= converters.map do |c|
         c.output_ext(document.extname)

data/lib/jekyll/site.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 require "csv"
 
 module Jekyll
@@ -45,10 +46,13 @@ module Jekyll
       @config = config.clone
 
       %w(safe lsi highlighter baseurl exclude include future unpublished
-        show_drafts limit_posts keep_files gems).each do |opt|
+        show_drafts limit_posts keep_files).each do |opt|
         self.send("#{opt}=", config[opt])
       end
 
+      # keep using `gems` to avoid breaking change
+      self.gems = config["plugins"]
+
       configure_plugins
       configure_theme
       configure_include_paths

data/lib/jekyll/tags/post_url.rb

@@ -81,7 +81,7 @@ eos
         site.posts.docs.each do |p|
           next unless @post.deprecated_equality p
           Jekyll::Deprecator.deprecation_message "A call to "\
-            "'{{ post_url #{@post.name} }}' did not match " \
+            "'{% post_url #{@post.name} %}' did not match " \
             "a post using the new matching method of checking name " \
             "(path-date-slug) equality. Please make sure that you " \
             "change this tag to match the post's name exactly."

data/lib/jekyll/theme.rb

@@ -39,6 +39,10 @@ module Jekyll
       Sass.load_paths << sass_path
     end
 
+    def runtime_dependencies
+      gemspec.runtime_dependencies
+    end
+
     private
 
     def path_for(folder)

data/lib/jekyll/url.rb

@@ -35,15 +35,8 @@ module Jekyll
     # The generated relative URL of the resource
     #
     # Returns the String URL
-    # Raises a Jekyll::Errors::InvalidURLError if the relative URL contains a colon
     def to_s
-      sanitized_url = sanitize_url(generated_permalink || generated_url)
-      if sanitized_url.include?(":")
-        raise Jekyll::Errors::InvalidURLError,
-          "The URL #{sanitized_url} is invalid because it contains a colon."
-      else
-        sanitized_url
-      end
+      sanitize_url(generated_permalink || generated_url)
     end
 
     # Generates a URL from the permalink

data/lib/jekyll/utils/win_tz.rb

@@ -46,7 +46,7 @@ module Jekyll
       #
       # Returns a rational number.
       def rational_hour(seconds)
-        seconds.to_r/3600
+        seconds.to_r / 3600
       end
 
       # Private: Convert given seconds to an hour as an absolute number.
@@ -56,7 +56,7 @@ module Jekyll
       #
       # Returns an integer.
       def absolute_hour(seconds)
-        seconds.abs/3600
+        seconds.abs / 3600
       end
 
       # Private: Perform a modulo operation on a given fraction.

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.4.5".freeze
+  VERSION = "3.5.0".freeze
 end

data/lib/site_template/404.html

@@ -0,0 +1,24 @@
+---
+layout: default
+---
+
+<style type="text/css" media="screen">
+  .container {
+    margin: 10px auto;
+    max-width: 600px;
+    text-align: center;
+  }
+  h1 {
+    margin: 30px 0;
+    font-size: 4em;
+    line-height: 1;
+    letter-spacing: -1px;
+  }
+</style>
+
+<div class="container">
+  <h1>404</h1>
+
+  <p><strong>Page not found :(</strong></p>
+  <p>The requested page could not be found.</p>
+</div>

data/lib/site_template/_config.yml

@@ -14,7 +14,7 @@
 # You can create any custom variable you would like, and they will be accessible
 # in the templates via {{ site.myvariable }}.
 title: Your awesome title
-email: your-email@domain.com
+email: your-email@example.com
 description: > # this means to ignore newlines until "baseurl:"
   Write an awesome description for your new site here. You can edit this
   line in _config.yml. It will appear in your document head meta (for
@@ -29,6 +29,15 @@ markdown: kramdown
 theme: minima
 gems:
   - jekyll-feed
-exclude:
-  - Gemfile
-  - Gemfile.lock
+
+# Exclude from processing.
+# The following items will not be processed, by default. Create a custom list
+# to override the default setting.
+# exclude:
+#   - Gemfile
+#   - Gemfile.lock
+#   - node_modules
+#   - vendor/bundle/
+#   - vendor/cache/
+#   - vendor/gems/
+#   - vendor/ruby/