jekyll 2.5.3 → 3.0.0.pre.beta1

data/lib/jekyll/filters.rb

@@ -1,19 +1,9 @@
 require 'uri'
 require 'json'
+require 'date'
 
 module Jekyll
   module Filters
-    # Convert a Textile string into HTML output.
-    #
-    # input - The Textile String to convert.
-    #
-    # Returns the HTML formatted String.
-    def textilize(input)
-      site = @context.registers[:site]
-      converter = site.getConverterImpl(Jekyll::Converters::Textile)
-      converter.convert(input)
-    end
-
     # Convert a Markdown string into HTML output.
     #
     # input - The Markdown String to convert.
@@ -21,7 +11,7 @@ module Jekyll
     # Returns the HTML formatted String.
     def markdownify(input)
       site = @context.registers[:site]
-      converter = site.getConverterImpl(Jekyll::Converters::Markdown)
+      converter = site.find_converter_instance(Jekyll::Converters::Markdown)
       converter.convert(input)
     end
 
@@ -32,7 +22,7 @@ module Jekyll
     # Returns the CSS formatted String.
     def sassify(input)
       site = @context.registers[:site]
-      converter = site.getConverterImpl(Jekyll::Converters::Sass)
+      converter = site.find_converter_instance(Jekyll::Converters::Sass)
       converter.convert(input)
     end
 
@@ -43,19 +33,19 @@ module Jekyll
     # Returns the CSS formatted String.
     def scssify(input)
       site = @context.registers[:site]
-      converter = site.getConverterImpl(Jekyll::Converters::Scss)
+      converter = site.find_converter_instance(Jekyll::Converters::Scss)
       converter.convert(input)
     end
 
     # Slugify a filename or title.
     #
     # input - The filename or title to slugify.
+    # mode - how string is slugified
     #
-    # Returns the given filename or title as a lowercase String, with every
-    # sequence of spaces and non-alphanumeric characters replaced with a
-    # hyphen.
-    def slugify(input)
-      Utils.slugify(input)
+    # Returns the given filename or title as a lowercase URL String.
+    # See Utils.slugify for more detail.
+    def slugify(input, mode=nil)
+      Utils.slugify(input, mode)
     end
 
     # Format a date in short format e.g. "27 Jan 2011".
@@ -302,6 +292,8 @@ module Jekyll
       case input
       when Time
         input
+      when Date
+        input.to_time
       when String
         Time.parse(input) rescue Time.at(input.to_i)
       when Numeric
@@ -309,7 +301,7 @@ module Jekyll
       else
         Jekyll.logger.error "Invalid Date:", "'#{input}' is not a valid datetime."
         exit(1)
-      end
+      end.localtime
     end
 
     def groupable?(element)

data/lib/jekyll/frontmatter_defaults.rb

@@ -168,7 +168,7 @@ module Jekyll
       end.compact
     end
 
-    # Sanitizes the given path by removing a leading and addding a trailing slash
+    # Sanitizes the given path by removing a leading and adding a trailing slash
     def sanitize_path(path)
       if path.nil? || path.empty?
         ""

data/lib/jekyll/layout.rb

@@ -8,6 +8,9 @@ module Jekyll
     # Gets the name of this layout.
     attr_reader :name
 
+    # Gets the path to this layout.
+    attr_reader :path
+
     # Gets/Sets the extension of this layout.
     attr_accessor :ext
 
@@ -26,6 +29,7 @@ module Jekyll
       @site = site
       @base = base
       @name = name
+      @path = site.in_source_dir(base, name)
 
       self.data = {}
 

data/lib/jekyll/log_adapter.rb

@@ -1,6 +1,6 @@
 module Jekyll
   class LogAdapter
