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

data/lib/jekyll/drops/excerpt_drop.rb

@@ -0,0 +1,15 @@
+# encoding: UTF-8
+
+module Jekyll
+  module Drops
+    class ExcerptDrop < DocumentDrop
+      def layout
+        @obj.doc.data["layout"]
+      end
+
+      def excerpt
+        nil
+      end
+    end
+  end
+end

data/lib/jekyll/drops/jekyll_drop.rb

@@ -16,6 +16,18 @@ module Jekyll
       def environment
         Jekyll.env
       end
+
+      def to_h
+        @to_h ||= {
+          "version"     => version,
+          "environment" => environment
+        }
+      end
+
+      def to_json(state = nil)
+        require "json"
+        JSON.generate(to_h, state)
+      end
     end
   end
 end

data/lib/jekyll/drops/site_drop.rb

@@ -24,11 +24,13 @@ module Jekyll
       end
 
       def html_pages
-        @site_html_pages ||= @obj.pages.select { |page| page.html? || page.url.end_with?("/") }
+        @site_html_pages ||= @obj.pages.select do |page|
+          page.html? || page.url.end_with?("/")
+        end
       end
 
       def collections
-        @site_collections ||= @obj.collections.values.map(&:to_liquid)
+        @site_collections ||= @obj.collections.values.sort_by(&:label).map(&:to_liquid)
       end
 
       private

data/lib/jekyll/drops/url_drop.rb

@@ -19,20 +19,20 @@ module Jekyll
       end
 
       def title
-        Utils.slugify(@obj.data['slug'], :mode => "pretty", :cased => true) ||
+        Utils.slugify(@obj.data["slug"], :mode => "pretty", :cased => true) ||
           Utils.slugify(@obj.basename_without_ext, :mode => "pretty", :cased => true)
       end
 
       def slug
-        Utils.slugify(@obj.data['slug']) || Utils.slugify(@obj.basename_without_ext)
+        Utils.slugify(@obj.data["slug"]) || Utils.slugify(@obj.basename_without_ext)
       end
 
       def categories
         category_set = Set.new
-        Array(@obj.data['categories']).each do |category|
+        Array(@obj.data["categories"]).each do |category|
           category_set << category.to_s.downcase
         end
-        category_set.to_a.join('/')
+        category_set.to_a.join("/")
       end
 
       def year

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)
@@ -37,8 +37,7 @@ module Jekyll
 
     def included?(entry)
       glob_include?(site.include,
-        entry
-      )
+        entry)
     end
 
     def special?(entry)
@@ -47,12 +46,17 @@ module Jekyll
     end
 
     def backup?(entry)
-      entry[-1..-1] == '~'
+      entry[-1..-1] == "~"
     end
 
     def excluded?(entry)
       excluded = glob_include?(site.exclude, relative_to_source(entry))
-      Jekyll.logger.debug "EntryFilter:", "excluded #{relative_to_source(entry)}" if excluded
+      if excluded
+        Jekyll.logger.debug(
+          "EntryFilter:",
+          "excluded #{relative_to_source(entry)}"
+        )
+      end
       excluded
     end
 
@@ -83,7 +87,6 @@ module Jekyll
     def glob_include?(enum, e)
       entry = Pathutil.new(site.in_source_dir).join(e)
       enum.any? do |exp|
-
         # Users who send a Regexp knows what they want to
         # exclude, so let them send a Regexp to exclude files,
         # we will not bother caring if it works or not, it's

data/lib/jekyll/errors.rb

@@ -9,8 +9,9 @@ module Jekyll
     InvalidYAMLFrontMatterError = Class.new(FatalException)
     MissingDependencyException  = Class.new(FatalException)
 
-    InvalidDateError = Class.new(FatalException)
-    InvalidPostNameError = Class.new(FatalException)
-    PostURLError = Class.new(FatalException)
+    InvalidDateError      = Class.new(FatalException)
+    InvalidPostNameError  = Class.new(FatalException)
+    PostURLError          = Class.new(FatalException)
+    InvalidURLError       = Class.new(FatalException)
   end
 end

data/lib/jekyll/excerpt.rb

@@ -7,7 +7,8 @@ module Jekyll
     attr_writer   :output
 
     def_delegators :@doc, :site, :name, :ext, :relative_path, :extname,
-                          :render_with_liquid?, :collection, :related_posts
+                          :render_with_liquid?, :collection, :related_posts,
+                          :url, :next_doc, :previous_doc
 
     # Initialize this Excerpt instance.
     #
@@ -59,10 +60,7 @@ module Jekyll
     end
 
     def to_liquid
