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

Rubocop: lib/jekyll/readers/layout_reader.rb

This commit is contained in:
Pat Hawks 2016-05-26 00:10:09 -05:00
parent 795bcdef68
commit e85690a61f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/jekyll/readers/layout_reader.rb
View File

@ -8,11 +8,13 @@ module Jekyll
def read def read
layout_entries.each do |layout_file| layout_entries.each do |layout_file|
@layouts[layout_name(layout_file)] = Layout.new(site, layout_directory, layout_file) @layouts[layout_name(layout_file)] = \
Layout.new(site, layout_directory, layout_file)
end end
theme_layout_entries.each do |layout_file| theme_layout_entries.each do |layout_file|
@layouts[layout_name(layout_file)] ||= Layout.new(site, theme_layout_directory, layout_file) @layouts[layout_name(layout_file)] ||= \
Layout.new(site, theme_layout_directory, layout_file)
end end
@layouts @layouts
@ -39,7 +41,7 @@ module Jekyll
def entries_in(dir) def entries_in(dir)
entries = [] entries = []
within(dir) do within(dir) do
entries = EntryFilter.new(site).filter(Dir['**/*.*']) entries = EntryFilter.new(site).filter(Dir["**/*.*"])
end end
entries entries
end end
@ -54,15 +56,13 @@ module Jekyll
end end
def layout_directory_inside_source def layout_directory_inside_source
site.in_source_dir(site.config['layouts_dir']) site.in_source_dir(site.config["layouts_dir"])
end end
def layout_directory_in_cwd def layout_directory_in_cwd
dir = Jekyll.sanitized_path(Dir.pwd, site.config['layouts_dir']) dir = Jekyll.sanitized_path(Dir.pwd, site.config["layouts_dir"])
if File.directory?(dir) && !site.safe if File.directory?(dir) && !site.safe
dir dir
else
nil
end end
end end
end end