jekyll 3.0.0.pre.beta10 → 3.0.0.pre.rc1

data/lib/jekyll/excerpt.rb

@@ -2,46 +2,43 @@ require 'forwardable'
 
 module Jekyll
   class Excerpt
-    include Convertible
     extend Forwardable
 
-    attr_accessor :post
-    attr_accessor :content, :output, :ext
+    attr_accessor :doc
+    attr_accessor :content, :ext
+    attr_writer   :output
 
-    def_delegator :@post, :site, :site
-    def_delegator :@post, :name, :name
-    def_delegator :@post, :ext,  :ext
+    def_delegators :@doc, :site, :name, :ext, :relative_path, :extname,
+                          :render_with_liquid?, :collection, :related_posts
 
-    # Initialize this Post instance.
+    # Initialize this Excerpt instance.
     #
-    # site       - The Site.
-    # base       - The String path to the dir containing the post file.
-    # name       - The String filename of the post file.
+    # doc - The Document.
     #
-    # Returns the new Post.
-    def initialize(post)
-      self.post = post
-      self.content = extract_excerpt(post.content)
+    # Returns the new Excerpt.
+    def initialize(doc)
+      self.doc = doc
+      self.content = extract_excerpt(doc.content)
     end
 
-    def to_liquid
-      post.to_liquid(post.class::EXCERPT_ATTRIBUTES_FOR_LIQUID)
-    end
-
-    # Fetch YAML front-matter data from related post, without layout key
+    # Fetch YAML front-matter data from related doc, without layout key
     #
-    # Returns Hash of post data
+    # Returns Hash of doc data
     def data
-      @data ||= post.data.dup
+      @data ||= doc.data.dup
       @data.delete("layout")
+      @data.delete("excerpt")
       @data
     end
 
+    def trigger_hooks(*)
+    end
+
     # 'Path' of the excerpt.
     #
-    # Returns the path for the post this excerpt belongs to with #excerpt appended
+    # Returns the path for the doc this excerpt belongs to with #excerpt appended
     def path
-      File.join(post.path, "#excerpt")
+      File.join(doc.path, "#excerpt")
     end
 
     # Check if excerpt includes a string
@@ -51,28 +48,43 @@ module Jekyll
       (output && output.include?(something)) || content.include?(something)
     end
 
-    # The UID for this post (useful in feeds).
-    # e.g. /2008/11/05/my-awesome-post
+    # The UID for this doc (useful in feeds).
+    # e.g. /2008/11/05/my-awesome-doc
     #
     # Returns the String UID.
     def id
-      File.join(post.dir, post.slug, "#excerpt")
+      "#{doc.id}#excerpt"
     end
 
     def to_s
       output || content
     end
 
-    # Returns the shorthand String identifier of this Post.
+    def to_liquid
+      doc.data['excerpt'] = nil
+      @to_liquid ||= doc.to_liquid
+      doc.data['excerpt'] = self
+      @to_liquid
+    end
+
+    # Returns the shorthand String identifier of this doc.
     def inspect
       "<Excerpt: #{self.id}>"
     end
 
+    def output
+      @output ||= Renderer.new(doc.site, self, site.site_payload).run
+    end
+
+    def place_in_layout?
+      false
+    end
+
     protected
 
     # Internal: Extract excerpt from the content
     #
-    # By default excerpt is your first paragraph of a post: everything before
+    # By default excerpt is your first paragraph of a doc: everything before
     # the first two new lines:
     #
     #     ---
@@ -86,16 +98,16 @@ module Jekyll
     #     [1]: http://example.com/
     #
     # This is fairly good option for Markdown and Textile files. But might cause
-    # problems for HTML posts (which is quite unusual for Jekyll). If default
+    # problems for HTML docs (which is quite unusual for Jekyll). If default
     # excerpt delimiter is not good for you, you might want to set your own via
     # configuration option `excerpt_separator`. For example, following is a good
-    # alternative for HTML posts:
+    # alternative for HTML docs:
     #
     #     # file: _config.yml
     #     excerpt_separator: "<!-- more -->"
     #
     # Notice that all markdown-style link references will be appended to the
-    # excerpt. So the example post above will have this excerpt source:
+    # excerpt. So the example doc above will have this excerpt source:
     #
     #     First paragraph with [link][1].
     #
@@ -104,8 +116,8 @@ module Jekyll
     # Excerpts are rendered same time as content is rendered.
     #
     # Returns excerpt String
