dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3204 from jekyll/sort-static-files-once

This commit is contained in:
Parker Moore 2014-12-26 23:05:04 -05:00
parent a8ec9cd507 b6641be8ef
commit f81601ee53
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/jekyll/renderer.rb
View File

@ -3,11 +3,12 @@
module Jekyll module Jekyll
class Renderer class Renderer
attr_reader :document, :site attr_reader :document, :site, :site_payload
def initialize(site, document) def initialize(site, document, site_payload = nil)
@site = site @site = site
@document = document @document = document
@site_payload = site_payload
end end
# Determine which converters to use based on this document's # Determine which converters to use based on this document's
@ -32,7 +33,7 @@ module Jekyll
def run def run
payload = Utils.deep_merge_hashes({ payload = Utils.deep_merge_hashes({
"page" => document.to_liquid "page" => document.to_liquid
}, site.site_payload) }, site_payload || site.site_payload)
info = { info = {
filters: [Jekyll::Filters], filters: [Jekyll::Filters],

6
lib/jekyll/site.rb
View File

@ -187,6 +187,7 @@ module Jekyll
end end
pages.sort_by!(&:name) pages.sort_by!(&:name)
static_files.sort_by!(&:relative_path)
end end
# Read all the files in <source>/<dir>/_posts and create a new Post # Read all the files in <source>/<dir>/_posts and create a new Post
@ -291,9 +292,10 @@ module Jekyll
def render def render
relative_permalinks_deprecation_method relative_permalinks_deprecation_method
payload = site_payload
collections.each do |label, collection| collections.each do |label, collection|
collection.docs.each do |document| collection.docs.each do |document|
document.output = Jekyll::Renderer.new(self, document).run if document.regenerate? document.output = Jekyll::Renderer.new(self, document, payload).run if document.regenerate?
end end
end end
@ -384,7 +386,7 @@ module Jekyll
"time" => time, "time" => time,
"posts" => posts.sort { |a, b| b <=> a }, "posts" => posts.sort { |a, b| b <=> a },
"pages" => pages, "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?("/") }, "html_pages" => pages.select { |page| page.html? || page.url.end_with?("/") },
"categories" => post_attr_hash('categories'), "categories" => post_attr_hash('categories'),
"tags" => post_attr_hash('tags'), "tags" => post_attr_hash('tags'),

8
lib/jekyll/static_file.rb
View File

@ -3,6 +3,8 @@ module Jekyll
# The cache of last modification times [path] -> mtime. # The cache of last modification times [path] -> mtime.
@@mtimes = Hash.new @@mtimes = Hash.new
attr_reader :relative_path
# Initialize a new StaticFile. # Initialize a new StaticFile.
# #
# site - The Site. # site - The Site.
@ -15,6 +17,7 @@ module Jekyll
@dir = dir @dir = dir
@name = name @name = name
@collection = collection @collection = collection
@relative_path = File.join(*[@dir, @name].compact)
end end
# Returns source file path. # Returns source file path.
@ -22,11 +25,6 @@ module Jekyll
File.join(*[@base, @dir, @name].compact) File.join(*[@base, @dir, @name].compact)
end end
# Returns the source file path relative to the site source
def relative_path
@relative_path ||= File.join(*[@dir, @name].compact)
end
def extname def extname
File.extname(path) File.extname(path)
end end