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

Merge pull request #875 from mojombo/posts-cant-be-dirs 

Directories with valid post names should be filtered out
This commit is contained in:
Parker Moore 2013-04-07 12:54:42 -07:00
parent ccf9d19aea 8f890cb064
commit 0f2c9d29ee
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/jekyll/site.rb
View File

@ -405,6 +405,7 @@ module Jekyll
base = File.join(self.source, dir, subfolder) base = File.join(self.source, dir, subfolder)
return [] unless File.exists?(base) return [] unless File.exists?(base)
entries = Dir.chdir(base) { filter_entries(Dir['**/*']) } entries = Dir.chdir(base) { filter_entries(Dir['**/*']) }
entries.delete_if { |e| File.directory?(File.join(base, e)) }
end end
# Aggregate post information # Aggregate post information

0
test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep Normal file
View File

4
test/test_site.rb
View File

@ -161,6 +161,7 @@ class TestSite < Test::Unit::TestCase
should "read posts" do should "read posts" do
@site.read_posts('') @site.read_posts('')
posts = Dir[source_dir('_posts', '*')] posts = Dir[source_dir('_posts', '*')]
posts.delete_if { |post| File.directory?(post) }
assert_equal posts.size - 1, @site.posts.size assert_equal posts.size - 1, @site.posts.size
end end
@ -169,9 +170,10 @@ class TestSite < Test::Unit::TestCase
@site.process @site.process
posts = Dir[source_dir("**", "_posts", "*")] posts = Dir[source_dir("**", "_posts", "*")]
posts.delete_if { |post| File.directory?(post) }
categories = %w(bar baz category foo z_category publish_test win).sort categories = %w(bar baz category foo z_category publish_test win).sort
assert_equal posts.size - 1, @site.posts.size assert_equal posts.size, @site.posts.size
assert_equal categories, @site.categories.keys.sort assert_equal categories, @site.categories.keys.sort
assert_equal 4, @site.categories['foo'].size assert_equal 4, @site.categories['foo'].size
end end