Add support for merging cells

Author: jameskleeh

build.gradle

@@ -14,7 +14,7 @@ apply plugin: "jacoco"
 
 
 group 'com.jameskleeh'
-version '0.1.1'
+version '0.1.2.BUILD-SNAPSHOT'
 
 targetCompatibility = 1.7
 

src/main/groovy/com/jameskleeh/excel/CellStyleBuilder.groovy

@@ -5,7 +5,6 @@ import groovy.transform.TypeCheckingMode
 import org.apache.poi.ss.usermodel.BorderStyle
 import org.apache.poi.ss.usermodel.FillPatternType
 import org.apache.poi.ss.usermodel.Font as FontType
-import org.apache.poi.ss.usermodel.IndexedColors
 import org.apache.poi.ss.usermodel.HorizontalAlignment
 import org.apache.poi.ss.usermodel.VerticalAlignment
 import org.apache.poi.xssf.usermodel.XSSFCell
@@ -424,7 +423,7 @@ class CellStyleBuilder {
     }
 
     @CompileStatic(TypeCheckingMode.SKIP)
-    private Map merge(Map[] sources) {
+    Map merge(Map[] sources) {
         if (sources.length == 0) {
             return [:]
         }

src/main/groovy/com/jameskleeh/excel/Row.groovy

@@ -1,6 +1,7 @@
 package com.jameskleeh.excel
 
 import groovy.transform.CompileStatic
+import org.apache.poi.ss.util.CellRangeAddress
 import org.apache.poi.xssf.usermodel.XSSFCell
 import org.apache.poi.xssf.usermodel.XSSFRow
 import org.apache.poi.xssf.usermodel.XSSFSheet
@@ -53,7 +54,13 @@ class Row {
     }
 
     void defaultStyle(Map options) {
-        this.defaultOptions = options
+        options = new LinkedHashMap(options)
+        styleBuilder.convertSimpleOptions(options)
+        if (defaultOptions == null) {
+            defaultOptions = options
+        } else {
+            defaultOptions = styleBuilder.merge(defaultOptions, options)
+        }
     }
 
     XSSFCell column(String value, Object id, final Map options = [:]) {
@@ -101,9 +108,7 @@ class Row {
     }
 
     XSSFCell cell() {
-        XSSFCell cell = nextCell()
-        cell.setCellValue('')
-        cell
+        cell('')
     }
     XSSFCell cell(Object value) {
         cell(value, null)
@@ -133,4 +138,38 @@ class Row {
         cell
     }
 
+    void merge(final Map style, @DelegatesTo(strategy = Closure.DELEGATE_FIRST, value = Row) Closure callable) {
+        Map existingDefaultOptions = defaultOptions
+
+        if (style != null && !style.isEmpty()) {
+            Map newDefaultOptions = new LinkedHashMap(style)
+            styleBuilder.convertSimpleOptions(newDefaultOptions)
+            newDefaultOptions = styleBuilder.merge(defaultOptions, newDefaultOptions)
+            defaultOptions = newDefaultOptions
+        }
+
+        callable.resolveStrategy = Closure.DELEGATE_FIRST
+        callable.delegate = this
+        int startingCellIndex = cellIdx
+        callable.call()
+        int endingCellIndex = cellIdx - 1
+        if (endingCellIndex > startingCellIndex) {
+            CellRangeAddress range = new CellRangeAddress(row.rowNum, row.rowNum, startingCellIndex, endingCellIndex)
+            sheet.addMergedRegion(range)
+        }
+
+        defaultOptions = existingDefaultOptions
+    }
+
+    void merge(@DelegatesTo(strategy = Closure.DELEGATE_FIRST, value = Row) Closure callable) {
+        merge(null, callable)
+    }
+
+    void merge(Object value, Integer count, final Map style = null) {
+        merge(style) {
+            cell(value)
+            skipCells(count)
+        }
+    }
+
 }

src/main/groovy/com/jameskleeh/excel/Sheet.groovy

@@ -28,6 +28,8 @@ class Sheet {
     }
 
     void defaultStyle(Map options) {
+        options = new LinkedHashMap(options)
+        styleBuilder.convertSimpleOptions(options)
         defaultOptions = options
     }
 

src/test/groovy/com/jameskleeh/excel/CellStyleBuilderSpec.groovy

@@ -595,5 +595,62 @@ class CellStyleBuilderSpec extends Specification {
         style.borderBottomEnum == BorderStyle.DASH_DOT
     }
 
+    void "test merging of options"() {
+        given:
+        XSSFCell testCell1
+        XSSFCell testCell2
+        XSSFCell testCell3
+        XSSFCell testCell4
+        ExcelBuilder.output(new FileOutputStream('/Users/jameskleeh/test.xlsx')) {
+            sheet {
+                defaultStyle([border: BorderStyle.MEDIUM])
+                row {
+                    defaultStyle([border: [left: BorderStyle.HAIR]])
+                    merge([border: [right: BorderStyle.THICK], alignment: 'center']) {
+                        testCell1 = cell('Foo')
+                        cell('')
+                        cell('')
+                        cell('')
+                        cell('')
+                        cell('')
+                    }
+                    testCell2 = cell('')
+                }
+                row {
+                    testCell3 = cell('')
+                }
+            }
+            sheet {
+                row {
+                    testCell4 = cell('')
+                }
+            }
+        }
+
+        when:
+        XSSFCellStyle style1 = testCell1.cellStyle //sheet, row, merge
+        XSSFCellStyle style2 = testCell2.cellStyle //sheet, row
+        XSSFCellStyle style3 = testCell3.cellStyle //sheet
+        XSSFCellStyle style4 = testCell4.cellStyle //none
+
+        then:
+        style1.borderLeftEnum == BorderStyle.HAIR
+        style1.borderTopEnum == BorderStyle.MEDIUM
+        style1.borderRightEnum == BorderStyle.THICK
+        style1.borderBottomEnum == BorderStyle.MEDIUM
+        style2.borderLeftEnum == BorderStyle.HAIR
+        style2.borderTopEnum == BorderStyle.MEDIUM
+        style2.borderRightEnum == BorderStyle.MEDIUM
+        style2.borderBottomEnum == BorderStyle.MEDIUM
+        style3.borderLeftEnum == BorderStyle.MEDIUM
+        style3.borderTopEnum == BorderStyle.MEDIUM
+        style3.borderRightEnum == BorderStyle.MEDIUM
+        style3.borderBottomEnum == BorderStyle.MEDIUM
+        style4.borderLeftEnum == BorderStyle.NONE
+        style4.borderTopEnum == BorderStyle.NONE
+        style4.borderRightEnum == BorderStyle.NONE
+        style4.borderBottomEnum == BorderStyle.NONE
+    }
+
 
 }