From 9fae4b6dfabc7485a8a2debf108d8190761590f5 Mon Sep 17 00:00:00 2001
From: Asko Nomm <asko@bien.ee>
Date: Sat, 9 Apr 2022 19:32:05 +0200
Subject: Fix #8: Links break textual checkboxes

---
 src/clarktown/parsers/link_and_image.clj       |  6 +++---
 test/clarktown/parsers/link_and_image_test.clj | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 test/clarktown/parsers/link_and_image_test.clj

diff --git a/src/clarktown/parsers/link_and_image.clj b/src/clarktown/parsers/link_and_image.clj
index dd8c9d0..3dbbac7 100644
--- a/src/clarktown/parsers/link_and_image.clj
+++ b/src/clarktown/parsers/link_and_image.clj
@@ -7,15 +7,15 @@
   "Renders all occurring links and images."
   [block _]
   (loop [block block
-         matches (-> (re-seq #"\!?\[(.*?)\]\((.*?)\)" block)
+         matches (-> (re-seq #"\!?\[(\w+( \w+|\.|\,)*)\]\((.*?)\)" block)
                      distinct)]
     (if (empty? matches)
       block
-      (let [[whole-match label href] (first matches)
+      (let [[whole-match label _ href] (first matches)
             image? (string/starts-with? whole-match "!")
             image (str "<img src=\"" href "\" alt=\"" label "\">")
             link (str "<a href=\"" href "\">" label "</a>")]
         (recur (if image?
                  (string/replace block whole-match image)
                  (string/replace block whole-match link))
-               (drop 1 matches))))))
+               (drop 1 matches))))))
\ No newline at end of file
diff --git a/test/clarktown/parsers/link_and_image_test.clj b/test/clarktown/parsers/link_and_image_test.clj
new file mode 100644
index 0000000..eadfc58
--- /dev/null
+++ b/test/clarktown/parsers/link_and_image_test.clj
@@ -0,0 +1,20 @@
+(ns clarktown.parsers.link-and-image-test
+  (:require
+    [clojure.test :refer [deftest testing is]]
+    [clarktown.parsers.link-and-image :as link-and-image]))
+
+
+(deftest link-test
+  (testing "Creating a link"
+    (is (= (link-and-image/render "[This is a link.](https://example.com)" nil)
+           "<a href=\"https://example.com\">This is a link.</a>"))
+
+    (is (= (link-and-image/render "[x] [label](link)" nil)
+           "[x] <a href=\"link\">label</a>"))
+
+    (is (= (link-and-image/render "[ ] [label](link)" nil)
+           "[ ] <a href=\"link\">label</a>")))
+
+  (testing "Creating an image"
+    (is (= (link-and-image/render "![This is an image](https://example.com)" nil)
+           "<img src=\"https://example.com\" alt=\"This is an image\">"))))
\ No newline at end of file
-- 
cgit v1.2.3