From 9bd67acab3c4c81cf4bad14b2da8be835ae086e0 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Fri, 23 Jan 2015 23:29:54 -0200
Subject: Refactor part of request-get-data into request-get-url

---
 sx-request.el | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/sx-request.el b/sx-request.el
index 2650c55..77ae1d7 100644
--- a/sx-request.el
+++ b/sx-request.el
@@ -221,18 +221,14 @@ Currently returns nil."
   "https://raw.githubusercontent.com/vermiculus/sx.el/data/data/%s.el"
   "Url of the \"data\" directory inside the SX `data' branch.")
 
-(defun sx-request-get-data (file)
-  "Fetch and return data stored online by SX.
-FILE is a string or symbol, the name of the file which holds the
-desired data, relative to `sx-request--data-url-format'.  For
-instance, `tags/emacs' returns the list of tags on Emacs.SE."
+(defun sx-request-get-url (url)
+  "Fetch and return data stored online at URL."
   (let* ((url-automatic-caching t)
          (url-inhibit-uncompression t)
-         (request-url (format sx-request--data-url-format file))
          (url-request-method "GET")
          (url-request-extra-headers
           '(("Content-Type" . "application/x-www-form-urlencoded")))
-         (response-buffer (url-retrieve-synchronously request-url)))
+         (response-buffer (url-retrieve-synchronously url)))
     (if (not response-buffer)
         (error "Something went wrong in `url-retrieve-synchronously'")
       (with-current-buffer response-buffer
@@ -241,9 +237,17 @@ instance, `tags/emacs' returns the list of tags on Emacs.SE."
           (if (not (search-forward "\n\n" nil t))
               (error "Headers missing; response corrupt")
             (when (looking-at-p "Not Found") (error "Page not found."))
-            (prog1 (read (current-buffer))
+            (prog1 (buffer-substring (point) (point-max))
               (kill-buffer (current-buffer)))))))))
 
+(defun sx-request-get-data (file)
+  "Fetch and return data stored online by SX.
+FILE is a string or symbol, the name of the file which holds the
+desired data, relative to `sx-request--data-url-format'.  For
+instance, `tags/emacs' returns the list of tags on Emacs.SE."
+  (read (sx-request-get-url
+         (format sx-request--data-url-format file))))
+
 
 ;;; Support Functions
 (defun sx-request--build-keyword-arguments (alist &optional kv-sep)
-- 
cgit v1.2.3


From 4bc72b0f622b2565e7b0d0263bb3053ca5252f63 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Fri, 23 Jan 2015 23:38:06 -0200
Subject: sx-request-get-url error unless code 200

---
 sx-request.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sx-request.el b/sx-request.el
index 77ae1d7..7f18a2b 100644
--- a/sx-request.el
+++ b/sx-request.el
@@ -234,9 +234,10 @@ Currently returns nil."
       (with-current-buffer response-buffer
         (progn
           (goto-char (point-min))
+          (unless (string-match "200" (thing-at-point 'line))
+            (error "Page not found."))
           (if (not (search-forward "\n\n" nil t))
               (error "Headers missing; response corrupt")
-            (when (looking-at-p "Not Found") (error "Page not found."))
             (prog1 (buffer-substring (point) (point-max))
               (kill-buffer (current-buffer)))))))))
 
-- 
cgit v1.2.3


From 76bfce36a4808e71aec27fdc2f7f8cef8462500f Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Fri, 23 Jan 2015 23:41:13 -0200
Subject: Add tests for sx-request-get-...

---
 test/test-api.el | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/test-api.el b/test/test-api.el
index b7d5dbb..30590d7 100644
--- a/test/test-api.el
+++ b/test/test-api.el
@@ -14,3 +14,11 @@
 (ert-deftest test-method-get-all ()
   "Tests sx-method interface to `sx-request-all-items'"
   (should (< 250 (length (sx-method-call 'sites :get-all t)))))
+
+(ert-deftest request-get ()
+  (should (sx-request-get-url "http://google.com"))
+  (should-error (sx-request-get-url "http://github.com/Bruce-Connor/does-not-exist"))
+  (should-error (sx-request-get-data "tags/emacs-does-not-exist"))
+  (let ((emacs-tags (length (sx-request-get-data 'tags/emacs))))
+    (should (> emacs-tags 450))
+    (should (not (cl-remove-if #'stringp emacs-tags)))))
-- 
cgit v1.2.3


From 684d093b24c0c1bb4627176109611980afad6617 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 24 Jan 2015 00:49:15 -0200
Subject: sx-question-mode--insert-link takes images too

---
 sx-question-print.el | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/sx-question-print.el b/sx-question-print.el
index b53b86a..7d1d69e 100644
--- a/sx-question-print.el
+++ b/sx-question-print.el
@@ -388,20 +388,24 @@ E.g.:
                (or (if sx-question-mode-pretty-links text full-text) url)
                url))))))))
 
-(defun sx-question-mode--insert-link (text url)
-  "Return a link propertized version of string TEXT.
+(defun sx-question-mode--insert-link (text-or-image url)
+  "Return a link propertized version of TEXT-OR-IMAGE.
 URL is used as 'help-echo and 'url properties."
-  (insert-text-button
-   text
-   ;; Mouse-over
-   'help-echo
-   (format sx-button--link-help-echo
-     (propertize (sx--shorten-url url)
-                 'face 'font-lock-function-name-face))
-   ;; For visiting and stuff.
-   'sx-button-url url
-   'sx-button-copy url
-   :type 'sx-button-link))
+  (let ((imagep (not (stringp text-or-image))))
+    (apply #'insert-text-button
+      (if imagep " " text-or-image)
+      ;; Mouse-over
+      'help-echo
+      (format sx-button--link-help-echo
+        (propertize (sx--shorten-url url)
+                    'face 'font-lock-function-name-face))
+      ;; For visiting and stuff.
+      'sx-button-url url
+      'sx-button-copy url
+      :type 'sx-button-link
+      ;; The last argument of `apply' is a list.
+      (when imagep
+        `(face default display ,text-or-image)))))
 
 (defun sx-question-mode-find-reference (id &optional fallback-id)
   "Find url identified by reference ID in current buffer.
-- 
cgit v1.2.3


From f54ab739c432af99356fd57d5abb6bd63a39e667 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 24 Jan 2015 00:49:38 -0200
Subject: Detect if link is an image, download it, and pass it to
 sx-question-mode--insert-link

---
 sx-question-print.el | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/sx-question-print.el b/sx-question-print.el
index 7d1d69e..63bfaa4 100644
--- a/sx-question-print.el
+++ b/sx-question-print.el
@@ -157,6 +157,16 @@ replaced with the comment."
           (const :tag "More active first"    sx-answer-more-active-p))
   :group 'sx-question-mode)
 
+(defcustom sx-question-mode-use-images t
+  "Non-nil if SX should download and display images."
+  :type 'boolean
+  :group 'sx-question-mode)
+
+(defcustom sx-question-mode-image-max-width 500
+  "Maximum width, in pixels, of images in the question buffer."
+  :type 'integer
+  :group 'sx-question-mode)
+
 
 ;;; Functions
 ;;;; Printing the general structure
@@ -321,7 +331,7 @@ E.g.:
 (defconst sx-question-mode--link-regexp
   ;; Done at compile time.
   (rx (or (and "[tag:" (group-n 5 (+ (not (any " ]")))) "]")
-          (and "[" (group-n 1 (1+ (not (any "]")))) "]"
+          (and (opt "!") "[" (group-n 1 (1+ (not (any "]")))) "]"
                (or (and "(" (group-n 2 (1+ (not (any ")")))) ")")
                    (and "[" (group-n 3 (1+ (not (any "]")))) "]")))
           (group-n 4 (and (and "http" (opt "s") "://") ""
@@ -365,7 +375,9 @@ E.g.:
 
 ;;; Handling links
 (defun sx-question-mode--process-links-in-buffer ()
-  "Turn all markdown links in this buffer into compact format."
+  "Turn all markdown links in this buffer into compact format.
+Image links are downloaded and displayed, if
+`sx-question-mode-use-images' is non-nil."
   (save-excursion
     (goto-char (point-min))
     (while (search-forward-regexp sx-question-mode--link-regexp nil t)
@@ -385,7 +397,13 @@ E.g.:
             (when (stringp url)
               (replace-match "")
               (sx-question-mode--insert-link
-               (or (if sx-question-mode-pretty-links text full-text) url)
+               (if (and sx-question-mode-use-images (eq ?! (elt full-text 0)))
+                   ;; Is it an image?
+                   (create-image (sx-request-get-url url) 'imagemagick t
+                                 :width (min sx-question-mode-image-max-width
+                                             (window-body-width nil 'pixel)))
+                 ;; Or a regular link
+                 (or (if sx-question-mode-pretty-links text full-text) url))
                url))))))))
 
 (defun sx-question-mode--insert-link (text-or-image url)
-- 
cgit v1.2.3


From a7a83411ccf68114847112bf27dced3d833cd524 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 24 Jan 2015 00:52:03 -0200
Subject: Test downloading image.

---
 test/test-api.el | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/test-api.el b/test/test-api.el
index 30590d7..f7f54c1 100644
--- a/test/test-api.el
+++ b/test/test-api.el
@@ -21,4 +21,10 @@
   (should-error (sx-request-get-data "tags/emacs-does-not-exist"))
   (let ((emacs-tags (length (sx-request-get-data 'tags/emacs))))
     (should (> emacs-tags 450))
-    (should (not (cl-remove-if #'stringp emacs-tags)))))
+    (should (not (cl-remove-if #'stringp emacs-tags))))
+  (should
+   ;; If image is not recognized, this returns nil.
+   (create-image (sx-request-get-url "https://raw.githubusercontent.com/vermiculus/sx.el/master/list-and-question.png")
+                 'imagemagick t
+                 :width (min sx-question-mode-image-max-width
+                             (window-body-width nil 'pixel)))))
-- 
cgit v1.2.3


From d0a09664737d82985c0db040afeb89f69c5b61b3 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 24 Jan 2015 01:07:10 -0200
Subject: sx-question-mode--reference-regexp no longer matches newlines

---
 sx-question-print.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sx-question-print.el b/sx-question-print.el
index 63bfaa4..963bfb4 100644
--- a/sx-question-print.el
+++ b/sx-question-print.el
@@ -323,7 +323,7 @@ where `value' is given `face' as its face.
 
 (defconst sx-question-mode--reference-regexp
   (rx line-start (0+ blank) "[%s]:" (0+ blank)
-      (group-n 1 (1+ (not blank))))
+      (group-n 1 (1+ (not (any blank "\n\r")))))
   "Regexp used to find the url of labeled links.
 E.g.:
    [1]: https://...")
-- 
cgit v1.2.3


From 5a4c4dba75ad605110a4415478072cdb4a907b20 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 24 Jan 2015 01:18:42 -0200
Subject: With nested links, just do the inner one.

---
 sx-question-print.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sx-question-print.el b/sx-question-print.el
index 963bfb4..e76e006 100644
--- a/sx-question-print.el
+++ b/sx-question-print.el
@@ -331,7 +331,7 @@ E.g.:
 (defconst sx-question-mode--link-regexp
   ;; Done at compile time.
   (rx (or (and "[tag:" (group-n 5 (+ (not (any " ]")))) "]")
-          (and (opt "!") "[" (group-n 1 (1+ (not (any "]")))) "]"
+          (and (opt "!") "[" (group-n 1 (1+ (not (any "[]")))) "]"
                (or (and "(" (group-n 2 (1+ (not (any ")")))) ")")
                    (and "[" (group-n 3 (1+ (not (any "]")))) "]")))
           (group-n 4 (and (and "http" (opt "s") "://") ""
-- 
cgit v1.2.3


From e8becf0aa8fd823a73a16292fffc261be7c4b9f5 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 24 Jan 2015 01:25:29 -0200
Subject: Sorround images with newlines

---
 sx-question-print.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sx-question-print.el b/sx-question-print.el
index e76e006..924608b 100644
--- a/sx-question-print.el
+++ b/sx-question-print.el
@@ -410,6 +410,9 @@ Image links are downloaded and displayed, if
   "Return a link propertized version of TEXT-OR-IMAGE.
 URL is used as 'help-echo and 'url properties."
   (let ((imagep (not (stringp text-or-image))))
+    ;; Images need to be at the start of a line.
+    (when (and imagep (not (looking-at-p "^")))
+      (insert "\n"))
     (apply #'insert-text-button
       (if imagep " " text-or-image)
       ;; Mouse-over
@@ -423,7 +426,9 @@ URL is used as 'help-echo and 'url properties."
       :type 'sx-button-link
       ;; The last argument of `apply' is a list.
       (when imagep
-        `(face default display ,text-or-image)))))
+        `(face default display ,text-or-image)))
+    ;; Images need to be at the end of a line too.
+    (insert "\n")))
 
 (defun sx-question-mode-find-reference (id &optional fallback-id)
   "Find url identified by reference ID in current buffer.
-- 
cgit v1.2.3


From ba80f6594f39b09a6212f1288297ad1a6124dcbe Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 24 Jan 2015 01:25:41 -0200
Subject: Clean up nested links

---
 sx-question-print.el | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sx-question-print.el b/sx-question-print.el
index 924608b..0528944 100644
--- a/sx-question-print.el
+++ b/sx-question-print.el
@@ -409,6 +409,14 @@ Image links are downloaded and displayed, if
 (defun sx-question-mode--insert-link (text-or-image url)
   "Return a link propertized version of TEXT-OR-IMAGE.
 URL is used as 'help-echo and 'url properties."
+  ;; For now, the only way to handle nested links is to remove them.
+  (when (eq (char-before) ?\[)
+    (insert "a")
+    (forward-char -2)
+    (if (looking-at sx-question-mode--link-regexp)
+        (replace-match "")
+      (forward-char 1)
+      (delete-char 1)))
   (let ((imagep (not (stringp text-or-image))))
     ;; Images need to be at the start of a line.
     (when (and imagep (not (looking-at-p "^")))
-- 
cgit v1.2.3


From 458231a11d0d54f8d7011addd9246661898cb2e0 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 24 Jan 2015 01:58:32 -0200
Subject: Fix and reorganize tests

---
 test/test-api.el | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/test-api.el b/test/test-api.el
index f7f54c1..0715a2e 100644
--- a/test/test-api.el
+++ b/test/test-api.el
@@ -15,16 +15,18 @@
   "Tests sx-method interface to `sx-request-all-items'"
   (should (< 250 (length (sx-method-call 'sites :get-all t)))))
 
-(ert-deftest request-get ()
+(ert-deftest request-get-url ()
   (should (sx-request-get-url "http://google.com"))
   (should-error (sx-request-get-url "http://github.com/Bruce-Connor/does-not-exist"))
-  (should-error (sx-request-get-data "tags/emacs-does-not-exist"))
-  (let ((emacs-tags (length (sx-request-get-data 'tags/emacs))))
-    (should (> emacs-tags 450))
-    (should (not (cl-remove-if #'stringp emacs-tags))))
   (should
    ;; If image is not recognized, this returns nil.
    (create-image (sx-request-get-url "https://raw.githubusercontent.com/vermiculus/sx.el/master/list-and-question.png")
                  'imagemagick t
                  :width (min sx-question-mode-image-max-width
                              (window-body-width nil 'pixel)))))
+
+(ert-deftest request-get-data ()
+  (should-error (sx-request-get-data "tags/emacs-does-not-exist"))
+  (let ((emacs-tags (sx-request-get-data 'tags/emacs)))
+    (should (> (length emacs-tags) 450))
+    (should (not (cl-remove-if #'stringp emacs-tags)))))
-- 
cgit v1.2.3


From 62592e73af739b898fa401fd3c3503f43e8bb267 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 24 Jan 2015 02:51:50 -0200
Subject: Larger max width

---
 sx-question-print.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sx-question-print.el b/sx-question-print.el
index 0528944..fe34d9c 100644
--- a/sx-question-print.el
+++ b/sx-question-print.el
@@ -162,7 +162,7 @@ replaced with the comment."
   :type 'boolean
   :group 'sx-question-mode)
 
-(defcustom sx-question-mode-image-max-width 500
+(defcustom sx-question-mode-image-max-width 550
   "Maximum width, in pixels, of images in the question buffer."
   :type 'integer
   :group 'sx-question-mode)
-- 
cgit v1.2.3


From d53dc5e22d6ebd7905c194b9dcd006e763a1aa3d Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 24 Jan 2015 02:52:09 -0200
Subject: Only shrink images, don't enlarge them.

---
 sx-question-print.el | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/sx-question-print.el b/sx-question-print.el
index fe34d9c..3a2eedf 100644
--- a/sx-question-print.el
+++ b/sx-question-print.el
@@ -399,13 +399,23 @@ Image links are downloaded and displayed, if
               (sx-question-mode--insert-link
                (if (and sx-question-mode-use-images (eq ?! (elt full-text 0)))
                    ;; Is it an image?
-                   (create-image (sx-request-get-url url) 'imagemagick t
-                                 :width (min sx-question-mode-image-max-width
-                                             (window-body-width nil 'pixel)))
+                   (sx-question-mode--create-image url)
                  ;; Or a regular link
                  (or (if sx-question-mode-pretty-links text full-text) url))
                url))))))))
 
+(defun sx-question-mode--create-image (url)
+  "Get and create an image from URL.
+Its size is bound by `sx-question-mode-image-max-width' and
+`window-body-width'."
+  (let* ((image
+          (create-image (sx-request-get-url url) 'imagemagick t))
+         (image-width (car (image-size image 'pixels))))
+    (append image
+            (list :width (min sx-question-mode-image-max-width
+                              (window-body-width nil 'pixel)
+                              image-width)))))
+
 (defun sx-question-mode--insert-link (text-or-image url)
   "Return a link propertized version of TEXT-OR-IMAGE.
 URL is used as 'help-echo and 'url properties."
-- 
cgit v1.2.3


From 131f48d0407f9721a467c84ea4aaecc4c3db62ba Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Mon, 26 Jan 2015 15:18:38 -0200
Subject: Only use images if imagemagick is available.

---
 sx-question-print.el | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sx-question-print.el b/sx-question-print.el
index 3a2eedf..e21c998 100644
--- a/sx-question-print.el
+++ b/sx-question-print.el
@@ -157,8 +157,13 @@ replaced with the comment."
           (const :tag "More active first"    sx-answer-more-active-p))
   :group 'sx-question-mode)
 
-(defcustom sx-question-mode-use-images t
-  "Non-nil if SX should download and display images."
+(defcustom sx-question-mode-use-images
+  (eval-when-compile
+    (image-type-available-p 'imagemagick))
+  "Non-nil if SX should download and display images.
+By default, this is `t' if the `imagemagick' image type is
+available (checked with `image-type-available-p').  If this image
+type is not available, images won't work."
   :type 'boolean
   :group 'sx-question-mode)
 
-- 
cgit v1.2.3


From 75c4a7d4e02e81c42a4914e2b798f60415a3b505 Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Mon, 26 Jan 2015 15:28:19 -0200
Subject: Check image-type-available-p in the tests

---
 test/test-api.el | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/test/test-api.el b/test/test-api.el
index 0715a2e..faf2e0a 100644
--- a/test/test-api.el
+++ b/test/test-api.el
@@ -18,12 +18,19 @@
 (ert-deftest request-get-url ()
   (should (sx-request-get-url "http://google.com"))
   (should-error (sx-request-get-url "http://github.com/Bruce-Connor/does-not-exist"))
-  (should
-   ;; If image is not recognized, this returns nil.
-   (create-image (sx-request-get-url "https://raw.githubusercontent.com/vermiculus/sx.el/master/list-and-question.png")
-                 'imagemagick t
-                 :width (min sx-question-mode-image-max-width
-                             (window-body-width nil 'pixel)))))
+  (when sx-question-mode-use-images
+    (should
+     ;; If image is not recognized, this returns nil.
+     (create-image (sx-request-get-url "https://raw.githubusercontent.com/vermiculus/sx.el/master/list-and-question.png")
+                   'imagemagick t
+                   :width sx-question-mode-image-max-width)))
+  ;; In case imagemacgick is not available, let's try png so we at
+  ;; least test the function.
+  (when (image-type-available-p 'png)
+    (should
+     (create-image (sx-request-get-url "https://raw.githubusercontent.com/vermiculus/sx.el/master/list-and-question.png")
+                   'png t
+                   :width sx-question-mode-image-max-width))))
 
 (ert-deftest request-get-data ()
   (should-error (sx-request-get-data "tags/emacs-does-not-exist"))
-- 
cgit v1.2.3