Nav and url handling improvements#3522

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
jasonvarga merged 4 commits into from
Apr 13, 2021
Merged

Nav and url handling improvements #3522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb5256b
Add tests for withoutRedirect methods, and flesh out existing unteste…
jasonvarga Apr 13, 2021
0f41078
implement withoutRedirect methods and tighten up implementation for r…
jasonvarga Apr 13, 2021
4b8d697
Fix is_parent by preventing looking at redirects
jasonvarga Apr 13, 2021
0486d09
Tidy
jasonvarga Apr 13, 2021
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
12 changes: 11 additions & 1 deletion src/Routing/Routable.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@ public function url()
return $this->redirectUrl();
}

return URL::makeRelative($this->absoluteUrl());
return $this->urlWithoutRedirect();
}

public function urlWithoutRedirect()
{
return URL::makeRelative($this->absoluteUrlWithoutRedirect());
}

public function absoluteUrl()
Expand All@@ -45,6 +50,11 @@ public function absoluteUrl()
return $this->redirectUrl();
}

return $this->absoluteUrlWithoutRedirect();
}

public function absoluteUrlWithoutRedirect()
{
$url = vsprintf('%s/%s', [
rtrim($this->site()->absoluteUrl(), '/'),
ltrim($this->uri(), '/'),
Expand Down
43 changes: 20 additions & 23 deletions src/Structures/Page.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,22 +42,17 @@ public function setUrl($url)

public function url()
{
if ($this->url) {
return $this->url;
}

if ($this->isRedirect()) {
return $this->redirectUrl();
}
return $this->url ?? optional($this->entry())->url();
}

if ($this->reference && $this->referenceExists()) {
return URL::makeRelative($this->absoluteUrl());
}
public function urlWithoutRedirect()
{
return $this->url ?? optional($this->entry())->urlWithoutRedirect();
}

public function isRedirect()
{
return optional($this->entry())->isRedirect();
return optional($this->entry())->isRedirect() ?? false;
}

public function setDepth($depth)
Expand DownExpand Up@@ -157,8 +152,12 @@ public function slug()

public function uri()
{
if ($this->url) {
return $this->url();
}

if (! $this->reference) {
return optional($this->parent)->uri();
return null;
}

$uris = Blink::store('structure-uris');
Expand All@@ -185,21 +184,19 @@ public function uri()
public function absoluteUrl()
{
if ($this->url) {
return $this->url;
return URL::makeAbsolute($this->url);
}

if ($this->isRedirect()) {
return $this->redirectUrl();
}

if ($this->reference && $this->referenceExists()) {
$url = vsprintf('%s/%s', [
rtrim($this->site()->absoluteUrl(), '/'),
ltrim($this->uri(), '/'),
]);
return optional($this->entry())->absoluteUrl();
}

return $url === '/' ? $url : rtrim($url, '/');
public function absoluteUrlWithoutRedirect()
{
if ($this->url) {
return $this->absoluteUrl();
}

return optional($this->entry())->absoluteUrlWithoutRedirect();
}

public function isRoot()
Expand Down
2 changes: 1 addition & 1 deletion src/Tags/Structure.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public function toArray($tree, $parent = null, $depth = 1)
'parent' => $parent,
'depth' => $depth,
'is_current' => rtrim(URL::getCurrent(), '/') == rtrim($page->url(), '/'),
'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->url()),
'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->urlWithoutRedirect()),
'is_external' => URL::isExternal($page->absoluteUrl()),
]);
})->filter()->values()->all();
Expand Down
13 changes: 13 additions & 0 deletions tests/Data/Entries/EntryTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,31 +204,41 @@ public function it_gets_the_url_from_the_collection()

$this->assertEquals('/blog/foo', $entryEn->uri());
$this->assertEquals('/blog/foo', $entryEn->url());
$this->assertEquals('/blog/foo', $entryEn->urlWithoutRedirect());
$this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrl());
$this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrlWithoutRedirect());
$this->assertEquals('http://domain.com/amp/blog/foo', $entryEn->ampUrl());
$this->assertNull($entryEn->redirectUrl());

$this->assertEquals('/le-blog/le-foo', $entryFr->uri());
$this->assertEquals('/fr/le-blog/le-foo', $entryFr->url());
$this->assertEquals('/fr/le-blog/le-foo', $entryFr->urlWithoutRedirect());
$this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrl());
$this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrlWithoutRedirect());
$this->assertEquals('http://domain.com/fr/amp/le-blog/le-foo', $entryFr->ampUrl());
$this->assertNull($entryFr->redirectUrl());

$this->assertEquals('/das-blog/das-foo', $entryDe->uri());
$this->assertEquals('/das-blog/das-foo', $entryDe->url());
$this->assertEquals('/das-blog/das-foo', $entryDe->urlWithoutRedirect());
$this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrl());
$this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrlWithoutRedirect());
$this->assertEquals('http://domain.de/amp/das-blog/das-foo', $entryDe->ampUrl());
$this->assertNull($entryDe->redirectUrl());

$this->assertEquals('/blog/redirected', $redirectEntry->uri());
$this->assertEquals('http://example.com/page', $redirectEntry->url());
$this->assertEquals('/blog/redirected', $redirectEntry->urlWithoutRedirect());
$this->assertEquals('http://example.com/page', $redirectEntry->absoluteUrl());
$this->assertEquals('http://domain.com/blog/redirected', $redirectEntry->absoluteUrlWithoutRedirect());
$this->assertNull($redirectEntry->ampUrl());
$this->assertEquals('http://example.com/page', $redirectEntry->redirectUrl());

$this->assertEquals('/blog/redirect-404', $redirect404Entry->uri());
$this->assertEquals('/blog/redirect-404', $redirect404Entry->url());
$this->assertEquals('/blog/redirect-404', $redirect404Entry->urlWithoutRedirect());
$this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrl());
$this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrlWithoutRedirect());
$this->assertEquals('http://domain.com/amp/blog/redirect-404', $redirect404Entry->ampUrl());
$this->assertEquals(404, $redirect404Entry->redirectUrl());
}
Expand DownExpand Up@@ -274,14 +284,17 @@ public function it_gets_urls_for_first_child_redirects()

$this->assertEquals('/parent', $parent->uri());
$this->assertEquals('/parent/child', $parent->url());
$this->assertEquals('/parent', $parent->urlWithoutRedirect());
$this->assertEquals('/parent/child', $parent->redirectUrl());

$this->assertEquals('/parent/child', $child->uri());
$this->assertEquals('/parent/child', $child->url());
$this->assertEquals('/parent/child', $child->urlWithoutRedirect());
$this->assertNull($child->redirectUrl());

$this->assertEquals('/nochildren', $noChildren->uri());
$this->assertEquals('/nochildren', $noChildren->url());
$this->assertEquals('/nochildren', $noChildren->urlWithoutRedirect());
$this->assertEquals(404, $noChildren->redirectUrl());
}

Expand Down
61 changes: 61 additions & 0 deletions tests/Data/Structures/PageTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ public function it_gets_the_entrys_uri_when_the_structure_does_not_have_a_collec

$this->assertEquals('/the/actual/entry/uri', $page->uri());
$this->assertEquals('/the/actual/entry/uri', $page->url());
$this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
$this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrl());
$this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
$this->assertFalse($page->isRedirect());
}

Expand All@@ -171,10 +173,69 @@ public function it_gets_the_uri_of_a_redirect_entry()

