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

Correctly access the StaticFile's site variable.

This commit is contained in:
Parker Moore 2014-09-07 13:09:29 -07:00
parent 9cbc24fce5
commit 3762878381
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jekyll/static_file.rb
View File

@ -37,7 +37,7 @@ module Jekyll
# #
# Returns destination file path. # Returns destination file path.
def destination(dest) def destination(dest)
dest = site.in_dest_dir(dest) dest = @site.in_dest_dir(dest)
Jekyll.sanitized_path(dest, File.join(*[destination_rel_dir, @name].compact)) Jekyll.sanitized_path(dest, File.join(*[destination_rel_dir, @name].compact))
end end

18
test/test_cleaner.rb
View File

@ -4,15 +4,16 @@ class TestCleaner < Test::Unit::TestCase
context "directory in keep_files" do context "directory in keep_files" do
setup do setup do
clear_dest clear_dest
stub(Jekyll).configuration do
Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
end
FileUtils.mkdir_p(dest_dir('to_keep/child_dir')) FileUtils.mkdir_p(dest_dir('to_keep/child_dir'))
FileUtils.touch(File.join(dest_dir('to_keep'), 'index.html')) FileUtils.touch(File.join(dest_dir('to_keep'), 'index.html'))
FileUtils.touch(File.join(dest_dir('to_keep/child_dir'), 'index.html')) FileUtils.touch(File.join(dest_dir('to_keep/child_dir'), 'index.html'))
@site = Site.new(Jekyll.configuration) @site = Site.new(Jekyll.configuration({
"skip_config_files" => true,
"source" => source_dir,
"destination" => dest_dir
}))
@site.keep_files = ['to_keep/child_dir'] @site.keep_files = ['to_keep/child_dir']
@cleaner = Site::Cleaner.new(@site) @cleaner = Site::Cleaner.new(@site)
@ -43,14 +44,15 @@ class TestCleaner < Test::Unit::TestCase
context "directory containing no files and non-empty directories" do context "directory containing no files and non-empty directories" do
setup do setup do
clear_dest clear_dest
stub(Jekyll).configuration do
Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
end
FileUtils.mkdir_p(source_dir('no_files_inside/child_dir')) FileUtils.mkdir_p(source_dir('no_files_inside/child_dir'))
FileUtils.touch(File.join(source_dir('no_files_inside/child_dir'), 'index.html')) FileUtils.touch(File.join(source_dir('no_files_inside/child_dir'), 'index.html'))
@site = Site.new(Jekyll.configuration) @site = Site.new(Jekyll.configuration({
"skip_config_files" => true,
"source" => source_dir,
"destination" => dest_dir
}))
@site.process @site.process
@cleaner = Site::Cleaner.new(@site) @cleaner = Site::Cleaner.new(@site)