embulk-parser-poi_excel 0.1.7 → 0.1.10

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellStyle.java

@@ -1,7 +1,7 @@
 package org.embulk.parser.poi_excel;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.net.URL;
@@ -9,7 +9,7 @@ import java.text.ParseException;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.BorderStyle;
 import org.embulk.parser.EmbulkPluginTester;
 import org.embulk.parser.EmbulkTestOutputPlugin.OutputRecord;
 import org.embulk.parser.EmbulkTestParserConfig;
@@ -44,11 +44,11 @@ public class TestPoiExcelParserPlugin_cellStyle {
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(5));
-			check1(result, 0, "red", 255, 0, 0, "top", CellStyle.BORDER_THIN, 0, 0, 0);
+			check1(result, 0, "red", 255, 0, 0, "top", BorderStyle.THIN.getCode(), 0, 0, 0);
 			check1(result, 1, "green", 0, 128, 0, null, 0, 0, 0, 0);
-			check1(result, 2, "blue", 0, 0, 255, "left", 0, 0, CellStyle.BORDER_THIN, 0);
-			check1(result, 3, "white", 255, 255, 255, "right", 0, 0, 0, CellStyle.BORDER_THIN);
-			check1(result, 4, "black", 0, 0, 0, "bottom", 0, CellStyle.BORDER_MEDIUM, 0, 0);
+			check1(result, 2, "blue", 0, 0, 255, "left", 0, 0, BorderStyle.THIN.getCode(), 0);
+			check1(result, 3, "white", 255, 255, 255, "right", 0, 0, 0, BorderStyle.THIN.getCode());
+			check1(result, 4, "black", 0, 0, 0, "bottom", 0, BorderStyle.MEDIUM.getCode(), 0, 0);
 		}
 	}
 
@@ -81,11 +81,11 @@ public class TestPoiExcelParserPlugin_cellStyle {
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(5));
-			check2(result, 0, "red", 255, 0, 0, "top", CellStyle.BORDER_THIN, 0, 0, 0);
+			check2(result, 0, "red", 255, 0, 0, "top", BorderStyle.THIN.getCode(), 0, 0, 0);
 			check2(result, 1, "green", 0, 128, 0, null, 0, 0, 0, 0);
-			check2(result, 2, "blue", 0, 0, 255, "left", 0, 0, CellStyle.BORDER_THIN, 0);
-			check2(result, 3, "white", 255, 255, 255, "right", 0, 0, 0, CellStyle.BORDER_THIN);
-			check2(result, 4, "black", 0, 0, 0, "bottom", 0, CellStyle.BORDER_MEDIUM, 0, 0);
+			check2(result, 2, "blue", 0, 0, 255, "left", 0, 0, BorderStyle.THIN.getCode(), 0);
+			check2(result, 3, "white", 255, 255, 255, "right", 0, 0, 0, BorderStyle.THIN.getCode());
+			check2(result, 4, "black", 0, 0, 0, "bottom", 0, BorderStyle.MEDIUM.getCode(), 0, 0);
 		}
 	}
 
@@ -130,11 +130,11 @@ public class TestPoiExcelParserPlugin_cellStyle {
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(5));
-			check2(result, 0, "red", 255, 0, 0, "top", CellStyle.BORDER_THIN, 0, 0, 0);
+			check2(result, 0, "red", 255, 0, 0, "top", BorderStyle.THIN.getCode(), 0, 0, 0);
 			check2(result, 1, "green", 0, 128, 0, null, 0, 0, 0, 0);
-			check2(result, 2, "blue", 0, 0, 255, "left", 0, 0, CellStyle.BORDER_THIN, 0);
-			check2(result, 3, "white", 255, 255, 255, "right", 0, 0, 0, CellStyle.BORDER_THIN);
-			check2(result, 4, "black", 0, 0, 0, "bottom", 0, CellStyle.BORDER_MEDIUM, 0, 0);
+			check2(result, 2, "blue", 0, 0, 255, "left", 0, 0, BorderStyle.THIN.getCode(), 0);
+			check2(result, 3, "white", 255, 255, 255, "right", 0, 0, 0, BorderStyle.THIN.getCode());
+			check2(result, 4, "black", 0, 0, 0, "bottom", 0, BorderStyle.MEDIUM.getCode(), 0, 0);
 		}
 	}
 }

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellType.java

@@ -1,14 +1,14 @@
 package org.embulk.parser.poi_excel;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.URL;
 import java.text.ParseException;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
 import org.embulk.parser.EmbulkPluginTester;
 import org.embulk.parser.EmbulkTestOutputPlugin.OutputRecord;
 import org.embulk.parser.EmbulkTestParserConfig;
