Merge pull request #629 from vyper/master

Added stringex and changed to use #to_url for create directory.
This commit is contained in:
Parker Moore 2013-03-05 14:58:55 -08:00
commit e2596c02cb

View File

@ -19,6 +19,8 @@
# - category_title_prefix: The string used before the category name in the page title (default is # - category_title_prefix: The string used before the category name in the page title (default is
# 'Category: '). # 'Category: ').
require 'stringex'
module Jekyll module Jekyll
# The CategoryIndex class creates a single category page for the specified category. # The CategoryIndex class creates a single category page for the specified category.
@ -106,7 +108,7 @@ module Jekyll
if self.layouts.key? 'category_index' if self.layouts.key? 'category_index'
dir = self.config['category_dir'] || 'categories' dir = self.config['category_dir'] || 'categories'
self.categories.keys.each do |category| self.categories.keys.each do |category|
self.write_category_index(File.join(dir, category.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase), category) self.write_category_index(File.join(dir, category.to_url), category)
end end
# Throw an exception if the layout couldn't be found. # Throw an exception if the layout couldn't be found.
@ -171,7 +173,7 @@ ERR
# #
def category_link(category) def category_link(category)
dir = @context.registers[:site].config['category_dir'] dir = @context.registers[:site].config['category_dir']
"<a class='category' href='/#{dir}/#{category.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase}/'>#{category}</a>" "<a class='category' href='/#{dir}/#{category.to_url}/'>#{category}</a>"
end end
# Outputs the post.date as formatted html, with hooks for CSS styling. # Outputs the post.date as formatted html, with hooks for CSS styling.