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

Already on GitHub? Sign in to your account

Jump to bottom

Make relative URLs in e- properties absolute #201

Merged
merged 7 commits into from
Nov 30, 2023
Merged

Make relative URLs in e- properties absolute #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f9403c
Make relative URLs in `e-` properties absolute
Jul 6, 2023
a131ffe
Add tests for relative URL handling in `e-`
Jul 6, 2023
4ed2573
Support `data` attribute
Jul 6, 2023
93ce1d8
Simplify test
angelogladding Oct 15, 2023
3b8ff8b
Add docstring to test
angelogladding Nov 30, 2023
d588f2e
Update CHANGELOG.md
angelogladding Nov 30, 2023
a612e42
Merge branch 'main' into handle-relative-urls-in-e
angelogladding Nov 30, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
All notable changes to this project will be documented in this file.

## 2.0 - unreleased
- make relative URLs in e-* properties absolute (#201)

## 1.1.3 - 2023-06-28
- reduce instances where photo is implied (#135)
Expand Down
4 changes: 4 additions & 0 deletions mf2py/parse_property.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ def datetime(el, default_date=None):

def embedded(el, base_url=""):
"""Process e-* properties"""
for tag in el.find_all():
for attr in ("href", "src", "cite", "data", "poster"):
if attr in tag.attrs:
tag.attrs[attr] = try_urljoin(base_url, tag.attrs[attr])
return {
"html": el.decode_contents().strip(), # secret bs4 method to get innerHTML
"value": get_textContent(el, replace_img=True, base_url=base_url),
Expand Down
13 changes: 13 additions & 0 deletions test/examples/relative_url_in_e.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Relative URLs in e-content</title>
<base href="http://example.com/" />
</head>
<body>
<div class="h-entry">
<div class="e-content"><p><a href=/cat.html>Cat <img src=cat.jpg></a></p></div>
</div>
</body>
</html>
10 changes: 10 additions & 0 deletions test/test_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,16 @@ def test_complex_e_content():
} == result["items"][0]


def test_relative_url_in_e():
"""When parsing e-* properties, make relative URLs absolute."""
result = parse_fixture("relative_url_in_e.html")

assert (
'<p><a href="http://example.com/cat.html">Cat '
'<img src="http://example.com/cat.jpg"/></a></p>'
) == result["items"][0]["properties"]["content"][0]["html"]


def test_nested_values():
"""When parsing nested microformats, check that value is the value of
the simple property element"""
Expand Down
Loading