jekyll 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68bb27761f573ec04ae1397a773f64e1d8f4545e
-  data.tar.gz: bd8993ae63044fd48be9ff85bcb0ee5ff7c3dc4c
+  metadata.gz: 68e5c34fa249f9c27cbe1c4a0ed36de42d15d715
+  data.tar.gz: 256fdf447db9bcfc643f895db6454c74cf67b0f5
 SHA512:
-  metadata.gz: bcd138cfb2d0629a83d4b2c16c4fd9d4635cb053ba14302611820be25acef3a475e0956f65933eb4641133769d7e62abdecd60f11636a53f2b70aa945bb2d74d
-  data.tar.gz: 2addd77ace5a02fae654c07fcc2d2db6d993ac8036771333cbb023d68a09c622d6433a8aefc42d9ab69b57f0972d9f75c0118924a89b0b9bbbec2384827ab907
+  metadata.gz: ee35404dd5880c76e378d11c8e7fb35cdb426bf8fa51b047bc942c6f008d076bed83caeadd0fc504787cf01ceade697b0f48c2eda20b081e26d6d102a9599db7
+  data.tar.gz: 07cf83c87ec8567f3d6c03c434991cd35248269401f42c0f11dc061a24c105ebe803f0827b746766e82c2ac4e301709c32e338a857c8948ba1a4a2f3ee13e899

data/.rubocop.yml

@@ -22,6 +22,8 @@ Metrics/BlockLength:
   Exclude:
     - test/**/*.rb
     - lib/jekyll/configuration.rb