-    def extract_excerpt(post_content)
-      head, _, tail = post_content.to_s.partition(post.excerpt_separator)
+    def extract_excerpt(doc_content)
+      head, _, tail = doc_content.to_s.partition(doc.excerpt_separator)
 
       if tail.empty?
         head

data/lib/jekyll/hooks.rb

@@ -17,19 +17,19 @@ module Jekyll
         pre_render: [],
         post_write: [],
       },
-      :page => {
+      :pages => {
         post_init: [],
         pre_render: [],
         post_render: [],
         post_write: [],
       },
-      :post => {
+      :posts => {
         post_init: [],
         pre_render: [],
         post_render: [],
         post_write: [],
       },
-      :document => {
+      :documents => {
         pre_render: [],
         post_render: [],
         post_write: [],
@@ -57,10 +57,12 @@ module Jekyll
 
     # register a single hook to be called later, internal API
     def self.register_one(owner, event, priority, &block)
-      unless @registry[owner]
-        raise NotAvailable, "Hooks are only available for the following " <<
-          "classes: #{@registry.keys.inspect}"
-      end
+      @registry[owner] ||={
+        post_init: [],
+        pre_render: [],
+        post_render: [],
+        post_write: [],
+      }
 
       unless @registry[owner][event]
         raise NotAvailable, "Invalid hook. #{owner} supports only the " <<

data/lib/jekyll/page.rb

@@ -36,7 +36,7 @@ module Jekyll
         site.frontmatter_defaults.find(File.join(dir, name), type, key)
       end
 
-      Jekyll::Hooks.trigger :page, :post_init, self
+      Jekyll::Hooks.trigger :pages, :post_init, self
     end
 
     # The generated directory into which the page will be placed

data/lib/jekyll/publisher.rb

@@ -15,7 +15,7 @@ module Jekyll
     end
 
     def hidden_in_the_future?(thing)
-      thing.is_a?(Post) && !@site.future && thing.date > @site.time
+      thing.respond_to?(:date) && !@site.future && thing.date.to_i > @site.time.to_i
     end
   end
-end
+end

data/lib/jekyll/reader.rb

@@ -22,12 +22,12 @@ module Jekyll
 
     # Sorts posts, pages, and static files.
     def sort_files!
-      site.posts.sort!
+      site.collections.values.each{|c| c.docs.sort!}
       site.pages.sort_by!(&:name)
       site.static_files.sort_by!(&:relative_path)
     end
 
-    # Recursively traverse directories to find posts, pages and static files
+    # Recursively traverse directories to find pages and static files
     # that will become part of the site according to the rules in
     # filter_entries.
     #
@@ -56,8 +56,8 @@ module Jekyll
     #
     # Returns nothing.
     def retrieve_posts(dir)
-      site.posts.concat(PostReader.new(site).read(dir))
-      site.posts.concat(DraftReader.new(site).read(dir)) if site.show_drafts
+      site.posts.docs.concat(PostReader.new(site).read_posts(dir))
+      site.posts.docs.concat(PostReader.new(site).read_drafts(dir)) if site.show_drafts
     end
 
     # Recursively traverse directories with the read_directories function.

data/lib/jekyll/readers/collection_reader.rb

@@ -1,5 +1,7 @@
 module Jekyll
   class CollectionReader
+    SPECIAL_COLLECTIONS = %w{posts data}.freeze
+
     attr_reader :site, :content
     def initialize(site)
       @site = site
@@ -11,9 +13,9 @@ module Jekyll
     # Returns nothing.
     def read
       site.collections.each do |_, collection|
-        collection.read unless collection.label.eql?('data')
+        collection.read unless SPECIAL_COLLECTIONS.include?(collection.label)
       end
     end
 
   end
-end
+end

data/lib/jekyll/readers/post_reader.rb

@@ -3,18 +3,40 @@ module Jekyll
     attr_reader :site, :unfiltered_content
     def initialize(site)
       @site = site
-      @unfiltered_content = Array.new
     end
 
-    # Read all the files in <source>/<dir>/_posts and create a new Post
+    # Read all the files in <source>/<dir>/_drafts and create a new
+    # Document object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read_drafts(dir)
+      read_publishable(dir, '_drafts', Document::DATELESS_FILENAME_MATCHER)
+    end
+
+    # Read all the files in <source>/<dir>/_posts and create a new Document
     # object with each one.
     #
     # dir - The String relative path of the directory to read.
     #
     # Returns nothing.
-    def read(dir)
-      @unfiltered_content = read_content(dir, '_posts')
-      @unfiltered_content.select{ |post| site.publisher.publish?(post) }
+    def read_posts(dir)
+      read_publishable(dir, '_posts', Document::DATE_FILENAME_MATCHER)
+    end
+
+    # Read all the files in <source>/<dir>/<magic_dir> and create a new
+    # Document object with each one insofar as it matches the regexp matcher.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read_publishable(dir, magic_dir, matcher)
+      read_content(dir, magic_dir, matcher).tap do |docs|
+        docs.each(&:read)
+      end.select do |doc|
+        site.publisher.publish?(doc)
+      end
     end
 
     # Read all the content files from <source>/<dir>/magic_dir
@@ -26,12 +48,15 @@ module Jekyll
     # klass - The return type of the content.
     #
     # Returns klass type of content files
-    def read_content(dir, magic_dir)
+    def read_content(dir, magic_dir, matcher)
       @site.reader.get_entries(dir, magic_dir).map do |entry|
-        Post.new(site, site.source, dir, entry) if Post.valid?(entry)
-      end.reject do |entry|
-        entry.nil?
-      end
+        next unless entry =~ matcher
+        path = @site.in_source_dir(File.join(dir, magic_dir, entry))
+        Document.new(path, {
+          site: @site,
+          collection: @site.posts
+        })
+      end.reject(&:nil?)
     end
   end
 end

data/lib/jekyll/regenerator.rb

@@ -17,8 +17,8 @@ module Jekyll
     # Returns a boolean.
     def regenerate?(document)
       case document
-      when Post, Page
-        document.asset_file? || document.data['regenerate'] || 
+      when Page
+        document.asset_file? || document.data['regenerate'] ||
           source_modified_or_dest_missing?(
             site.in_source_dir(document.relative_path), document.destination(@site.dest)
           )
@@ -87,7 +87,7 @@ module Jekyll
       return true if disabled?
 
       # objects that don't have a path are always regenerated
-      return true if path.nil? 
+      return true if path.nil?
 
       # Check for path in cache
       if cache.has_key? path
@@ -144,7 +144,7 @@ module Jekyll
     #
     # Returns a Boolean (true for disabled, false for enabled).
     def disabled?
-      @disabled = site.full_rebuild? if @disabled.nil?
+      @disabled = !site.incremental? if @disabled.nil?
       @disabled
     end
 

data/lib/jekyll/related_posts.rb

@@ -14,7 +14,7 @@ module Jekyll
     end
 
     def build
-      return [] unless site.posts.size > 1
+      return [] unless site.posts.docs.size > 1
 
       if site.lsi
         build_index
@@ -30,7 +30,7 @@ module Jekyll
         lsi = ClassifierReborn::LSI.new(:auto_rebuild => false)
         display("Populating LSI...")
 
-        site.posts.each do |x|
+        site.posts.docs.each do |x|
           lsi.add_item(x)
         end
 
@@ -46,7 +46,7 @@ module Jekyll
     end
 
     def most_recent_posts
-      @most_recent_posts ||= (site.posts.reverse - [post]).first(10)
+      @most_recent_posts ||= (site.posts.docs.reverse - [post]).first(10)
     end
 
     def display(output)

data/lib/jekyll/renderer.rb

@@ -23,7 +23,7 @@ module Jekyll
     #
     # Returns the output extname including the leading period.
     def output_ext
-      converters.first.output_ext(document.extname)
+      @output_ext ||= converters.first.output_ext(document.extname)
     end
 
     ######################
@@ -31,11 +31,18 @@ module Jekyll
     ######################
 
     def run
+      Jekyll.logger.debug "Rendering:", document.relative_path
+
       payload = Utils.deep_merge_hashes({
         "page" => document.to_liquid
       }, site_payload || site.site_payload)
 
-      Jekyll::Hooks.trigger :document, :pre_render, document, payload
+      if document.collection.label == 'posts' && document.is_a?(Document)
+        payload['site']['related_posts'] = document.related_posts
+      end
+
+      Jekyll.logger.debug "Pre-Render Hooks:", document.relative_path
+      document.trigger_hooks(:pre_render, payload)
 
       info = {
         filters:   [Jekyll::Filters],
@@ -49,13 +56,16 @@ module Jekyll
       output = document.content
 
       if document.render_with_liquid?
+        Jekyll.logger.debug "Rendering Liquid:", document.relative_path
         output = render_liquid(output, payload, info, document.path)
       end
 
+      Jekyll.logger.debug "Rendering Markup:", document.relative_path
       output = convert(output)
       document.content = output
 
       if document.place_in_layout?
+        Jekyll.logger.debug "Rendering Layout:", document.relative_path
         place_in_layouts(
           output,
           payload,

data/lib/jekyll/site.rb

@@ -4,7 +4,7 @@ require 'csv'
 module Jekyll
   class Site
     attr_reader   :source, :dest, :config
-    attr_accessor :layouts, :posts, :pages, :static_files, :drafts,
+    attr_accessor :layouts, :pages, :static_files, :drafts,
                   :exclude, :include, :lsi, :highlighter, :permalink_style,
                   :time, :future, :unpublished, :safe, :plugins, :limit_posts,
                   :show_drafts, :keep_files, :baseurl, :data, :file_read_opts,
@@ -74,7 +74,6 @@ module Jekyll
     def reset
       self.time = (config['time'] ? Utils.parse_date(config['time'].to_s, "Invalid time in _config.yml.") : Time.now)
       self.layouts = {}
-      self.posts = []
       self.pages = []
       self.static_files = []
       self.data = {}
@@ -170,14 +169,14 @@ module Jekyll
         collection.docs.each do |document|
           if regenerator.regenerate?(document)
             document.output = Jekyll::Renderer.new(self, document, payload).run
-            Jekyll::Hooks.trigger :document, :post_render, document
+            document.trigger_hooks(:post_render)
           end
         end
       end
 
-      [posts, pages].flatten.each do |page_or_post|
-        if regenerator.regenerate?(page_or_post)
-          page_or_post.render(layouts, payload)
+      pages.flatten.each do |page|
+        if regenerator.regenerate?(page)
+          page.render(layouts, payload)
         end
       end
     rescue Errno::ENOENT
@@ -202,6 +201,10 @@ module Jekyll
       Jekyll::Hooks.trigger :site, :post_write, self
     end
 
+    def posts
+      collections['posts'] ||= Collection.new(self, 'posts')
+    end
+
     # Construct a Hash of Posts indexed by the specified Post attribute.
     #
     # post_attr - The String name of the Post attribute.
@@ -219,7 +222,7 @@ module Jekyll
       # Build a hash map based on the specified post attribute ( post attr =>
       # array of posts ) then sort each array in reverse order.
       hash = Hash.new { |h, key| h[key] = [] }
-      posts.each { |p| p.send(post_attr.to_sym).each { |t| hash[t] << p } }
+      posts.docs.each { |p| p.data[post_attr].each { |t| hash[t] << p } }
       hash.values.each { |posts| posts.sort!.reverse! }
       hash
     end
@@ -262,7 +265,7 @@ module Jekyll
         "site"   => Utils.deep_merge_hashes(config,
           Utils.deep_merge_hashes(Hash[collections.map{|label, coll| [label, coll.docs]}], {
             "time"         => time,
-            "posts"        => posts.sort { |a, b| b <=> a },
+            "posts"        => posts.docs.sort { |a, b| b <=> a },
             "pages"        => pages,
             "static_files" => static_files,
             "html_pages"   => pages.select { |page| page.html? || page.url.end_with?("/") },
@@ -330,7 +333,7 @@ module Jekyll
     end
 
     def each_site_file
-      %w(posts pages static_files docs_to_write).each do |type|
+      %w(pages static_files docs_to_write).each do |type|
         send(type).each do |item|
           yield item
         end
@@ -348,8 +351,8 @@ module Jekyll
     # 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']
+    def incremental?(override = {})
+      override['incremental'] || config['incremental']
     end
 
     # Returns the publisher or creates a new publisher if it doesn't
@@ -391,8 +394,8 @@ module Jekyll
     # Returns nothing
     def limit_posts!
       if limit_posts > 0
-        limit = posts.length < limit_posts ? posts.length : limit_posts
-        self.posts = posts[-limit, limit]
+        limit = posts.docs.length < limit_posts ? posts.docs.length : limit_posts
+        self.posts.docs = posts.docs[-limit, limit]
       end
     end