$this->assertEquals('/the/actual/entry/uri', $page->uri());
$this->assertEquals('http://example.com/page', $page->url());
$this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
$this->assertEquals('http://example.com/page', $page->absoluteUrl());
$this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
$this->assertTrue($page->isRedirect());
}

/** @test */
public function it_gets_the_uri_of_a_hardcoded_relative_link()
{
$tree = $this->newTree()->setStructure(
$this->mock(Nav::class)
);

$page = (new Page)
->setTree($tree)
->setUrl('/blog');

$this->assertEquals('/blog', $page->uri());
$this->assertEquals('/blog', $page->url());
$this->assertEquals('/blog', $page->urlWithoutRedirect());
$this->assertEquals('http://localhost/blog', $page->absoluteUrl());
$this->assertEquals('http://localhost/blog', $page->absoluteUrlWithoutRedirect());
$this->assertFalse($page->isRedirect());
}

/** @test */
public function it_gets_the_uri_of_a_hardcoded_absolute_link()
{
$tree = $this->newTree()->setStructure(
$this->mock(Nav::class)
);

$page = (new Page)
->setTree($tree)
->setUrl('https://google.com');

$this->assertEquals('https://google.com', $page->uri());
$this->assertEquals('https://google.com', $page->url());
$this->assertEquals('https://google.com', $page->urlWithoutRedirect());
$this->assertEquals('https://google.com', $page->absoluteUrl());
$this->assertEquals('https://google.com', $page->absoluteUrlWithoutRedirect());
$this->assertFalse($page->isRedirect());
}

/** @test */
public function it_gets_the_uri_of_a_hardcoded_text_only_page()
{
$tree = $this->newTree()->setStructure(
$this->mock(Nav::class)
);

$page = (new Page)
->setTree($tree)
->setTitle('Test');

$this->assertNull($page->uri());
$this->assertNull($page->url());
$this->assertNull($page->urlWithoutRedirect());
$this->assertNull($page->absoluteUrl());
$this->assertNull($page->absoluteUrlWithoutRedirect());
$this->assertFalse($page->isRedirect());
}

/** @test */
public function it_gets_child_pages()
{
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Nav and url handling improvements#3522

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

jasonvarga
merged 4 commits into

from

Apr 13, 2021
 Merged


Nav and url handling improvements
#3522
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb5256b

Add tests for withoutRedirect methods, and flesh out existing unteste…


jasonvarga Apr 13, 2021
0f41078

implement withoutRedirect methods and tighten up implementation for r…


jasonvarga Apr 13, 2021
4b8d697

Fix is_parent by preventing looking at redirects


jasonvarga Apr 13, 2021
0486d09

Tidy


jasonvarga Apr 13, 2021

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


12 changes: 11 additions & 1 deletion
src/Routing/Routable.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@ public function url()
 return $this->redirectUrl();
 }

 return URL::makeRelative($this->absoluteUrl());
 return $this->urlWithoutRedirect();
 }

 public function urlWithoutRedirect()
 {
 return URL::makeRelative($this->absoluteUrlWithoutRedirect());
 }

 public function absoluteUrl()
Expand All@@ -45,6 +50,11 @@ public function absoluteUrl()
 return $this->redirectUrl();
 }

 return $this->absoluteUrlWithoutRedirect();
 }

 public function absoluteUrlWithoutRedirect()
 {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
Expand Down

43 changes: 20 additions & 23 deletions
src/Structures/Page.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,22 +42,17 @@ public function setUrl($url)

 public function url()
 {
 if ($this->url) {
 return $this->url;
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }
 return $this->url ?? optional($this->entry())->url();
 }

 if ($this->reference && $this->referenceExists()) {
 return URL::makeRelative($this->absoluteUrl());
}
public function urlWithoutRedirect()
{
return $this->url ?? optional($this->entry())->urlWithoutRedirect();
 }

 public function isRedirect()
 {
 return optional($this->entry())->isRedirect();
 return optional($this->entry())->isRedirect() ?? false;
 }

 public function setDepth($depth)
Expand DownExpand Up@@ -157,8 +152,12 @@ public function slug()

 public function uri()
 {
 if ($this->url) {
 return $this->url();
 }

 if (! $this->reference) {
 return optional($this->parent)->uri();
 return null;
 }

 $uris = Blink::store('structure-uris');
Expand All@@ -185,21 +184,19 @@ public function uri()
 public function absoluteUrl()
 {
 if ($this->url) {
 return $this->url;
 return URL::makeAbsolute($this->url);
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }

 if ($this->reference && $this->referenceExists()) {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
 ]);
 return optional($this->entry())->absoluteUrl();
 }

 return $url === '/' ? $url : rtrim($url, '/');
 public function absoluteUrlWithoutRedirect()
 {
 if ($this->url) {
 return $this->absoluteUrl();
 }

 return optional($this->entry())->absoluteUrlWithoutRedirect();
 }

 public function isRoot()
Expand Down

2 changes: 1 addition & 1 deletion
src/Tags/Structure.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public function toArray($tree, $parent = null, $depth = 1)
 'parent' => $parent,
 'depth' => $depth,
 'is_current' => rtrim(URL::getCurrent(), '/') == rtrim($page->url(), '/'),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->url()),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->urlWithoutRedirect()),
 'is_external' => URL::isExternal($page->absoluteUrl()),
 ]);
 })->filter()->values()->all();
Expand Down

13 changes: 13 additions & 0 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,31 +204,41 @@ public function it_gets_the_url_from_the_collection()

 $this->assertEquals('/blog/foo', $entryEn->uri());
 $this->assertEquals('/blog/foo', $entryEn->url());
 $this->assertEquals('/blog/foo', $entryEn->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/foo', $entryEn->ampUrl());
 $this->assertNull($entryEn->redirectUrl());

 $this->assertEquals('/le-blog/le-foo', $entryFr->uri());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->url());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrl());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/amp/le-blog/le-foo', $entryFr->ampUrl());
 $this->assertNull($entryFr->redirectUrl());

 $this->assertEquals('/das-blog/das-foo', $entryDe->uri());
 $this->assertEquals('/das-blog/das-foo', $entryDe->url());
 $this->assertEquals('/das-blog/das-foo', $entryDe->urlWithoutRedirect());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrl());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.de/amp/das-blog/das-foo', $entryDe->ampUrl());
 $this->assertNull($entryDe->redirectUrl());

 $this->assertEquals('/blog/redirected', $redirectEntry->uri());
 $this->assertEquals('http://example.com/page', $redirectEntry->url());
 $this->assertEquals('/blog/redirected', $redirectEntry->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $redirectEntry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirected', $redirectEntry->absoluteUrlWithoutRedirect());
 $this->assertNull($redirectEntry->ampUrl());
 $this->assertEquals('http://example.com/page', $redirectEntry->redirectUrl());

 $this->assertEquals('/blog/redirect-404', $redirect404Entry->uri());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->url());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/redirect-404', $redirect404Entry->ampUrl());
 $this->assertEquals(404, $redirect404Entry->redirectUrl());
 }
Expand DownExpand Up@@ -274,14 +284,17 @@ public function it_gets_urls_for_first_child_redirects()

 $this->assertEquals('/parent', $parent->uri());
 $this->assertEquals('/parent/child', $parent->url());
 $this->assertEquals('/parent', $parent->urlWithoutRedirect());
 $this->assertEquals('/parent/child', $parent->redirectUrl());

 $this->assertEquals('/parent/child', $child->uri());
 $this->assertEquals('/parent/child', $child->url());
 $this->assertEquals('/parent/child', $child->urlWithoutRedirect());
 $this->assertNull($child->redirectUrl());

 $this->assertEquals('/nochildren', $noChildren->uri());
 $this->assertEquals('/nochildren', $noChildren->url());
 $this->assertEquals('/nochildren', $noChildren->urlWithoutRedirect());
 $this->assertEquals(404, $noChildren->redirectUrl());
 }