-      doc.data['excerpt'] = nil
-      @to_liquid ||= doc.to_liquid
-      doc.data['excerpt'] = self
-      @to_liquid
+      Jekyll::Drops::ExcerptDrop.new(self)
     end
 
     # Returns the shorthand String identifier of this doc.
@@ -120,7 +118,7 @@ module Jekyll
       if tail.empty?
         head
       else
-        "" << head << "\n\n" << tail.scan(/^\[[^\]]+\]:.+$/).join("\n")
+        "" << head << "\n\n" << tail.scan(%r!^\[[^\]]+\]:.+$!).join("\n")
       end
     end
   end

data/lib/jekyll/external.rb

@@ -17,13 +17,13 @@ module Jekyll
       #
       # names - a string gem name or array of gem names
       #
-      def require_if_present(names, &block)
+      def require_if_present(names)
         Array(names).each do |name|
           begin
             require name
           rescue LoadError
             Jekyll.logger.debug "Couldn't load #{name}. Skipping."
-            block.call(name) if block
+            yield(name) if block_given?
             false
           end
         end
@@ -39,7 +39,7 @@ module Jekyll
       def require_with_graceful_fail(names)
         Array(names).each do |name|
           begin
-            Jekyll.logger.debug "Requiring:", "#{name}"
+            Jekyll.logger.debug "Requiring:", name.to_s
             require name
           rescue LoadError => e
             Jekyll.logger.error "Dependency Error:", <<-MSG
@@ -50,7 +50,7 @@ The full error message from Ruby is: '#{e.message}'
 
 If you run into trouble, you can find helpful resources at http://jekyllrb.com/help/!
             MSG
-            raise Jekyll::Errors::MissingDependencyException.new(name)
+            raise Jekyll::Errors::MissingDependencyException, name
           end
         end
       end

data/lib/jekyll/filters.rb

@@ -1,7 +1,7 @@
-require 'uri'
-require 'json'
-require 'date'
-require 'liquid'
+require "uri"
+require "json"
+require "date"
+require "liquid"
 
 module Jekyll
   module Filters
@@ -13,7 +13,7 @@ module Jekyll
     def markdownify(input)
       site = @context.registers[:site]
       converter = site.find_converter_instance(Jekyll::Converters::Markdown)
-      converter.convert(input)
+      converter.convert(input.to_s)
     end
 
     # Convert quotes into smart quotes.
@@ -24,7 +24,7 @@ module Jekyll
     def smartify(input)
       site = @context.registers[:site]
       converter = site.find_converter_instance(Jekyll::Converters::SmartyPants)
-      converter.convert(input)
+      converter.convert(input.to_s)
     end
 
     # Convert a Sass string into CSS output.
@@ -56,7 +56,7 @@ module Jekyll
     #
     # Returns the given filename or title as a lowercase URL String.
     # See Utils.slugify for more detail.
-    def slugify(input, mode=nil)
+    def slugify(input, mode = nil)
       Utils.slugify(input, :mode => mode)
     end
 
@@ -118,7 +118,7 @@ module Jekyll
     #
     # Returns the escaped String.
     def xml_escape(input)
-      input.to_s.encode(:xml => :attr).gsub(/\A"|"\Z/, "")
+      input.to_s.encode(:xml => :attr).gsub(%r!\A"|"\Z!, "")
     end
 
     # CGI escape a string for use in a URL. Replaces any special characters
@@ -133,7 +133,7 @@ module Jekyll
     #
     # Returns the escaped String.
     def cgi_escape(input)
-      CGI::escape(input)
+      CGI.escape(input)
     end
 
     # URI escape a string.
@@ -150,6 +150,15 @@ module Jekyll
       URI.escape(input)
     end
 
+    # Replace any whitespace in the input string with a single space
+    #
+    # input - The String on which to operate.
+    #
+    # Returns the formatted String
+    def normalize_whitespace(input)
+      input.to_s.gsub(%r!\s+!, " ").strip
+    end
+
     # Count the number of words in the input string.
     #
     # input - The String on which to operate.
@@ -180,7 +189,7 @@ module Jekyll
       when 2
         "#{array[0]} #{connector} #{array[1]}"
       else
-        "#{array[0...-1].join(', ')}, #{connector} #{array[-1]}"
+        "#{array[0...-1].join(", ")}, #{connector} #{array[-1]}"
       end
     end
 
@@ -203,11 +212,14 @@ module Jekyll
     #   "items" => [...] } # all the items where `property` == "larry"
     def group_by(input, property)
       if groupable?(input)
-        input.group_by do |item|
-          item_property(item, property).to_s
-        end.inject([]) do |memo, i|
-          memo << { "name" => i.first, "items" => i.last, "size" => i.last.size }
-        end
+        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
@@ -223,7 +235,9 @@ module Jekyll
     def where(input, property, value)
       return input unless input.is_a?(Enumerable)
       input = input.values if input.is_a?(Hash)
