jekyll 2.1.1 → 2.2.0

data/lib/jekyll/converters/textile.rb

@@ -13,7 +13,7 @@ module Jekyll
       rescue LoadError
         STDERR.puts 'You are missing a library required for Textile. Please run:'
         STDERR.puts '  $ [sudo] gem install RedCloth'
-        raise FatalException.new("Missing dependency: RedCloth")
+        raise Errors::FatalException.new("Missing dependency: RedCloth")
       end
 
       def matches(ext)
@@ -32,7 +32,7 @@ module Jekyll
         return RedCloth.new(content).to_html if @config['redcloth'].nil?
 
         # List of attributes defined on RedCloth
-        # (from http://redcloth.rubyforge.org/classes/RedCloth/TextileDoc.html)
+        # (from https://github.com/jgarber/redcloth/blob/master/lib/redcloth/textile_doc.rb)
         attrs = ['filter_classes', 'filter_html', 'filter_ids', 'filter_styles',
                 'hard_breaks', 'lite_mode', 'no_span_caps', 'sanitize_html']
 

data/lib/jekyll/convertible.rb

@@ -153,6 +153,15 @@ module Jekyll
       !asset_file?
     end
 
+    # Checks if the layout specified in the document actually exists
+    #
+    # layout - the layout to check
+    #
+    # Returns true if the layout is invalid, false if otherwise
+    def invalid_layout?(layout)
+      !data["layout"].nil? && data["layout"] != "none" && layout.nil? && !(self.is_a? Jekyll::Excerpt)
+    end
+
     # Recursively render layouts
     #
     # layouts - a list of the layouts
@@ -163,6 +172,9 @@ module Jekyll
     def render_all_layouts(layouts, payload, info)
       # recursively render layouts
       layout = layouts[data["layout"]]
+
+      Jekyll.logger.warn("Build Warning:", "Layout '#{data["layout"]}' requested in #{path} does not exist.") if invalid_layout? layout
+
       used = Set.new([layout])
 
       while layout

data/lib/jekyll/deprecator.rb

@@ -1,5 +1,5 @@
 module Jekyll
-  class Deprecator
+  module Deprecator
     def self.process(args)
       no_subcommand(args)
       arg_is_present? args, "--server", "The --server command has been replaced by the \
@@ -32,5 +32,23 @@ module Jekyll
     def self.deprecation_message(message)
       Jekyll.logger.error "Deprecation:", message
     end
+
+    def self.gracefully_require(gem_name)
+      Array(gem_name).each do |name|
+        begin
+          require name
+        rescue LoadError => e
+          Jekyll.logger.error "Dependency Error:", <<-MSG
+  Yikes! It looks like you don't have #{name} or one of its dependencies installed.
+  In order to use Jekyll as currently contfigured, 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/!
+  MSG
+          raise Errors::MissingDependencyException.new(name)
+        end
+      end
+    end
   end
 end

data/lib/jekyll/errors.rb

@@ -1,4 +1,9 @@
 module Jekyll
-  class FatalException < StandardError
+  module Errors
+    class FatalException < RuntimeError
+    end
+
+    class MissingDependencyException < FatalException
+    end
   end
 end

data/lib/jekyll/excerpt.rb

@@ -1,4 +1,3 @@
-require 'jekyll/convertible'
 require 'forwardable'
 
 module Jekyll

data/lib/jekyll/frontmatter_defaults.rb

@@ -1,147 +1,145 @@
 module Jekyll
-  class Configuration
-    # This class handles custom defaults for YAML frontmatter settings.
-    # These are set in _config.yml and apply both to internal use (e.g. layout)
-    # and the data available to liquid.
-    #
-    # It is exposed via the frontmatter_defaults method on the site class.
-    class FrontmatterDefaults
-      # Initializes a new instance.
-      def initialize(site)
-        @site = site
-      end
+  # This class handles custom defaults for YAML frontmatter settings.
+  # These are set in _config.yml and apply both to internal use (e.g. layout)
+  # and the data available to liquid.
+  #
+  # It is exposed via the frontmatter_defaults method on the site class.
+  class FrontmatterDefaults
+    # Initializes a new instance.
+    def initialize(site)
+      @site = site
+    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
-      #
-      # Returns the default value or nil if none was found
-      def find(path, type, setting)
-        value = nil
-        old_scope = nil
-
-        matching_sets(path, type).each do |set|
-          if set['values'].has_key?(setting) && has_precedence?(old_scope, set['scope'])
-            value = set['values'][setting]
-            old_scope = set['scope']
-          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
+    #
+    # Returns the default value or nil if none was found
+    def find(path, type, setting)
+      value = nil
+      old_scope = nil
+
+      matching_sets(path, type).each do |set|
+        if set['values'].has_key?(setting) && has_precedence?(old_scope, set['scope'])
+          value = set['values'][setting]
+          old_scope = set['scope']
         end