Expand Down

61 changes: 61 additions & 0 deletions
tests/Data/Structures/PageTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ public function it_gets_the_entrys_uri_when_the_structure_does_not_have_a_collec

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('/the/actual/entry/uri', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

Expand All@@ -171,10 +173,69 @@ public function it_gets_the_uri_of_a_redirect_entry()

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('http://example.com/page', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertTrue($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_relative_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('/blog');

 $this->assertEquals('/blog', $page->uri());
 $this->assertEquals('/blog', $page->url());
 $this->assertEquals('/blog', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrl());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_absolute_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('https://google.com');

 $this->assertEquals('https://google.com', $page->uri());
 $this->assertEquals('https://google.com', $page->url());
 $this->assertEquals('https://google.com', $page->urlWithoutRedirect());
 $this->assertEquals('https://google.com', $page->absoluteUrl());
 $this->assertEquals('https://google.com', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_text_only_page()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setTitle('Test');

 $this->assertNull($page->uri());
 $this->assertNull($page->url());
 $this->assertNull($page->urlWithoutRedirect());
 $this->assertNull($page->absoluteUrl());
 $this->assertNull($page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_child_pages()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Nav and url handling improvements#3522

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

jasonvarga
merged 4 commits into

from

Apr 13, 2021
 Merged


Nav and url handling improvements
#3522
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb5256b

Add tests for withoutRedirect methods, and flesh out existing unteste…


jasonvarga Apr 13, 2021
0f41078

implement withoutRedirect methods and tighten up implementation for r…


jasonvarga Apr 13, 2021
4b8d697

Fix is_parent by preventing looking at redirects


jasonvarga Apr 13, 2021
0486d09

Tidy


jasonvarga Apr 13, 2021

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


12 changes: 11 additions & 1 deletion
src/Routing/Routable.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@ public function url()
 return $this->redirectUrl();
 }

 return URL::makeRelative($this->absoluteUrl());
 return $this->urlWithoutRedirect();
 }

 public function urlWithoutRedirect()
 {
 return URL::makeRelative($this->absoluteUrlWithoutRedirect());
 }

 public function absoluteUrl()
Expand All@@ -45,6 +50,11 @@ public function absoluteUrl()
 return $this->redirectUrl();
 }

 return $this->absoluteUrlWithoutRedirect();
 }

 public function absoluteUrlWithoutRedirect()
 {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
Expand Down

43 changes: 20 additions & 23 deletions
src/Structures/Page.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,22 +42,17 @@ public function setUrl($url)

 public function url()
 {
 if ($this->url) {
 return $this->url;
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }
 return $this->url ?? optional($this->entry())->url();
 }

 if ($this->reference && $this->referenceExists()) {
 return URL::makeRelative($this->absoluteUrl());
}
public function urlWithoutRedirect()
{
return $this->url ?? optional($this->entry())->urlWithoutRedirect();
 }

 public function isRedirect()
 {
 return optional($this->entry())->isRedirect();
 return optional($this->entry())->isRedirect() ?? false;
 }

 public function setDepth($depth)
Expand DownExpand Up@@ -157,8 +152,12 @@ public function slug()

 public function uri()
 {
 if ($this->url) {
 return $this->url();
 }

 if (! $this->reference) {
 return optional($this->parent)->uri();
 return null;
 }

 $uris = Blink::store('structure-uris');
Expand All@@ -185,21 +184,19 @@ public function uri()
 public function absoluteUrl()
 {
 if ($this->url) {
 return $this->url;
 return URL::makeAbsolute($this->url);
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }

 if ($this->reference && $this->referenceExists()) {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
 ]);
 return optional($this->entry())->absoluteUrl();
 }

 return $url === '/' ? $url : rtrim($url, '/');
 public function absoluteUrlWithoutRedirect()
 {
 if ($this->url) {
 return $this->absoluteUrl();
 }

 return optional($this->entry())->absoluteUrlWithoutRedirect();
 }

 public function isRoot()
Expand Down

2 changes: 1 addition & 1 deletion
src/Tags/Structure.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public function toArray($tree, $parent = null, $depth = 1)
 'parent' => $parent,
 'depth' => $depth,
 'is_current' => rtrim(URL::getCurrent(), '/') == rtrim($page->url(), '/'),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->url()),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->urlWithoutRedirect()),
 'is_external' => URL::isExternal($page->absoluteUrl()),
 ]);
 })->filter()->values()->all();
Expand Down

13 changes: 13 additions & 0 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,31 +204,41 @@ public function it_gets_the_url_from_the_collection()

 $this->assertEquals('/blog/foo', $entryEn->uri());
 $this->assertEquals('/blog/foo', $entryEn->url());
 $this->assertEquals('/blog/foo', $entryEn->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/foo', $entryEn->ampUrl());
 $this->assertNull($entryEn->redirectUrl());

 $this->assertEquals('/le-blog/le-foo', $entryFr->uri());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->url());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrl());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/amp/le-blog/le-foo', $entryFr->ampUrl());
 $this->assertNull($entryFr->redirectUrl());

 $this->assertEquals('/das-blog/das-foo', $entryDe->uri());
 $this->assertEquals('/das-blog/das-foo', $entryDe->url());
 $this->assertEquals('/das-blog/das-foo', $entryDe->urlWithoutRedirect());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrl());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.de/amp/das-blog/das-foo', $entryDe->ampUrl());
 $this->assertNull($entryDe->redirectUrl());

 $this->assertEquals('/blog/redirected', $redirectEntry->uri());
 $this->assertEquals('http://example.com/page', $redirectEntry->url());
 $this->assertEquals('/blog/redirected', $redirectEntry->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $redirectEntry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirected', $redirectEntry->absoluteUrlWithoutRedirect());
 $this->assertNull($redirectEntry->ampUrl());
 $this->assertEquals('http://example.com/page', $redirectEntry->redirectUrl());

 $this->assertEquals('/blog/redirect-404', $redirect404Entry->uri());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->url());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/redirect-404', $redirect404Entry->ampUrl());
 $this->assertEquals(404, $redirect404Entry->redirectUrl());
 }
Expand DownExpand Up@@ -274,14 +284,17 @@ public function it_gets_urls_for_first_child_redirects()

 $this->assertEquals('/parent', $parent->uri());
 $this->assertEquals('/parent/child', $parent->url());
 $this->assertEquals('/parent', $parent->urlWithoutRedirect());
 $this->assertEquals('/parent/child', $parent->redirectUrl());

 $this->assertEquals('/parent/child', $child->uri());
 $this->assertEquals('/parent/child', $child->url());
 $this->assertEquals('/parent/child', $child->urlWithoutRedirect());
 $this->assertNull($child->redirectUrl());

 $this->assertEquals('/nochildren', $noChildren->uri());
 $this->assertEquals('/nochildren', $noChildren->url());
 $this->assertEquals('/nochildren', $noChildren->urlWithoutRedirect());
 $this->assertEquals(404, $noChildren->redirectUrl());
 }

Expand Down

