Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve path normalization in liquid_renderer #8075

Merged
merged 4 commits into from May 9, 2020
Merged

Improve path normalization in liquid_renderer #8075

merged 4 commits into from May 9, 2020

Conversation

ashmaroli
Copy link
Member

  • This is a 馃悰 bug fix.
  • I've added tests

Summary

Merging #8069 exposed a bug in Jekyll::LiquidRenderer. The table output when building with
--profile isn't robust to handle absolute paths of layouts from plugins (like jekyll-redirect-from).

So, this PR revamps the path normalization logic into a new private instance method.

@ashmaroli ashmaroli added the fix label Mar 25, 2020
DirtyF
DirtyF previously approved these changes Mar 25, 2020
View reviewed changes
Copy link
Member

@DirtyF DirtyF left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@ashmaroli ashmaroli requested a review from mattr- March 25, 2020 15:02
@ashmaroli ashmaroli added this to the 4.1 milestone Apr 8, 2020
@ashmaroli
Copy link
Member Author

Update: Introduced a Theme#basename getter so that LiquidRenderer need not allocate a new string for every file from a theme repository (when the Gemfile points to a local theme repo / remote theme repo on GitHub / when using the jekyll-remote-theme plugin).

@ashmaroli ashmaroli requested a review from DirtyF May 7, 2020 06:58
@ashmaroli ashmaroli dismissed DirtyF鈥檚 stale review May 7, 2020 07:00

Introduced change since last review

@DirtyF
Copy link
Member

DirtyF commented May 9, 2020

@jekyll: merge +fix

@jekyllbot jekyllbot merged commit 48e6cb1 into jekyll:master May 9, 2020
@jekyllbot jekyllbot added the bug label May 9, 2020
jekyllbot added a commit that referenced this pull request May 9, 2020
@jekyllbot
Update history to reflect merge of #8075 [ci skip]
0fbdefb
@ashmaroli ashmaroli deleted the liquid-renderer-normalize-path branch May 10, 2020 14:41
@jekyll jekyll locked and limited conversation to collaborators May 10, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@DirtyF DirtyF DirtyF approved these changes

@mattr- mattr- Awaiting requested review from mattr-

Assignees
No one assigned
Labels
bug fix frozen-due-to-age
Projects
None yet
Milestone
4.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ashmaroli @DirtyF @jekyllbot