-    attr_reader :writer
+    attr_reader :writer, :messages
 
     LOG_LEVELS = {
       :debug => ::Logger::DEBUG,
@@ -16,6 +16,7 @@ module Jekyll
     #
     # Returns nothing
     def initialize(writer, level = :info)
+      @messages = []
       @writer = writer
       self.log_level = level
     end
@@ -87,7 +88,9 @@ module Jekyll
     #
     # Returns the formatted message
     def message(topic, message)
-      formatted_topic(topic) + message.to_s.gsub(/\s+/, ' ')
+      msg = formatted_topic(topic) + message.to_s.gsub(/\s+/, ' ')
+      messages << msg
+      msg
     end
 
     # Internal: Format the topic

data/lib/jekyll/post.rb

@@ -23,6 +23,7 @@ module Jekyll
     ATTRIBUTES_FOR_LIQUID = EXCERPT_ATTRIBUTES_FOR_LIQUID + %w[
       content
       excerpt
+      excerpt_separator
     ]
 
     # Post name validator. Post filenames must be like:
@@ -52,12 +53,12 @@ module Jekyll
       @base = containing_dir(dir)
       @name = name
 
-      self.categories = dir.downcase.split('/').reject { |x| x.empty? }
+      self.categories = dir.split('/').reject { |x| x.empty? }
       process(name)
       read_yaml(@base, name)
 
       data.default_proc = proc do |hash, key|
-        site.frontmatter_defaults.find(File.join(dir, name), type, key)
+        site.frontmatter_defaults.find(relative_path, type, key)
       end
 
       if data.key?('date')
@@ -80,7 +81,7 @@ module Jekyll
       categories_from_data = Utils.pluralized_array_from_hash(data, 'category', 'categories')
       self.categories = (
         Array(categories) + categories_from_data
-      ).map {|c| c.to_s.downcase}.flatten.uniq
+      ).map { |c| c.to_s }.flatten.uniq
     end
 
     def populate_tags
@@ -118,6 +119,14 @@ module Jekyll
       data.fetch('title') { titleized_slug }
     end
 
+    # Public: the Post excerpt_separator, from the YAML Front-Matter or site default
+    #         excerpt_separator value
+    #
+    # Returns the post excerpt_separator
+    def excerpt_separator
+      (data['excerpt_separator'] || site.config['excerpt_separator']).to_s
+    end
+
     # Turns the post slug into a suitable title
     def titleized_slug
       slug.split('-').select {|w| w.capitalize! || w }.join(' ')
@@ -218,7 +227,7 @@ module Jekyll
         :title       => slug,
         :i_day       => date.strftime("%-d"),
         :i_month     => date.strftime("%-m"),
-        :categories  => (categories || []).map { |c| c.to_s }.join('/'),
+        :categories  => (categories || []).map { |c| c.to_s.downcase }.uniq.join('/'),
         :short_month => date.strftime("%b"),
         :short_year  => date.strftime("%y"),
         :y_day       => date.strftime("%j"),
@@ -269,7 +278,7 @@ module Jekyll
     def destination(dest)
       # The url needs to be unescaped in order to preserve the correct filename
       path = site.in_dest_dir(dest, URL.unescape_path(url))
-      path = File.join(path, "index.html") if path[/\.html?$/].nil?
+      path = File.join(path, "index.html") if self.url =~ /\/$/
       path
     end
 
@@ -307,7 +316,7 @@ module Jekyll
     end
 
     def generate_excerpt?
-      !(site.config['excerpt_separator'].to_s.empty?)
+      !excerpt_separator.empty?
     end
   end
 end

data/lib/jekyll/regenerator.rb