-        value
       end
+      value
+    end
 
-      # Collects a hash with all default values for a page or post
-      #
-      # path - the relative path of the page or post
-      # type - a symbol indicating the type (:post, :page or :draft)
-      #
-      # Returns a hash with all default values (an empty hash if there are none)
-      def all(path, type)
-        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']
-          else
-            defaults = Utils.deep_merge_hashes(set['values'], defaults)
-          end
+    # Collects a hash with all default values for a page or post
+    #
+    # path - the relative path of the page or post
+    # type - a symbol indicating the type (:post, :page or :draft)
+    #
+    # Returns a hash with all default values (an empty hash if there are none)
+    def all(path, type)
+      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']
+        else
+          defaults = Utils.deep_merge_hashes(set['values'], defaults)
         end
-        defaults
       end
+      defaults
+    end
 
-      private
-
-      # Checks if a given default setting scope matches the given path and type
-      #
-      # scope - the hash indicating the scope, as defined in _config.yml
-      # path - the path to check for
-      # type - the type (:post, :page or :draft) to check for
-      #
-      # Returns true if the scope applies to the given path and type
-      def applies?(scope, path, type)
-        applies_path?(scope, path) && applies_type?(scope, type)
-      end
+    private
 
-      def applies_path?(scope, path)
-        return true if scope['path'].empty?
+    # Checks if a given default setting scope matches the given path and type
+    #
+    # scope - the hash indicating the scope, as defined in _config.yml
+    # path - the path to check for
+    # type - the type (:post, :page or :draft) to check for
+    #
+    # Returns true if the scope applies to the given path and type
+    def applies?(scope, path, type)
+      applies_path?(scope, path) && applies_type?(scope, type)
+    end
 
-        scope_path = Pathname.new(scope['path'])
-        Pathname.new(sanitize_path(path)).ascend do |path|
-          if path == scope_path
-            return true
-          end
+    def applies_path?(scope, path)
+      return true if scope['path'].empty?
+
+      scope_path = Pathname.new(scope['path'])
+      Pathname.new(sanitize_path(path)).ascend do |path|
+        if path == scope_path
+          return true
         end
       end
+    end
 
-      def applies_type?(scope, type)
-        !scope.has_key?('type') || scope['type'] == type.to_s
-      end
+    def applies_type?(scope, type)
+      !scope.has_key?('type') || scope['type'] == type.to_s
+    end
 
-      # Checks if a given set of default values is valid
-      #
-      # set - the default value hash, as defined in _config.yml
-      #
-      # Returns true if the set is valid and can be used in this class
-      def valid?(set)
-        set.is_a?(Hash) && set['scope'].is_a?(Hash) && set['scope']['path'].is_a?(String) && set['values'].is_a?(Hash)
-      end
+    # Checks if a given set of default values is valid
+    #
+    # set - the default value hash, as defined in _config.yml
+    #
+    # Returns true if the set is valid and can be used in this class
+    def valid?(set)
+      set.is_a?(Hash) && set['scope'].is_a?(Hash) && set['scope']['path'].is_a?(String) && set['values'].is_a?(Hash)
+    end
 
-      # Determines if a new scope has precedence over an old one
-      #
-      # old_scope - the old scope hash, or nil if there's none
-      # new_scope - the new scope hash
-      #
-      # Returns true if the new scope has precedence over the older
-      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'])
-
-        if new_path.length != old_path.length
-          new_path.length >= old_path.length
-        elsif new_scope.has_key? 'type'
-          true
-        else
-          !old_scope.has_key? 'type'
-        end
+    # Determines if a new scope has precedence over an old one
+    #
+    # old_scope - the old scope hash, or nil if there's none
+    # new_scope - the new scope hash
+    #
+    # Returns true if the new scope has precedence over the older
+    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'])
+
+      if new_path.length != old_path.length
+        new_path.length >= old_path.length
+      elsif new_scope.has_key? 'type'
+        true
+      else
+        !old_scope.has_key? 'type'
       end
+    end
 
-      # 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|
-          applies?(set['scope'], path, type)
-        end
+    # 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|
+        applies?(set['scope'], path, type)
       end
+    end
 