@@ -38,11 +38,11 @@ public class TestPoiExcelParserPlugin_cellType {
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(5));
-			check1(result, 0, Cell.CELL_TYPE_NUMERIC, "NUMERIC");
-			check1(result, 1, Cell.CELL_TYPE_STRING, "STRING");
-			check1(result, 2, Cell.CELL_TYPE_FORMULA, "FORMULA");
-			check1(result, 3, Cell.CELL_TYPE_BOOLEAN, "BOOLEAN");
-			check1(result, 4, Cell.CELL_TYPE_FORMULA, "FORMULA");
+			check1(result, 0, CellType.NUMERIC, "NUMERIC");
+			check1(result, 1, CellType.STRING, "STRING");
+			check1(result, 2, CellType.FORMULA, "FORMULA");
+			check1(result, 3, CellType.BOOLEAN, "BOOLEAN");
+			check1(result, 4, CellType.FORMULA, "FORMULA");
 		}
 	}
 
@@ -61,18 +61,19 @@ public class TestPoiExcelParserPlugin_cellType {
 			List<OutputRecord> result = tester.runParser(inFile, parser);
 
 			assertThat(result.size(), is(5));
-			check1(result, 0, Cell.CELL_TYPE_NUMERIC, "NUMERIC");
-			check1(result, 1, Cell.CELL_TYPE_STRING, "STRING");
-			check1(result, 2, Cell.CELL_TYPE_BOOLEAN, "BOOLEAN");
-			check1(result, 3, Cell.CELL_TYPE_BOOLEAN, "BOOLEAN");
-			check1(result, 4, Cell.CELL_TYPE_ERROR, "ERROR");
+			check1(result, 0, CellType.NUMERIC, "NUMERIC");
+			check1(result, 1, CellType.STRING, "STRING");
+			check1(result, 2, CellType.BOOLEAN, "BOOLEAN");
+			check1(result, 3, CellType.BOOLEAN, "BOOLEAN");
+			check1(result, 4, CellType.ERROR, "ERROR");
 		}
 	}
 
-	private void check1(List<OutputRecord> result, int index, long l, String s) throws ParseException {
+	@SuppressWarnings("deprecation")
+	private void check1(List<OutputRecord> result, int index, CellType cellType, String s) throws ParseException {
 		OutputRecord r = result.get(index);
 		// System.out.println(r);
-		assertThat(r.getAsLong("long"), is(l));
+		assertThat(r.getAsLong("long"), is((long) cellType.getCode()));
 		assertThat(r.getAsString("string"), is(s));
 	}
 }

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_columnNumber.java

@@ -2,7 +2,7 @@ package org.embulk.parser.poi_excel;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.URL;
 import java.text.ParseException;

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_constant.java

@@ -2,7 +2,7 @@ package org.embulk.parser.poi_excel;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.URL;
 import java.text.ParseException;

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_convertError.java

@@ -2,7 +2,7 @@ package org.embulk.parser.poi_excel;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.net.URL;

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_formula.java

@@ -1,7 +1,7 @@
 package org.embulk.parser.poi_excel;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.URL;
 import java.text.ParseException;

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_mergedCell.java

@@ -0,0 +1,89 @@
+package org.embulk.parser.poi_excel;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.net.URL;
+import java.text.ParseException;
+import java.util.List;
+
+import org.embulk.parser.EmbulkPluginTester;
+import org.embulk.parser.EmbulkTestOutputPlugin.OutputRecord;
+import org.embulk.parser.EmbulkTestParserConfig;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
+
+@RunWith(Theories.class)
+public class TestPoiExcelParserPlugin_mergedCell {
+
+	@DataPoints
+	public static String[] FILES = { "test1.xls", "test2.xlsx" };
+
+	@Theory
+	public void testSearchMergedCell_default(String excelFile) throws ParseException {
+		test(excelFile, null, true);
+	}
+
+	@Theory
+	public void testSearchMergedCell_true(String excelFile) throws ParseException {
+		// compatibility ver 0.1.7
+		test(excelFile, true, true);
+	}
+
+	@Theory
+	public void testSearchMergedCell_false(String excelFile) throws ParseException {
+		// compatibility ver 0.1.7
+		test(excelFile, false, false);
+	}
+
+	@Theory
+	public void testSearchMergedCell_none(String excelFile) throws ParseException {
+		test(excelFile, "none", false);
+	}
+
+	@Theory
+	public void testSearchMergedCell_linear(String excelFile) throws ParseException {
+		test(excelFile, "linear_search", true);
+	}
+
+	@Theory
+	public void testSearchMergedCell_tree(String excelFile) throws ParseException {
+		test(excelFile, "tree_search", true);
+	}
+
+	private void test(String excelFile, Object arg, boolean search) {
+		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
+			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
+
+			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
+			parser.set("sheet", "merged_cell");
+			if (arg != null) {
+				parser.set("search_merged_cell", arg);
+			}
+			parser.addColumn("a", "string");
+			parser.addColumn("b", "string");
+
+			URL inFile = getClass().getResource(excelFile);
+			List<OutputRecord> result = tester.runParser(inFile, parser);
+
+			assertThat(result.size(), is(4));
+			if (search) {
+				check6(result, 0, "test3-a1", "test3-a1");
+			} else {
+				check6(result, 0, "test3-a1", null);
+			}
+			check6(result, 1, "data", "0");
+			check6(result, 2, null, null);
+			check6(result, 3, null, null);
+		}
+	}
+
+	private void check6(List<OutputRecord> result, int index, String a, String b) {
+		OutputRecord r = result.get(index);
+		// System.out.println(r);
+		assertThat(r.getAsString("a"), is(a));
+		assertThat(r.getAsString("b"), is(b));
+	}
+}