+    - rake/*.rake
+    - jekyll.gemspec
 Metrics/ClassLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb$/
@@ -32,6 +34,8 @@ Metrics/CyclomaticComplexity:
 Metrics/LineLength:
   Exclude:
     - !ruby/regexp /features\/.*.rb/
+    - Rakefile
+    - rake/*.rake
   Max: 90
   Severity: warning
 Metrics/MethodLength:
@@ -44,6 +48,14 @@ Metrics/ParameterLists:
   Max: 4
 Metrics/PerceivedComplexity:
   Max: 8
+Security/MarshalLoad:
+  Exclude:
+    - !ruby/regexp /test\/.*.rb$/
+    - lib/jekyll/regenerator.rb
+Security/YAMLLoad:
+  Exclude:
+    - !ruby/regexp /features\/.*.rb/
+    - !ruby/regexp /test\/.*.rb$/
 Style/Alias:
   Enabled: false
 Style/AlignArray:
@@ -127,5 +139,7 @@ Style/StringLiterals:
   EnforcedStyle: double_quotes
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: consistent_comma
 Style/UnneededCapitalW:
   Enabled: false

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2008-2016 Tom Preston-Werner
+Copyright (c) 2008-2017 Tom Preston-Werner and Jekyll contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.markdown

@@ -43,8 +43,7 @@ conduct.
 Please adhere to this code of conduct in any interactions you have in the
 Jekyll community. It is strictly enforced on all official Jekyll
 repositories, websites, and resources. If you encounter someone violating
-these terms, please let a maintainer ([@parkr](https://github.com/parkr), [@envygeeks](https://github.com/envygeeks), or [@mattr-](https://github.com/mattr-)) know
-and we will address it as soon as possible.
+these terms, please let a maintainer ([@parkr](https://github.com/parkr), [@envygeeks](https://github.com/envygeeks), [@mattr-](https://github.com/mattr-), or [@alfredxing](https://github.com/alfredxing)) know and we will address it as soon as possible.
 
 ## Diving In
 

data/lib/jekyll.rb

@@ -119,7 +119,11 @@ module Jekyll
     # Returns nothing
     # rubocop:disable Style/AccessorMethodName
     def set_timezone(timezone)
-      ENV["TZ"] = timezone
+      ENV["TZ"] = if Utils::Platforms.really_windows?
+                    Utils::WinTZ.calculate(timezone)
+                  else
+                    timezone
+                  end
     end
     # rubocop:enable Style/AccessorMethodName
 

data/lib/jekyll/collection.rb

@@ -32,8 +32,8 @@ module Jekyll
     # Override of method_missing to check in @data for the key.
     def method_missing(method, *args, &blck)
       if docs.respond_to?(method.to_sym)
-        Jekyll.logger.warn "Deprecation:", "#{label}.#{method} should be changed to" \
-          "#{label}.docs.#{method}."
+        Jekyll.logger.warn "Deprecation:",
+          "#{label}.#{method} should be changed to #{label}.docs.#{method}."
         Jekyll.logger.warn "", "Called by #{caller.first}."
         docs.public_send(method.to_sym, *args, &blck)
       else
@@ -197,6 +197,7 @@ module Jekyll
     end
 
     private
+
     def read_document(full_path)
       doc = Jekyll::Document.new(full_path, :site => site, :collection => self)
       doc.read
@@ -208,14 +209,20 @@ module Jekyll
     end
 
     private
+
     def read_static_file(file_path, full_path)
       relative_dir = Jekyll.sanitized_path(
         relative_directory,
         File.dirname(file_path)
       ).chomp("/.")
 
-      files << StaticFile.new(site, site.source, relative_dir,
-        File.basename(full_path), self)
+      files << StaticFile.new(
+        site,
+        site.source,
+        relative_dir,
+        File.basename(full_path),
+        self
+      )
     end
   end
 end

data/lib/jekyll/commands/doctor.rb

@@ -35,7 +35,7 @@ module Jekyll
             fsnotify_buggy?(site),
             !deprecated_relative_permalinks(site),
             !conflicting_urls(site),
-            !urls_only_differ_by_case(site)
+            !urls_only_differ_by_case(site),
           ].all?
         end
 

data/lib/jekyll/commands/new.rb

@@ -84,6 +84,10 @@ gem "minima", "~> 2.0"
 group :jekyll_plugins do
    gem "jekyll-feed", "~> 0.6"
 end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
 RUBY
         end
 
@@ -121,23 +125,23 @@ RUBY
         # unless the user opts to generate a blank blog or skip 'bundle install'.
 
         def after_install(path, options = {})
-          Jekyll.logger.info "New jekyll site installed in #{path.cyan}."
-          Jekyll.logger.info "Bundle install skipped." if options["skip-bundle"]
-
           unless options["blank"] || options["skip-bundle"]
             bundle_install path
           end
+
+          Jekyll.logger.info "New jekyll site installed in #{path.cyan}."
+          Jekyll.logger.info "Bundle install skipped." if options["skip-bundle"]
         end
 
         def bundle_install(path)
           Jekyll::External.require_with_graceful_fail "bundler"
           Jekyll.logger.info "Running bundle install in #{path.cyan}..."
           Dir.chdir(path) do
-            if ENV["CI"]
-              system("bundle", "install", "--quiet")
-            else
-              system("bundle", "install")
+            process, output = Jekyll::Utils::Exec.run("bundle", "install")
+            output.to_s.each_line do |line|
+              Jekyll.logger.info("Bundler:".green, line.strip) unless line.to_s.empty?
             end
+            raise SystemExit unless process.success?
           end
         end
       end

data/lib/jekyll/commands/serve.rb

@@ -10,9 +10,9 @@ module Jekyll
           "ssl_key"            => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
           "port"               => ["-P", "--port [PORT]", "Port to listen on"],
           "show_dir_listing"   => ["--show-dir-listing",
-            "Show a directory listing instead of loading your index file."],
+            "Show a directory listing instead of loading your index file.",],
           "skip_initial_build" => ["skip_initial_build", "--skip-initial-build",
-            "Skips the initial site build which occurs before the server is started."]
+            "Skips the initial site build which occurs before the server is started.",],
         }.freeze
 
         #
@@ -88,7 +88,7 @@ module Jekyll
               index.rhtml
               index.cgi
               index.xml
-            )
+            ),
           }
 
           opts[:DirectoryIndex] = [] if opts[:JekyllOptions]["show_dir_listing"]
@@ -116,8 +116,8 @@ module Jekyll
           WEBrick::Config::FileHandler.merge({
             :FancyIndexing     => true,
             :NondisclosureName => [
-              ".ht*", "~*"
-            ]
+              ".ht*", "~*",
+            ],
           })
         end
 
@@ -139,7 +139,7 @@ module Jekyll
             :prefix  => ssl_enabled ? "https" : "http",
             :address => address,
             :port    => port,
-            :baseurl => baseurl ? "#{baseurl}/" : ""
+            :baseurl => baseurl ? "#{baseurl}/" : "",
           })
         end
 

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

@@ -6,7 +6,7 @@ module Jekyll
       class Servlet < WEBrick::HTTPServlet::FileHandler
         DEFAULTS = {
           "Cache-Control" => "private, max-age=0, proxy-revalidate, " \
-            "no-store, no-cache, must-revalidate"
+            "no-store, no-cache, must-revalidate",
         }.freeze
 
         def initialize(server, root, callbacks)

data/lib/jekyll/configuration.rb

@@ -58,15 +58,15 @@ module Jekyll
       "defaults"          => [],
 
       "liquid"            => {
-        "error_mode" => "warn"
+        "error_mode" => "warn",
       },
 
       "rdiscount"         => {
-        "extensions" => []
+        "extensions" => [],
       },
 
       "redcarpet"         => {
-        "extensions" => []
+        "extensions" => [],
       },
 
       "kramdown"          => {
@@ -76,8 +76,8 @@ module Jekyll
         "smart_quotes"  => "lsquo,rsquo,ldquo,rdquo",
         "input"         => "GFM",
         "hard_wrap"     => false,
-        "footnote_nr"   => 1
-      }
+        "footnote_nr"   => 1,
+      },
     }.map { |k, v| [k, v.freeze] }].freeze
 
     class << self

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

@@ -11,7 +11,7 @@ module Jekyll
           "line_numbers"      => "inline",
           "line_number_start" => 1,
           "tab_width"         => 4,
-          "wrap"              => "div"
+          "wrap"              => "div",
         }.freeze
 
         def initialize(config)

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

@@ -21,7 +21,7 @@ class Jekyll::Converters::Markdown::RedcarpetParser
           code,
           {
             :lexer   => lang,
-            :options => { :encoding => "utf-8" }
+            :options => { :encoding => "utf-8" },
           }
         ),
         lang

data/lib/jekyll/document.rb

@@ -9,7 +9,7 @@ module Jekyll
 
     YAML_FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m
     DATELESS_FILENAME_MATCHER = %r!^(?:.+/)*(.*)(\.[^.]+)$!
-    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$!
+    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d{4}-\d{2}-\d{2})-(.*)(\.[^.]+)$!
 
     # Create a new Document.
     #
@@ -196,7 +196,7 @@ module Jekyll
       @url = URL.new({
         :template     => url_template,
         :placeholders => url_placeholders,
-        :permalink    => permalink
+        :permalink    => permalink,
       }).to_s
     end
 
@@ -469,14 +469,14 @@ module Jekyll
           "category",
           "categories"
         )
-        ).map(&:to_s).flatten.uniq
+        ).map(&:to_s).flatten.uniq,
       })
     end
 
     private
     def populate_tags
       merge_data!({
-        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten
+        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten,
       })
     end
 

data/lib/jekyll/drops/jekyll_drop.rb

@@ -20,7 +20,7 @@ module Jekyll
       def to_h
         @to_h ||= {
           "version"     => version,
-          "environment" => environment
+          "environment" => environment,
         }
       end
 

data/lib/jekyll/entry_filter.rb

@@ -2,7 +2,7 @@ module Jekyll
   class EntryFilter
     attr_reader :site
     SPECIAL_LEADING_CHARACTERS = [
-      ".", "_", "#", "~"
+      ".", "_", "#", "~",
     ].freeze
 
     def initialize(site, base_directory = nil)

data/lib/jekyll/excerpt.rb

@@ -30,8 +30,7 @@ module Jekyll
       @data
     end
 
-    def trigger_hooks(*)
-    end
+    def trigger_hooks(*); end
 
     # 'Path' of the excerpt.
     #

data/lib/jekyll/external.rb

@@ -48,7 +48,7 @@ In order to use Jekyll as currently configured, you'll need to install this gem.
 
 The full error message from Ruby is: '#{e.message}'
 
-If you run into trouble, you can find helpful resources at http://jekyllrb.com/help/!
+If you run into trouble, you can find helpful resources at https://jekyllrb.com/help/!
             MSG
             raise Jekyll::Errors::MissingDependencyException, name
           end

data/lib/jekyll/filters.rb

@@ -1,4 +1,4 @@
-require "uri"
+require "addressable/uri"
 require "json"
 require "date"
 require "liquid"
@@ -8,6 +8,8 @@ require_all "jekyll/filters"
 module Jekyll
   module Filters
     include URLFilters
+    include GroupingFilters
+
     # Convert a Markdown string into HTML output.
     #
     # input - The Markdown String to convert.
@@ -150,7 +152,7 @@ module Jekyll
     #
     # Returns the escaped String.
     def uri_escape(input)
-      URI.escape(input)
+      Addressable::URI.encode(input)
     end
 
     # Replace any whitespace in the input string with a single space
@@ -175,6 +177,7 @@ module Jekyll
     # word "and" for the last one.
     #
     # array - The Array of Strings to join.
+    # connector - Word used to connect the last 2 items in the array
     #
     # Examples
     #
@@ -182,8 +185,7 @@ module Jekyll
     #   # => "apples, oranges, and grapes"
     #
     # Returns the formatted String.
-    def array_to_sentence_string(array)
-      connector = "and"
+    def array_to_sentence_string(array, connector = "and")
       case array.length
       when 0
         ""
@@ -205,29 +207,6 @@ module Jekyll
       as_liquid(input).to_json
     end
 
-    # Group an array of items by a property
-    #
-    # input - the inputted Enumerable
-    # property - the property
-    #
-    # Returns an array of Hashes, each looking something like this:
-    #  {"name"  => "larry"
-    #   "items" => [...] } # all the items where `property` == "larry"
-    def group_by(input, property)
-      if groupable?(input)
-        input.group_by { |item| item_property(item, property).to_s }
-          .each_with_object([]) do |item, array|
-            array << {
-              "name"  => item.first,
-              "items" => item.last,
-              "size"  => item.last.size
-            }
-          end
-      else
-        input
-      end
-    end
-
     # Filter an array of objects
     #
     # input - the object array
@@ -381,11 +360,6 @@ module Jekyll
       end.localtime
     end
 
-    private
-    def groupable?(element)
-      element.respond_to?(:group_by)
-    end
-
     private
     def item_property(item, property)
       if item.respond_to?(:to_liquid)
@@ -436,6 +410,7 @@ module Jekyll
 
       condition
     end
+
   end
 end
 

data/lib/jekyll/filters/grouping_filters.rb

@@ -0,0 +1,63 @@
+module Jekyll
+  module Filters
+    module GroupingFilters
+      # Group an array of items by a property
+      #
+      # input - the inputted Enumerable
+      # property - the property
+      #
+      # Returns an array of Hashes, each looking something like this:
+      #  {"name"  => "larry"
+      #   "items" => [...] } # all the items where `property` == "larry"
+      def group_by(input, property)
+        if groupable?(input)
+          groups = input.group_by { |item| item_property(item, property).to_s }
+          grouped_array(groups)
+        else
+          input
+        end
+      end
+
+      # Group an array of items by an expression
+      #
+      # input - the object array
+      # variable - the variable to assign each item to in the expression
+      # expression -a Liquid comparison expression passed in as a string
+      #
+      # Returns the filtered array of objects
+      def group_by_exp(input, variable, expression)
+        return input unless groupable?(input)
+
+        parsed_expr = parse_expression(expression)
+        @context.stack do
+          groups = input.group_by do |item|
+            @context[variable] = item
+            parsed_expr.render(@context)
+          end
+          grouped_array(groups)
+        end
+      end
+
+      private
+      def parse_expression(str)
+        Liquid::Variable.new(str, {})
+      end
+
+      private
+      def groupable?(element)
+        element.respond_to?(:group_by)
+      end
+
+      private
+      def grouped_array(groups)
+        groups.each_with_object([]) do |item, array|
+          array << {
+            "name"  => item.first,
+            "items" => item.last,
+            "size"  => item.last.size,
+          }
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/hooks.rb

@@ -6,7 +6,7 @@ module Jekyll
     PRIORITY_MAP = {
       :low    => 10,
       :normal => 20,
-      :high   => 30
+      :high   => 30,
     }.freeze
 
     # initial empty hooks
@@ -17,26 +17,26 @@ module Jekyll
         :post_read   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
+        :post_write  => [],
       },
       :pages     => {
         :post_init   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
+        :post_write  => [],
       },
       :posts     => {
         :post_init   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
+        :post_write  => [],
       },
       :documents => {
         :post_init   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
-      }
+        :post_write  => [],
+      },
     }
 
     # map of all hooks and their priorities
@@ -64,7 +64,7 @@ module Jekyll
         :post_init   => [],
         :pre_render  => [],
         :post_render => [],
-        :post_write  => []
+        :post_write  => [],
       }
 
       unless @registry[owner][event]

data/lib/jekyll/log_adapter.rb

@@ -6,7 +6,7 @@ module Jekyll
       :debug => ::Logger::DEBUG,
       :info  => ::Logger::INFO,
       :warn  => ::Logger::WARN,
-      :error => ::Logger::ERROR
+      :error => ::Logger::ERROR,
     }.freeze
 
     # Public: Create a new instance of a log writer

data/lib/jekyll/page.rb

@@ -58,7 +58,7 @@ module Jekyll
 
     # The generated directory into which the page will be placed
     # upon generation. This is derived from the permalink or, if
-    # permalink is absent, we be '/'
+    # permalink is absent, will be '/'
     #
     # Returns the String destination directory.
     def dir
@@ -98,7 +98,7 @@ module Jekyll
       @url ||= URL.new({
         :template     => template,
         :placeholders => url_placeholders,
-        :permalink    => permalink
+        :permalink    => permalink,
       }).to_s
     end
 
@@ -108,7 +108,7 @@ module Jekyll
       {
         :path       => @dir,
         :basename   => basename,
-        :output_ext => output_ext
+        :output_ext => output_ext,
       }
     end
 

data/lib/jekyll/plugin.rb

@@ -5,7 +5,7 @@ module Jekyll
       :highest => 100,
       :lowest  => -100,
       :normal  => 0,
-      :high    => 10
+      :high    => 10,
     }.freeze
 
     #

data/lib/jekyll/reader.rb

@@ -71,7 +71,7 @@ module Jekyll
     #
     # Returns nothing.
     def retrieve_dirs(_base, dir, dot_dirs)
-      dot_dirs.map do |file|
+      dot_dirs.each do |file|
         dir_path = site.in_source_dir(dir, file)
         rel_path = File.join(dir, file)
         unless @site.dest.sub(%r!/$!, "") == dir_path

data/lib/jekyll/readers/data_reader.rb

@@ -7,20 +7,20 @@ module Jekyll
       @entry_filter = EntryFilter.new(site)
     end
 
-    # Read all the files in <source>/<dir>/_drafts and create a new Draft
-    # object with each one.
+    # Read all the files in <dir> and adds them to @content
     #
     # dir - The String relative path of the directory to read.
     #
-    # Returns nothing.
+    # Returns @content, a Hash of the .yaml, .yml,
+    # .json, and .csv files in the base directory
     def read(dir)
       base = site.in_source_dir(dir)
       read_data_to(base, @content)
       @content
     end
 
-    # Read and parse all yaml files under <dir> and add them to the
-    # <data> variable.
+    # Read and parse all .yaml, .yml, .json, and .csv
+    # files under <dir> and add them to the <data> variable.
     #
     # dir - The string absolute path of the directory to read.
     # data - The variable to which data will be added.
@@ -54,7 +54,7 @@ module Jekyll
       when ".csv"
         CSV.read(path, {
           :headers  => true,
-          :encoding => site.config["encoding"]
+          :encoding => site.config["encoding"],
         }).map(&:to_hash)
       else
         SafeYAML.load_file(path)

data/lib/jekyll/readers/post_reader.rb

@@ -57,7 +57,7 @@ module Jekyll
         path = @site.in_source_dir(File.join(dir, magic_dir, entry))
         Document.new(path, {
           :site       => @site,
-          :collection => @site.posts
+          :collection => @site.posts,
         })
       end.reject(&:nil?)
     end

data/lib/jekyll/regenerator.rb

@@ -40,7 +40,7 @@ module Jekyll
 
       metadata[path] = {
         "mtime" => File.mtime(path),
-        "deps"  => []
+        "deps"  => [],
       }
       cache[path] = true
     end

data/lib/jekyll/related_posts.rb

@@ -26,15 +26,15 @@ module Jekyll
     def build_index
       self.class.lsi ||= begin
         lsi = ClassifierReborn::LSI.new(:auto_rebuild => false)
-        display("Populating LSI...")
+        Jekyll.logger.info("Populating LSI...")
 
         site.posts.docs.each do |x|
           lsi.add_item(x)
         end
 
-        display("Rebuilding index...")
+        Jekyll.logger.info("Rebuilding index...")
         lsi.build_index
-        display("")
+        Jekyll.logger.info("")
         lsi
       end
     end
@@ -46,11 +46,5 @@ module Jekyll
     def most_recent_posts
       @most_recent_posts ||= (site.posts.docs.reverse - [post]).first(10)
     end
-
-    def display(output)
-      $stdout.print("\n")
-      $stdout.print(Jekyll.logger.formatted_topic(output))
-      $stdout.flush
-    end
   end
 end

data/lib/jekyll/site.rb

@@ -302,7 +302,7 @@ module Jekyll
         Jekyll.logger.abort_with "Since v3.0, permalinks for pages" \
                                 " in subfolders must be relative to the" \
                                 " site source directory, not the parent" \
-                                " directory. Check http://jekyllrb.com/docs/upgrading/"\
+                                " directory. Check https://jekyllrb.com/docs/upgrading/"\
                                 " for more info."
       end
     end
@@ -435,7 +435,7 @@ module Jekyll
     private
     def configure_include_paths
       @includes_load_paths = Array(in_source_dir(config["includes_dir"].to_s))
-      @includes_load_paths << theme.includes_path if self.theme
+      @includes_load_paths << theme.includes_path if theme && theme.includes_path
     end
 
     private

data/lib/jekyll/static_file.rb

@@ -101,7 +101,7 @@ module Jekyll
         "name"          => name,
         "extname"       => extname,
         "modified_time" => modified_time,
-        "path"          => File.join("", relative_path)
+        "path"          => File.join("", relative_path),
       }
     end
 
@@ -112,7 +112,7 @@ module Jekyll
           @collection.relative_directory.size..relative_path.size],
         :output_ext => "",
         :name       => "",
-        :title      => ""
+        :title      => "",
       }
     end
 
@@ -125,7 +125,7 @@ module Jekyll
                else
                  ::Jekyll::URL.new({
                    :template     => @collection.url_template,
-                   :placeholders => placeholders
+                   :placeholders => placeholders,
                  })
                end.to_s.gsub(%r!/$!, "")
     end

data/lib/jekyll/tags/highlight.rb

@@ -54,7 +54,7 @@ eos
             [:hl_lines,    opts.fetch(:hl_lines, nil)],
             [:linenos,     opts.fetch(:linenos, nil)],
             [:encoding,    opts.fetch(:encoding, "utf-8")],
-            [:cssclass,    opts.fetch(:cssclass, nil)]
+            [:cssclass,    opts.fetch(:cssclass, nil)],
           ].reject { |f| f.last.nil? }]
         else
           opts
@@ -125,7 +125,7 @@ eos
       def add_code_tag(code)
         code_attributes = [
           "class=\"language-#{@lang.to_s.tr("+", "-")}\"",
-          "data-lang=\"#{@lang}\""
+          "data-lang=\"#{@lang}\"",
         ].join(" ")
         "<figure class=\"highlight\"><pre><code #{code_attributes}>"\
         "#{code.chomp}</code></pre></figure>"

data/lib/jekyll/tags/include.rb

@@ -112,8 +112,8 @@ eos
       def locate_include_file(context, file, safe)
         includes_dirs = tag_includes_dirs(context)
         includes_dirs.each do |dir|
-          path = File.join(dir, file)
-          return path if valid_include_file?(path, dir, safe)
+          path = File.join(dir.to_s, file.to_s)
+          return path if valid_include_file?(path, dir.to_s, safe)
         end
         raise IOError, "Could not locate the included file '#{file}' in any of "\
           "#{includes_dirs}. Ensure it exists in one of those directories and, "\
@@ -155,15 +155,19 @@ eos
         if cached_partial.key?(path)
           cached_partial[path]
         else
-          cached_partial[path] = context.registers[:site]
+          unparsed_file = context.registers[:site]
             .liquid_renderer
             .file(path)
-            .parse(read_file(path, context))
+          begin
+            cached_partial[path] = unparsed_file.parse(read_file(path, context))
+          rescue Liquid::SyntaxError => ex
+            raise IncludeTagError.new(ex.message, path)
+          end
         end
       end
 
       def valid_include_file?(path, dir, safe)
-        !(outside_site_source?(path, dir, safe) || !File.exist?(path))
+        !outside_site_source?(path, dir, safe) && File.file?(path)
       end
 
       def outside_site_source?(path, dir, safe)

data/lib/jekyll/tags/post_url.rb

@@ -14,8 +14,9 @@ module Jekyll
             "'#{name}' does not contain valid date and/or title."
         end
 
-        @name_regex = %r!^_posts/#{path}#{date}-#{slug}\.[^.]+|
-          ^#{path}_posts/?#{date}-#{slug}\.[^.]+!x
+        escaped_slug = Regexp.escape(slug)
+        @name_regex = %r!^_posts/#{path}#{date}-#{escaped_slug}\.[^.]+|
+          ^#{path}_posts/?#{date}-#{escaped_slug}\.[^.]+!x
       end
 
       def post_date

data/lib/jekyll/theme_builder.rb

@@ -28,7 +28,7 @@ class Jekyll::ThemeBuilder
   def template_file(filename)
     [
       root.join("theme_template", "#{filename}.erb"),
-      root.join("theme_template", filename.to_s)
+      root.join("theme_template", filename.to_s),
     ].find(&:exist?)
   end
 

data/lib/jekyll/url.rb

@@ -1,4 +1,4 @@
-require "uri"
+require "addressable/uri"
 
 # Public: Methods that generate a URL for a resource such as a Post or a Page.
 #
@@ -145,7 +145,8 @@ module Jekyll
       #   pct-encoded   = "%" HEXDIG HEXDIG
       #   sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
       #                 / "*" / "+" / "," / ";" / "="
-      URI.escape(path, %r{[^a-zA-Z\d\-._~!$&'()*+,;=:@\/]}).encode("utf-8")
+      path = Addressable::URI.encode(path)
+      path.encode("utf-8").sub("#", "%23")
     end
 
     # Unescapes a URL path segment
@@ -159,7 +160,7 @@ module Jekyll
     #
     # Returns the unescaped path.
     def self.unescape_path(path)
-      URI.unescape(path.encode("utf-8"))
+      Addressable::URI.unencode(path.encode("utf-8"))
     end
   end
 end

data/lib/jekyll/utils.rb

@@ -2,8 +2,10 @@
 module Jekyll
   module Utils
     extend self
-    autoload :Platforms, "jekyll/utils/platforms"
     autoload :Ansi, "jekyll/utils/ansi"
+    autoload :Exec, "jekyll/utils/exec"
+    autoload :Platforms, "jekyll/utils/platforms"
+    autoload :WinTZ, "jekyll/utils/win_tz"
 
     # Constants for use in #slugify
     SLUGIFY_MODES = %w(raw default pretty ascii).freeze

data/lib/jekyll/utils/ansi.rb

@@ -17,7 +17,7 @@ module Jekyll
         :yellow  => 33,
         :white   => 37,
         :blue    => 34,
-        :cyan    => 36
+        :cyan    => 36,
       }.freeze
 
       # Strip ANSI from the current string.  It also strips cursor stuff,

data/lib/jekyll/utils/exec.rb

@@ -0,0 +1,25 @@
+require "open3"
+
+module Jekyll
+  module Utils
+    module Exec
+      extend self
+
+      # Runs a program in a sub-shell.
+      #
+      # *args - a list of strings containing the program name and arguments
+      #
+      # Returns a Process::Status and a String of output in an array in
+      # that order.
+      def run(*args)
+        stdin, stdout, stderr, process = Open3.popen3(*args)
+        out = stdout.read.strip
+        err = stderr.read.strip
+
+        [stdin, stdout, stderr].each(&:close)
+        [process.value, out + err]
+      end
+
+    end
+  end
+end

data/lib/jekyll/utils/win_tz.rb

@@ -0,0 +1,73 @@
+module Jekyll
+  module Utils
+    module WinTZ
+      extend self
+
+      # Public: Calculate the Timezone for Windows when the config file has a defined
+      #         'timezone' key.
+      #
+      # timezone - the IANA Time Zone specified in "_config.yml"
+      #
+      # Returns a string that ultimately re-defines ENV["TZ"] in Windows
+      def calculate(timezone)
+        External.require_with_graceful_fail("tzinfo")
+        tz = TZInfo::Timezone.get(timezone)
+        difference = Time.now.to_i - tz.now.to_i
+        #
+        # POSIX style definition reverses the offset sign.
+        #   e.g. Eastern Standard Time (EST) that is 5Hrs. to the 'west' of Prime Meridian
+        #   is denoted as:
+        #     EST+5 (or) EST+05:00
+        # Reference: http://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html
+        sign = difference < 0 ? "-" : "+"
+        offset = sign == "-" ? "+" : "-" unless difference.zero?
+        #
+        # convert the difference (in seconds) to hours, as a rational number, and perform
+        # a modulo operation on it.
+        modulo = modulo_of(rational_hour(difference))
+        #
+        # Format the hour as a two-digit number.
+        # Establish the minutes based on modulo expression.
+        hh = format("%02d", absolute_hour(difference).ceil)
+        mm = modulo.zero? ? "00" : "30"
+
+        Jekyll.logger.debug "Timezone:", "#{timezone} #{offset}#{hh}:#{mm}"
+        #
+        # Note: The 3-letter-word below doesn't have a particular significance.
+        "WTZ#{sign}#{hh}:#{mm}"
+      end
+
+      private
+
+      # Private: Convert given seconds to an hour as a rational number.
+      #
+      # seconds - supplied as an integer, it is converted to a rational number.
+      # 3600 - no. of seconds in an hour.
+      #
+      # Returns a rational number.
+      def rational_hour(seconds)
+        seconds.to_r/3600
+      end
+
+      # Private: Convert given seconds to an hour as an absolute number.
+      #
+      # seconds - supplied as an integer, it is converted to its absolute.
+      # 3600 - no. of seconds in an hour.
+      #
+      # Returns an integer.
+      def absolute_hour(seconds)
+        seconds.abs/3600
+      end
+
+      # Private: Perform a modulo operation on a given fraction.
+      #
+      # fraction - supplied as a rational number, its numerator is divided
+      #            by its denominator and the remainder returned.
+      #
+      # Returns an integer.
+      def modulo_of(fraction)
+        fraction.numerator % fraction.denominator
+      end
+    end
+  end
+end

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.3.1".freeze
+  VERSION = "3.4.0".freeze
 end

data/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb

@@ -20,6 +20,6 @@ print_hi('Tom')
 
 Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk].
 
-[jekyll-docs]: http://jekyllrb.com/docs/home
+[jekyll-docs]: https://jekyllrb.com/docs/home
 [jekyll-gh]:   https://github.com/jekyll/jekyll
 [jekyll-talk]: https://talk.jekyllrb.com/

data/lib/site_template/about.md

@@ -4,7 +4,7 @@ title: About
 permalink: /about/
 ---
 
-This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/)
+This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](https://jekyllrb.com/)
 
 You can find the source code for the Jekyll new theme at:
 {% include icon-github.html username="jekyll" %} /

data/lib/theme_template/LICENSE.txt.erb

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 <%= user_name %>
+Copyright (c) <%= Time.now.year %> <%= user_name %>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/theme_template/README.md.erb

@@ -6,7 +6,7 @@ TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
-Add this line to your Jekyll site's Gemfile:
+Add this line to your Jekyll site's `Gemfile`:
 
 ```ruby
 gem <%= theme_name.inspect %>
@@ -44,5 +44,5 @@ When your theme is released, only the files in `_layouts`, `_includes`, and `_sa
 
 ## License
 
-The theme is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The theme is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 

metadata

@@ -1,155 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: liquid
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: colorator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mercenary
+  name: jekyll-sass-converter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: safe_yaml
+  name: jekyll-watch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: colorator
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rouge
+  name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: jekyll-sass-converter
+  name: mercenary
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
-  name: jekyll-watch
+  name: pathutil
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: pathutil
+  name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.0'
 description: Jekyll is a simple, blog aware, static site generator.
 email: tom@mojombo.com
 executables:
@@ -199,6 +199,7 @@ files:
 - lib/jekyll/excerpt.rb
 - lib/jekyll/external.rb
 - lib/jekyll/filters.rb
+- lib/jekyll/filters/grouping_filters.rb
 - lib/jekyll/filters/url_filters.rb
 - lib/jekyll/frontmatter_defaults.rb
 - lib/jekyll/generator.rb
@@ -237,7 +238,9 @@ files:
 - lib/jekyll/url.rb
 - lib/jekyll/utils.rb
 - lib/jekyll/utils/ansi.rb
+- lib/jekyll/utils/exec.rb
 - lib/jekyll/utils/platforms.rb
+- lib/jekyll/utils/win_tz.rb
 - lib/jekyll/version.rb
 - lib/site_template/.gitignore
 - lib/site_template/_config.yml
@@ -278,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 2
 summary: A simple, blog aware, static site generator.