@@ -0,0 +1,141 @@
+module Jekyll
+  class Regenerator
+    attr_reader :site, :metadata, :cache
+
+    def initialize(site)
+      @site = site
+
+      # Read metadata from file
+      read_metadata
+
+      # Initialize cache to an empty hash
+      @cache = {}
+    end
+
+    # Checks if a renderable object needs to be regenerated
+    #
+    # Returns a boolean.
+    def regenerate?(document)
+      case document
+      when Post, Page
+        document.asset_file? || document.data['regenerate'] ||
+          modified?(site.in_source_dir(document.relative_path))
+      when Document
+        !document.write? || document.data['regenerate'] || modified?(document.path)
+      else
+        if document.respond_to?(:path)
+          modified?(document.path)
+        else
+          true
+        end
+      end
+    end
+
+    # Add a path to the metadata
+    #
+    # Returns true, also on failure.
+    def add(path)
+      return true unless File.exist?(path)
+
+      metadata[path] = {
+        "mtime" => File.mtime(path),
+        "deps" => []
+      }
+      cache[path] = true
+    end
+
+    # Force a path to regenerate
+    #
+    # Returns true.
+    def force(path)
+      cache[path] = true
+    end
+
+    # Clear the metadata and cache
+    #
+    # Returns nothing
+    def clear
+      @metadata = {}
+      @cache = {}
+    end
+
+    # Checks if a path's (or one of its dependencies)
+    # mtime has changed
+    #
+    # Returns a boolean.
+    def modified?(path)
+      return true if disabled?
+
+      # Check for path in cache
+      if cache.has_key? path
+        return cache[path]
+      end
+
+      # Check path that exists in metadata
+      data = metadata[path]
+      if data
+        data["deps"].each do |dependency|
+          if modified?(dependency)
+            return cache[dependency] = cache[path] = true
+          end
+        end
+        if data["mtime"].eql? File.mtime(path)
+          return cache[path] = false
+        else
+          return add(path)
+        end
+      end
+
+      # Path does not exist in metadata, add it
+      return add(path)
+    end
+
+    # Add a dependency of a path
+    #
+    # Returns nothing.
+    def add_dependency(path, dependency)
+      return if (metadata[path].nil? || @disabled)
+
+      metadata[path]["deps"] << dependency unless metadata[path]["deps"].include? dependency
+      regenerate? dependency
+    end
+
+    # Write the metadata to disk
+    #
+    # Returns nothing.
+    def write_metadata
+      File.open(metadata_file, 'w') do |f|
+        f.write(metadata.to_yaml)
+      end
+    end
+
+    # Produce the absolute path of the metadata file
+    #
+    # Returns the String path of the file.
+    def metadata_file
+      site.in_source_dir('.jekyll-metadata')
+    end
+
+    # Check if metadata has been disabled
+    #
+    # Returns a Boolean (true for disabled, false for enabled).
+    def disabled?
+      @disabled = site.full_rebuild? if @disabled.nil?
+      @disabled
+    end
+
+    private
+
+    # Read metadata from the metadata file, if no file is found,
+    # initialize with an empty hash
+    #
+    # Returns the read metadata.
+    def read_metadata
+      @metadata = if !disabled? && File.file?(metadata_file)
+        SafeYAML.load(File.read(metadata_file))
+      else
+        {}
+      end
+    end
+  end
+end

data/lib/jekyll/renderer.rb

@@ -3,11 +3,12 @@
 module Jekyll
   class Renderer
 
-    attr_reader :document, :site
+    attr_reader :document, :site, :site_payload
 
-    def initialize(site, document)
-      @site     = site
-      @document = document
+    def initialize(site, document, site_payload = nil)
+      @site         = site
+      @document     = document
+      @site_payload = site_payload
     end
 
     # Determine which converters to use based on this document's
@@ -32,7 +33,7 @@ module Jekyll
     def run
       payload = Utils.deep_merge_hashes({
         "page" => document.to_liquid
-      }, site.site_payload)
+      }, site_payload || site.site_payload)
 
       info = {
         filters:   [Jekyll::Filters],
@@ -138,6 +139,12 @@ module Jekyll
           File.join(site.config['layouts'], layout.name)
         )
 
+        # Add layout to dependency tree
+        site.regenerator.add_dependency(
+          site.in_source_dir(document.path),
+          site.in_source_dir(layout.path)
+        ) if document.write?
+
         if layout = site.layouts[layout.data["layout"]]
           if used.include?(layout)
             layout = nil # avoid recursive chain

data/lib/jekyll/site.rb

@@ -11,6 +11,7 @@ module Jekyll
                   :gems, :plugin_manager
 
     attr_accessor :converters, :generators
+    attr_reader   :regenerator
 
     # Public: Initialize a new Site.
     #
