delay converting to strings

joegallo · Nov 12, 2011 · 9ad0722 · 9ad0722
1 parent 3885145
commit 9ad0722
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/doric/core.clj b/src/doric/core.clj
@@ -39,10 +39,11 @@
                                   (map str data))))))
 
 (defn format-cell [col s]
-  (str ((:format col) s)))
+  ((:format col) s))
 
 (defn align-cell [col s align]
   (let [width (:width col)
+        s (str s)
         s (cond (<= (count s) width) s
                 (:ellipsis col) (str (subs s 0 (- width 3)) "...")
                 :else (subs s 0 width))

diff --git a/src/doric/csv.clj b/src/doric/csv.clj
@@ -8,7 +8,7 @@
 (def td unaligned-td)
 
 (defn escape [s]
-  (let [s (.replaceAll s "\"" "\"\"")]
+  (let [s (.replaceAll (str s) "\"" "\"\"")]
     (if (re-find #"[,\n\"]" s)
       (str "\"" s "\"")
       s)))

diff --git a/test/doric/test/core.clj b/test/doric/test/core.clj
@@ -44,7 +44,7 @@
   (is (= 7 (width {:name :foobar} ["foobar2"]))))
 
 (deftest test-format-cell
-  (is (= "2" (format-cell {:format inc} 1))))
+  (is (= 2 (format-cell {:format inc} 1))))
 
 (deftest test-align-cell
   (is (= "." (align-cell {:width 1} "." :left)))