Archives
/
readability
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #68 from mozilla/fix-base-urls

Browse Source 
Fixes #53 - Fixed dot-slash relative URI resolution.
pull/70/head
Gijs 9 years ago
parent f9ea568f3f ad52d8ee30
commit b8b620631d
5 changed files with 92 additions and 1 deletions
Show Stats Download Patch File Download Diff File

4
Readability.js
Unescape Escape View File

@ -172,6 +172,10 @@ Readability.prototype = {
if (uri[0] == "/")
return prePath + uri;
// Dotslash relative URI.
if (uri.indexOf("./") === 0)
return pathBase + uri.slice(2);
// Standard relative URI; add entire path. pathBase already includes a
// trailing "/".
return pathBase + uri;

5
test/test-pages/base-url/expected-metadata.json
Unescape Escape View File

@ -0,0 +1,5 @@
{
"title": "Base URL test",
"byline": null,
"excerpt": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,\n quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo\n consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse\n cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non\n proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
}

42
test/test-pages/base-url/expected.html
Unescape Escape View File

@ -0,0 +1,42 @@
<div id="readability-page-1" class="page">
<article>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p>Links</p>
<p><a href="http://fakehost/test/foo/bar/baz.html">link</a>
</p>
<p><a href="http://fakehost/test/foo/bar/baz.html">link</a>
</p>
<p><a href="http://fakehost/foo/bar/baz.html">link</a>
</p>
<p><a href="http://test/foo/bar/baz.html">link</a>
</p>
<p><a href="https://test/foo/bar/baz.html">link</a>
</p>
<p>Images</p>
<p>
<img src="http://fakehost/test/foo/bar/baz.png" />
</p>
<p>
<img src="http://fakehost/test/foo/bar/baz.png" />
</p>
<p>
<img src="http://fakehost/foo/bar/baz.png" />
</p>
<p>
<img src="http://test/foo/bar/baz.png" />
</p>
<p>
<img src="https://test/foo/bar/baz.png" />
</p>
<p>Tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
</article>
</div>

40
test/test-pages/base-url/source.html
Unescape Escape View File

@ -0,0 +1,40 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Base URL test</title>
</head>
<body>
<article>
<h1>Lorem</h1>
<div>
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</div>
<p>Links</p>
<p><a href="foo/bar/baz.html">link</a></p>
<p><a href="./foo/bar/baz.html">link</a></p>
<p><a href="/foo/bar/baz.html">link</a></p>
<p><a href="http://test/foo/bar/baz.html">link</a></p>
<p><a href="https://test/foo/bar/baz.html">link</a></p>
<p>Images</p>
<p><img src="foo/bar/baz.png"/></p>
<p><img src="./foo/bar/baz.png"/></p>
<p><img src="/foo/bar/baz.png"/></p>
<p><img src="http://test/foo/bar/baz.png"/></p>
<p><img src="https://test/foo/bar/baz.png"/></p>
<h2>Foo</h2>
<div>
Tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</div>
</article>
</body>
</html>

2
test/test-readability.js
Unescape Escape View File

@ -60,7 +60,7 @@ describe("Test page", function() {
host: "fakehost",
prePath: "http://fakehost",
scheme: "http",
pathBase: "http://fakehost/test"
pathBase: "http://fakehost/test/"
};
beforeEach(function() {

Write Preview
Loading…
Cancel
Save