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

Merge pull request #992 from maul-esel/consistent-page.url 

add leading slash to page.url and post.url
This commit is contained in:
Parker Moore 2013-05-05 13:56:15 -07:00
parent 8bd1e0f06e 9582a7cc84
commit ce999f12fc
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/jekyll/page.rb
View File

@ -78,6 +78,7 @@ module Jekyll
# sanitize url # sanitize url
@url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/') @url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/')
@url += "/" if url =~ /\/$/ @url += "/" if url =~ /\/$/
@url.gsub!(/\A([^\/])/, '/\1')
@url @url
end end

1
lib/jekyll/post.rb
View File

@ -228,6 +228,7 @@ module Jekyll
# sanitize url # sanitize url
@url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/') @url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/')
@url += "/" if url =~ /\/$/ @url += "/" if url =~ /\/$/
@url.gsub!(/\A([^\/])/, '/\1')
@url @url
end end

3
site/_posts/2012-07-01-variables.md
View File

@ -176,7 +176,8 @@ following is a reference of the available data.
<td><p><code>page.url</code></p></td> <td><p><code>page.url</code></p></td>
<td><p> <td><p>
The URL of the Post without the domain. e.g. The URL of the Post without the domain, but
with a leading slash, e.g.
<code>/2008/12/14/my-post.html</code> <code>/2008/12/14/my-post.html</code>
</p></td> </p></td>

4
test/test_post.rb
View File

@ -71,8 +71,8 @@ class TestPost < Test::Unit::TestCase
@post.read_yaml(@source, file) @post.read_yaml(@source, file)
assert_equal "my_category/permalinked-post", @post.permalink assert_equal "my_category/permalinked-post", @post.permalink
assert_equal "my_category", @post.dir assert_equal "/my_category", @post.dir
assert_equal "my_category/permalinked-post", @post.url assert_equal "/my_category/permalinked-post", @post.url
end end
context "with CRLF linebreaks" do context "with CRLF linebreaks" do