Skip to content

Make _create_absolute_fileurl() function more resilient #74

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justinmayer merged 3 commits into from
Mar 19, 2025
Merged

Make _create_absolute_fileurl() function more resilient #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
efe1651
Made _create_absolute_fileurl() function more resilient
max-pfeiffer Mar 19, 2025
746af55
Revert .gitignore changes
justinmayer Mar 19, 2025
cb740e0
Prepare release
justinmayer Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Release type: patch

Support `SITEURL` values that contain slugs after the domain
5 changes: 5 additions & 0 deletions pelican/plugins/seo/seo_enhancer/html_enhancer/open_graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ def __init__(

def _create_absolute_fileurl(self):
"""Join site URL and file path."""
if not self.siteurl.endswith("/"):
self.siteurl += "/"

if self.fileurl.startswith("/"):
self.fileurl = self.fileurl[1:]

file_url = parse.urljoin(self.siteurl, self.fileurl)
return file_url
Expand Down
22 changes: 22 additions & 0 deletions pelican/plugins/seo/tests/test_open_graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,28 @@ def test_create_absolute_fileurl(self, fake_article):

assert fileurl == "https://www.fakesite.com/fake-title.html"

@pytest.mark.parametrize(
"site_url", ["https://fake.github.io/blog", "https://fake.github.io/blog/"]
)
@pytest.mark.parametrize("file_url", ["fake-title.html", "/fake-title.html"])
def test_create_absolute_fileurl_with_site_url_with_path(self, site_url, file_url):
"""
Test if create_absolute_fileurl() joins a site URL with or without a trailing
slash and a file URL with or without a leading slash properly.
"""
og = OpenGraph(
siteurl=site_url,
fileurl=file_url,
file_type=None,
title=None,
description=None,
image=None,
locale=None,
)
fileurl = og._create_absolute_fileurl()

assert fileurl == "https://fake.github.io/blog/fake-title.html"

@pytest.mark.parametrize(
"locale,expected_result",
[
Expand Down