jekyll 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45083d9a5aaf050f5b5dc16a09c7d4001db30856
-  data.tar.gz: 4bfa431a22f2d147963b49e6664584a43f9cdbc3
+  metadata.gz: 49712197bbd449a1ccb1593b58772be181e0df1a
+  data.tar.gz: 80f61cc61b7309db6e1dcc29ca833e833f72c233
 SHA512:
-  metadata.gz: 289e5fd56eccf356d07eca309241ac9ef9a11c020bd218c394d1499d2984d88c49e842697e07b0d576147ee3b1937d7046d290e31a3d49430f4373e168f0de49
-  data.tar.gz: 11c5a946bbb64cfbb560db1a28be0534131391b3353a1e55e5ae3aa05bccc2cf28386a879bb91b9ce9068173d63747409df80b1694e54ef8779ce12f0697c65f
+  metadata.gz: 698b36066f4d75677f9a2e1e33ef18f9609fac1de550b972f73f3eb16fbf1b082d5b51778a9a6d4ef089adee7355a18b259a002d290f8cb2813e7e6391057ff2
+  data.tar.gz: 97bbe79b72ac0dafc6f7eb67e7cfaf1ce46eb4dd0e55971834312d8328ca717d2e56563f6fcf3cb9ab34170125f6bd2ff8d4a1ca92a26033f1d31af63d0bbbd7

data/README.markdown