data/src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_sheets.java

@@ -1,7 +1,7 @@
 package org.embulk.parser.poi_excel;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.URL;
 import java.text.ParseException;

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-poi_excel
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.10
 platform: ruby
 authors:
 - hishidama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-11 00:00:00.000000000 Z
+date: 2020-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   name: bundler
@@ -21,13 +21,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   name: rake
@@ -35,7 +35,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Parses Excel files(xls, xlsx) read by other file input plugins.
@@ -45,10 +45,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - LICENSE.txt
 - README.md
 - build.gradle
+- classpath/commons-codec-1.10.jar
+- classpath/commons-collections4-4.1.jar
+- classpath/curvesapi-1.04.jar
+- classpath/embulk-parser-poi_excel-0.1.10.jar
+- classpath/embulk-standards-0.7.5.jar
+- classpath/poi-3.17.jar
+- classpath/poi-ooxml-3.17.jar
+- classpath/poi-ooxml-schemas-3.17.jar
+- classpath/xmlbeans-2.6.0.jar
 - gradle/wrapper/gradle-wrapper.jar
 - gradle/wrapper/gradle-wrapper.properties
 - gradlew
@@ -60,6 +69,7 @@ files:
 - src/main/java/org/embulk/parser/poi_excel/bean/PoiExcelColumnBean.java
 - src/main/java/org/embulk/parser/poi_excel/bean/PoiExcelColumnIndex.java
 - src/main/java/org/embulk/parser/poi_excel/bean/PoiExcelSheetBean.java
+- src/main/java/org/embulk/parser/poi_excel/bean/util/PoiExcelCellAddress.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/AbstractPoiExcelCellAttributeVisitor.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelCellCommentVisitor.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelCellFontVisitor.java
@@ -77,11 +87,13 @@ files:
 - src/main/java/org/embulk/parser/poi_excel/visitor/embulk/LongCellVisitor.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/embulk/StringCellVisitor.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/embulk/TimestampCellVisitor.java
+- src/main/java/org/embulk/parser/poi_excel/visitor/util/MergedRegionMap.java
 - src/test/java/org/embulk/parser/EmbulkPluginTester.java
 - src/test/java/org/embulk/parser/EmbulkTestFileInputPlugin.java
 - src/test/java/org/embulk/parser/EmbulkTestOutputPlugin.java
 - src/test/java/org/embulk/parser/EmbulkTestParserConfig.java
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin.java
+- src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellAddress.java
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellComment.java
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellError.java
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_cellFont.java
@@ -91,16 +103,10 @@ files:
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_constant.java
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_convertError.java
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_formula.java
+- src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_mergedCell.java
 - src/test/java/org/embulk/parser/poi_excel/TestPoiExcelParserPlugin_sheets.java
 - src/test/resources/org/embulk/parser/poi_excel/test1.xls
 - src/test/resources/org/embulk/parser/poi_excel/test2.xlsx
-- classpath/commons-codec-1.9.jar
-- classpath/embulk-parser-poi_excel-0.1.7.jar
-- classpath/embulk-standards-0.7.5.jar
-- classpath/poi-3.13.jar
-- classpath/poi-ooxml-3.13.jar
-- classpath/poi-ooxml-schemas-3.13.jar
-- classpath/xmlbeans-2.6.0.jar
 homepage: https://github.com/hishidama/embulk-parser-poi_excel
 licenses:
 - MIT
@@ -111,17 +117,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: Apache POI Excel parser plugin for Embulk