Replace nested conditional with guard clauses (#8294)

Merge pull request 8294
This commit is contained in:
Alex Malaszkiewicz 2020-07-09 20:25:59 +02:00 committed by GitHub
parent 119c490ad2
commit f5826eed3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 15 deletions

View File

@ -14,5 +14,4 @@ Layout/SpaceAroundOperators:
Exclude: Exclude:
- 'lib/jekyll/commands/build.rb' - 'lib/jekyll/commands/build.rb'
- 'lib/jekyll/site.rb' - 'lib/jekyll/site.rb'
- 'lib/jekyll/tags/include.rb'
- 'test/test_configuration.rb' - 'test/test_configuration.rb'

View File

@ -253,20 +253,18 @@ module Jekyll
end end
def page_path(context) def page_path(context)
if context.registers[:page].nil? page, site = context.registers.values_at(:page, :site)
context.registers[:site].source return site.source unless page
else
site = context.registers[:site] site.in_source_dir File.dirname(resource_path(page, site))
page_payload = context.registers[:page] end
resource_path = \
if page_payload["collection"].nil? private
page_payload["path"]
else def resource_path(page, site)
File.join(site.config["collections_dir"], page_payload["path"]) path = page["path"]
end path = File.join(site.config["collections_dir"], path) if page["collection"]
resource_path.sub!(%r!/#excerpt\z!, "") path.sub(%r!/#excerpt\z!, "")
site.in_source_dir File.dirname(resource_path)
end
end end
end end
end end