@@ -4,6 +4,7 @@
 [![Build Status](https://secure.travis-ci.org/jekyll/jekyll.svg?branch=master)](https://travis-ci.org/jekyll/jekyll)
 [![Code Climate](http://img.shields.io/codeclimate/github/jekyll/jekyll.svg)](https://codeclimate.com/github/jekyll/jekyll)
 [![Dependency Status](https://gemnasium.com/jekyll/jekyll.svg)](https://gemnasium.com/jekyll/jekyll)
+[![Security](https://hakiri.io/github/jekyll/jekyll/master.svg)](https://hakiri.io/github/jekyll/jekyll/master)
 
 By Tom Preston-Werner, Nick Quaranto, Parker Moore, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)!
 

data/bin/jekyll

@@ -13,6 +13,8 @@ require 'mercenary'
   end
 end
 
+Jekyll::PluginManager.require_from_bundler
+
 Jekyll::Deprecator.process(ARGV)
 
 Mercenary.program(:jekyll) do |p|

data/lib/jekyll.rb

@@ -68,66 +68,88 @@ module Jekyll
   require 'jekyll/command'
   require 'jekyll/liquid_extensions'
 
-  # Public: Tells you which Jekyll environment you are building in so you can skip tasks
-  # if you need to.  This is useful when doing expensive compression tasks on css and
-  # images and allows you to skip that when working in development.
+  class << self
+    # Public: Tells you which Jekyll environment you are building in so you can skip tasks
+    # if you need to.  This is useful when doing expensive compression tasks on css and
+    # images and allows you to skip that when working in development.
 
-  def self.env
-    ENV["JEKYLL_ENV"] || "development"
-  end
+    def env
+      ENV["JEKYLL_ENV"] || "development"
+    end
 
-  # Public: Generate a Jekyll configuration Hash by merging the default
-  # options with anything in _config.yml, and adding the given options on top.
-  #
-  # override - A Hash of config directives that override any options in both
-  #            the defaults and the config file. See Jekyll::Configuration::DEFAULTS for a
-  #            list of option names and their defaults.
-  #
-  # Returns the final configuration Hash.
-  def self.configuration(override)
-    config = Configuration[Configuration::DEFAULTS]
-    override = Configuration[override].stringify_keys
-    config = config.read_config_files(config.config_files(override))
-
-    # Merge DEFAULTS < _config.yml < override
-    config = Utils.deep_merge_hashes(config, override).stringify_keys
-    set_timezone(config['timezone']) if config['timezone']
-
-    config
-  end
+    # Public: Generate a Jekyll configuration Hash by merging the default
+    # options with anything in _config.yml, and adding the given options on top.
+    #
+    # override - A Hash of config directives that override any options in both
+    #            the defaults and the config file. See Jekyll::Configuration::DEFAULTS for a
+    #            list of option names and their defaults.
+    #
+    # Returns the final configuration Hash.
+    def configuration(override = Hash.new)
+      config = Configuration[Configuration::DEFAULTS]
+      override = Configuration[override].stringify_keys
+      unless override.delete('skip_config_files')
+        config = config.read_config_files(config.config_files(override))
+      end
+
+      # Merge DEFAULTS < _config.yml < override
+      config = Utils.deep_merge_hashes(config, override).stringify_keys
+      set_timezone(config['timezone']) if config['timezone']
+
+      config
+    end
 
-  # Static: Set the TZ environment variable to use the timezone specified
-  #
-  # timezone - the IANA Time Zone
-  #
-  # Returns nothing
-  def self.set_timezone(timezone)
-    ENV['TZ'] = timezone
-  end
+    # Public: Set the TZ environment variable to use the timezone specified
+    #
+    # timezone - the IANA Time Zone
+    #
+    # Returns nothing
+    def set_timezone(timezone)
+      ENV['TZ'] = timezone
+    end
 
-  def self.logger
-    @logger ||= LogAdapter.new(Stevenson.new)
-  end
+    # Public: Fetch the logger instance for this Jekyll process.
+    #
+    # Returns the LogAdapter instance.
+    def logger
+      @logger ||= LogAdapter.new(Stevenson.new, (ENV["JEKYLL_LOG_LEVEL"] || :info).to_sym)
+    end
 
-  def self.logger=(writer)
-    @logger = LogAdapter.new(writer)
-  end
+    # Public: Set the log writer.
+    #         New log writer must respond to the same methods
+    #         as Ruby's interal Logger.
+    #
+    # writer - the new Logger-compatible log transport
+    #
+    # Returns the new logger.
+    def logger=(writer)
+      @logger = LogAdapter.new(writer)
+    end
 
-  # Public: File system root
-  #
-  # Returns the root of the filesystem as a Pathname
-  def self.fs_root
-    @fs_root ||= "/"
-  end
+    # Public: An array of sites
+    #
+    # Returns the Jekyll sites created.
+    def sites
+      @sites ||= []
+    end
 
-  def self.sanitized_path(base_directory, questionable_path)
-    clean_path = File.expand_path(questionable_path, fs_root)
-    clean_path.gsub!(/\A\w\:\//, '/')
-    unless clean_path.start_with?(base_directory)
-      File.join(base_directory, clean_path)
-    else
-      clean_path
+    # Public: Ensures the questionable path is prefixed with the base directory
+    #         and prepends the questionable path with the base directory if false.
+    #
+    # base_directory - the directory with which to prefix the questionable path
+    # questionable_path - the path we're unsure about, and want prefixed
+    #
+    # Returns the sanitized path.
+    def sanitized_path(base_directory, questionable_path)
+      clean_path = File.expand_path(questionable_path, "/")
+      clean_path.gsub!(/\A\w\:\//, '/')
+      unless clean_path.start_with?(base_directory)
+        File.join(base_directory, clean_path)
+      else
+        clean_path
+      end
     end
+
   end
 end
 

data/lib/jekyll/cleaner.rb

@@ -29,7 +29,7 @@ module Jekyll
       # Returns a Set with the file paths
       def existing_files
         files = Set.new
-        Dir.glob(File.join(site.dest, "**", "*"), File::FNM_DOTMATCH) do |file|
+        Dir.glob(site.in_dest_dir("**", "*"), File::FNM_DOTMATCH) do |file|
           files << file unless file =~ /\/\.{1,2}$/ || file =~ keep_file_regex || keep_dirs.include?(file)
         end
         files
@@ -76,7 +76,7 @@ module Jekyll
       #
       # Returns a Set with the directory paths
       def keep_dirs
-        site.keep_files.map{|file| parent_dirs(File.join(site.dest, file))}.flatten.to_set
+        site.keep_files.map { |file| parent_dirs(site.in_dest_dir(file)) }.flatten.to_set
       end
 
       # Private: Creates a regular expression from the config's keep_files array

data/lib/jekyll/collection.rb

@@ -35,7 +35,8 @@ module Jekyll
     # Returns the sorted array of docs.
     def read
       filtered_entries.each do |file_path|
-        full_path = Jekyll.sanitized_path(directory, file_path)
+        full_path = collection_dir(file_path)
+        next if File.directory?(full_path)
         if Utils.has_yaml_header? full_path
           doc = Jekyll::Document.new(full_path, { site: site, collection: self })
           doc.read
@@ -54,9 +55,10 @@ module Jekyll
     #   relative to the collection's directory
     def entries
       return Array.new unless exists?
-      Dir.glob(File.join(directory, "**", "*.*")).map do |entry|
-        entry[File.join(directory, "")] = ''; entry
-      end
+      @entries ||=
+        Dir.glob(collection_dir("**", "*.*")).map do |entry|
+          entry["#{collection_dir}/"] = ''; entry
+        end
     end
 
     # Filtered version of the entries in this collection.
@@ -65,9 +67,13 @@ module Jekyll
     # Returns a list of filtered entry paths.
     def filtered_entries
       return Array.new unless exists?
-      Dir.chdir(directory) do
-        entry_filter.filter(entries).reject { |f| File.directory?(f) }
-      end
+      @filtered_entries ||=
+        Dir.chdir(directory) do
+          entry_filter.filter(entries).reject do |f|
+            path = collection_dir(f)
+            File.directory?(path) || (File.symlink?(f) && site.safe)
+          end
+        end
     end
 
     # The directory for this Collection, relative to the site source.
@@ -75,15 +81,28 @@ module Jekyll
     # Returns a String containing the directory name where the collection
     #   is stored on the filesystem.
     def relative_directory
-      "_#{label}"
+      @relative_directory ||= "_#{label}"
     end
 
-    # The full path to the directory containing the
+    # The full path to the directory containing the collection.
     #
     # Returns a String containing th directory name where the collection
     #   is stored on the filesystem.
     def directory
-      Jekyll.sanitized_path(site.source, relative_directory)
+      @directory ||= site.in_source_dir(relative_directory)
+    end
+
+    # The full path to the directory containing the collection, with
+    #   optional subpaths.
+    #
+    # *files - (optional) any other path pieces relative to the
+    #           directory to append to the path
+    #
+    # Returns a String containing th directory name where the collection
+    #   is stored on the filesystem.
+    def collection_dir(*files)
+      return directory if files.empty?
+      site.in_source_dir(relative_directory, *files)
     end
 
     # Checks whether the directory "exists" for this collection.

data/lib/jekyll/commands/build.rb

@@ -9,6 +9,7 @@ module Jekyll
           prog.command(:build) do |c|
             c.syntax      'build [options]'
             c.description 'Build your site'
+            c.alias :b
 
             add_build_options(c)
 

data/lib/jekyll/commands/serve.rb

@@ -10,6 +10,7 @@ module Jekyll
             c.syntax 'serve [options]'
             c.description 'Serve your site locally'
             c.alias :server
+            c.alias :s
 
             add_build_options(c)
 
@@ -75,16 +76,20 @@ module Jekyll
 
         def webrick_options(config)
           opts = {
-            :DocumentRoot       => config['destination'],
-            :Port               => config['port'],
             :BindAddress        => config['host'],
-            :MimeTypes          => mime_types,
+            :DirectoryIndex     => %w(index.html index.htm index.cgi index.rhtml index.xml),
+            :DocumentRoot       => config['destination'],
             :DoNotReverseLookup => true,
-            :StartCallback      => start_callback(config['detach']),
-            :DirectoryIndex     => %w(index.html index.htm index.cgi index.rhtml index.xml)
+            :MimeTypes          => mime_types,
+            :Port               => config['port'],
+            :StartCallback      => start_callback(config['detach'])
           }
 
-          if !config['verbose']
+          if config['verbose']
+            opts.merge!({
+              :Logger => WEBrick::Log.new($stdout, WEBrick::Log::DEBUG)
+            })
+          else
             opts.merge!({
               :AccessLog => [],
               :Logger => WEBrick::Log.new([], WEBrick::Log::WARN)
@@ -118,9 +123,10 @@ module Jekyll
 
         # recreate NondisclosureName under utf-8 circumstance
         def file_handler_options
-          fh_option = WEBrick::Config::FileHandler
-          fh_option[:NondisclosureName] = ['.ht*','~*']
-          fh_option
+          WEBrick::Config::FileHandler.merge({
+            :FancyIndexing     => true,
+            :NondisclosureName => ['.ht*','~*']
+          })
         end
 
       end

data/lib/jekyll/configuration.rb

@@ -42,7 +42,7 @@ module Jekyll
       # Serving
       'detach'        => false,          # default to not detaching the server
       'port'          => '4000',
-      'host'          => '0.0.0.0',
+      'host'          => '127.0.0.1',
       'baseurl'       => '',
 
       # Backwards-compatibility options

data/lib/jekyll/converters/markdown.rb

@@ -46,9 +46,15 @@ module Jekyll
         ].map(&:to_sym)
       end
 
+      def extname_matches_regexp
+        @extname_matches_regexp ||= Regexp.new(
+          '(' + @config['markdown_ext'].gsub(',','|') +')$',
+          Regexp::IGNORECASE
+        )
+      end
+
       def matches(ext)
-        rgx = '^\.(' + @config['markdown_ext'].gsub(',','|') +')$'
-        ext =~ Regexp.new(rgx, Regexp::IGNORECASE)
+        ext =~ extname_matches_regexp
       end
 
       def output_ext(ext)

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

@@ -48,8 +48,8 @@ module Jekyll
           end
 
           protected
-          def rouge_formatter(opts = {})
-            Rouge::Formatters::HTML.new(opts.merge(wrap: false))
+          def rouge_formatter(lexer)
+            Rouge::Formatters::HTML.new(:wrap => false)
           end
         end
 

data/lib/jekyll/converters/textile.rb

@@ -16,9 +16,15 @@ module Jekyll
         raise Errors::FatalException.new("Missing dependency: RedCloth")
       end
 
+      def extname_matches_regexp
+        @extname_matches_regexp ||= Regexp.new(
+          '(' + @config['textile_ext'].gsub(',','|') +')$',
+          Regexp::IGNORECASE
+        )
+      end
+
       def matches(ext)
-        rgx = '(' + @config['textile_ext'].gsub(',','|') +')'
-        ext =~ Regexp.new(rgx, Regexp::IGNORECASE)
+        ext =~ extname_matches_regexp
       end
 
       def output_ext(ext)

data/lib/jekyll/convertible.rb

@@ -43,7 +43,7 @@ module Jekyll
     # Returns nothing.
     def read_yaml(base, name, opts = {})
       begin
-        self.content = File.read(Jekyll.sanitized_path(base, name),
+        self.content = File.read(site.in_source_dir(base, name),
                                  merged_file_read_opts(opts))
         if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
           self.content = $POSTMATCH
@@ -60,7 +60,7 @@ module Jekyll
 
     # Transform the contents based on the content type.
     #
-    # Returns nothing.
+    # Returns the transformed contents.
     def transform
       converters.reduce(content) do |output, converter|
         begin

data/lib/jekyll/document.rb

@@ -4,7 +4,7 @@ module Jekyll
   class Document
     include Comparable
 
-    attr_reader   :path, :site
+    attr_reader   :path, :site, :extname
     attr_accessor :content, :collection, :output
 
     # Create a new Document.
@@ -16,6 +16,7 @@ module Jekyll
     def initialize(path, relations)
       @site = relations[:site]
       @path = path
+      @extname = File.extname(path)
       @collection = relations[:collection]
       @has_yaml_header = nil
     end
@@ -33,23 +34,21 @@ module Jekyll
     # Returns a String path which represents the relative path
     #   from the site source to this document
     def relative_path
-      Pathname.new(path).relative_path_from(Pathname.new(site.source)).to_s
+      @relative_path ||= Pathname.new(path).relative_path_from(Pathname.new(site.source)).to_s
     end
 
-    # The base filename of the document.
-    #
-    # suffix - (optional) the suffix to be removed from the end of the filename
+    # The base filename of the document, without the file extname.
     #
-    # Returns the base filename of the document.
-    def basename(suffix = "")
-      File.basename(path, suffix)
+    # Returns the basename without the file extname.
+    def basename_without_ext
+      @basename_without_ext ||= File.basename(path, '.*')
     end
 
-    # The extension name of the document.
+    # The base filename of the document.
     #
-    # Returns the extension name of the document.
-    def extname
-      File.extname(path)
+    # Returns the base filename of the document.
+    def basename
+      @basename ||= File.basename(path)
     end
 
     # Produces a "cleaned" relative path.
@@ -64,7 +63,8 @@ module Jekyll
     #
     # Returns the cleaned relative path of the document.
     def cleaned_relative_path
-      relative_path[0 .. -extname.length - 1].sub(collection.relative_directory, "")
+      @cleaned_relative_path ||=
+        relative_path[0 .. -extname.length - 1].sub(collection.relative_directory, "")
     end
 
     # Determine whether the document is a YAML file.
@@ -129,8 +129,8 @@ module Jekyll
         collection: collection.label,
         path:       cleaned_relative_path,
         output_ext: Jekyll::Renderer.new(site, self).output_ext,
-        name:       Utils.slugify(basename(".*")),
-        title:      Utils.slugify(data['title']) || Utils.slugify(basename(".*"))
+        name:       Utils.slugify(basename_without_ext),
+        title:      Utils.slugify(data['title']) || Utils.slugify(basename_without_ext)
       }
     end
 
@@ -159,7 +159,8 @@ module Jekyll
     #
     # Returns the full path to the output file of this document.
     def destination(base_directory)
-      path = Jekyll.sanitized_path(base_directory, url)
+      dest = site.in_dest_dir(base_directory)
+      path = site.in_dest_dir(dest, url)
       path = File.join(path, "index.html") if url =~ /\/$/
       path
     end

data/lib/jekyll/draft.rb

@@ -14,8 +14,8 @@ module Jekyll
     end
 
     # Get the full path to the directory containing the draft files
-    def containing_dir(source, dir)
-      File.join(source, dir, '_drafts')
+    def containing_dir(dir)
+      site.in_source_dir(dir, '_drafts')
     end
 
     # The path to the draft source file, relative to the site source

data/lib/jekyll/entry_filter.rb

@@ -47,7 +47,7 @@ module Jekyll
 
     def excluded?(entry)
       excluded = glob_include?(site.exclude, relative_to_source(entry))
-      Jekyll.logger.debug "excluded?(#{relative_to_source(entry)}) ==> #{excluded}"
+      Jekyll.logger.debug "EntryFilter:", "excluded?(#{relative_to_source(entry)}) ==> #{excluded}"
       excluded
     end
 

data/lib/jekyll/excerpt.rb

@@ -106,7 +106,7 @@ module Jekyll
     # Returns excerpt String
     def extract_excerpt(post_content)
       separator     = site.config['excerpt_separator']
-      head, _, tail = post_content.partition(separator)
+      head, _, tail = post_content.to_s.partition(separator)
 
       "" << head << "\n\n" << tail.scan(/^\[[^\]]+\]:.+$/).join("\n")
     end

data/lib/jekyll/filters.rb

@@ -219,7 +219,8 @@ module Jekyll
     #
     # Returns the filtered array of objects
     def where(input, property, value)
-      return input unless input.is_a?(Array)
+      return input unless input.is_a?(Enumerable)
+      input = input.values if input.is_a?(Hash)
       input.select { |object| item_property(object, property) == value }
     end
 
@@ -326,7 +327,16 @@ module Jekyll
     end
 
     def as_liquid(item)
-      item.respond_to?(:to_liquid) ? item.to_liquid : item
+      case item
+      when String, Numeric, nil
+        item.to_liquid
+      when Hash
+        Hash[item.map { |k, v| [as_liquid(k), as_liquid(v)] }]
+      when Array
+        item.map{ |i| as_liquid(i) }
+      else
+        item.respond_to?(:to_liquid) ? as_liquid(item.to_liquid) : item
+      end
     end
   end
 end

data/lib/jekyll/layout_reader.rb

@@ -38,12 +38,12 @@ module Jekyll
     end
 
     def layout_directory_inside_source
-      Jekyll.sanitized_path(site.source, site.config['layouts'])
+      site.in_source_dir(site.config['layouts'])
     end
 
     def layout_directory_in_cwd
       dir = Jekyll.sanitized_path(Dir.pwd, site.config['layouts'])
-      if File.directory?(dir)
+      if File.directory?(dir) && !site.safe
         dir
       else
         nil

data/lib/jekyll/page.rb

@@ -126,7 +126,7 @@ module Jekyll
     #
     # Returns the path to the source file
     def path
-      data.fetch('path', relative_path.sub(/\A\//, ''))
+      data.fetch('path') { relative_path.sub(/\A\//, '') }
     end
 
     # The path to the page source file, relative to the site source
@@ -140,7 +140,7 @@ module Jekyll
     #
     # Returns the destination file path String.
     def destination(dest)
-      path = Jekyll.sanitized_path(dest, URL.unescape_path(url))
+      path = site.in_dest_dir(dest, URL.unescape_path(url))
       path = File.join(path, "index.html") if url =~ /\/$/
       path
     end

data/lib/jekyll/plugin_manager.rb

@@ -17,6 +17,7 @@ module Jekyll
     def conscientious_require
       require_plugin_files
       require_gems
+      self.class.require_from_bundler
     end
 
     # Require each of the gem plugins specified.
@@ -25,11 +26,26 @@ module Jekyll
     def require_gems
       site.gems.each do |gem|
         if plugin_allowed?(gem)
+          Jekyll.logger.debug("PluginManager:", "Requiring #{gem}")
           require gem
         end
       end
     end
 
+    def self.require_from_bundler
+      if ENV["JEKYLL_NO_BUNDLER_REQUIRE"]
+        false
+      else
+        require "bundler"
+        required_gems = Bundler.require(:jekyll_plugins)
+        Jekyll.logger.debug("PluginManager:", "Required #{required_gems.map(&:name).join(', ')}")
+        ENV["JEKYLL_NO_BUNDLER_REQUIRE"] = "true"
+        true
+      end
+    rescue LoadError, Bundler::GemfileNotFound
+      false
+    end
+
     # Check whether a gem plugin is allowed to be used during this build.
     #
     # gem_name - the name of the gem
@@ -66,7 +82,7 @@ module Jekyll
     # Returns an Array of plugin search paths
     def plugins_path
       if (site.config['plugins'] == Jekyll::Configuration::DEFAULTS['plugins'])
-        [Jekyll.sanitized_path(site.source, site.config['plugins'])]
+        [site.in_source_dir(site.config['plugins'])]
       else
         Array(site.config['plugins']).map { |d| File.expand_path(d) }
       end

data/lib/jekyll/post.rb

@@ -49,7 +49,7 @@ module Jekyll
     def initialize(site, source, dir, name)
       @site = site
       @dir = dir
-      @base = containing_dir(source, dir)
+      @base = containing_dir(dir)
       @name = name
 
       self.categories = dir.downcase.split('/').reject { |x| x.empty? }
@@ -88,8 +88,8 @@ module Jekyll
     end
 
     # Get the full path to the directory containing the post files
-    def containing_dir(source, dir)
-      return File.join(source, dir, '_posts')
+    def containing_dir(dir)
+      site.in_source_dir(dir, '_posts')
     end
 
     # Read the YAML frontmatter.
@@ -108,14 +108,14 @@ module Jekyll
     #
     # Returns excerpt string.
     def excerpt
-      data.fetch('excerpt', extracted_excerpt.to_s)
+      data.fetch('excerpt') { extracted_excerpt.to_s }
     end
 
     # Public: the Post title, from the YAML Front-Matter or from the slug
     #
     # Returns the post title
     def title
-      data.fetch("title", titleized_slug)
+      data.fetch('title') { titleized_slug }
     end
 
     # Turns the post slug into a suitable title
@@ -130,7 +130,7 @@ module Jekyll
     #
     # Returns the path to the file relative to the site source
     def path
-      data.fetch('path', relative_path.sub(/\A\//, ''))
+      data.fetch('path') { relative_path.sub(/\A\//, '') }
     end
 
     # The path to the post source file, relative to the site source
@@ -268,8 +268,8 @@ module Jekyll
     # Returns destination file path String.
     def destination(dest)
       # The url needs to be unescaped in order to preserve the correct filename
-      path = Jekyll.sanitized_path(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if path[/\.html$/].nil?
+      path = site.in_dest_dir(dest, URL.unescape_path(url))
+      path = File.join(path, "index.html") if path[/\.html?$/].nil?
       path
     end
 

data/lib/jekyll/related_posts.rb

@@ -46,8 +46,7 @@ module Jekyll
     end
 
     def most_recent_posts
-      recent_posts = site.posts.reverse - [post]
-      recent_posts.first(10)
+      @most_recent_posts ||= (site.posts.reverse - [post]).first(10)
     end
 
     def display(output)

data/lib/jekyll/site.rb

@@ -3,11 +3,12 @@ require 'csv'
 
 module Jekyll
   class Site
-    attr_accessor :config, :layouts, :posts, :pages, :static_files,
-                  :exclude, :include, :source, :dest, :lsi, :highlighter,
-                  :permalink_style, :time, :future, :unpublished, :safe, :plugins, :limit_posts,
-                  :show_drafts, :keep_files, :baseurl, :data, :file_read_opts, :gems,
-                  :plugin_manager
+    attr_reader   :source, :dest, :config
+    attr_accessor :layouts, :posts, :pages, :static_files,
+                  :exclude, :include, :lsi, :highlighter, :permalink_style,
+                  :time, :future, :unpublished, :safe, :plugins, :limit_posts,
+                  :show_drafts, :keep_files, :baseurl, :data, :file_read_opts,
+                  :gems, :plugin_manager
 
     attr_accessor :converters, :generators
 
@@ -15,16 +16,16 @@ module Jekyll
     #
     # config - A Hash containing site configuration details.
     def initialize(config)
-      self.config = config.clone
+      @config = config.clone
 
       %w[safe lsi highlighter baseurl exclude include future unpublished
         show_drafts limit_posts keep_files gems].each do |opt|
         self.send("#{opt}=", config[opt])
       end
 
-      self.source          = File.expand_path(config['source'])
-      self.dest            = File.expand_path(config['destination'])
-      self.permalink_style = config['permalink'].to_sym
+      # Source and destination may not be changed after the site has been created.
+      @source              = File.expand_path(config['source']).freeze
+      @dest                = File.expand_path(config['destination']).freeze
 
       self.plugin_manager = Jekyll::PluginManager.new(self)
       self.plugins        = plugin_manager.plugins_path
@@ -32,6 +33,10 @@ module Jekyll
       self.file_read_opts = {}
       self.file_read_opts[:encoding] = config['encoding'] if config['encoding']
 
+      self.permalink_style = config['permalink'].to_sym
+
+      Jekyll.sites << self
+
       reset
       setup
     end
@@ -88,6 +93,30 @@ module Jekyll
       end
     end
 
+    # Public: Prefix a given path with the source directory.
+    #
+    # paths - (optional) path elements to a file or directory within the
+    #         source directory
+    #
+    # Returns a path which is prefixed with the source directory.
+    def in_source_dir(*paths)
+      paths.reduce(source) do |base, path|
+        Jekyll.sanitized_path(base, path)
+      end
+    end
+
+    # Public: Prefix a given path with the destination directory.
+    #
+    # paths - (optional) path elements to a file or directory within the
+    #         destination directory
+    #
+    # Returns a path which is prefixed with the destination directory.
+    def in_dest_dir(*paths)
+      paths.reduce(dest) do |base, path|
+        Jekyll.sanitized_path(base, path)
+      end
+    end
+
     # The list of collections and their corresponding Jekyll::Collection instances.
     # If config['collections'] is set, a new instance is created for each item in the collection.
     # If config['collections'] is not set, a new hash is returned.
@@ -132,7 +161,7 @@ module Jekyll
     #
     # Returns nothing.
     def read_directories(dir = '')
-      base = File.join(source, dir)
+      base = in_source_dir(dir)
       entries = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
 
       read_posts(dir)
@@ -141,7 +170,7 @@ module Jekyll
       limit_posts! if limit_posts > 0 # limit the posts if :limit_posts option is set
 
       entries.each do |f|
-        f_abs = File.join(base, f)
+        f_abs = in_source_dir(base, f)
         if File.directory?(f_abs)
           f_rel = File.join(dir, f)
           read_directories(f_rel) unless dest.sub(/\/$/, '') == f_abs
@@ -198,7 +227,7 @@ module Jekyll
     #
     # Returns nothing
     def read_data(dir)
-      base = Jekyll.sanitized_path(source, dir)
+      base = in_source_dir(dir)
       read_data_to(base, self.data)
     end
 
@@ -217,7 +246,7 @@ module Jekyll
       end
 
       entries.each do |entry|
-        path = Jekyll.sanitized_path(dir, entry)
+        path = in_source_dir(dir, entry)
         next if File.symlink?(path) && safe
 
         key = sanitize_filename(File.basename(entry, '.*'))
@@ -407,10 +436,10 @@ module Jekyll
     #
     # Returns the list of entries to process
     def get_entries(dir, subfolder)
-      base = File.join(source, dir, subfolder)
+      base = in_source_dir(dir, subfolder)
       return [] unless File.exist?(base)
       entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) }
-      entries.delete_if { |e| File.directory?(File.join(base, e)) }
+      entries.delete_if { |e| File.directory?(in_source_dir(base, e)) }
     end
 
     # Aggregate post information

data/lib/jekyll/static_file.rb

@@ -37,7 +37,7 @@ module Jekyll
     #
     # Returns destination file path.
     def destination(dest)
-      File.join(*[dest, destination_rel_dir, @name].compact)
+      @site.in_dest_dir(*[dest, destination_rel_dir, @name].compact)
     end
 
     def destination_rel_dir

data/lib/jekyll/tags/include.rb

@@ -13,11 +13,14 @@ module Jekyll
 
     class IncludeTag < Liquid::Tag
 
+      attr_reader :includes_dir
+
       VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/
       VARIABLE_SYNTAX = /(?<variable>[^{]*\{\{\s*(?<name>[\w\-\.]+)\s*(\|.*)?\}\}[^\s}]*)(?<params>.*)/
 
       def initialize(tag_name, markup, tokens)
         super
+        @includes_dir = tag_includes_dir
         matched = markup.strip.match(VARIABLE_SYNTAX)
         if matched
           @file = matched['variable'].strip
@@ -97,7 +100,7 @@ eos
         end
       end
 
-      def includes_dir
+      def tag_includes_dir
         '_includes'
       end
 
@@ -118,12 +121,12 @@ eos
             partial.render!(context)
           end
         rescue => e
-          raise IncludeTagError.new e.message, File.join(includes_dir, @file)
+          raise IncludeTagError.new e.message, File.join(@includes_dir, @file)
         end
       end
 
       def resolved_includes_dir(context)
-        File.join(File.realpath(context.registers[:site].source), includes_dir)
+        File.join(File.realpath(context.registers[:site].source), @includes_dir)
       end
 
       def validate_path(path, dir, safe)
@@ -135,7 +138,7 @@ eos
       end
 
       def path_relative_to_source(dir, path)
-        File.join(includes_dir, path.sub(Regexp.new("^#{dir}"), ""))
+        File.join(@includes_dir, path.sub(Regexp.new("^#{dir}"), ""))
       end
 
       def realpath_prefixed_with?(path, dir)
@@ -149,13 +152,16 @@ eos
     end
 
     class IncludeRelativeTag < IncludeTag
-      def includes_dir
+      def tag_includes_dir
         '.'
       end
 
+      def page_path(context)
+        context.registers[:page].nil? ? includes_dir : File.dirname(context.registers[:page]["path"])
+      end
+
       def resolved_includes_dir(context)
-        page_path = context.registers[:page].nil? ? includes_dir : File.dirname(context.registers[:page]["path"])
-        Jekyll.sanitized_path(context.registers[:site].source, page_path)
+        context.registers[:site].in_source_dir(page_path(context))
       end
     end
   end

data/lib/jekyll/url.rb

@@ -37,33 +37,46 @@ module Jekyll
     #
     # Returns the String URL
     def to_s
-      sanitize_url(@permalink || generate_url)
+      sanitize_url(generated_permalink || generated_url)
+    end
+
+    # Generates a URL from the permalink
+    #
+    # Returns the _unsanitized String URL
+    def generated_permalink
+      (@generated_permlink ||= generate_url(@permalink)) if @permalink
+    end
+
+    # Generates a URL from the template
+    #
+    # Returns the _unsanitized String URL
+    def generated_url
+      @generated_url ||= generate_url(@template)
     end
 
     # Internal: Generate the URL by replacing all placeholders with their
-    # respective values
+    # respective values in the given template
     #
     # Returns the _unsanitizied_ String URL
-    def generate_url
-      @placeholders.inject(@template) do |result, token|
+    def generate_url(template)
+      @placeholders.inject(template) do |result, token|
+        break result if result.index(':').nil?
         result.gsub(/:#{token.first}/, self.class.escape_path(token.last))
       end
     end
 
     # Returns a sanitized String URL
     def sanitize_url(in_url)
-
-      # Remove all double slashes
-      url = in_url.gsub(/\/\//, "/")
-
-      # Remove every URL segment that consists solely of dots
-      url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/')
+      url = in_url \
+        # Remove all double slashes
+        .gsub(/\/\//, '/') \
+        # Remove every URL segment that consists solely of dots
+        .split('/').reject{ |part| part =~ /^\.+$/ }.join('/') \
+        # Always add a leading slash
+        .gsub(/\A([^\/])/, '/\1')
 
       # Append a trailing slash to the URL if the unsanitized URL had one
-      url += "/" if in_url =~ /\/$/
-
-      # Always add a leading slash
-      url.gsub!(/\A([^\/])/, '/\1')
+      url << "/" if in_url[-1].eql?('/')
 
       url
     end
@@ -79,7 +92,7 @@ module Jekyll
     #
     # Returns the escaped path.
     def self.escape_path(path)
-      # Because URI.escape doesn't escape '?', '[' and ']' by defaut,
+      # 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:

data/lib/jekyll/utils.rb

@@ -14,7 +14,7 @@ module Jekyll
     def deep_merge_hashes(master_hash, other_hash)
       target = master_hash.dup
 
-      other_hash.keys.each do |key|
+      other_hash.each_key do |key|
         if other_hash[key].is_a? Hash and target[key].is_a? Hash
           target[key] = Utils.deep_merge_hashes(target[key], other_hash[key])
           next
@@ -111,11 +111,13 @@ module Jekyll
     # hyphen.
     def slugify(string)
       unless string.nil?
-        # Replace each non-alphanumeric character sequence with a hyphen
-        slug = string.gsub(/[^a-z0-9]+/i, '-')
-        # Remove leading/trailing hyphen
-        slug.gsub!(/^\-|\-$/i, '')
-        slug.downcase
+        string \
+          # Replace each non-alphanumeric character sequence with a hyphen
+          .gsub(/[^a-z0-9]+/i, '-') \
+          # Remove leading/trailing hyphen
+          .gsub(/^\-|\-$/i, '') \
+          # Downcase it
+          .downcase
       end
     end
 

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

data/lib/site_template/_includes/head.html

@@ -1,11 +1,12 @@
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width initial-scale=1" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width initial-scale=1">
 
-    <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
-    <meta name="description" content="{{ site.description }}">
+  <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
+  <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
-    <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
-    <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+  <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
+  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+  <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
 </head>

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

@@ -4,7 +4,7 @@ title:  "Welcome to Jekyll!"
 date:   <%= Time.now.strftime('%Y-%m-%d %H:%M:%S') %>
 categories: jekyll update
 ---
-You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve --watch`, which launches a web server and auto-regenerates your site when a file is updated.
+You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
 
 To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
 

data/lib/site_template/_sass/_base.scss

@@ -154,8 +154,8 @@ pre {
  * Wrapper
  */
 .wrapper {
-    max-width: -webkit-calc(800px - (#{$spacing-unit} * 2));
-    max-width:         calc(800px - (#{$spacing-unit} * 2));
+    max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2));
+    max-width:         calc(#{$content-width} - (#{$spacing-unit} * 2));
     margin-right: auto;
     margin-left: auto;
     padding-right: $spacing-unit;
@@ -163,8 +163,8 @@ pre {
     @extend %clearfix;
 
     @include media-query($on-laptop) {
-        max-width: -webkit-calc(800px - (#{$spacing-unit}));
-        max-width:         calc(800px - (#{$spacing-unit}));
+        max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
+        max-width:         calc(#{$content-width} - (#{$spacing-unit}));
         padding-right: $spacing-unit / 2;
         padding-left: $spacing-unit / 2;
     }

data/lib/site_template/css/main.scss

@@ -21,13 +21,16 @@ $grey-color:       #828282;
 $grey-color-light: lighten($grey-color, 40%);
 $grey-color-dark:  darken($grey-color, 25%);
 
+// Width of the content area
+$content-width:    800px;
+
 $on-palm:          600px;
 $on-laptop:        800px;
 
 
 
 // Using media queries with like this:
-// @include media-query($palm) {
+// @include media-query($on-palm) {
 //     .wrapper {
 //         padding-right: $spacing-unit / 2;
 //         padding-left: $spacing-unit / 2;

data/lib/site_template/feed.xml

@@ -7,7 +7,7 @@ layout: null
     <title>{{ site.title | xml_escape }}</title>
     <description>{{ site.description | xml_escape }}</description>
     <link>{{ site.url }}{{ site.baseurl }}/</link>
-    <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml" />
+    <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml"/>
     <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
     <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
     <generator>Jekyll v{{ jekyll.version }}</generator>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -436,14 +436,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 description: Jekyll is a simple, blog aware, static site generator.
 email: tom@mojombo.com
 executables: