Un/Escaping links, refs #36

dontdrinkandroot · Jun 17, 2016 · c6e3886 · c6e3886
1 parent 0fb44f8
commit c6e3886
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/Markdown/Renderer/FileSystemAwareLinkRenderer.php b/Markdown/Renderer/FileSystemAwareLinkRenderer.php
@@ -6,7 +6,6 @@
 use Dontdrinkandroot\Path\FilePath;
 use Dontdrinkandroot\Utils\StringUtils;
 use League\CommonMark\ElementRendererInterface;
-use League\CommonMark\HtmlElement;
 use League\CommonMark\HtmlRendererInterface;
 use League\CommonMark\Inline\Element\AbstractInline;
 use League\CommonMark\Inline\Element\Link;
@@ -90,6 +89,9 @@ protected function targetUrlExists($url)
                 /* Absolute paths won't work */
                 return false;
             }
+
+            $urlPath = urldecode($urlPath);
+
             $currentDirectoryPath = $this->currentFilePath->getParentPath();
             $path = $currentDirectoryPath->appendPathString($urlPath);
             $fileExists = $this->fileSystemService->exists($path);

diff --git a/Resources/views/Markdown/edit.html.twig b/Resources/views/Markdown/edit.html.twig
@@ -325,7 +325,7 @@
                     var selection = getSelection();
                     var path = $('#internal-link-file').val();
                     var text = $('#internal-link-text').val();
-                    var newMarkDown = selection.before + '[' + text + '](' + path + ')' + selection.after;
+                    var newMarkDown = selection.before + '[' + text + '](' + encodeURI(path) + ')' + selection.after;
                     $editArea.val(newMarkDown);
                     $('#internalLinkModal').modal('hide');
                     $('#external-link-file').val('');

diff --git a/Tests/Data/repo/examples/a filename with spaces.md b/Tests/Data/repo/examples/a filename with spaces.md
@@ -0,0 +1,2 @@
+A filename with spaces
+======================
diff --git a/Tests/Data/repo/examples/link-example.md b/Tests/Data/repo/examples/link-example.md
@@ -10,3 +10,8 @@ Missing Link
 ------------
 
 [Missing](./missing.md)
+
+Link with Spaces
+----------------
+
+[Link with Spaces](./a%20filename%20with%20spaces.md)
diff --git a/Tests/Service/WikiServiceTest.php b/Tests/Service/WikiServiceTest.php
@@ -49,9 +49,10 @@ public function testFindAllFiles()
     {
         /** @var FilePath[] $files */
         $files = $this->wikiService->findAllFiles();
-        $this->assertCount(4, $files);
+        $this->assertCount(5, $files);
 
         $expectedFilePaths = [
+            '/examples/a filename with spaces.md',
             '/index.md',
             '/examples/link-example.md',
             '/examples/toc-example.md',
@@ -71,9 +72,10 @@ public function testFindAllFilesWithPath()
     {
         /** @var FilePath[] $files */
         $files = $this->wikiService->findAllFiles(DirectoryPath::parse('/examples/'));
-        $this->assertCount(3, $files);
+        $this->assertCount(4, $files);
 
         $expectedFilePaths = [
+            '/examples/a filename with spaces.md',
             '/examples/link-example.md',
             '/examples/toc-example.md',
             '/examples/table-example.md'