From de56b977b6672d041215d681a6d47cb6c131c3d6 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Sun, 18 Dec 2016 07:22:11 +0100 Subject: [PATCH 1/3] ran rubocop -a #5665 --- lib/jekyll/collection.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index f04fdb3f..a2f912ac 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -32,8 +32,8 @@ module Jekyll # Override of method_missing to check in @data for the key. def method_missing(method, *args, &blck) if docs.respond_to?(method.to_sym) - Jekyll.logger.warn "Deprecation:", "#{label}.#{method} should be changed to" \ - "#{label}.docs.#{method}." + Jekyll.logger.warn "Deprecation:", + "#{label}.#{method} should be changed to #{label}.docs.#{method}." Jekyll.logger.warn "", "Called by #{caller.first}." docs.public_send(method.to_sym, *args, &blck) else @@ -197,6 +197,7 @@ module Jekyll end private + def read_document(full_path) doc = Jekyll::Document.new(full_path, :site => site, :collection => self) doc.read @@ -208,6 +209,7 @@ module Jekyll end private + def read_static_file(file_path, full_path) relative_dir = Jekyll.sanitized_path( relative_directory, @@ -215,7 +217,7 @@ module Jekyll ).chomp("/.") files << StaticFile.new(site, site.source, relative_dir, - File.basename(full_path), self) + File.basename(full_path), self) end end end From d134afcd4aa150746f472fb309e69487bc774039 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Sun, 18 Dec 2016 07:22:36 +0100 Subject: [PATCH 2/3] ran rubocop -a --- lib/jekyll/excerpt.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/jekyll/excerpt.rb b/lib/jekyll/excerpt.rb index 34a2e65c..61344e79 100644 --- a/lib/jekyll/excerpt.rb +++ b/lib/jekyll/excerpt.rb @@ -30,8 +30,7 @@ module Jekyll @data end - def trigger_hooks(*) - end + def trigger_hooks(*); end # 'Path' of the excerpt. # From 48f7a155c3e91d62e2b899334b34ab19916734bc Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Sun, 18 Dec 2016 08:55:05 +0100 Subject: [PATCH 3/3] reindent attributes --- lib/jekyll/collection.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb index a2f912ac..9e906ab0 100644 --- a/lib/jekyll/collection.rb +++ b/lib/jekyll/collection.rb @@ -216,8 +216,13 @@ module Jekyll File.dirname(file_path) ).chomp("/.") - files << StaticFile.new(site, site.source, relative_dir, - File.basename(full_path), self) + files << StaticFile.new( + site, + site.source, + relative_dir, + File.basename(full_path), + self + ) end end end