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

Merge pull request #3014 from jekyll/revert-3013-revert-2921-post-dest

This commit is contained in:
Parker Moore 2015-01-17 15:13:17 -08:00
parent 3d69582d36 004f923644
commit a312115a5a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/permalinks.feature
View File

@ -39,7 +39,7 @@ Feature: Fancy permalinks
And I have the following post: And I have the following post:
| title | category | date | content | | title | category | date | content |
| Custom Permalink Schema | stuff | 2009-03-27 | Totally custom. | | Custom Permalink Schema | stuff | 2009-03-27 | Totally custom. |
And I have a configuration file with "permalink" set to "/blog/:year/:month/:day/:title" And I have a configuration file with "permalink" set to "/blog/:year/:month/:day/:title/"
When I run jekyll build When I run jekyll build
Then the _site directory should exist Then the _site directory should exist
And I should see "Totally custom." in "_site/blog/2009/03/27/custom-permalink-schema/index.html" And I should see "Totally custom." in "_site/blog/2009/03/27/custom-permalink-schema/index.html"
@ -68,7 +68,7 @@ Feature: Fancy permalinks
Given I have a _posts directory Given I have a _posts directory
And I have the following post: And I have the following post:
| title | date | permalink | content | | title | date | permalink | content |
| Some post | 2013-04-14 | /custom/posts/1 | bla bla | | Some post | 2013-04-14 | /custom/posts/1/ | bla bla |
When I run jekyll build When I run jekyll build
Then the _site directory should exist Then the _site directory should exist
And the _site/custom/posts/1 directory should exist And the _site/custom/posts/1 directory should exist

2
lib/jekyll/post.rb
View File

@ -278,7 +278,7 @@ module Jekyll
def destination(dest) def destination(dest)
# The url needs to be unescaped in order to preserve the correct filename # The url needs to be unescaped in order to preserve the correct filename
path = site.in_dest_dir(dest, URL.unescape_path(url)) path = site.in_dest_dir(dest, URL.unescape_path(url))
path = File.join(path, "index.html") if path[/\.html?$/].nil? path = File.join(path, "index.html") if self.url =~ /\/$/
path path
end end

2
test/test_post.rb
View File

@ -653,7 +653,7 @@ class TestPost < Test::Unit::TestCase
should "write properly without html extension" do should "write properly without html extension" do
post = setup_post("2008-10-18-foo-bar.textile") post = setup_post("2008-10-18-foo-bar.textile")
post.site.permalink_style = ":title" post.site.permalink_style = ":title/"
do_render(post) do_render(post)
post.write(dest_dir) post.write(dest_dir)