From e27a65d9e3ef674592e4584093f3445d2e0d8d37 Mon Sep 17 00:00:00 2001 From: Anatoliy Yastreb Date: Tue, 4 Oct 2016 19:39:41 +0100 Subject: [PATCH] Sanitize directory name as a key --- lib/jekyll/readers/data_reader.rb | 2 +- test/test_site.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/readers/data_reader.rb b/lib/jekyll/readers/data_reader.rb index 20474011..370a6893 100644 --- a/lib/jekyll/readers/data_reader.rb +++ b/lib/jekyll/readers/data_reader.rb @@ -38,7 +38,7 @@ module Jekyll next if @entry_filter.symlink?(path) if File.directory?(path) - read_data_to(path, data[entry] = {}) + read_data_to(path, data[sanitize_filename(entry)] = {}) else key = sanitize_filename(File.basename(entry, ".*")) data[key] = read_data_file(path) diff --git a/test/test_site.rb b/test/test_site.rb index 5cd20b64..4f527281 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -446,9 +446,9 @@ class TestSite < JekyllUnitTest source_dir, "_data", "categories.01", "dairy.yaml" )) - assert_equal site.data["categories.01"]["dairy"], file_content + assert_equal site.data["categories01"]["dairy"], file_content assert_equal( - site.site_payload["site"]["data"]["categories.01"]["dairy"], + site.site_payload["site"]["data"]["categories01"]["dairy"], file_content ) end