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

data/lib/jekyll/tags/link.rb

@@ -1,7 +1,11 @@
 module Jekyll
   module Tags
     class Link < Liquid::Tag
-      TagName = 'link'
+      class << self
+        def tag_name
+          self.name.split("::").last.downcase
+        end
+      end
 
       def initialize(tag_name, relative_path, tokens)
         super
@@ -16,11 +20,14 @@ module Jekyll
           return document.url if document.relative_path == @relative_path
         end
 
-        raise ArgumentError, "Could not find document '#{@relative_path}' in tag '#{TagName}'.\n\n" \
-          "Make sure the document exists and the path is correct."
+        raise ArgumentError, <<eos
+Could not find document '#{@relative_path}' in tag '#{self.class.tag_name}'.
+
+Make sure the document exists and the path is correct.
+eos
       end
     end
   end
 end
 
-Liquid::Template.register_tag(Jekyll::Tags::Link::TagName, Jekyll::Tags::Link)
+Liquid::Template.register_tag(Jekyll::Tags::Link.tag_name, Jekyll::Tags::Link)

data/lib/jekyll/tags/post_url.rb

@@ -1,20 +1,20 @@
 module Jekyll
   module Tags
     class PostComparer
-      MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)$/
+      MATCHER = %r!^(.+/)*(\d+-\d+-\d+)-(.*)$!
 
       attr_reader :path, :date, :slug, :name
 
       def initialize(name)
         @name = name
 
