From 795bcdef686d9be7d0ec9c19c2ea3d42014a5793 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Thu, 26 May 2016 00:09:46 -0500 Subject: [PATCH 1/7] Rubocop: lib/jekyll/reader.rb --- lib/jekyll/reader.rb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb index c9ded560..abbe923f 100644 --- a/lib/jekyll/reader.rb +++ b/lib/jekyll/reader.rb @@ -1,5 +1,5 @@ # encoding: UTF-8 -require 'csv' +require "csv" module Jekyll class Reader @@ -16,7 +16,7 @@ module Jekyll @site.layouts = LayoutReader.new(site).read read_directories sort_files! - @site.data = DataReader.new(site).read(site.config['data_dir']) + @site.data = DataReader.new(site).read(site.config["data_dir"]) CollectionReader.new(site).read end @@ -34,13 +34,15 @@ module Jekyll # dir - The String relative path of the directory to read. Default: ''. # # Returns nothing. - def read_directories(dir = '') + def read_directories(dir = "") base = site.in_source_dir(dir) - dot = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) } + dot = Dir.chdir(base) { filter_entries(Dir.entries("."), base) } dot_dirs = dot.select { |file| File.directory?(@site.in_source_dir(base, file)) } dot_files = (dot - dot_dirs) - dot_pages = dot_files.select { |file| Utils.has_yaml_header?(@site.in_source_dir(base, file)) } + dot_pages = dot_files.select do |file| + Utils.has_yaml_header?(@site.in_source_dir(base, file)) + end dot_static_files = dot_files - dot_pages retrieve_posts(dir) @@ -71,7 +73,9 @@ module Jekyll dot_dirs.map do |file| dir_path = site.in_source_dir(dir, file) rel_path = File.join(dir, file) - @site.reader.read_directories(rel_path) unless @site.dest.sub(/\/$/, '') == dir_path + unless @site.dest.sub(%r!/$!, "") == dir_path + @site.reader.read_directories(rel_path) + end end end @@ -119,7 +123,7 @@ module Jekyll def get_entries(dir, subfolder) base = site.in_source_dir(dir, subfolder) return [] unless File.exist?(base) - entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) } + entries = Dir.chdir(base) { filter_entries(Dir["**/*"], base) } entries.delete_if { |e| File.directory?(site.in_source_dir(base, e)) } end end From e85690a61f13703da22c609d3a16f05f03c6e5d4 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Thu, 26 May 2016 00:10:09 -0500 Subject: [PATCH 2/7] Rubocop: lib/jekyll/readers/layout_reader.rb --- lib/jekyll/readers/layout_reader.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/jekyll/readers/layout_reader.rb b/lib/jekyll/readers/layout_reader.rb index df8931cb..985491c6 100644 --- a/lib/jekyll/readers/layout_reader.rb +++ b/lib/jekyll/readers/layout_reader.rb @@ -8,11 +8,13 @@ module Jekyll def read 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 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 @layouts @@ -39,7 +41,7 @@ module Jekyll def entries_in(dir) entries = [] within(dir) do - entries = EntryFilter.new(site).filter(Dir['**/*.*']) + entries = EntryFilter.new(site).filter(Dir["**/*.*"]) end entries end @@ -54,15 +56,13 @@ module Jekyll end def layout_directory_inside_source - site.in_source_dir(site.config['layouts_dir']) + site.in_source_dir(site.config["layouts_dir"]) end 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 dir - else - nil end end end From 615a9ee9ac971668f203db76955a247b08926509 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Thu, 26 May 2016 00:10:20 -0500 Subject: [PATCH 3/7] Rubocop: lib/jekyll/readers/page_reader.rb --- lib/jekyll/readers/page_reader.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/readers/page_reader.rb b/lib/jekyll/readers/page_reader.rb index 97748c01..507c609e 100644 --- a/lib/jekyll/readers/page_reader.rb +++ b/lib/jekyll/readers/page_reader.rb @@ -14,7 +14,9 @@ module Jekyll # # Returns an array of static pages. def read(files) - files.map { |page| @unfiltered_content << Page.new(@site, @site.source, @dir, page) } + files.map do |page| + @unfiltered_content << Page.new(@site, @site.source, @dir, page) + end @unfiltered_content.select { |page| site.publisher.publish?(page) } end end From 0696e6c169ddd8643689386b3470a6130906e3a8 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Thu, 26 May 2016 00:10:31 -0500 Subject: [PATCH 4/7] Rubocop: lib/jekyll/readers/post_reader.rb --- lib/jekyll/readers/post_reader.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb index f7a44ca7..ec5bc7ad 100644 --- a/lib/jekyll/readers/post_reader.rb +++ b/lib/jekyll/readers/post_reader.rb @@ -12,7 +12,7 @@ module Jekyll # # Returns nothing. def read_drafts(dir) - read_publishable(dir, '_drafts', Document::DATELESS_FILENAME_MATCHER) + read_publishable(dir, "_drafts", Document::DATELESS_FILENAME_MATCHER) end # Read all the files in //_posts and create a new Document @@ -22,7 +22,7 @@ module Jekyll # # Returns nothing. def read_posts(dir) - read_publishable(dir, '_posts', Document::DATE_FILENAME_MATCHER) + read_publishable(dir, "_posts", Document::DATE_FILENAME_MATCHER) end # Read all the files in // and create a new @@ -32,9 +32,10 @@ module Jekyll # # Returns nothing. def read_publishable(dir, magic_dir, matcher) - read_content(dir, magic_dir, matcher).tap do |docs| + documents = read_content(dir, magic_dir, matcher).tap do |docs| docs.each(&:read) - end.select do |doc| + end + documents.select do |doc| site.publisher.publish?(doc).tap do |will_publish| if !will_publish && site.publisher.hidden_in_the_future?(doc) Jekyll.logger.debug "Skipping:", "#{doc.relative_path} has a future date" @@ -57,7 +58,7 @@ module Jekyll next unless entry =~ matcher path = @site.in_source_dir(File.join(dir, magic_dir, entry)) Document.new(path, { - :site => @site, + :site => @site, :collection => @site.posts }) end.reject(&:nil?) From 382be191aed931174e19da4f9edd000665532933 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Thu, 26 May 2016 00:10:43 -0500 Subject: [PATCH 5/7] Rubocop: lib/jekyll/readers/static_file_reader.rb --- lib/jekyll/readers/static_file_reader.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/readers/static_file_reader.rb b/lib/jekyll/readers/static_file_reader.rb index 8def1365..1d43d69c 100644 --- a/lib/jekyll/readers/static_file_reader.rb +++ b/lib/jekyll/readers/static_file_reader.rb @@ -14,7 +14,9 @@ module Jekyll # # Returns an array of static files. def read(files) - files.map { |file| @unfiltered_content << StaticFile.new(@site, @site.source, @dir, file) } + files.map do |file| + @unfiltered_content << StaticFile.new(@site, @site.source, @dir, file) + end @unfiltered_content end end From 0d0ed561fdf2baa837367d04366388088dab0846 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Thu, 26 May 2016 00:11:37 -0500 Subject: [PATCH 6/7] Rubocop: Readers --- .rubocop.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index b7dd2530..e4d97d3b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -20,11 +20,6 @@ AllCops: - lib/jekyll/frontmatter_defaults.rb - lib/jekyll/liquid_renderer/table.rb - lib/jekyll/liquid_renderer.rb - - lib/jekyll/reader.rb - - lib/jekyll/readers/layout_reader.rb - - lib/jekyll/readers/page_reader.rb - - lib/jekyll/readers/post_reader.rb - - lib/jekyll/readers/static_file_reader.rb - lib/jekyll/regenerator.rb - lib/jekyll/renderer.rb - lib/jekyll/site.rb From 3a3405fe51c8ae4510f6b50473557dd6c9ad6248 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 26 May 2016 16:09:56 -0700 Subject: [PATCH 7/7] I will chain blocks if I want to chain blocks. --- lib/jekyll/readers/post_reader.rb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb index ec5bc7ad..123709e7 100644 --- a/lib/jekyll/readers/post_reader.rb +++ b/lib/jekyll/readers/post_reader.rb @@ -32,16 +32,14 @@ module Jekyll # # Returns nothing. def read_publishable(dir, magic_dir, matcher) - documents = read_content(dir, magic_dir, matcher).tap do |docs| - docs.each(&:read) - end - documents.select do |doc| - site.publisher.publish?(doc).tap do |will_publish| - if !will_publish && site.publisher.hidden_in_the_future?(doc) - Jekyll.logger.debug "Skipping:", "#{doc.relative_path} has a future date" + read_content(dir, magic_dir, matcher).tap { |docs| docs.each(&:read) } + .select do |doc| + site.publisher.publish?(doc).tap do |will_publish| + if !will_publish && site.publisher.hidden_in_the_future?(doc) + Jekyll.logger.debug "Skipping:", "#{doc.relative_path} has a future date" + end end end - end end # Read all the content files from //magic_dir