From 3eb47937060bed01ef25e81c835dcadf2d25e64f Mon Sep 17 00:00:00 2001
From: Chris Kankiewicz <Chris@ChrisKankiewicz.com>
Date: Sun, 19 Jan 2020 00:37:31 -0700
Subject: [PATCH] Generate parent directory link instead of using '..'

---
 app/Providers/TwigProvider.php           |  1 +
 app/ViewFunctions/ParentDir.php          | 25 ++++++++++++++++++++++++
 app/resources/views/components/file.twig |  2 +-
 app/resources/views/index.twig           |  4 +---
 tests/ViewFunctions/ParentTest.php       | 16 +++++++++++++++
 5 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 app/ViewFunctions/ParentDir.php
 create mode 100644 tests/ViewFunctions/ParentTest.php

diff --git a/app/Providers/TwigProvider.php b/app/Providers/TwigProvider.php
index 51537ed..45177eb 100644
--- a/app/Providers/TwigProvider.php
+++ b/app/Providers/TwigProvider.php
@@ -19,6 +19,7 @@ class TwigProvider
         ViewFunctions\Config::class,
         ViewFunctions\Icon::class,
         ViewFunctions\Markdown::class,
+        ViewFunctions\ParentDir::class,
         ViewFunctions\SizeForHumans::class,
     ];
 
diff --git a/app/ViewFunctions/ParentDir.php b/app/ViewFunctions/ParentDir.php
new file mode 100644
index 0000000..e59366f
--- /dev/null
+++ b/app/ViewFunctions/ParentDir.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\ViewFunctions;
+
+use Tightenco\Collect\Support\Collection;
+
+class ParentDir extends ViewFunction
+{
+    /** @var string The function name */
+    protected $name = 'parent_dir';
+
+    /**
+     * Get the parent directory for a given path.
+     *
+     * @param string $path
+     *
+     * @return string
+     */
+    public function __invoke(string $path)
+    {
+        return Collection::make(
+            explode('/', $path)
+        )->filter()->slice(0, -1)->implode('/');
+    }
+}
diff --git a/app/resources/views/components/file.twig b/app/resources/views/components/file.twig
index 4b61f43..ab6cb76 100644
--- a/app/resources/views/components/file.twig
+++ b/app/resources/views/components/file.twig
@@ -1,5 +1,5 @@
 <a
-    href="{{ parentDir ? '..' : file.getRelativePathname }}"
+    href="/{{ parentDir ? parent_dir(path) : file.getPathname }}"
     class="flex flex-col items-center rounded-lg font-mono group hover:bg-gray-200 hover:shadow"
 >
     <div class="flex justify-between items-center p-4 w-full">
diff --git a/app/resources/views/index.twig b/app/resources/views/index.twig
index 1161b61..9cd1615 100644
--- a/app/resources/views/index.twig
+++ b/app/resources/views/index.twig
@@ -20,9 +20,7 @@
             </div>
 
             {% if not search and not is_root %}
-                {{ include('components/file.twig', {
-                    parentDir: true
-                }, with_context = false) }}
+                {{ include('components/file.twig', { parentDir: true }) }}
             {% endif %}
 
             {% for file in files %}
diff --git a/tests/ViewFunctions/ParentTest.php b/tests/ViewFunctions/ParentTest.php
new file mode 100644
index 0000000..6f6c0f4
--- /dev/null
+++ b/tests/ViewFunctions/ParentTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\ViewFunctions;
+
+use App\ViewFunctions\ParentDir;
+use Tests\TestCase;
+
+class ParentDirTest extends TestCase
+{
+    public function test_it_can_get_the_parent_directory_from_a_path(): void
+    {
+        $parentDir = new ParentDir($this->container, $this->config);
+
+        $this->assertEquals('foo/bar', $parentDir('foo/bar/baz'));
+    }
+}