lib/jekyll/readers/layout_reader.rb in jekyll-4.2.1 vs lib/jekyll/readers/layout_reader.rb in jekyll-4.2.2
- old
+ new
@@ -1,62 +1,62 @@
-# frozen_string_literal: true
-
-module Jekyll
- class LayoutReader
- attr_reader :site
-
- def initialize(site)
- @site = site
- @layouts = {}
- end
-
- def read
- layout_entries.each do |layout_file|
- @layouts[layout_name(layout_file)] = \
- Layout.new(site, layout_directory, layout_file)
- end
-
- theme_layout_entries.each do |layout_file|
- @layouts[layout_name(layout_file)] ||= \
- Layout.new(site, theme_layout_directory, layout_file)
- end
-
- @layouts
- end
-
- def layout_directory
- @layout_directory ||= site.in_source_dir(site.config["layouts_dir"])
- end
-
- def theme_layout_directory
- @theme_layout_directory ||= site.theme.layouts_path if site.theme
- end
-
- private
-
- def layout_entries
- entries_in layout_directory
- end
-
- def theme_layout_entries
- theme_layout_directory ? entries_in(theme_layout_directory) : []
- end
-
- def entries_in(dir)
- entries = []
- within(dir) do
- entries = EntryFilter.new(site).filter(Dir["**/*.*"])
- end
- entries
- end
-
- def layout_name(file)
- file.split(".")[0..-2].join(".")
- end
-
- def within(directory)
- return unless File.exist?(directory)
-
- Dir.chdir(directory) { yield }
- end
- end
-end
+# frozen_string_literal: true
+
+module Jekyll
+ class LayoutReader
+ attr_reader :site
+
+ def initialize(site)
+ @site = site
+ @layouts = {}
+ end
+
+ def read
+ layout_entries.each do |layout_file|
+ @layouts[layout_name(layout_file)] = \
+ Layout.new(site, layout_directory, layout_file)
+ end
+
+ theme_layout_entries.each do |layout_file|
+ @layouts[layout_name(layout_file)] ||= \
+ Layout.new(site, theme_layout_directory, layout_file)
+ end
+
+ @layouts
+ end
+
+ def layout_directory
+ @layout_directory ||= site.in_source_dir(site.config["layouts_dir"])
+ end
+
+ def theme_layout_directory
+ @theme_layout_directory ||= site.theme.layouts_path if site.theme
+ end
+
+ private
+
+ def layout_entries
+ entries_in layout_directory
+ end
+
+ def theme_layout_entries
+ theme_layout_directory ? entries_in(theme_layout_directory) : []
+ end
+
+ def entries_in(dir)
+ entries = []
+ within(dir) do
+ entries = EntryFilter.new(site).filter(Dir["**/*.*"])
+ end
+ entries
+ end
+
+ def layout_name(file)
+ file.split(".")[0..-2].join(".")
+ end
+
+ def within(directory)
+ return unless File.exist?(directory)
+
+ Dir.chdir(directory) { yield }
+ end
+ end
+end