61 changes: 61 additions & 0 deletions
tests/Data/Structures/PageTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ public function it_gets_the_entrys_uri_when_the_structure_does_not_have_a_collec

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('/the/actual/entry/uri', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

Expand All@@ -171,10 +173,69 @@ public function it_gets_the_uri_of_a_redirect_entry()

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('http://example.com/page', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertTrue($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_relative_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('/blog');

 $this->assertEquals('/blog', $page->uri());
 $this->assertEquals('/blog', $page->url());
 $this->assertEquals('/blog', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrl());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_absolute_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('https://google.com');

 $this->assertEquals('https://google.com', $page->uri());
 $this->assertEquals('https://google.com', $page->url());
 $this->assertEquals('https://google.com', $page->urlWithoutRedirect());
 $this->assertEquals('https://google.com', $page->absoluteUrl());
 $this->assertEquals('https://google.com', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_text_only_page()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setTitle('Test');

 $this->assertNull($page->uri());
 $this->assertNull($page->url());
 $this->assertNull($page->urlWithoutRedirect());
 $this->assertNull($page->absoluteUrl());
 $this->assertNull($page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_child_pages()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Nav and url handling improvements#3522

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

jasonvarga
merged 4 commits into

from

Apr 13, 2021
 Merged


Nav and url handling improvements
#3522
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb5256b

Add tests for withoutRedirect methods, and flesh out existing unteste…


jasonvarga Apr 13, 2021
0f41078

implement withoutRedirect methods and tighten up implementation for r…


jasonvarga Apr 13, 2021
4b8d697

Fix is_parent by preventing looking at redirects


jasonvarga Apr 13, 2021
0486d09

Tidy


jasonvarga Apr 13, 2021

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


12 changes: 11 additions & 1 deletion
src/Routing/Routable.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@ public function url()
 return $this->redirectUrl();
 }

 return URL::makeRelative($this->absoluteUrl());
 return $this->urlWithoutRedirect();
 }

 public function urlWithoutRedirect()
 {
 return URL::makeRelative($this->absoluteUrlWithoutRedirect());
 }

 public function absoluteUrl()
Expand All@@ -45,6 +50,11 @@ public function absoluteUrl()
 return $this->redirectUrl();
 }

 return $this->absoluteUrlWithoutRedirect();
 }

 public function absoluteUrlWithoutRedirect()
 {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
Expand Down

43 changes: 20 additions & 23 deletions
src/Structures/Page.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,22 +42,17 @@ public function setUrl($url)

 public function url()
 {
 if ($this->url) {
 return $this->url;
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }
 return $this->url ?? optional($this->entry())->url();
 }

 if ($this->reference && $this->referenceExists()) {
 return URL::makeRelative($this->absoluteUrl());
}
public function urlWithoutRedirect()
{
return $this->url ?? optional($this->entry())->urlWithoutRedirect();
 }

 public function isRedirect()
 {
 return optional($this->entry())->isRedirect();
 return optional($this->entry())->isRedirect() ?? false;
 }

 public function setDepth($depth)
Expand DownExpand Up@@ -157,8 +152,12 @@ public function slug()

 public function uri()
 {
 if ($this->url) {
 return $this->url();
 }

 if (! $this->reference) {
 return optional($this->parent)->uri();
 return null;
 }

 $uris = Blink::store('structure-uris');
Expand All@@ -185,21 +184,19 @@ public function uri()
 public function absoluteUrl()
 {
 if ($this->url) {
 return $this->url;
 return URL::makeAbsolute($this->url);
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }

 if ($this->reference && $this->referenceExists()) {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
 ]);
 return optional($this->entry())->absoluteUrl();
 }

 return $url === '/' ? $url : rtrim($url, '/');
 public function absoluteUrlWithoutRedirect()
 {
 if ($this->url) {
 return $this->absoluteUrl();
 }

 return optional($this->entry())->absoluteUrlWithoutRedirect();
 }

 public function isRoot()
Expand Down

2 changes: 1 addition & 1 deletion
src/Tags/Structure.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public function toArray($tree, $parent = null, $depth = 1)
 'parent' => $parent,
 'depth' => $depth,
 'is_current' => rtrim(URL::getCurrent(), '/') == rtrim($page->url(), '/'),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->url()),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->urlWithoutRedirect()),
 'is_external' => URL::isExternal($page->absoluteUrl()),
 ]);
 })->filter()->values()->all();
Expand Down

13 changes: 13 additions & 0 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,31 +204,41 @@ public function it_gets_the_url_from_the_collection()

 $this->assertEquals('/blog/foo', $entryEn->uri());
 $this->assertEquals('/blog/foo', $entryEn->url());
 $this->assertEquals('/blog/foo', $entryEn->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/foo', $entryEn->ampUrl());
 $this->assertNull($entryEn->redirectUrl());

 $this->assertEquals('/le-blog/le-foo', $entryFr->uri());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->url());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrl());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/amp/le-blog/le-foo', $entryFr->ampUrl());
 $this->assertNull($entryFr->redirectUrl());

 $this->assertEquals('/das-blog/das-foo', $entryDe->uri());
 $this->assertEquals('/das-blog/das-foo', $entryDe->url());
 $this->assertEquals('/das-blog/das-foo', $entryDe->urlWithoutRedirect());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrl());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.de/amp/das-blog/das-foo', $entryDe->ampUrl());
 $this->assertNull($entryDe->redirectUrl());

 $this->assertEquals('/blog/redirected', $redirectEntry->uri());
 $this->assertEquals('http://example.com/page', $redirectEntry->url());
 $this->assertEquals('/blog/redirected', $redirectEntry->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $redirectEntry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirected', $redirectEntry->absoluteUrlWithoutRedirect());
 $this->assertNull($redirectEntry->ampUrl());
 $this->assertEquals('http://example.com/page', $redirectEntry->redirectUrl());

 $this->assertEquals('/blog/redirect-404', $redirect404Entry->uri());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->url());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/redirect-404', $redirect404Entry->ampUrl());
 $this->assertEquals(404, $redirect404Entry->redirectUrl());
 }
Expand DownExpand Up@@ -274,14 +284,17 @@ public function it_gets_urls_for_first_child_redirects()

 $this->assertEquals('/parent', $parent->uri());
 $this->assertEquals('/parent/child', $parent->url());
 $this->assertEquals('/parent', $parent->urlWithoutRedirect());
 $this->assertEquals('/parent/child', $parent->redirectUrl());

 $this->assertEquals('/parent/child', $child->uri());
 $this->assertEquals('/parent/child', $child->url());
 $this->assertEquals('/parent/child', $child->urlWithoutRedirect());
 $this->assertNull($child->redirectUrl());

 $this->assertEquals('/nochildren', $noChildren->uri());
 $this->assertEquals('/nochildren', $noChildren->url());
 $this->assertEquals('/nochildren', $noChildren->urlWithoutRedirect());
 $this->assertEquals(404, $noChildren->redirectUrl());
 }

Expand Down

