Preformatted text should bypass the html stream.

Closes #20.
ruricolist · Jul 14, 2017 · d80c90d · d80c90d
1 parent d50add1
commit d80c90d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/run.lisp b/run.lisp
@@ -112,13 +112,17 @@
       (when (> col goal)
         (terpri stream)))))
 
-(defun fill-text (string &optional safe? &aux (html *html*))
+(defun fill-text (string &optional safe?
+                  &aux (html *html*)
+                       (pretty? *print-pretty*)
+                       (pre? *pre*))
   (check-type string string)
   (cond
     ((= (length string) 0))
-    (*pre*
-     (fast-format html "~&~A~%" string))
-    (*print-pretty*
+    (pre?
+     (let ((stream (html-stream.base-stream html)))
+       (fast-format stream "~A" string)))
+    (pretty?
      (let* ((start-col (get-indent))
             (fill *fill-column*)
             (goal (+ fill start-col)))

diff --git a/stream.lisp b/stream.lisp
@@ -1,5 +1,9 @@
 (in-package :spinneret)
 
+(defgeneric html-stream.base-stream (stream)
+  (:method ((stream stream))
+    stream))
+
 (defclass html-stream (fundamental-character-output-stream)
   ((col :type (integer 0 *) :initform 0
         :reader html-stream-column
@@ -12,7 +16,8 @@
    (elastic-newline :type boolean
                     :initform nil)
    (base-stream :type stream
-                :initarg :base-stream))
+                :initarg :base-stream
+                :reader html-stream.base-stream))
   (:default-initargs))
 
 (defun make-html-stream (base-stream)

diff --git a/tests.lisp b/tests.lisp
@@ -482,3 +482,26 @@
            (with-html-string
              (:div
                (:p "Text " (:a "link text") " more text"))))))))
+
+(test textarea-preformatting
+  (flet ((test1 ()
+           (with-html-string
+             (:div (:textarea "123"))))
+         (test2 ()
+           (with-html-string
+             (let ((*print-pretty*))
+               (:div (:textarea "123"))))))
+    (with-pretty-printing
+      (is (visually-equal (test1)
+                          (format nil "~
+<div>
+ <textarea>123
+ </textarea>
+</div>")))
+      (is (visually-equal (test2)
+                          "<div><textarea>123</textarea></div>")))
+    ;; Test that dereferencing the underlying stream works when the
+    ;; stream is not, in fact, an HTML stream.
+    (without-pretty-printing
+      (is (visually-equal (test2)
+                          "<div><textarea>123</textarea></div>")))))