rubocop: fix code style

This commit is contained in:
Anatoliy Yastreb 2016-06-19 18:22:59 +03:00
parent 902f344a50
commit d13112dbdc
2 changed files with 46 additions and 30 deletions

View File

@ -8,7 +8,6 @@ AllCops:
- lib/jekyll/configuration.rb - lib/jekyll/configuration.rb
- lib/jekyll/convertible.rb - lib/jekyll/convertible.rb
- lib/jekyll/document.rb - lib/jekyll/document.rb
- lib/jekyll/regenerator.rb
- lib/jekyll/renderer.rb - lib/jekyll/renderer.rb
- lib/jekyll/utils.rb - lib/jekyll/utils.rb
- bin/**/* - bin/**/*

View File

@ -20,18 +20,14 @@ module Jekyll
def regenerate?(document) def regenerate?(document)
case document case document
when Page when Page
document.asset_file? || document.data['regenerate'] || regenerate_page?(document)
source_modified_or_dest_missing?(
site.in_source_dir(document.relative_path), document.destination(@site.dest)
)
when Document when Document
!document.write? || document.data['regenerate'] || regenerate_document?(document)
source_modified_or_dest_missing?(
document.path, document.destination(@site.dest)
)
else else
source_path = document.respond_to?(:path) ? document.path : nil source_path = document.respond_to?(:path) ? document.path : nil
dest_path = document.respond_to?(:destination) ? document.destination(@site.dest) : nil dest_path = if document.respond_to?(:destination)
document.destination(@site.dest)
end
source_modified_or_dest_missing?(source_path, dest_path) source_modified_or_dest_missing?(source_path, dest_path)
end end
end end
@ -94,23 +90,7 @@ module Jekyll
return cache[path] return cache[path]
end end
# Check path that exists in metadata check_path_exists(path)
data = metadata[path]
if data
data["deps"].each do |dependency|
if modified?(dependency)
return cache[dependency] = cache[path] = true
end
end
if File.exist?(path) && data["mtime"].eql?(File.mtime(path))
return cache[path] = false
else
return add(path)
end
end
# Path does not exist in metadata, add it
return add(path)
end end
# Add a dependency of a path # Add a dependency of a path
@ -139,7 +119,7 @@ module Jekyll
# #
# Returns the String path of the file. # Returns the String path of the file.
def metadata_file def metadata_file
site.in_source_dir('.jekyll-metadata') site.in_source_dir(".jekyll-metadata")
end end
# Check if metadata has been disabled # Check if metadata has been disabled
@ -173,5 +153,42 @@ module Jekyll
{} {}
end end
end end
private
def regenerate_page?(document)
document.asset_file? || document.data["regenerate"] ||
source_modified_or_dest_missing?(
site.in_source_dir(document.relative_path), document.destination(@site.dest)
)
end
private
def regenerate_document?(document)
!document.write? || document.data["regenerate"] ||
source_modified_or_dest_missing?(
document.path, document.destination(@site.dest)
)
end
# Private: Check path that exists in metadata
#
# Returns Boolean
private
def check_path_exists(path)
data = metadata[path]
if data
data["deps"].each do |dependency|
if modified?(dependency)
return cache[dependency] = cache[path] = true
end
end
if File.exist?(path) && data["mtime"].eql?(File.mtime(path))
return cache[path] = false
end
end
# Path does not exist in metadata, add it
add(path)
end
end end
end end