Merge pull request #684 from mattr-/issue-680.

This commit is contained in:
Parker Moore 2013-01-18 10:28:14 -05:00
commit f231ef7644
5 changed files with 28 additions and 1 deletions

View File

@ -42,6 +42,9 @@ Gem::Specification.new do |s|
s.add_development_dependency('redcarpet', "~> 2.1.1")
s.add_development_dependency('launchy', "~> 2.1.2")
s.add_development_dependency('simplecov', "~> 0.7")
s.add_development_dependency('sequel', "~> 3.42")
s.add_development_dependency('htmlentities', "~> 4.3")
s.add_development_dependency('hpricot', "~> 0.8")
# = MANIFEST =
s.files = %w[

View File

@ -276,6 +276,7 @@ module Jekyll
text.gsub!(">", ">")
text.gsub!(""", '"')
text.gsub!("'", "'")
text.gsub!("/", "/")
text
end

View File

@ -19,7 +19,7 @@ module Jekyll
permalink_title = item.at('wp:post_name').inner_text
# Fallback to "prettified" title if post_name is empty (can happen)
if permalink_title == ""
permalink_title = title.downcase.split.join('-')
permalink_title = sluggify(title)
end
date = Time.parse(item.at('wp:post_date').inner_text)
@ -74,5 +74,9 @@ module Jekyll
puts "Imported #{value} #{key}s"
end
end
def self.sluggify(title)
title.downcase.split.join('-').gsub('/','-')
end
end
end

View File

@ -0,0 +1,10 @@
require 'helper'
require 'jekyll/migrators/wordpress'
require 'htmlentities'
class TestWordpressMigrator < Test::Unit::TestCase
should "clean slashes from slugs" do
test_title = "blogs part 1/2"
assert_equal("blogs-part-1-2", Jekyll::WordPress.sluggify(test_title))
end
end

View File

@ -0,0 +1,9 @@
require 'helper'
require 'jekyll/migrators/wordpressdotcom'
class TestWordpressDotComMigrator < Test::Unit::TestCase
should "clean slashes from slugs" do
test_title = "blogs part 1/2"
assert_equal("blogs-part-1-2", Jekyll::WordpressDotCom.sluggify(test_title))
end
end