Skip to content

Commit

Permalink
Reduce Pathname objects from front matter defaults (#8067)
Browse files Browse the repository at this point in the history
Merge pull request 8067
  • Loading branch information
ashmaroli committed Mar 29, 2020
1 parent 7860d1b commit e972065
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions lib/jekyll/frontmatter_defaults.rb
Expand Up @@ -103,15 +103,15 @@ def applies?(scope, path, type)
end

def applies_path?(scope, path)
return true if !scope.key?("path") || scope["path"].empty?
rel_scope_path = scope["path"]
return true if !rel_scope_path.is_a?(String) || rel_scope_path.empty?

sanitized_path = Pathname.new(sanitize_path(path))
rel_scope_path = Pathname.new(scope["path"])
sanitized_path = sanitize_path(path)

if scope["path"].to_s.include?("*")
if rel_scope_path.include?("*")
glob_scope(sanitized_path, rel_scope_path)
else
path_is_subpath?(sanitized_path, strip_collections_dir(scope["path"]))
path_is_subpath?(sanitized_path, strip_collections_dir(rel_scope_path))
end
end

Expand All @@ -134,11 +134,7 @@ def glob_cache(path)
end

def path_is_subpath?(path, parent_path)
path.ascend do |ascended_path|
return true if ascended_path.to_s == parent_path.to_s
end

false
path.start_with?(parent_path)
end

def strip_collections_dir(path)
Expand Down

0 comments on commit e972065

Please sign in to comment.