61 changes: 61 additions & 0 deletions
tests/Data/Structures/PageTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ public function it_gets_the_entrys_uri_when_the_structure_does_not_have_a_collec

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('/the/actual/entry/uri', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

Expand All@@ -171,10 +173,69 @@ public function it_gets_the_uri_of_a_redirect_entry()

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('http://example.com/page', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertTrue($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_relative_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('/blog');

 $this->assertEquals('/blog', $page->uri());
 $this->assertEquals('/blog', $page->url());
 $this->assertEquals('/blog', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrl());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_absolute_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('https://google.com');

 $this->assertEquals('https://google.com', $page->uri());
 $this->assertEquals('https://google.com', $page->url());
 $this->assertEquals('https://google.com', $page->urlWithoutRedirect());
 $this->assertEquals('https://google.com', $page->absoluteUrl());
 $this->assertEquals('https://google.com', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_text_only_page()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setTitle('Test');

 $this->assertNull($page->uri());
 $this->assertNull($page->url());
 $this->assertNull($page->urlWithoutRedirect());
 $this->assertNull($page->absoluteUrl());
 $this->assertNull($page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_child_pages()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Nav and url handling improvements#3522

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

jasonvarga
merged 4 commits into

from

Apr 13, 2021
 Merged


Nav and url handling improvements
#3522
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb5256b

Add tests for withoutRedirect methods, and flesh out existing unteste…


jasonvarga Apr 13, 2021
0f41078

implement withoutRedirect methods and tighten up implementation for r…


jasonvarga Apr 13, 2021
4b8d697

Fix is_parent by preventing looking at redirects


jasonvarga Apr 13, 2021
0486d09

Tidy


jasonvarga Apr 13, 2021

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


12 changes: 11 additions & 1 deletion
src/Routing/Routable.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@ public function url()
 return $this->redirectUrl();
 }

 return URL::makeRelative($this->absoluteUrl());
 return $this->urlWithoutRedirect();
 }

 public function urlWithoutRedirect()
 {
 return URL::makeRelative($this->absoluteUrlWithoutRedirect());
 }

 public function absoluteUrl()
Expand All@@ -45,6 +50,11 @@ public function absoluteUrl()
 return $this->redirectUrl();
 }

 return $this->absoluteUrlWithoutRedirect();
 }

 public function absoluteUrlWithoutRedirect()
 {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
Expand Down

43 changes: 20 additions & 23 deletions
src/Structures/Page.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,22 +42,17 @@ public function setUrl($url)

 public function url()
 {
 if ($this->url) {
 return $this->url;
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }
 return $this->url ?? optional($this->entry())->url();
 }

 if ($this->reference && $this->referenceExists()) {
 return URL::makeRelative($this->absoluteUrl());
}
public function urlWithoutRedirect()
{
return $this->url ?? optional($this->entry())->urlWithoutRedirect();
 }

 public function isRedirect()
 {
 return optional($this->entry())->isRedirect();
 return optional($this->entry())->isRedirect() ?? false;
 }

 public function setDepth($depth)
Expand DownExpand Up@@ -157,8 +152,12 @@ public function slug()

 public function uri()
 {
 if ($this->url) {
 return $this->url();
 }

 if (! $this->reference) {
 return optional($this->parent)->uri();
 return null;
 }

 $uris = Blink::store('structure-uris');
Expand All@@ -185,21 +184,19 @@ public function uri()
 public function absoluteUrl()
 {
 if ($this->url) {
 return $this->url;
 return URL::makeAbsolute($this->url);
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }

 if ($this->reference && $this->referenceExists()) {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
 ]);
 return optional($this->entry())->absoluteUrl();
 }

 return $url === '/' ? $url : rtrim($url, '/');
 public function absoluteUrlWithoutRedirect()
 {
 if ($this->url) {
 return $this->absoluteUrl();
 }

 return optional($this->entry())->absoluteUrlWithoutRedirect();
 }

 public function isRoot()
Expand Down

2 changes: 1 addition & 1 deletion
src/Tags/Structure.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public function toArray($tree, $parent = null, $depth = 1)
 'parent' => $parent,
 'depth' => $depth,
 'is_current' => rtrim(URL::getCurrent(), '/') == rtrim($page->url(), '/'),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->url()),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->urlWithoutRedirect()),
 'is_external' => URL::isExternal($page->absoluteUrl()),
 ]);
 })->filter()->values()->all();
Expand Down

13 changes: 13 additions & 0 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,31 +204,41 @@ public function it_gets_the_url_from_the_collection()

 $this->assertEquals('/blog/foo', $entryEn->uri());
 $this->assertEquals('/blog/foo', $entryEn->url());
 $this->assertEquals('/blog/foo', $entryEn->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/foo', $entryEn->ampUrl());
 $this->assertNull($entryEn->redirectUrl());

 $this->assertEquals('/le-blog/le-foo', $entryFr->uri());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->url());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrl());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/amp/le-blog/le-foo', $entryFr->ampUrl());
 $this->assertNull($entryFr->redirectUrl());

 $this->assertEquals('/das-blog/das-foo', $entryDe->uri());
 $this->assertEquals('/das-blog/das-foo', $entryDe->url());
 $this->assertEquals('/das-blog/das-foo', $entryDe->urlWithoutRedirect());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrl());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.de/amp/das-blog/das-foo', $entryDe->ampUrl());
 $this->assertNull($entryDe->redirectUrl());

 $this->assertEquals('/blog/redirected', $redirectEntry->uri());
 $this->assertEquals('http://example.com/page', $redirectEntry->url());
 $this->assertEquals('/blog/redirected', $redirectEntry->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $redirectEntry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirected', $redirectEntry->absoluteUrlWithoutRedirect());
 $this->assertNull($redirectEntry->ampUrl());
 $this->assertEquals('http://example.com/page', $redirectEntry->redirectUrl());

 $this->assertEquals('/blog/redirect-404', $redirect404Entry->uri());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->url());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/redirect-404', $redirect404Entry->ampUrl());
 $this->assertEquals(404, $redirect404Entry->redirectUrl());
 }
Expand DownExpand Up@@ -274,14 +284,17 @@ public function it_gets_urls_for_first_child_redirects()

 $this->assertEquals('/parent', $parent->uri());
 $this->assertEquals('/parent/child', $parent->url());
 $this->assertEquals('/parent', $parent->urlWithoutRedirect());
 $this->assertEquals('/parent/child', $parent->redirectUrl());

 $this->assertEquals('/parent/child', $child->uri());
 $this->assertEquals('/parent/child', $child->url());
 $this->assertEquals('/parent/child', $child->urlWithoutRedirect());
 $this->assertNull($child->redirectUrl());

 $this->assertEquals('/nochildren', $noChildren->uri());
 $this->assertEquals('/nochildren', $noChildren->url());
 $this->assertEquals('/nochildren', $noChildren->urlWithoutRedirect());
 $this->assertEquals(404, $noChildren->redirectUrl());
 }

Expand Down

