Get rid of problematic rhizome dependency & fix column resizing

Author: matthewdowney

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [1.3.3] - 2020-07-11
+### Fixed
+- Bug where columns would only auto resize up until 'J'
+- Unnecessary Rhizome dependency causing headaches in headless environments
+
 ## [1.3.2] - 2020-04-15
 ### Fixed
 - Bug introduced in v1.3.1 where adjacent cells with width > 1 cause an 

README.md

@@ -8,7 +8,7 @@ common sense styling.
 
 Lein:
 ```
-[org.clojars.mjdowney/excel-clj "1.3.2"]
+[org.clojars.mjdowney/excel-clj "1.3.3"]
 ```
 
 - [Getting Started](#getting-started)

project.clj

@@ -1,10 +1,9 @@
-(defproject org.clojars.mjdowney/excel-clj "1.3.2"
+(defproject org.clojars.mjdowney/excel-clj "1.3.3"
   :description "Generate Excel documents & PDFs from Clojure data."
   :url "https://github.com/matthewdowney/excel-clj"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :dependencies [[org.clojure/clojure "1.10.1"]
                  [com.taoensso/tufte "2.0.1"]
-                 [rhizome "0.2.9"]
                  [org.apache.poi/poi-ooxml "4.0.0"]
                  [org.jodconverter/jodconverter-core "4.0.0-RELEASE"]])

src/excel_clj/prototype.clj

@@ -104,17 +104,17 @@
 
 
 (defn- write-rows!
-  "Write the rows via the given sheet-writer, returning the number of rows
-  written."
+  "Write the rows via the given sheet-writer, returning [the number of rows
+  written, number of columns written]."
   [sheet-writer rows-seq]
   (reduce
-    (fn [n next-row]
+    (fn [[rows cols] next-row]
       (doseq [cell next-row]
         (let [{:keys [width height]} (dims cell)]
           (poi/write! sheet-writer (data cell) (style cell) width height)))
       (poi/newline! sheet-writer)
-      (inc n))
-    0
+      [(inc rows) (max cols (count next-row))])
+    [0 0]
     rows-seq))
 
 
@@ -129,10 +129,10 @@
     (with-open [w (poi/writer f)]
       (doseq [[nm rows] workbook
               :let [sh (poi/sheet-writer w nm)
-                    n-written (write-rows! sh rows)]]
+                    [rows-written cols-written] (write-rows! sh rows)]]
         ;; Only auto-size columns for small sheets, otherwise it takes forever
-        (when (< n-written 2000)
-          (dotimes [i 10]
+        (when (< rows-written 2000)
+          (dotimes [i cols-written]
             (poi/autosize!! sh i)))))
     f))
 

src/excel_clj/style.clj

@@ -58,9 +58,7 @@
           (coerce-to-obj
             workbook :font {:bold true :font-height-in-points 10}))))"
   {:author "Matthew Downey"}
-  (:require [clojure.string :as string]
-            [clojure.reflect :as reflect]
-            [rhizome.viz :as viz])
+  (:require [clojure.string :as string])
   (:import (org.apache.poi.ss.usermodel
              DataFormat BorderStyle HorizontalAlignment FontUnderline
              FillPatternType)
@@ -344,19 +342,3 @@
 (def default-tree-total-formatters
   {0 {:font {:bold true} :border-top :medium}
    1 {:border-top :thin :border-bottom :thin}})
-
-(defn example
-  "If one wanted to visualize all of the nested setters & POI objects...
-  Keep in mind that this requires $ apt-get install graphviz"
-  []
-  (let [param-type (fn [setter] (resolve (first (:parameter-types setter))))
-        is-setter? (fn [{:keys [name parameter-types]}]
-                     (and (string/starts-with? (str name) "set")
-                          (= 1 (count parameter-types))))
-        setters (fn [class]
-                  (filter is-setter? (#'reflect/declared-methods class)))
-        cell-style (first
-                     (filter #(= 'setCellStyle (:name %)) (setters XSSFCell)))]
-    (viz/view-tree
-      #(instance? Class (param-type %)) (comp setters param-type) cell-style
-      :node->descriptor #(->{:label ((juxt :name :parameter-types) %)}))))