Skip to content

Commit

Permalink
rubocop: fix code style
Browse files Browse the repository at this point in the history
  • Loading branch information
ayastreb committed Jun 19, 2016
1 parent 902f344 commit d13112d
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 30 deletions.
1 change: 0 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ AllCops:
- lib/jekyll/configuration.rb
- lib/jekyll/convertible.rb
- lib/jekyll/document.rb
- lib/jekyll/regenerator.rb
- lib/jekyll/renderer.rb
- lib/jekyll/utils.rb
- bin/**/*
Expand Down
75 changes: 46 additions & 29 deletions lib/jekyll/regenerator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,14 @@ def initialize(site)
def regenerate?(document)
case document
when Page
document.asset_file? || document.data['regenerate'] ||
source_modified_or_dest_missing?(
site.in_source_dir(document.relative_path), document.destination(@site.dest)
)
regenerate_page?(document)
when Document
!document.write? || document.data['regenerate'] ||
source_modified_or_dest_missing?(
document.path, document.destination(@site.dest)
)
regenerate_document?(document)
else
source_path = document.respond_to?(:path) ? document.path : nil
dest_path = document.respond_to?(:destination) ? document.destination(@site.dest) : nil
source_path = document.respond_to?(:path) ? document.path : nil
dest_path = if document.respond_to?(:destination)
document.destination(@site.dest)
end
source_modified_or_dest_missing?(source_path, dest_path)
end
end
Expand All @@ -44,7 +40,7 @@ def add(path)

metadata[path] = {
"mtime" => File.mtime(path),
"deps" => []
"deps" => []
}
cache[path] = true
end
Expand Down Expand Up @@ -94,23 +90,7 @@ def modified?(path)
return cache[path]
end

# Check path that exists in metadata
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)
check_path_exists(path)
end

# Add a dependency of a path
Expand Down Expand Up @@ -139,7 +119,7 @@ def write_metadata
#
# Returns the String path of the file.
def metadata_file
site.in_source_dir('.jekyll-metadata')
site.in_source_dir(".jekyll-metadata")
end

# Check if metadata has been disabled
Expand Down Expand Up @@ -173,5 +153,42 @@ def read_metadata
{}
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

0 comments on commit d13112d

Please sign in to comment.