61 changes: 61 additions & 0 deletions
tests/Data/Structures/PageTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ public function it_gets_the_entrys_uri_when_the_structure_does_not_have_a_collec

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('/the/actual/entry/uri', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

Expand All@@ -171,10 +173,69 @@ public function it_gets_the_uri_of_a_redirect_entry()

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('http://example.com/page', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertTrue($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_relative_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('/blog');

 $this->assertEquals('/blog', $page->uri());
 $this->assertEquals('/blog', $page->url());
 $this->assertEquals('/blog', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrl());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_absolute_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('https://google.com');

 $this->assertEquals('https://google.com', $page->uri());
 $this->assertEquals('https://google.com', $page->url());
 $this->assertEquals('https://google.com', $page->urlWithoutRedirect());
 $this->assertEquals('https://google.com', $page->absoluteUrl());
 $this->assertEquals('https://google.com', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_text_only_page()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setTitle('Test');

 $this->assertNull($page->uri());
 $this->assertNull($page->url());
 $this->assertNull($page->urlWithoutRedirect());
 $this->assertNull($page->absoluteUrl());
 $this->assertNull($page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_child_pages()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Nav and url handling improvements#3522

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

jasonvarga
merged 4 commits into

from

Apr 13, 2021
 Merged


Nav and url handling improvements
#3522
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb5256b

Add tests for withoutRedirect methods, and flesh out existing unteste…


jasonvarga Apr 13, 2021
0f41078

implement withoutRedirect methods and tighten up implementation for r…


jasonvarga Apr 13, 2021
4b8d697

Fix is_parent by preventing looking at redirects


jasonvarga Apr 13, 2021
0486d09

Tidy


jasonvarga Apr 13, 2021

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


12 changes: 11 additions & 1 deletion
src/Routing/Routable.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@ public function url()
 return $this->redirectUrl();
 }

 return URL::makeRelative($this->absoluteUrl());
 return $this->urlWithoutRedirect();
 }

 public function urlWithoutRedirect()
 {
 return URL::makeRelative($this->absoluteUrlWithoutRedirect());
 }

 public function absoluteUrl()
Expand All@@ -45,6 +50,11 @@ public function absoluteUrl()
 return $this->redirectUrl();
 }

 return $this->absoluteUrlWithoutRedirect();
 }

 public function absoluteUrlWithoutRedirect()
 {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
Expand Down

43 changes: 20 additions & 23 deletions
src/Structures/Page.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,22 +42,17 @@ public function setUrl($url)

 public function url()
 {
 if ($this->url) {
 return $this->url;
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }
 return $this->url ?? optional($this->entry())->url();
 }

 if ($this->reference && $this->referenceExists()) {
 return URL::makeRelative($this->absoluteUrl());
}
public function urlWithoutRedirect()
{
return $this->url ?? optional($this->entry())->urlWithoutRedirect();
 }

 public function isRedirect()
 {
 return optional($this->entry())->isRedirect();
 return optional($this->entry())->isRedirect() ?? false;
 }

 public function setDepth($depth)
Expand DownExpand Up@@ -157,8 +152,12 @@ public function slug()

 public function uri()
 {
 if ($this->url) {
 return $this->url();
 }

 if (! $this->reference) {
 return optional($this->parent)->uri();
 return null;
 }

 $uris = Blink::store('structure-uris');
Expand All@@ -185,21 +184,19 @@ public function uri()
 public function absoluteUrl()
 {
 if ($this->url) {
 return $this->url;
 return URL::makeAbsolute($this->url);
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }

 if ($this->reference && $this->referenceExists()) {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
 ]);
 return optional($this->entry())->absoluteUrl();
 }

 return $url === '/' ? $url : rtrim($url, '/');
 public function absoluteUrlWithoutRedirect()
 {
 if ($this->url) {
 return $this->absoluteUrl();
 }

 return optional($this->entry())->absoluteUrlWithoutRedirect();
 }

 public function isRoot()
Expand Down

2 changes: 1 addition & 1 deletion
src/Tags/Structure.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public function toArray($tree, $parent = null, $depth = 1)
 'parent' => $parent,
 'depth' => $depth,
 'is_current' => rtrim(URL::getCurrent(), '/') == rtrim($page->url(), '/'),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->url()),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->urlWithoutRedirect()),
 'is_external' => URL::isExternal($page->absoluteUrl()),
 ]);
 })->filter()->values()->all();
Expand Down

13 changes: 13 additions & 0 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,31 +204,41 @@ public function it_gets_the_url_from_the_collection()

 $this->assertEquals('/blog/foo', $entryEn->uri());
 $this->assertEquals('/blog/foo', $entryEn->url());
 $this->assertEquals('/blog/foo', $entryEn->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/foo', $entryEn->ampUrl());
 $this->assertNull($entryEn->redirectUrl());

 $this->assertEquals('/le-blog/le-foo', $entryFr->uri());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->url());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrl());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/amp/le-blog/le-foo', $entryFr->ampUrl());
 $this->assertNull($entryFr->redirectUrl());

 $this->assertEquals('/das-blog/das-foo', $entryDe->uri());
 $this->assertEquals('/das-blog/das-foo', $entryDe->url());
 $this->assertEquals('/das-blog/das-foo', $entryDe->urlWithoutRedirect());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrl());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.de/amp/das-blog/das-foo', $entryDe->ampUrl());
 $this->assertNull($entryDe->redirectUrl());

 $this->assertEquals('/blog/redirected', $redirectEntry->uri());
 $this->assertEquals('http://example.com/page', $redirectEntry->url());
 $this->assertEquals('/blog/redirected', $redirectEntry->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $redirectEntry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirected', $redirectEntry->absoluteUrlWithoutRedirect());
 $this->assertNull($redirectEntry->ampUrl());
 $this->assertEquals('http://example.com/page', $redirectEntry->redirectUrl());

 $this->assertEquals('/blog/redirect-404', $redirect404Entry->uri());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->url());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/redirect-404', $redirect404Entry->ampUrl());
 $this->assertEquals(404, $redirect404Entry->redirectUrl());
 }
Expand DownExpand Up@@ -274,14 +284,17 @@ public function it_gets_urls_for_first_child_redirects()

 $this->assertEquals('/parent', $parent->uri());
 $this->assertEquals('/parent/child', $parent->url());
 $this->assertEquals('/parent', $parent->urlWithoutRedirect());
 $this->assertEquals('/parent/child', $parent->redirectUrl());

 $this->assertEquals('/parent/child', $child->uri());
 $this->assertEquals('/parent/child', $child->url());
 $this->assertEquals('/parent/child', $child->urlWithoutRedirect());
 $this->assertNull($child->redirectUrl());

 $this->assertEquals('/nochildren', $noChildren->uri());
 $this->assertEquals('/nochildren', $noChildren->url());
 $this->assertEquals('/nochildren', $noChildren->urlWithoutRedirect());
 $this->assertEquals(404, $noChildren->redirectUrl());
 }

Expand Down