@@ -27,6 +28,9 @@ module Jekyll
       @source              = File.expand_path(config['source']).freeze
       @dest                = File.expand_path(config['destination']).freeze
 
+      # Initialize incremental regenerator
+      @regenerator = Regenerator.new(self)
+
       self.plugin_manager = Jekyll::PluginManager.new(self)
       self.plugins        = plugin_manager.plugins_path
 
@@ -183,6 +187,7 @@ module Jekyll
       end
 
       pages.sort_by!(&:name)
+      static_files.sort_by!(&:relative_path)
     end
 
     # Read all the files in <source>/<dir>/_posts and create a new Post
@@ -287,17 +292,22 @@ module Jekyll
     def render
       relative_permalinks_deprecation_method
 
+      payload = site_payload
       collections.each do |label, collection|
         collection.docs.each do |document|
-          document.output = Jekyll::Renderer.new(self, document).run
+          if regenerator.regenerate?(document)
+            document.output = Jekyll::Renderer.new(self, document, payload).run
+          end
         end
       end
 
       payload = site_payload
       [posts, pages].flatten.each do |page_or_post|
-        page_or_post.render(layouts, payload)
+        if regenerator.regenerate?(page_or_post)
+          page_or_post.render(layouts, payload)
+        end
       end
-    rescue Errno::ENOENT => e
+    rescue Errno::ENOENT
       # ignore missing layout dir
     end
 
@@ -312,7 +322,10 @@ module Jekyll
     #
     # Returns nothing.
     def write
-      each_site_file { |item| item.write(dest) }
+      each_site_file { |item|
+        item.write(dest) if regenerator.regenerate?(item)
+      }
+      regenerator.write_metadata unless full_rebuild?
     end
 
     # Construct a Hash of Posts indexed by the specified Post attribute.
@@ -377,7 +390,7 @@ module Jekyll
             "time"         => time,
             "posts"        => posts.sort { |a, b| b <=> a },
             "pages"        => pages,
-            "static_files" => static_files.sort { |a, b| a.relative_path <=> b.relative_path },
+            "static_files" => static_files,
             "html_pages"   => pages.select { |page| page.html? || page.url.end_with?("/") },
             "categories"   => post_attr_hash('categories'),
             "tags"         => post_attr_hash('tags'),
@@ -405,13 +418,8 @@ module Jekyll
     # klass - The Class of the Converter to fetch.
     #
     # Returns the Converter instance implementing the given Converter.
-    def getConverterImpl(klass)
-      matches = converters.select { |c| c.class == klass }
-      if impl = matches.first
-        impl
-      else
-        raise "Converter implementation not found for #{klass}"
-      end
+    def find_converter_instance(klass)
+      converters.find { |c| c.class == klass } || proc { raise "No converter for #{klass}" }.call
     end
 
     # Create array of instances of the subclasses of the class or module
@@ -453,7 +461,7 @@ module Jekyll
 
     def relative_permalinks_deprecation_method
       if config['relative_permalinks'] && has_relative_page?
-        Jekyll.logger.warn "Deprecation:", "Starting in 2.0, permalinks for pages" +
+        Jekyll.logger.warn "Deprecation:", "Since v2.0, permalinks for pages" +
                                             " in subfolders must be relative to the" +
                                             " site source directory, not the parent" +
                                             " directory. Check http://jekyllrb.com/docs/upgrading/"+
@@ -483,6 +491,17 @@ module Jekyll
       @frontmatter_defaults ||= FrontmatterDefaults.new(self)
     end
 
+    # Whether to perform a full rebuild without incremental regeneration
+    #
+    # Returns a Boolean: true for a full rebuild, false for normal build
+    def full_rebuild?(override = {})
+      override['full_rebuild'] || config['full_rebuild']
+    end
+
+    def publisher
+      @publisher ||= Publisher.new(self)
+    end
+
     private
 
     def has_relative_page?
@@ -503,9 +522,5 @@ module Jekyll
       name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
       name.gsub(/\s+/, '_')
     end
-
-    def publisher
-      @publisher ||= Publisher.new(self)
-    end
   end
 end