-      input.select { |object| Array(item_property(object, property)).map(&:to_s).include?(value.to_s) }
+      input.select do |object|
+        Array(item_property(object, property)).map(&:to_s).include?(value.to_s)
+      end
     end
 
     # Filters an array of objects against an expression
@@ -246,6 +260,17 @@ module Jekyll
       end
     end
 
+    # Convert the input into integer
+    #
+    # input - the object string
+    #
+    # Returns the integer value
+    def to_integer(input)
+      return 1 if input == true
+      return 0 if input == false
+      input.to_i
+    end
+
     # Sort an array of objects
     #
     # input - the object array
@@ -255,33 +280,21 @@ module Jekyll
     # Returns the filtered array of objects
     def sort(input, property = nil, nils = "first")
       if input.nil?
-        raise ArgumentError.new("Cannot sort a null object.")
+        raise ArgumentError, "Cannot sort a null object."
       end
       if property.nil?
         input.sort
       else
-        case
-        when nils == "first"
+        if nils == "first"
           order = - 1
-        when nils == "last"
+        elsif nils == "last"
           order = + 1
         else
-          raise ArgumentError.new("Invalid nils order: " \
-            "'#{nils}' is not a valid nils order. It must be 'first' or 'last'.")
+          raise ArgumentError, "Invalid nils order: " \
+            "'#{nils}' is not a valid nils order. It must be 'first' or 'last'."
         end
 
-        input.sort do |apple, orange|
-          apple_property = item_property(apple, property)
-          orange_property = item_property(orange, property)
-
-          if !apple_property.nil? && orange_property.nil?
-            - order
-          elsif apple_property.nil? && !orange_property.nil?
-            + order
-          else
-            apple_property <=> orange_property
-          end
-        end
+        sort_input(input, property, order)
       end
     end
 
@@ -332,6 +345,22 @@ module Jekyll
       xml_escape(input.inspect)
     end
 
+    private
+    def sort_input(input, property, order)
+      input.sort do |apple, orange|
+        apple_property = item_property(apple, property)
+        orange_property = item_property(orange, property)
+
+        if !apple_property.nil? && orange_property.nil?
+          - order
+        elsif apple_property.nil? && !orange_property.nil?
+          + order
+        else
+          apple_property <=> orange_property
+        end
+      end
+    end
+
     private
     def time(input)
       case input
@@ -349,10 +378,12 @@ 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)
         item.to_liquid[property.to_s]
@@ -363,6 +394,7 @@ module Jekyll
       end
     end
 
+    private
     def as_liquid(item)
       case item
       when Hash
@@ -386,6 +418,7 @@ module Jekyll
     end
 
     # Parse a string to a Liquid Condition
+    private
     def parse_condition(exp)
       parser = Liquid::Parser.new(exp)
       left_expr = parser.expression

data/lib/jekyll/frontmatter_defaults.rb

@@ -11,37 +11,42 @@ module Jekyll
     end
 
     def update_deprecated_types(set)
-      return set unless set.key?('scope') && set['scope'].key?('type')
-
-      set['scope']['type'] =
-        case set['scope']['type']
-        when 'page'
-          Deprecator.defaults_deprecate_type('page', 'pages')
-          'pages'
-        when 'post'
-          Deprecator.defaults_deprecate_type('post', 'posts')
-          'posts'
-        when 'draft'
-          Deprecator.defaults_deprecate_type('draft', 'drafts')
-          'drafts'
+      return set unless set.key?("scope") && set["scope"].key?("type")
+
+      set["scope"]["type"] =
+        case set["scope"]["type"]
+        when "page"
+          Deprecator.defaults_deprecate_type("page", "pages")
+          "pages"
+        when "post"
+          Deprecator.defaults_deprecate_type("post", "posts")
+          "posts"
+        when "draft"
+          Deprecator.defaults_deprecate_type("draft", "drafts")
+          "drafts"
         else
-          set['scope']['type']
+          set["scope"]["type"]
         end
 
       set
     end
 
     def ensure_time!(set)
-      return set unless set.key?('values') && set['values'].key?('date')
-      return set if set['values']['date'].is_a?(Time)
-      set['values']['date'] = Utils.parse_date(set['values']['date'], "An invalid date format was found in a front-matter default set: #{set}")
+      return set unless set.key?("values") && set["values"].key?("date")
+      return set if set["values"]["date"].is_a?(Time)
+      set["values"]["date"] = Utils.parse_date(
+        set["values"]["date"],
+        "An invalid date format was found in a front-matter default set: #{set}"
+      )
       set
     end
 
     # Finds a default value for a given setting, filtered by path and type
     #
