Merge branch 'develop' for v1.3.2

Author: matthewdowney

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 
-## [1.3.0] - 2020-04-05
+## [1.3.2] - 2020-04-15
+### Fixed
+- Bug introduced in v1.3.1 where adjacent cells with width > 1 cause an 
+  exception.
+
+## [1.3.1] - 2020-04-05
 ### Added
 - A lower-level, writer style interface for Apache POI.
 - [Prototype/brainstorm](src/excel_clj/prototype.clj) of less complicated, 

README.md

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

project.clj

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

src/excel_clj/core.clj

@@ -229,9 +229,8 @@
   [workbook]
   (open (write-pdf! workbook (temp ".pdf"))))
 
-(defn example []
-  (quick-open
-    {"Tree Sheet"
+(def example-workbook-data
+  {"Tree Sheet"
      (tree
        ["Mock Balance Sheet for the year ending Dec 31st, 2018"
         tree/mock-balance-sheet])
@@ -243,11 +242,13 @@
         {"Date" "2018-03-01" "% Return" 0.07M "USD" 2100.66666666M}])
 
      "Freeform Grid Sheet"
-     [["First Column" "Second Column" {:value "A few merged" :width 3}]
+     [["First" "Second" {:value "Wide" :width 2} {:value "Wider" :width 3}]
       ["First Column Value" "Second Column Value"]
       ["This" "Row" "Has" "Its" "Own"
-       {:value "Format" :style {:font {:bold true}}}]]}))
+       {:value "Format" :style {:font {:bold true}}}]]})
 
+(defn example []
+  (quick-open example-workbook-data))
 
 (comment
   ;; This should open an Excel workbook
@@ -259,9 +260,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]

src/excel_clj/poi.clj

@@ -121,6 +121,9 @@
           poi-cell (.createCell poi-row cidx)]
 
       (when (or (> width 1) (> height 1))
+        ;; If the width is > 1, move the cursor along so that the next write on
+        ;; this row happens in the next free cell, skipping the merged area
+        (vswap! col-cursor + (dec width))
         (let [ridx @row-cursor
               cra (CellRangeAddress.
                     ridx (dec (+ ridx height))
@@ -213,7 +216,14 @@
       ;; This one won't be visible, because it's hidden behind the tall cell
       (write! t "1")
       (write! t "2")
-      (write! t "3"))))
+      (write! t "3")
+
+      (newline! t)
+      (write! t "Wide" nil 2 1)
+      (write! t "Wider" nil 3 1)
+      (write! t "Much Wider" nil 5 1)))
+
+  )
 
 
 (defn performance-test

test/excel_clj/core_test.clj

@@ -1,6 +1,7 @@
 (ns excel-clj.core-test
   (:require [clojure.test :refer :all]
-            [excel-clj.core :refer :all]))
+            [excel-clj.core :refer :all]
+            [clojure.java.io :as io]))
 
 (deftest table-test
   (let [data [{"Date" "2018-01-01" "% Return" 0.05M "USD" 1500.5005M}
@@ -29,3 +30,12 @@
            ["" 5 2]
            ["Tree 2" nil nil]
            ["Child" -2 -1]]))))
+
+
+(deftest example-test
+  (let [temp-file (io/file (#'excel-clj.core/temp ".xlsx"))]
+    (try
+      (testing "Example code snippet writes successfully."
+        (write! example-workbook-data temp-file))
+      (finally
+        (io/delete-file temp-file)))))