61 changes: 61 additions & 0 deletions
tests/Data/Structures/PageTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ public function it_gets_the_entrys_uri_when_the_structure_does_not_have_a_collec

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('/the/actual/entry/uri', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

Expand All@@ -171,10 +173,69 @@ public function it_gets_the_uri_of_a_redirect_entry()

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('http://example.com/page', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertTrue($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_relative_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('/blog');

 $this->assertEquals('/blog', $page->uri());
 $this->assertEquals('/blog', $page->url());
 $this->assertEquals('/blog', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrl());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_absolute_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('https://google.com');

 $this->assertEquals('https://google.com', $page->uri());
 $this->assertEquals('https://google.com', $page->url());
 $this->assertEquals('https://google.com', $page->urlWithoutRedirect());
 $this->assertEquals('https://google.com', $page->absoluteUrl());
 $this->assertEquals('https://google.com', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_text_only_page()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setTitle('Test');

 $this->assertNull($page->uri());
 $this->assertNull($page->url());
 $this->assertNull($page->urlWithoutRedirect());
 $this->assertNull($page->absoluteUrl());
 $this->assertNull($page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_child_pages()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Nav and url handling improvements#3522

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

jasonvarga
merged 4 commits into

from

Apr 13, 2021
 Merged


Nav and url handling improvements
#3522
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb5256b

Add tests for withoutRedirect methods, and flesh out existing unteste…


jasonvarga Apr 13, 2021
0f41078

implement withoutRedirect methods and tighten up implementation for r…


jasonvarga Apr 13, 2021
4b8d697

Fix is_parent by preventing looking at redirects


jasonvarga Apr 13, 2021
0486d09

Tidy


jasonvarga Apr 13, 2021

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


12 changes: 11 additions & 1 deletion
src/Routing/Routable.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@ public function url()
 return $this->redirectUrl();
 }

 return URL::makeRelative($this->absoluteUrl());
 return $this->urlWithoutRedirect();
 }

 public function urlWithoutRedirect()
 {
 return URL::makeRelative($this->absoluteUrlWithoutRedirect());
 }

 public function absoluteUrl()
Expand All@@ -45,6 +50,11 @@ public function absoluteUrl()
 return $this->redirectUrl();
 }

 return $this->absoluteUrlWithoutRedirect();
 }

 public function absoluteUrlWithoutRedirect()
 {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
Expand Down

43 changes: 20 additions & 23 deletions
src/Structures/Page.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,22 +42,17 @@ public function setUrl($url)

 public function url()
 {
 if ($this->url) {
 return $this->url;
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }
 return $this->url ?? optional($this->entry())->url();
 }

 if ($this->reference && $this->referenceExists()) {
 return URL::makeRelative($this->absoluteUrl());
}
public function urlWithoutRedirect()
{
return $this->url ?? optional($this->entry())->urlWithoutRedirect();
 }

 public function isRedirect()
 {
 return optional($this->entry())->isRedirect();
 return optional($this->entry())->isRedirect() ?? false;
 }

 public function setDepth($depth)
Expand DownExpand Up@@ -157,8 +152,12 @@ public function slug()

 public function uri()
 {
 if ($this->url) {
 return $this->url();
 }

 if (! $this->reference) {
 return optional($this->parent)->uri();
 return null;
 }

 $uris = Blink::store('structure-uris');
Expand All@@ -185,21 +184,19 @@ public function uri()
 public function absoluteUrl()
 {
 if ($this->url) {
 return $this->url;
 return URL::makeAbsolute($this->url);
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }

 if ($this->reference && $this->referenceExists()) {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
 ]);
 return optional($this->entry())->absoluteUrl();
 }

 return $url === '/' ? $url : rtrim($url, '/');
 public function absoluteUrlWithoutRedirect()
 {
 if ($this->url) {
 return $this->absoluteUrl();
 }

 return optional($this->entry())->absoluteUrlWithoutRedirect();
 }

 public function isRoot()
Expand Down

2 changes: 1 addition & 1 deletion
src/Tags/Structure.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public function toArray($tree, $parent = null, $depth = 1)
 'parent' => $parent,
 'depth' => $depth,
 'is_current' => rtrim(URL::getCurrent(), '/') == rtrim($page->url(), '/'),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->url()),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->urlWithoutRedirect()),
 'is_external' => URL::isExternal($page->absoluteUrl()),
 ]);
 })->filter()->values()->all();
Expand Down

13 changes: 13 additions & 0 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,31 +204,41 @@ public function it_gets_the_url_from_the_collection()

 $this->assertEquals('/blog/foo', $entryEn->uri());
 $this->assertEquals('/blog/foo', $entryEn->url());
 $this->assertEquals('/blog/foo', $entryEn->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/foo', $entryEn->ampUrl());
 $this->assertNull($entryEn->redirectUrl());

 $this->assertEquals('/le-blog/le-foo', $entryFr->uri());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->url());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrl());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/amp/le-blog/le-foo', $entryFr->ampUrl());
 $this->assertNull($entryFr->redirectUrl());

 $this->assertEquals('/das-blog/das-foo', $entryDe->uri());
 $this->assertEquals('/das-blog/das-foo', $entryDe->url());
 $this->assertEquals('/das-blog/das-foo', $entryDe->urlWithoutRedirect());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrl());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.de/amp/das-blog/das-foo', $entryDe->ampUrl());
 $this->assertNull($entryDe->redirectUrl());

 $this->assertEquals('/blog/redirected', $redirectEntry->uri());
 $this->assertEquals('http://example.com/page', $redirectEntry->url());
 $this->assertEquals('/blog/redirected', $redirectEntry->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $redirectEntry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirected', $redirectEntry->absoluteUrlWithoutRedirect());
 $this->assertNull($redirectEntry->ampUrl());
 $this->assertEquals('http://example.com/page', $redirectEntry->redirectUrl());

 $this->assertEquals('/blog/redirect-404', $redirect404Entry->uri());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->url());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/redirect-404', $redirect404Entry->ampUrl());
 $this->assertEquals(404, $redirect404Entry->redirectUrl());
 }
Expand DownExpand Up@@ -274,14 +284,17 @@ public function it_gets_urls_for_first_child_redirects()

 $this->assertEquals('/parent', $parent->uri());
 $this->assertEquals('/parent/child', $parent->url());
 $this->assertEquals('/parent', $parent->urlWithoutRedirect());
 $this->assertEquals('/parent/child', $parent->redirectUrl());

 $this->assertEquals('/parent/child', $child->uri());
 $this->assertEquals('/parent/child', $child->url());
 $this->assertEquals('/parent/child', $child->urlWithoutRedirect());
 $this->assertNull($child->redirectUrl());

 $this->assertEquals('/nochildren', $noChildren->uri());
 $this->assertEquals('/nochildren', $noChildren->url());
 $this->assertEquals('/nochildren', $noChildren->urlWithoutRedirect());
 $this->assertEquals(404, $noChildren->redirectUrl());
 }

Expand Down

