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

Reduce allocations from Jekyll::Document instances (#7625) 

Merge pull request 7625
This commit is contained in:
Ashwin Maroli 2019-05-16 20:25:59 +05:30 committed by jekyllbot
parent 7cdbbaafa7
commit 7548132944
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/jekyll/document.rb
View File

@ -17,6 +17,20 @@ module Jekyll
SASS_FILE_EXTS = %w(.sass .scss).freeze SASS_FILE_EXTS = %w(.sass .scss).freeze
YAML_FILE_EXTS = %w(.yaml .yml).freeze YAML_FILE_EXTS = %w(.yaml .yml).freeze
#
# Class-wide cache to stash and retrieve regexp to detect "super-directories"
# of a particular Jekyll::Document object.
#
# dirname - The *special directory* for the Document.
# e.g. "_posts" or "_drafts" for Documents from the `site.posts` collection.
def self.superdirs_regex(dirname)
@superdirs_regex ||= {}
@superdirs_regex[dirname] ||= %r!#{dirname}.*!
end
#
# Create a new Document. # Create a new Document.
# #
# path - the path to the file # path - the path to the file
@ -404,28 +418,29 @@ module Jekyll
# #
# Returns nothing. # Returns nothing.
def categories_from_path(special_dir) def categories_from_path(special_dir)
superdirs = relative_path.sub(%r!#{special_dir}(.*)!, "") superdirs = relative_path.sub(Document.superdirs_regex(special_dir), "")
.split(File::SEPARATOR) superdirs = superdirs.split(File::SEPARATOR)
.reject do |c| superdirs.reject! { |c| c.empty? || c == special_dir || c == basename }
c.empty? || c == special_dir || c == basename
end
merge_data!({ "categories" => superdirs }, :source => "file path") merge_data!({ "categories" => superdirs }, :source => "file path")
end end
def populate_categories def populate_categories
merge_data!( categories = Array(data["categories"]) + Utils.pluralized_array_from_hash(
"categories" => (
Array(data["categories"]) + Utils.pluralized_array_from_hash(
data, "category", "categories" data, "category", "categories"
) )
).map(&:to_s).flatten.uniq categories.map!(&:to_s)
) categories.flatten!
categories.uniq!
merge_data!("categories" => categories)
end end
def populate_tags def populate_tags
merge_data!( tags = Utils.pluralized_array_from_hash(data, "tag", "tags")
"tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten tags.flatten!
)
merge_data!("tags" => tags)
end end
private private