-        all, @path, @date, @slug = *name.sub(/^\//, "").match(MATCHER)
+        all, @path, @date, @slug = *name.sub(%r!^/!, "").match(MATCHER)
         unless all
           raise Jekyll::Errors::InvalidPostNameError,
             "'#{name}' does not contain valid date and/or title."
         end
 
-        @name_regex = /^#{path}#{date}-#{slug}\.[^.]+/
+        @name_regex = %r!^#{path}#{date}-#{slug}\.[^.]+!
       end
 
       def post_date
@@ -42,9 +42,9 @@ module Jekyll
       def post_slug(other)
         path = other.basename.split("/")[0...-1].join("/")
         if path.nil? || path == ""
-          other.data['slug']
+          other.data["slug"]
         else
-          path + '/' + other.data['slug']
+          path + "/" + other.data["slug"]
         end
       end
     end
@@ -78,7 +78,8 @@ 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 " \
+          Jekyll::Deprecator.deprecation_message "A call to "\
+            "'{{ 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."
@@ -95,4 +96,4 @@ eos
   end
 end
 
-Liquid::Template.register_tag('post_url', Jekyll::Tags::PostUrl)
+Liquid::Template.register_tag("post_url", Jekyll::Tags::PostUrl)

data/lib/jekyll/theme.rb

@@ -27,7 +27,7 @@ module Jekyll
 
     def configure_sass
       return unless sass_path
-      require 'sass'
+      require "sass"
       Sass.load_paths << sass_path
     end
 
@@ -38,7 +38,7 @@ module Jekyll
       return unless resolved_dir
 
       path = Jekyll.sanitized_path(root, resolved_dir)
-      path if Dir.exists?(path)
+      path if File.directory?(path)
     end
 
     def realpath_for(folder)
@@ -50,7 +50,8 @@ module Jekyll
     def gemspec
       @gemspec ||= Gem::Specification.find_by_name(name)
     rescue Gem::LoadError
-      raise Jekyll::Errors::MissingDependencyException, "The #{name} theme could not be found."
+      raise Jekyll::Errors::MissingDependencyException,
+        "The #{name} theme could not be found."
     end
   end
 end

data/lib/jekyll/theme_builder.rb

@@ -1,17 +1,19 @@
 class Jekyll::ThemeBuilder
   SCAFFOLD_DIRECTORIES = %w(
-    _layouts _includes _sass example example/_posts
+    _layouts _includes _sass
   ).freeze
 
-  attr_reader :name, :path
+  attr_reader :name, :path, :code_of_conduct
 
-  def initialize(theme_name)
-    @name = theme_name.to_s.tr(" ", "_").gsub(/_+/, "_")
+  def initialize(theme_name, opts)
+    @name = theme_name.to_s.tr(" ", "_").gsub(%r!_+!, "_")
     @path = Pathname.new(File.expand_path(name, Dir.pwd))
+    @code_of_conduct = !!opts["code_of_conduct"]
   end
 
   def create!
     create_directories
+    create_starter_files
     create_gemspec
     create_accessories
     create_example_site
@@ -55,6 +57,13 @@ class Jekyll::ThemeBuilder
 
   def create_directories
     mkdir_p(SCAFFOLD_DIRECTORIES)
+    mkdir_p(%w(example example/_posts))
+  end
+
+  def create_starter_files
+    %w(page post default).each do |layout|
+      write_file("_layouts/#{layout}.html", template("_layouts/#{layout}.html"))
+    end
   end
 
   def create_gemspec
@@ -63,7 +72,9 @@ class Jekyll::ThemeBuilder
   end
 
   def create_accessories
-    %w(README.md Rakefile CODE_OF_CONDUCT.md LICENSE.txt).each do |filename|
+    accessories = %w(README.md Rakefile LICENSE.txt)
+    accessories << "CODE_OF_CONDUCT.md" if code_of_conduct
+    accessories.each do |filename|
       write_file(filename, template(filename))
     end
   end
@@ -81,6 +92,7 @@ class Jekyll::ThemeBuilder
   def initialize_git_repo
     Jekyll.logger.info "initialize", path.join(".git").to_s
     Dir.chdir(path.to_s) { `git init` }
+    write_file(".gitignore", template("gitignore"))
   end
 
   def user_name
@@ -102,7 +114,7 @@ class Jekyll::ThemeBuilder
       @theme_builder = theme_builder
     end
 
-    def jekyll_pessimistic_version
+    def jekyll_version_with_minor
       Jekyll::VERSION.split(".").take(2).join(".")
     end
 

data/lib/jekyll/url.rb

@@ -1,4 +1,4 @@
-require 'uri'
+require "uri"
 
 # Public: Methods that generate a URL for a resource such as a Post or a Page.
 #
@@ -35,8 +35,15 @@ 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
-      sanitize_url(generated_permalink || generated_url)
+      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
     end
 
     # Generates a URL from the permalink
@@ -67,32 +74,32 @@ module Jekyll
 
     def generate_url_from_hash(template)
       @placeholders.inject(template) do |result, token|
-        break result if result.index(':').nil?
+        break result if result.index(":").nil?
         if token.last.nil?
-          # Remove leading '/' to avoid generating urls with `//`
-          result.gsub(/\/:#{token.first}/, '')
+          # Remove leading "/" to avoid generating urls with `//`
+          result.gsub(%r!/:#{token.first}!, "")
         else
-          result.gsub(/:#{token.first}/, self.class.escape_path(token.last))
+          result.gsub(%r!:#{token.first}!, self.class.escape_path(token.last))
         end
       end
     end
 
     def generate_url_from_drop(template)
-      template.gsub(/:([a-z_]+)/.freeze) do |match|
-        replacement = @placeholders.public_send(match.sub(':'.freeze, ''.freeze))
+      template.gsub(%r!:([a-z_]+)!) do |match|
+        replacement = @placeholders.public_send(match.sub(":".freeze, "".freeze))
         if replacement.nil?
-          ''.freeze
+          "".freeze
         else
           self.class.escape_path(replacement)
         end
-      end.gsub(/\/\//.freeze, '/'.freeze)
+      end.gsub(%r!//!, "/".freeze)
     end
 
     # Returns a sanitized String URL, stripping "../../" and multiples of "/",
     # as well as the beginning "/" so we can enforce and ensure it.
 
     def sanitize_url(str)
-      "/" + str.gsub(/\/{2,}/, "/").gsub(/\.+\/|\A\/+/, "")
+      "/" + str.gsub(%r!/{2,}!, "/").gsub(%r!\.+/|\A/+!, "")
     end
 
     # Escapes a path to be a valid URL path segment
@@ -106,7 +113,7 @@ module Jekyll
     #
     # Returns the escaped path.
     def self.escape_path(path)
-      # Because URI.escape doesn't escape '?', '[' and ']' by default,
+      # Because URI.escape doesn't escape "?", "[" and "]" by default,
       # specify unsafe string (except unreserved, sub-delims, ":", "@" and "/").
       #
       # URI path segment is defined in RFC 3986 as follows:
@@ -116,7 +123,7 @@ module Jekyll
       #   pct-encoded   = "%" HEXDIG HEXDIG
       #   sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
       #                 / "*" / "+" / "," / ";" / "="
-      URI.escape(path, /[^a-zA-Z\d\-._~!$&'()*+,;=:@\/]/).encode('utf-8')
+      URI.escape(path, %r{[^a-zA-Z\d\-._~!$&'()*+,;=:@\/]}).encode("utf-8")
     end
 
     # Unescapes a URL path segment
@@ -130,7 +137,7 @@ module Jekyll
     #
     # Returns the unescaped path.
     def self.unescape_path(path)
-      URI.unescape(path.encode('utf-8'))
+      URI.unescape(path.encode("utf-8"))
     end
   end
 end

data/lib/jekyll/utils.rb

@@ -2,27 +2,25 @@
 module Jekyll
   module Utils
     extend self
-    autoload :Platforms, 'jekyll/utils/platforms'
+    autoload :Platforms, "jekyll/utils/platforms"
     autoload :Ansi, "jekyll/utils/ansi"
 
     # Constants for use in #slugify
-    SLUGIFY_MODES = %w(raw default pretty)
+    SLUGIFY_MODES = %w(raw default pretty).freeze
     SLUGIFY_RAW_REGEXP = Regexp.new('\\s+').freeze
-    SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze
+    SLUGIFY_DEFAULT_REGEXP = Regexp.new("[^[:alnum:]]+").freeze
     SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
 
     # Takes an indented string and removes the preceding spaces on each line
 
     def strip_heredoc(str)
-      str.gsub(/^[ \t]{#{(str.scan(/^[ \t]*(?=\S)/).min || "").size}}/, "")
+      str.gsub(%r!^[ \t]{#{(str.scan(%r!^[ \t]*(?=\S)!).min || "").size}}!, "")
     end
 
     # Takes a slug and turns it into a simple title.
 
     def titleize_slug(slug)
-      slug.split("-").map! do |val|
-        val.capitalize
-      end.join(" ")
+      slug.split("-").map!(&:capitalize).join(" ")
     end
 
     # Non-destructive version of deep_merge_hashes! See that method.
@@ -42,17 +40,9 @@ module Jekyll
     #
     # Thanks to whoever made it.
     def deep_merge_hashes!(target, overwrite)
-      target.merge!(overwrite) do |key, old_val, new_val|
-        if new_val.nil?
-          old_val
-        else
-          mergable?(old_val) && mergable?(new_val) ? deep_merge_hashes(old_val, new_val) : new_val
-        end
-      end
-
-      if target.respond_to?(:default_proc) && overwrite.respond_to?(:default_proc) && target.default_proc.nil?
-        target.default_proc = overwrite.default_proc
-      end
+      merge_values(target, overwrite)
+      merge_default_proc(target, overwrite)
+      duplicate_frozen_values(target)
 
       target
     end
@@ -61,6 +51,15 @@ module Jekyll
       value.is_a?(Hash) || value.is_a?(Drops::Drop)
     end
 
+    def duplicable?(obj)
+      case obj
+      when nil, false, true, Symbol, Numeric
+        false
+      else
+        true
+      end
+    end
+
     # Read array from the supplied hash favouring the singular key
     # and then the plural key, and handling any nil entries.
     #
@@ -71,7 +70,9 @@ module Jekyll
     # Returns an array
     def pluralized_array_from_hash(hash, singular_key, plural_key)
       [].tap do |array|
-        array << (value_from_singular_key(hash, singular_key) || value_from_plural_key(hash, plural_key))
+        value = value_from_singular_key(hash, singular_key)
+        value ||= value_from_plural_key(hash, plural_key)
+        array << value
       end.flatten.compact
     end
 
@@ -133,17 +134,19 @@ module Jekyll
     # Determines whether a given file has
     #
     # Returns true if the YAML front matter is present.
+    # rubocop: disable PredicateName
     def has_yaml_header?(file)
-      !!(File.open(file, 'rb') { |f| f.readline } =~ /\A---\s*\r?\n/)
+      !!(File.open(file, "rb", &:readline) =~ %r!\A---\s*\r?\n!)
     rescue EOFError
       false
     end
+    # rubocop: enable PredicateName
 
     # Slugify a filename or title.
     #
     # string - the filename or title to slugify
     # mode - how string is slugified
-    # cased - whether to replace all  uppercase letters with their
+    # cased - whether to replace all uppercase letters with their
     # lowercase counterparts
     #
     # When mode is "none", return the given string.
@@ -172,7 +175,7 @@ module Jekyll
     #
     # Returns the slugified string.
     def slugify(string, mode: nil, cased: false)
-      mode ||= 'default'
+      mode ||= "default"
       return nil if string.nil?
 
       unless SLUGIFY_MODES.include?(mode)
@@ -182,21 +185,21 @@ module Jekyll
       # Replace each character sequence with a hyphen
       re =
         case mode
-        when 'raw'
+        when "raw"
           SLUGIFY_RAW_REGEXP
-        when 'default'
+        when "default"
           SLUGIFY_DEFAULT_REGEXP
-        when 'pretty'
+        when "pretty"
           # "._~!$&'()+,;=@" is human readable (not URI-escaped) in URL
           # and is allowed in both extN and NTFS.
           SLUGIFY_PRETTY_REGEXP
         end
 
       # Strip according to the mode
-      slug = string.gsub(re, '-')
+      slug = string.gsub(re, "-")
 
       # Remove leading/trailing hyphen
-      slug.gsub!(/^\-|\-$/i, '')
+      slug.gsub!(%r!^\-|\-$!i, "")
 
       slug.downcase! unless cased
       slug
@@ -267,7 +270,7 @@ module Jekyll
     # Returns matched pathes
     def safe_glob(dir, patterns, flags = 0)
       return [] unless Dir.exist?(dir)
-      pattern = File.join(Array patterns)
+      pattern = File.join(Array(patterns))
       return [dir] if pattern.empty?
       Dir.chdir(dir) do
         Dir.glob(pattern, flags).map { |f| File.join(dir, f) }
@@ -284,5 +287,31 @@ module Jekyll
       merged
     end
 
+    private
+    def merge_values(target, overwrite)
+      target.merge!(overwrite) do |_key, old_val, new_val|
+        if new_val.nil?
+          old_val
+        elsif mergable?(old_val) && mergable?(new_val)
+          deep_merge_hashes(old_val, new_val)
+        else
+          new_val
+        end
+      end
+    end
+
+    private
+    def merge_default_proc(target, overwrite)
+      if target.is_a?(Hash) && overwrite.is_a?(Hash) && target.default_proc.nil?
+        target.default_proc = overwrite.default_proc
+      end
+    end
+
+    private
+    def duplicate_frozen_values(target)
+      target.each do |key, val|
+        target[key] = val.dup if val.frozen? && duplicable?(val)
+      end
+    end
   end
 end

data/lib/jekyll/utils/ansi.rb

@@ -8,17 +8,17 @@ module Jekyll
       extend self
 
       ESCAPE = format("%c", 27)
-      MATCH = /#{ESCAPE}\[(?:\d+)(?:;\d+)*(j|k|m|s|u|A|B|G)|\e\(B\e\[m/ix.freeze
+      MATCH = %r!#{ESCAPE}\[(?:\d+)(?:;\d+)*(j|k|m|s|u|A|B|G)|\e\(B\e\[m!ix
       COLORS = {
-        :red => 31,
-        :green => 32,
-        :black => 30,
+        :red     => 31,
+        :green   => 32,
+        :black   => 30,
         :magenta => 35,
-        :yellow => 33,
-        :white => 37,
-        :blue => 34,
-        :cyan => 36
-      }
+        :yellow  => 33,
+        :white   => 37,
+        :blue    => 34,
+        :cyan    => 36
+      }.freeze
 
       # Strip ANSI from the current string.  It also strips cursor stuff,
       # well some of it, and it also strips some other stuff that a lot of