Skip to content

Commit

Permalink
Correctly generates file basename. Fixes jekyll#208.
Browse files Browse the repository at this point in the history
The previous procedure generated invalid basenames when the filename had
more than one dot.
  • Loading branch information
lpenz committed Sep 5, 2010
1 parent 3fa9af1 commit b1049c8
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 1 deletion.
4 changes: 4 additions & 0 deletions History.txt
@@ -1,3 +1,7 @@
== HEAD
* Bug Fixes
* Fixed filename basename generation (#208)

== 0.7.0 / 2010-08-24
* Minor Enhancements
* Add support for rdiscount extensions (#173)
Expand Down
2 changes: 1 addition & 1 deletion lib/jekyll/page.rb
Expand Up @@ -71,7 +71,7 @@ def url
# Returns nothing
def process(name)
self.ext = File.extname(name)
self.basename = name.split('.')[0..-2].first
self.basename = name[0 .. -self.ext.length-1]
end

# Add any necessary layouts to this post
Expand Down
7 changes: 7 additions & 0 deletions test/source/deal.with.dots.html
@@ -0,0 +1,7 @@
---
title: Deal with dots
permalink: /deal.with.dots/
---

Let's test if jekyll deals properly with dots.

10 changes: 10 additions & 0 deletions test/test_page.rb
Expand Up @@ -23,6 +23,16 @@ def do_render(page)
assert_equal "/contacts.html", @page.url
end

should "deal properly with extensions" do
@page = setup_page('deal.with.dots.html')
assert_equal ".html", @page.ext
end

should "deal properly with dots" do
@page = setup_page('deal.with.dots.html')
assert_equal "deal.with.dots", @page.basename
end

context "with pretty url style" do
setup do
@site.permalink_style = :pretty
Expand Down

0 comments on commit b1049c8

Please sign in to comment.