From b68229aa2caaaa82117e7a321fe3217b6643926d Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Mon, 17 Feb 2014 22:13:29 -0600 Subject: [PATCH] Make LayoutReader#layout_directory public. Since it's being used in a test, let's go ahead and expose it instead of dealing with using Object#send to send the message along. --- lib/jekyll/layout_reader.rb | 8 ++++---- test/test_layout_reader.rb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/jekyll/layout_reader.rb b/lib/jekyll/layout_reader.rb index 949a69ec..66854339 100644 --- a/lib/jekyll/layout_reader.rb +++ b/lib/jekyll/layout_reader.rb @@ -14,6 +14,10 @@ module Jekyll @layouts end + def layout_directory + @layout_directory ||= (layout_directory_in_cwd || layout_directory_inside_source) + end + private def layout_entries @@ -33,10 +37,6 @@ module Jekyll Dir.chdir(directory) { yield } end - def layout_directory - @layout_directory = (layout_directory_in_cwd || layout_directory_inside_source) - end - def layout_directory_inside_source # TODO: Fix for Windows File.join(site.source, File.expand_path(site.config['layouts'], "/")) diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb index 2bf50d7d..ff979c2b 100644 --- a/test/test_layout_reader.rb +++ b/test/test_layout_reader.rb @@ -16,7 +16,7 @@ class TestLayoutReader < Test::Unit::TestCase context "when no _layouts directory exists in CWD" do should "know to use the layout directory relative to the site source" do - assert_equal LayoutReader.new(@site).send(:layout_directory), source_dir("_layouts") + assert_equal LayoutReader.new(@site).layout_directory, source_dir("_layouts") end end @@ -27,7 +27,7 @@ class TestLayoutReader < Test::Unit::TestCase end should "know to use the layout directory relative to CWD" do - assert_equal LayoutReader.new(@site).send(:layout_directory), source_dir("blah/_layouts") + assert_equal LayoutReader.new(@site).layout_directory, source_dir("blah/_layouts") end end end