Fix ClassCastException issue from uses of name

Author: matthewdowney

src/excel_clj/core.clj

@@ -28,13 +28,16 @@
 ;;; Build grids of [[cell]] out of Clojure's data structures
 
 
+(defn- name' [x]
+  (if (instance? Named x)
+    (name x)
+    (str x)))
+
+
 (defn best-guess-cell-format
   "Try to guess appropriate formatting based on column name and cell value."
   [val column-name]
-  (let [column' (string/lower-case
-                  (if (instance? Named column-name)
-                    (name column-name)
-                    (str column-name)))]
+  (let [column' (string/lower-case (name' column-name))]
     (cond
       (and (string? val) (> (count val) 75))
       {:wrap-text true}
@@ -146,14 +149,14 @@
                 empty-row (zipmap (keys combined) (repeat nil))]
             (concat
               ; header
-              [(style (assoc empty-row "" (name parent)) (get' fmts depth))]
+              [(style (assoc empty-row "" (name' parent)) (get' fmts depth))]
               ; children
               (tree/table render node)
               ; total row
               (when (> (count node) 1)
                 [(style-data (assoc combined "" "") (get' total-fmts depth))])))
           ; leaf
-          [(style-data (assoc node "" (name parent)) (get' fmts (max depth 2)))]))
+          [(style-data (assoc node "" (name' parent)) (get' fmts (max depth 2)))]))
       t)))
 
 
@@ -371,9 +374,19 @@
 ;; Some v1.X backwards compatibility
 
 
-(def ^:deprecated tree (partial deprecated/tree table-grid with-title))
-(def ^:deprecated table deprecated/table)
-(def ^:deprecated quick-open quick-open!)
+(def ^:deprecated tree
+  "Deprecated in favor of `tree-grid`."
+  (partial deprecated/tree table-grid with-title))
+
+
+(def ^:deprecated table
+  "Deprecated in favor of `table-grid`."
+  deprecated/table)
+
+
+(def ^:deprecated quick-open
+  "Deprecated in favor of `quick-open!`."
+  quick-open!)
 
 
 (comment

src/excel_clj/poi.clj

@@ -4,10 +4,12 @@
   See the `example` and `performance-test` functions at the end of
   this ns + the adjacent (comment ...) forms for more detail."
   {:author "Matthew Downey"}
-  (:require [clojure.java.io :as io]
-            [taoensso.encore :as enc]
-            [excel-clj.style :as style]
+  (:require [excel-clj.style :as style]
+
+            [clojure.java.io :as io]
             [clojure.walk :as walk]
+
+            [taoensso.encore :as enc]
             [taoensso.tufte :as tufte])
   (:import (java.io Closeable BufferedInputStream InputStream)
            (org.apache.poi.ss.usermodel RichTextString Sheet Cell Row Workbook)

src/excel_clj/tree.clj

@@ -3,7 +3,8 @@
 
   Use ordered maps (like array-map) to enforce order."
   {:author "Matthew Downey"}
-  (:require [clojure.walk :as walk]))
+  (:require [clojure.walk :as walk])
+  (:import (clojure.lang Named)))
 
 
 (defn leaf?
@@ -97,6 +98,7 @@
 
 
 (def ^{:private true :dynamic true} *depth* nil)
+(defn- ->str [x] (if (instance? Named x) (name x) (str x)))
 (defn table
   "Given `(fn f [parent-key node depth] => row-map)`, convert `tree` into a
   table of `[row]`.
@@ -112,7 +114,7 @@
      (fn render [parent node depth]
        (let [row (fold (fn [_ _] nil) node)]
          (cons
-           (assoc row "" (name parent) :tree/indent depth)
+           (assoc row "" (->str parent) :tree/indent depth)
            (when-not (leaf? node) (table render node)))))
      tree))
   ([f tree]
@@ -131,7 +133,7 @@
      (cons
        (assoc
          (combine-with node)
-         "" (name parent)
+         "" (->str parent)
          :tree/indent depth)
        (when-not (leaf? node) (table render node))))))
 
@@ -147,10 +149,10 @@
        (let [combined (combine-with node)
              empty-row (zipmap (keys combined) (repeat nil))]
          (concat
-           [(assoc empty-row "" (name parent) :tree/indent depth)] ; header
+           [(assoc empty-row "" (->str parent) :tree/indent depth)] ; header
            (table render node) ; children
            [(assoc combined "" "" :tree/indent depth)])) ; total
-       [(assoc node "" (name parent) :tree/indent depth)]))))
+       [(assoc node "" (->str parent) :tree/indent depth)]))))
 
 
 (defn indent
@@ -275,4 +277,4 @@
                 (fold - {:assets (fold + assets)
                          :liabilities (fold + liabilities)})}))))
 
-  (print-table tbl))
+  (print-table tbl))