61 changes: 61 additions & 0 deletions
tests/Data/Structures/PageTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ public function it_gets_the_entrys_uri_when_the_structure_does_not_have_a_collec

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('/the/actual/entry/uri', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

Expand All@@ -171,10 +173,69 @@ public function it_gets_the_uri_of_a_redirect_entry()

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('http://example.com/page', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertTrue($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_relative_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('/blog');

 $this->assertEquals('/blog', $page->uri());
 $this->assertEquals('/blog', $page->url());
 $this->assertEquals('/blog', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrl());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_absolute_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('https://google.com');

 $this->assertEquals('https://google.com', $page->uri());
 $this->assertEquals('https://google.com', $page->url());
 $this->assertEquals('https://google.com', $page->urlWithoutRedirect());
 $this->assertEquals('https://google.com', $page->absoluteUrl());
 $this->assertEquals('https://google.com', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_text_only_page()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setTitle('Test');

 $this->assertNull($page->uri());
 $this->assertNull($page->url());
 $this->assertNull($page->urlWithoutRedirect());
 $this->assertNull($page->absoluteUrl());
 $this->assertNull($page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_child_pages()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Nav and url handling improvements#3522

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

jasonvarga
merged 4 commits into

from

Apr 13, 2021
 Merged


Nav and url handling improvements
#3522
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb5256b

Add tests for withoutRedirect methods, and flesh out existing unteste…


jasonvarga Apr 13, 2021
0f41078

implement withoutRedirect methods and tighten up implementation for r…


jasonvarga Apr 13, 2021
4b8d697

Fix is_parent by preventing looking at redirects


jasonvarga Apr 13, 2021
0486d09

Tidy


jasonvarga Apr 13, 2021

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


12 changes: 11 additions & 1 deletion
src/Routing/Routable.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,12 @@ public function url()
 return $this->redirectUrl();
 }

 return URL::makeRelative($this->absoluteUrl());
 return $this->urlWithoutRedirect();
 }

 public function urlWithoutRedirect()
 {
 return URL::makeRelative($this->absoluteUrlWithoutRedirect());
 }

 public function absoluteUrl()
Expand All@@ -45,6 +50,11 @@ public function absoluteUrl()
 return $this->redirectUrl();
 }

 return $this->absoluteUrlWithoutRedirect();
 }

 public function absoluteUrlWithoutRedirect()
 {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
Expand Down

43 changes: 20 additions & 23 deletions
src/Structures/Page.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,22 +42,17 @@ public function setUrl($url)

 public function url()
 {
 if ($this->url) {
 return $this->url;
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }
 return $this->url ?? optional($this->entry())->url();
 }

 if ($this->reference && $this->referenceExists()) {
 return URL::makeRelative($this->absoluteUrl());
}
public function urlWithoutRedirect()
{
return $this->url ?? optional($this->entry())->urlWithoutRedirect();
 }

 public function isRedirect()
 {
 return optional($this->entry())->isRedirect();
 return optional($this->entry())->isRedirect() ?? false;
 }

 public function setDepth($depth)
Expand DownExpand Up@@ -157,8 +152,12 @@ public function slug()

 public function uri()
 {
 if ($this->url) {
 return $this->url();
 }

 if (! $this->reference) {
 return optional($this->parent)->uri();
 return null;
 }

 $uris = Blink::store('structure-uris');
Expand All@@ -185,21 +184,19 @@ public function uri()
 public function absoluteUrl()
 {
 if ($this->url) {
 return $this->url;
 return URL::makeAbsolute($this->url);
 }

 if ($this->isRedirect()) {
 return $this->redirectUrl();
 }

 if ($this->reference && $this->referenceExists()) {
 $url = vsprintf('%s/%s', [
 rtrim($this->site()->absoluteUrl(), '/'),
 ltrim($this->uri(), '/'),
 ]);
 return optional($this->entry())->absoluteUrl();
 }

 return $url === '/' ? $url : rtrim($url, '/');
 public function absoluteUrlWithoutRedirect()
 {
 if ($this->url) {
 return $this->absoluteUrl();
 }

 return optional($this->entry())->absoluteUrlWithoutRedirect();
 }

 public function isRoot()
Expand Down

2 changes: 1 addition & 1 deletion
src/Tags/Structure.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ public function toArray($tree, $parent = null, $depth = 1)
 'parent' => $parent,
 'depth' => $depth,
 'is_current' => rtrim(URL::getCurrent(), '/') == rtrim($page->url(), '/'),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->url()),
 'is_parent' => Site::current()->url() === $page->url() ? false : URL::isAncestorOf(URL::getCurrent(), $page->urlWithoutRedirect()),
 'is_external' => URL::isExternal($page->absoluteUrl()),
 ]);
 })->filter()->values()->all();
Expand Down

13 changes: 13 additions & 0 deletions
tests/Data/Entries/EntryTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,31 +204,41 @@ public function it_gets_the_url_from_the_collection()

 $this->assertEquals('/blog/foo', $entryEn->uri());
 $this->assertEquals('/blog/foo', $entryEn->url());
 $this->assertEquals('/blog/foo', $entryEn->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/foo', $entryEn->ampUrl());
 $this->assertNull($entryEn->redirectUrl());

 $this->assertEquals('/le-blog/le-foo', $entryFr->uri());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->url());
 $this->assertEquals('/fr/le-blog/le-foo', $entryFr->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrl());
 $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/fr/amp/le-blog/le-foo', $entryFr->ampUrl());
 $this->assertNull($entryFr->redirectUrl());

 $this->assertEquals('/das-blog/das-foo', $entryDe->uri());
 $this->assertEquals('/das-blog/das-foo', $entryDe->url());
 $this->assertEquals('/das-blog/das-foo', $entryDe->urlWithoutRedirect());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrl());
 $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.de/amp/das-blog/das-foo', $entryDe->ampUrl());
 $this->assertNull($entryDe->redirectUrl());

 $this->assertEquals('/blog/redirected', $redirectEntry->uri());
 $this->assertEquals('http://example.com/page', $redirectEntry->url());
 $this->assertEquals('/blog/redirected', $redirectEntry->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $redirectEntry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirected', $redirectEntry->absoluteUrlWithoutRedirect());
 $this->assertNull($redirectEntry->ampUrl());
 $this->assertEquals('http://example.com/page', $redirectEntry->redirectUrl());

 $this->assertEquals('/blog/redirect-404', $redirect404Entry->uri());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->url());
 $this->assertEquals('/blog/redirect-404', $redirect404Entry->urlWithoutRedirect());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrl());
 $this->assertEquals('http://domain.com/blog/redirect-404', $redirect404Entry->absoluteUrlWithoutRedirect());
 $this->assertEquals('http://domain.com/amp/blog/redirect-404', $redirect404Entry->ampUrl());
 $this->assertEquals(404, $redirect404Entry->redirectUrl());
 }
Expand DownExpand Up@@ -274,14 +284,17 @@ public function it_gets_urls_for_first_child_redirects()

 $this->assertEquals('/parent', $parent->uri());
 $this->assertEquals('/parent/child', $parent->url());
 $this->assertEquals('/parent', $parent->urlWithoutRedirect());
 $this->assertEquals('/parent/child', $parent->redirectUrl());

 $this->assertEquals('/parent/child', $child->uri());
 $this->assertEquals('/parent/child', $child->url());
 $this->assertEquals('/parent/child', $child->urlWithoutRedirect());
 $this->assertNull($child->redirectUrl());

 $this->assertEquals('/nochildren', $noChildren->uri());
 $this->assertEquals('/nochildren', $noChildren->url());
 $this->assertEquals('/nochildren', $noChildren->urlWithoutRedirect());
 $this->assertEquals(404, $noChildren->redirectUrl());
 }

Expand Down

61 changes: 61 additions & 0 deletions
tests/Data/Structures/PageTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ public function it_gets_the_entrys_uri_when_the_structure_does_not_have_a_collec

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('/the/actual/entry/uri', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

Expand All@@ -171,10 +173,69 @@ public function it_gets_the_uri_of_a_redirect_entry()

 $this->assertEquals('/the/actual/entry/uri', $page->uri());
 $this->assertEquals('http://example.com/page', $page->url());
 $this->assertEquals('/the/actual/entry/uri', $page->urlWithoutRedirect());
 $this->assertEquals('http://example.com/page', $page->absoluteUrl());
 $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
 $this->assertTrue($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_relative_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('/blog');

 $this->assertEquals('/blog', $page->uri());
 $this->assertEquals('/blog', $page->url());
 $this->assertEquals('/blog', $page->urlWithoutRedirect());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrl());
 $this->assertEquals('http://localhost/blog', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_absolute_link()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setUrl('https://google.com');

 $this->assertEquals('https://google.com', $page->uri());
 $this->assertEquals('https://google.com', $page->url());
 $this->assertEquals('https://google.com', $page->urlWithoutRedirect());
 $this->assertEquals('https://google.com', $page->absoluteUrl());
 $this->assertEquals('https://google.com', $page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_the_uri_of_a_hardcoded_text_only_page()
 {
 $tree = $this->newTree()->setStructure(
 $this->mock(Nav::class)
 );

 $page = (new Page)
 ->setTree($tree)
 ->setTitle('Test');

 $this->assertNull($page->uri());
 $this->assertNull($page->url());
 $this->assertNull($page->urlWithoutRedirect());
 $this->assertNull($page->absoluteUrl());
 $this->assertNull($page->absoluteUrlWithoutRedirect());
 $this->assertFalse($page->isRedirect());
 }

 /** @test */
 public function it_gets_child_pages()
 {
Expand Down