From 6f6ad001d2dcbda7f6acb1dd66e553be12bf585a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 19 Mar 2013 21:59:06 +0100 Subject: [PATCH 1/2] Ignore entries if they are directories. --- lib/jekyll/site.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index b4b40442..b3876722 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -405,6 +405,7 @@ module Jekyll base = File.join(self.source, dir, subfolder) return [] unless File.exists?(base) entries = Dir.chdir(base) { filter_entries(Dir['**/*']) } + entries.delete_if { |e| File.directory?(File.join(base, e)) } end # Aggregate post information From 8f890cb064675321d506229c104d332aa4856ca6 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 19 Mar 2013 21:59:43 +0100 Subject: [PATCH 2/2] Fix tests that fail due to having a directory that looks like a post --- test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep | 0 test/test_site.rb | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep diff --git a/test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep b/test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_site.rb b/test/test_site.rb index 6934596f..558cd779 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -161,6 +161,7 @@ class TestSite < Test::Unit::TestCase should "read posts" do @site.read_posts('') posts = Dir[source_dir('_posts', '*')] + posts.delete_if { |post| File.directory?(post) } assert_equal posts.size - 1, @site.posts.size end @@ -169,9 +170,10 @@ class TestSite < Test::Unit::TestCase @site.process posts = Dir[source_dir("**", "_posts", "*")] + posts.delete_if { |post| File.directory?(post) } 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 4, @site.categories['foo'].size end