test/source/sitemap.xml @@ -26,11 +26,13 @@ Feature: Fancy permalinks Scenario: Use pretty permalink schema for pages Given I have an "index.html" page that contains "Totally index" And I have an "awesome.html" page that contains "Totally awesome" + And I have an "sitemap.xml" page that contains "Totally uhm, sitemap" And I have a configuration file with "permalink" set to "pretty" When I run jekyll Then the _site directory should exist And I should see "Totally index" in "_site/index.html" And I should see "Totally awesome" in "_site/awesome/index.html" + And I should see "Totally uhm, sitemap" in "_site/sitemap.xml" Scenario: Use custom permalink schema with prefix Given I have a _posts directory features/permalinks.feature @@ -57,7 +57,7 @@ module Jekyll def url return permalink if permalink - @url ||= template.gsub(':name', basename) + @url ||= (ext == '.html') ? template.gsub(':name', basename) : "/#{name}" end # Extract information from the page filename @@ -91,7 +91,7 @@ module Jekyll # The url needs to be unescaped in order to preserve the correct filename path = File.join(dest, CGI.unescape(self.url)) - if self.url[/\.html$/].nil? + if self.ext == '.html' && self.url[/\.html$/].nil? FileUtils.mkdir_p(path) path = File.join(path, "index.html") end lib/jekyll/page.rb @@ -81,6 +81,17 @@ class TestPage < Test::Unit::TestCase assert File.exists?(File.join(dest_dir, 'contacts', 'index.html')) end + should "write properly with extension different from html" do + page = setup_page("sitemap.xml") + page.site.permalink_style = :pretty + do_render(page) + page.write(dest_dir) + + assert_equal("/sitemap.xml", page.url) + assert_nil(page.url[/\.html$/]) + assert File.directory?(dest_dir) + assert File.exists?(File.join(dest_dir,'sitemap.xml')) + end end end test/test_page.rb f1c8e388e406e2cc022354562d8bd683d1262072 Jeffry Degrande jeffry@jeffrydegrande.com http://github.com/mojombo/jekyll/commit/176c047ff16493205f9ed17df36f989598443570 176c047ff16493205f9ed17df36f989598443570 2009-07-14T16:17:44-07:00 2009-06-29T04:40:31-07:00 bugfix for permalinks Signed-off-by: Nick Quaranto <nick@quaran.to> ea4966a92b84b5421564840c951e7245a02863f7 Nick Quaranto nick@quaran.to