-    # path - the path (relative to the source) of the page, post or :draft the default is used in
-    # type - a symbol indicating whether a :page, a :post or a :draft calls this method
+    # path - the path (relative to the source) of the page,
+    # post or :draft the default is used in
+    # type - a symbol indicating whether a :page,
+    # a :post or a :draft calls this method
     #
     # Returns the default value or nil if none was found
     def find(path, type, setting)
@@ -49,9 +54,9 @@ module Jekyll
       old_scope = nil
 
       matching_sets(path, type).each do |set|
-        if set['values'].key?(setting) && has_precedence?(old_scope, set['scope'])
-          value = set['values'][setting]
-          old_scope = set['scope']
+        if set["values"].key?(setting) && has_precedence?(old_scope, set["scope"])
+          value = set["values"][setting]
+          old_scope = set["scope"]
         end
       end
       value
@@ -67,11 +72,11 @@ module Jekyll
       defaults = {}
       old_scope = nil
       matching_sets(path, type).each do |set|
-        if has_precedence?(old_scope, set['scope'])
-          defaults = Utils.deep_merge_hashes(defaults, set['values'])
-          old_scope = set['scope']
+        if has_precedence?(old_scope, set["scope"])
+          defaults = Utils.deep_merge_hashes(defaults, set["values"])
+          old_scope = set["scope"]
         else
-          defaults = Utils.deep_merge_hashes(set['values'], defaults)
+          defaults = Utils.deep_merge_hashes(set["values"], defaults)
         end
       end
       defaults
@@ -91,9 +96,9 @@ module Jekyll
     end
 
     def applies_path?(scope, path)
-      return true if !scope.key?('path') || scope['path'].empty?
+      return true if !scope.key?("path") || scope["path"].empty?
 
-      scope_path = Pathname.new(scope['path'])
+      scope_path = Pathname.new(scope["path"])
       Pathname.new(sanitize_path(path)).ascend do |ascended_path|
         if ascended_path.to_s == scope_path.to_s
           return true
@@ -113,7 +118,7 @@ module Jekyll
     # Returns true if either of the above conditions are satisfied,
     #   otherwise returns false
     def applies_type?(scope, type)
-      !scope.key?('type') || scope['type'].eql?(type.to_s)
+      !scope.key?("type") || scope["type"].eql?(type.to_s)
     end
 
     # Checks if a given set of default values is valid
@@ -122,7 +127,7 @@ module Jekyll
     #
     # Returns true if the set is valid and can be used in this class
     def valid?(set)
-      set.is_a?(Hash) && set['values'].is_a?(Hash)
+      set.is_a?(Hash) && set["values"].is_a?(Hash)
     end
 
     # Determines if a new scope has precedence over an old one
@@ -131,27 +136,29 @@ module Jekyll
     # new_scope - the new scope hash
     #
     # Returns true if the new scope has precedence over the older
+    # rubocop: disable PredicateName
     def has_precedence?(old_scope, new_scope)
       return true if old_scope.nil?
 
-      new_path = sanitize_path(new_scope['path'])
-      old_path = sanitize_path(old_scope['path'])
+      new_path = sanitize_path(new_scope["path"])
+      old_path = sanitize_path(old_scope["path"])
 
       if new_path.length != old_path.length
         new_path.length >= old_path.length
-      elsif new_scope.key? 'type'
+      elsif new_scope.key?("type")
         true
       else
-        !old_scope.key? 'type'
+        !old_scope.key? "type"
       end
     end
+    # rubocop: enable PredicateName
 
     # Collects a list of sets that match the given path and type
     #
     # Returns an array of hashes
     def matching_sets(path, type)
       valid_sets.select do |set|
-        !set.key?('scope') || applies?(set['scope'], path, type)
+        !set.key?("scope") || applies?(set["scope"], path, type)
       end
     end
 
@@ -162,7 +169,7 @@ module Jekyll
     #
     # Returns an array of hashes
     def valid_sets
-      sets = @site.config['defaults']
+      sets = @site.config["defaults"]
       return [] unless sets.is_a?(Array)
 
       sets.map do |set|
@@ -170,7 +177,7 @@ module Jekyll
           ensure_time!(update_deprecated_types(set))
         else
           Jekyll.logger.warn "Defaults:", "An invalid front-matter default set was found:"
-          Jekyll.logger.warn "#{set}"
+          Jekyll.logger.warn set.to_s
           nil
         end
       end.compact
@@ -181,7 +188,7 @@ module Jekyll
       if path.nil? || path.empty?
         ""
       else
-        path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1')
+        path.gsub(%r!\A/!, "").gsub(%r!([^/])\z!, '\1')
       end
     end
   end