Merge branch 'develop' for v1.3.1

matthewdowney · Apr 14, 2020 · bda30b2 · bda30b2
2 parents 440f661 + f119a3a
commit bda30b2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ common sense styling.
 
 Lein:
 ```
-[org.clojars.mjdowney/excel-clj "1.3.0"]
+[org.clojars.mjdowney/excel-clj "1.3.1"]
 ```
 
 - [Getting Started](#getting-started)

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.clojars.mjdowney/excel-clj "1.3.0"
+(defproject org.clojars.mjdowney/excel-clj "1.3.1"
   :description "Generate Excel documents & PDFs from Clojure data."
   :url "https://github.com/matthewdowney/excel-clj"
   :license {:name "Eclipse Public License"

diff --git a/src/excel_clj/core.clj b/src/excel_clj/core.clj
@@ -259,11 +259,9 @@
   (open (convert-pdf! (example) (temp ".pdf")))
 
   ;; Expose ordering / styling issues in v1.2.X
-  (quick-open
-    [["Test"
-      (table
-        (for [x (range 10000)]
-          {"N" x "N^2" (* x x) "N^3" (* x x x)}))]])
+(quick-open {"Test" (table
+                      (for [x (range 10000)]
+                        {"N" x, "N^2" (* x x), "N^3" (* x x x)}))})
 
   ;; Ballpark performance test
   (dotimes [_ 5]

diff --git a/src/excel_clj/prototype.clj b/src/excel_clj/prototype.clj
@@ -2,7 +2,6 @@
   "Prototype features to be included in v2.0.0 -- everything subject to change."
   {:author "Matthew Downey"}
   (:require [excel-clj.poi :as poi]
-            [excel-clj.cell :as cell]
             [clojure.java.io :as io]
             [clojure.string :as string]
             [taoensso.encore :as enc])

diff --git a/src/excel_clj/style.clj b/src/excel_clj/style.clj
@@ -59,7 +59,8 @@
             workbook :font {:bold true :font-height-in-points 10}))))"
   {:author "Matthew Downey"}
   (:require [clojure.string :as string]
-            [clojure.reflect :as reflect])
+            [clojure.reflect :as reflect]
+            [rhizome.viz :as viz])
   (:import (org.apache.poi.ss.usermodel
              DataFormat BorderStyle HorizontalAlignment FontUnderline
              FillPatternType)
@@ -348,7 +349,6 @@
   "If one wanted to visualize all of the nested setters & POI objects...
   Keep in mind that this requires $ apt-get install graphviz"
   []
-  (require '[rhizome.viz :as viz])
   (let [param-type (fn [setter] (resolve (first (:parameter-types setter))))
         is-setter? (fn [{:keys [name parameter-types]}]
                      (and (string/starts-with? (str name) "set")