Merge pull request #5666 from DirtyF/rubocop-jekyll

Merge pull request 5666
This commit is contained in:
jekyllbot 2016-12-18 02:02:41 -08:00 committed by GitHub
commit 7231088e5c
2 changed files with 12 additions and 6 deletions

View File

@ -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,14 +209,20 @@ module Jekyll
end
private
def read_static_file(file_path, full_path)
relative_dir = Jekyll.sanitized_path(
relative_directory,
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

View File

@ -30,8 +30,7 @@ module Jekyll
@data
end
def trigger_hooks(*)
end
def trigger_hooks(*); end
# 'Path' of the excerpt.
#