-      # Returns a list of valid sets
-      #
-      # This is not cached to allow plugins to modify the configuration
-      # and have their changes take effect
-      #
-      # Returns an array of hashes
-      def valid_sets
-        sets = @site.config['defaults']
-        return [] unless sets.is_a?(Array)
-
-        sets.select do |set|
-          unless valid?(set)
-            Jekyll.logger.warn "Default:", "An invalid default set was found"
-          end
-          valid?(set)
+    # Returns a list of valid sets
+    #
+    # This is not cached to allow plugins to modify the configuration
+    # and have their changes take effect
+    #
+    # Returns an array of hashes
+    def valid_sets
+      sets = @site.config['defaults']
+      return [] unless sets.is_a?(Array)
+
+      sets.select do |set|
+        unless valid?(set)
+          Jekyll.logger.warn "Default:", "An invalid default set was found"
         end
+        valid?(set)
       end
+    end
 
-      # Sanitizes the given path by removing a leading and addding a trailing slash
-      def sanitize_path(path)
-        if path.nil? || path.empty?
-          ""
-        else
-          path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1/')
-        end
+    # Sanitizes the given path by removing a leading and addding a trailing slash
+    def sanitize_path(path)
+      if path.nil? || path.empty?
+        ""
+      else
+        path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1/')
       end
     end
   end

data/lib/jekyll/post.rb

@@ -159,6 +159,8 @@ module Jekyll
     # Returns nothing.
     def process(name)
       m, cats, date, slug, ext = *name.match(MATCHER)
+      self.categories ||= []
+      self.categories += (cats || '').downcase.split('/')
       self.date = Time.parse(date)
       self.slug = slug
       self.ext = ext
@@ -166,7 +168,7 @@ module Jekyll
       path = File.join(@dir || "", name)
       msg  =  "Post '#{path}' does not have a valid date.\n"
       msg  << "Fix the date, or exclude the file or directory from being processed"
-      raise FatalException.new(msg)
+      raise Errors::FatalException.new(msg)
     end
 
     # The generated directory into which the post will be placed

data/lib/jekyll/renderer.rb

@@ -92,6 +92,15 @@ module Jekyll
       raise e
     end
 
+    # Checks if the layout specified in the document actually exists
+    #
+    # layout - the layout to check
+    #
+    # Returns true if the layout is invalid, false if otherwise
+    def invalid_layout?(layout)
+      !document.data["layout"].nil? && layout.nil?
+    end
+
     # Render layouts and place given content inside.
     #
     # content - the content to be placed in the layout
@@ -101,6 +110,9 @@ module Jekyll
     def place_in_layouts(content, payload, info)
       output = content.dup
       layout = site.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
+
       used   = Set.new([layout])
 
       while layout

data/lib/jekyll/site.rb

@@ -80,7 +80,7 @@ module Jekyll
       dest_pathname = Pathname.new(dest)
       Pathname.new(source).ascend do |path|
         if path == dest_pathname
-          raise FatalException.new "Destination directory cannot be or contain the Source directory."
+          raise Errors::FatalException.new "Destination directory cannot be or contain the Source directory."
         end
       end
     end
@@ -443,7 +443,7 @@ module Jekyll
     end
 
     def frontmatter_defaults
-      @frontmatter_defaults ||= Configuration::FrontmatterDefaults.new(self)
+      @frontmatter_defaults ||= FrontmatterDefaults.new(self)
     end
 
     private

data/lib/jekyll/tags/highlight.rb

@@ -44,9 +44,11 @@ eos
         suffix = context["highlighter_suffix"] || ""
         code = super.to_s.strip
 
+        is_safe = !!context.registers[:site].safe
+
         output = case context.registers[:site].highlighter
         when 'pygments'
-          render_pygments(code)
+          render_pygments(code, is_safe)
         when 'rouge'
           render_rouge(code)
         else
@@ -57,11 +59,30 @@ eos
         prefix + rendered_output + suffix
       end
 
-      def render_pygments(code)
+      def sanitized_opts(opts, is_safe)
+        if is_safe
+          Hash[[
+            [:startinline, opts.fetch(:startinline, nil)],
+            [:hl_linenos,  opts.fetch(:hl_linenos, nil)],
+            [:linenos,     opts.fetch(:linenos, nil)],
+            [:encoding,    opts.fetch(:encoding, 'utf-8')],
+            [:cssclass,    opts.fetch(:cssclass, nil)]
+          ].reject {|f| f.last.nil? }]
+        else
+          opts
+        end
+      end
+
+      def render_pygments(code, is_safe)
         require 'pygments'
+
         @options[:encoding] = 'utf-8'
 
-        highlighted_code = Pygments.highlight(code, :lexer => @lang, :options => @options)
+        highlighted_code = Pygments.highlight(
+          code,
+          :lexer   => @lang,
+          :options => sanitized_opts(@options, is_safe)
+        )
 
         if highlighted_code.nil?
           Jekyll.logger.error "There was an error highlighting your code:"