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

Rename 'slug' to 'sluggify' and clean up code

This commit is contained in:
Chris Frederick 2014-09-01 16:25:42 +09:00
parent be2b16507e
commit 05d65f0341
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/jekyll/document.rb
View File

@ -45,15 +45,19 @@ module Jekyll
File.basename(path, suffix) File.basename(path, suffix)
end end
# A sluggified filename or title. # Sluggify a filename or title.
# #
# name - the filename or title to sluggify # name - the filename or title to sluggify
# #
# Returns the given filename or title in lowercase, with every # Returns the given filename or title in lowercase, with every
# sequence of spaces and non-alphanumeric characters replaced with a # sequence of spaces and non-alphanumeric characters replaced with a
# hyphen. # hyphen.
def slug(name) def sluggify(name)
name.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-') if name.nil?
nil
else
name.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-')
end
end end
# The extension name of the document. # The extension name of the document.
@ -136,14 +140,12 @@ module Jekyll
# #
# Returns the Hash of key-value pairs for replacement in the URL. # Returns the Hash of key-value pairs for replacement in the URL.
def url_placeholders def url_placeholders
name_slug = slug(File.basename(path, ".*"))
title_slug = data['title'].nil? ? name_slug : slug(data['title'])
{ {
collection: collection.label, collection: collection.label,
path: cleaned_relative_path, path: cleaned_relative_path,
output_ext: Jekyll::Renderer.new(site, self).output_ext, output_ext: Jekyll::Renderer.new(site, self).output_ext,
name: name_slug, name: sluggify(basename(".*")),
title: title_slug title: sluggify(data['title']) || sluggify(basename(".*"))
} }
end end