embulk-parser-poi_excel 0.1.11 → 0.1.12

data/src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelCellValueVisitor.java

@@ -13,6 +13,7 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellReference;
 import org.embulk.parser.poi_excel.PoiExcelColumnValueType;
 import org.embulk.parser.poi_excel.PoiExcelParserPlugin.FormulaReplaceTask;
 import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean;
@@ -159,7 +160,13 @@ public class PoiExcelCellValueVisitor {
 				String regex = replace.getRegex();
 				String replacement = replace.getTo();
 
-				replacement = replacement.replace("${row}", Integer.toString(cell.getRowIndex() + 1));
+				if (replacement.contains("${row}")) {
+					replacement = replacement.replace("${row}", Integer.toString(cell.getRowIndex() + 1));
+				}
+				if (replacement.contains("${column}")) {
+					replacement = replacement.replace("${column}",
+							CellReference.convertNumToColString(cell.getColumnIndex() + 1));
+				}
 
 				formula = formula.replaceAll(regex, replacement);
 			}

data/src/main/java/org/embulk/parser/poi_excel/visitor/PoiExcelColumnVisitor.java

@@ -4,11 +4,10 @@ import java.text.MessageFormat;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.util.CellReference;
 import org.embulk.parser.poi_excel.PoiExcelColumnValueType;
 import org.embulk.parser.poi_excel.bean.PoiExcelColumnBean;
+import org.embulk.parser.poi_excel.bean.record.PoiExcelRecord;
 import org.embulk.parser.poi_excel.bean.util.PoiExcelCellAddress;
 import org.embulk.parser.poi_excel.visitor.embulk.CellVisitor;
 import org.embulk.spi.Column;
@@ -24,7 +23,7 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 	protected final PageBuilder pageBuilder;
 	protected final PoiExcelVisitorFactory factory;
 
-	protected Row currentRow;
+	protected PoiExcelRecord record;
 
 	public PoiExcelColumnVisitor(PoiExcelVisitorValue visitorValue) {
 		this.visitorValue = visitorValue;
@@ -32,8 +31,8 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 		this.factory = visitorValue.getVisitorFactory();
 	}
 
-	public void setRow(Row row) {
-		this.currentRow = row;
+	public void setRecord(PoiExcelRecord record) {
+		this.record = record;
 	}
 
 	@Override
@@ -69,8 +68,7 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 			visitCell(column, visitor);
 		} catch (Exception e) {
 			String sheetName = visitorValue.getSheet().getSheetName();
-			String ref = new CellReference(currentRow.getRowNum(), visitorValue.getColumnBean(column).getColumnIndex())
-					.formatAsString();
+			String ref = record.getCellReference(visitorValue.getColumnBean(column)).formatAsString();
 			throw new RuntimeException(MessageFormat.format("error at {0} cell={1}!{2}. {3}", column, sheetName, ref,
 					e.getMessage()), e);
 		}
@@ -87,7 +85,7 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 		switch (valueType) {
 		case SHEET_NAME:
 			if (cellAddress != null) {
-				Sheet sheet = cellAddress.getSheet(currentRow);
+				Sheet sheet = cellAddress.getSheet(record);
 				visitor.visitSheetName(column, sheet);
 			} else {
 				visitor.visitSheetName(column);
@@ -96,28 +94,18 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 		case ROW_NUMBER:
 			int rowIndex;
 			if (cellAddress != null) {
-				Cell cell = cellAddress.getCell(currentRow);
-				if (cell == null) {
-					visitCellNull(column);
-					return;
-				}
-				rowIndex = cell.getRowIndex();
+				rowIndex = cellAddress.getRowIndex();
 			} else {
-				rowIndex = currentRow.getRowNum();
+				rowIndex = record.getRowIndex(bean);
 			}
 			visitor.visitRowNumber(column, rowIndex + 1);
 			return;
 		case COLUMN_NUMBER:
 			int columnIndex;
 			if (cellAddress != null) {
-				Cell cell = cellAddress.getCell(currentRow);
-				if (cell == null) {
-					visitCellNull(column);
-					return;
-				}
-				columnIndex = cell.getColumnIndex();
+				columnIndex = cellAddress.getColumnIndex();
 			} else {
-				columnIndex = bean.getColumnIndex();
+				columnIndex = record.getColumnIndex(bean);
 			}
 			visitor.visitColumnNumber(column, columnIndex + 1);
 			return;
@@ -128,12 +116,12 @@ public class PoiExcelColumnVisitor implements ColumnVisitor {
 			break;
 		}
 
-		assert valueType.useCell();
+		// assert valueType.useCell();
 		Cell cell;
 		if (cellAddress != null) {
-			cell = cellAddress.getCell(currentRow);
+			cell = cellAddress.getCell(record);
 		} else {
-			cell = currentRow.getCell(bean.getColumnIndex());
+			cell = record.getCell(bean);
 		}
 		if (cell == null) {
 			visitCellNull(column);

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

@@ -0,0 +1,192 @@
+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_recordType {
+
+	@DataPoints
+	public static String[] FILES = { "test1.xls", "test2.xlsx" };
+
+	@Theory
+	public void testRecordType_row(String excelFile) throws ParseException {
+		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
+			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
+
+			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
+			parser.set("sheet", "test1");
+			parser.set("record_type", "row");
+			parser.set("skip_header_lines", 1);
+			parser.addColumn("text", "string").set("cell_column", "D");
+			parser.addColumn("text_row", "long").set("cell_column", "D").set("value", "row_number");
+			parser.addColumn("text_col", "long").set("cell_column", "D").set("value", "column_number");
+			parser.addColumn("text2", "string").set("cell_row", "4");
+			parser.addColumn("text2_row", "long").set("cell_row", "4").set("value", "row_number");
+			parser.addColumn("text2_col", "long").set("cell_row", "4").set("value", "column_number");
+			parser.addColumn("address1", "string").set("cell_address", "B1").set("value", "cell_value");
+			parser.addColumn("address2", "string").set("cell_column", "D").set("cell_row", "2");
+			parser.addColumn("fix_row", "long").set("cell_address", "B1").set("value", "row_number");
+			parser.addColumn("fix_col", "long").set("cell_address", "B1").set("value", "column_number");
+
+			URL inFile = getClass().getResource(excelFile);
+			List<OutputRecord> result = tester.runParser(inFile, parser);
+
+			assertThat(result.size(), is(7));
+			check1(result, 0, "abc");
+			check1(result, 1, "def");
+			check1(result, 2, "456");
+			check1(result, 3, "abc");
+			check1(result, 4, "abc");
+			check1(result, 5, "true");
+			check1(result, 6, null);
+		}
+	}
+
+	private void check1(List<OutputRecord> result, int index, String text) {
+		OutputRecord record = result.get(index);
+		// System.out.println(record);
+		assertThat(record.getAsString("text"), is(text));
+		assertThat(record.getAsLong("text_row"), is((long) index + 2));
+		assertThat(record.getAsLong("text_col"), is(4L));
+		assertThat(record.getAsString("text2"), is("42283"));
+		assertThat(record.getAsLong("text2_row"), is(4L));
+		assertThat(record.getAsLong("text2_col"), is(5L));
+		assertThat(record.getAsString("address1"), is("long"));
+		assertThat(record.getAsString("address2"), is("abc"));
+		assertThat(record.getAsLong("fix_row"), is(1L));
+		assertThat(record.getAsLong("fix_col"), is(2L));
+	}
+
+	@Theory
+	public void testRecordType_column0(String excelFile) throws ParseException {
+		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
+			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
+
+			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
+			parser.set("sheet", "test1");
+			parser.set("record_type", "column");
+			// parser.set("skip_header_lines", 0);
+			parser.addColumn("text", "string").set("cell_row", "5");
+			parser.addColumn("text_row", "long").set("cell_row", "5").set("value", "row_number");
+			parser.addColumn("text_col", "long").set("cell_row", "5").set("value", "column_number");
+			parser.addColumn("text2", "string").set("cell_column", "D");
+			parser.addColumn("text2_row", "long").set("cell_column", "D").set("value", "row_number");
+			parser.addColumn("text2_col", "long").set("cell_column", "D").set("value", "column_number");
+			parser.addColumn("address1", "string").set("cell_address", "B1").set("value", "cell_value");
+			parser.addColumn("address2", "string").set("cell_column", "D").set("cell_row", "2");
+			parser.addColumn("fix_row", "long").set("cell_address", "B1").set("value", "row_number");
+			parser.addColumn("fix_col", "long").set("cell_address", "B1").set("value", "column_number");
+
+			URL inFile = getClass().getResource(excelFile);
+			List<OutputRecord> result = tester.runParser(inFile, parser);
+
+			assertThat(result.size(), is(7));
+			int z = 1;
+			check2(result, 0, z, "true");
+			check2(result, 1, z, "123");
+			check2(result, 2, z, "123.4");
+			check2(result, 3, z, "abc");
+			check2(result, 4, z, "2015/10/07");
+			check2(result, 5, z, null);
+			check2(result, 6, z, "CELL_TYPE_STRING");
+		}
+	}
+
+	@Theory
+	public void testRecordType_column1(String excelFile) throws ParseException {
+		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
+			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
+
+			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
+			parser.set("sheet", "test1");
+			parser.set("record_type", "column");
+			parser.set("skip_header_lines", 1);
+			parser.addColumn("text", "string").set("cell_row", "5");
+			parser.addColumn("text_row", "long").set("cell_row", "5").set("value", "row_number");
+			parser.addColumn("text_col", "long").set("cell_row", "5").set("value", "column_number");
+			parser.addColumn("text2", "string").set("cell_column", "D");
+			parser.addColumn("text2_row", "long").set("cell_column", "D").set("value", "row_number");
+			parser.addColumn("text2_col", "long").set("cell_column", "D").set("value", "column_number");
+			parser.addColumn("address1", "string").set("cell_address", "B1").set("value", "cell_value");
+			parser.addColumn("address2", "string").set("cell_column", "D").set("cell_row", "2");
+			parser.addColumn("fix_row", "long").set("cell_address", "B1").set("value", "row_number");
+			parser.addColumn("fix_col", "long").set("cell_address", "B1").set("value", "column_number");
+
+			URL inFile = getClass().getResource(excelFile);
+			List<OutputRecord> result = tester.runParser(inFile, parser);
+
+			assertThat(result.size(), is(6));
+			int z = 2;
+			check2(result, 0, z, "123");
+			check2(result, 1, z, "123.4");
+			check2(result, 2, z, "abc");
+			check2(result, 3, z, "2015/10/07");
+			check2(result, 4, z, null);
+			check2(result, 5, z, "CELL_TYPE_STRING");
+		}
+	}
+
+	private void check2(List<OutputRecord> result, int index, int z, String text) {
+		OutputRecord record = result.get(index);
+		// System.out.println(record);
+		assertThat(record.getAsString("text"), is(text));
+		assertThat(record.getAsLong("text_row"), is(5L));
+		assertThat(record.getAsLong("text_col"), is((long) index + z));
+		assertThat(record.getAsString("text2"), is("abc"));
+		assertThat(record.getAsLong("text2_row"), is(6L));
+		assertThat(record.getAsLong("text2_col"), is(4L));
+		assertThat(record.getAsString("address1"), is("long"));
+		assertThat(record.getAsString("address2"), is("abc"));
+		assertThat(record.getAsLong("fix_row"), is(1L));
+		assertThat(record.getAsLong("fix_col"), is(2L));
+	}
+
+	@Theory
+	public void testRecordType_sheet(String excelFile) throws ParseException {
+		try (EmbulkPluginTester tester = new EmbulkPluginTester()) {
+			tester.addParserPlugin(PoiExcelParserPlugin.TYPE, PoiExcelParserPlugin.class);
+
+			EmbulkTestParserConfig parser = tester.newParserConfig(PoiExcelParserPlugin.TYPE);
+			parser.set("sheet", "style");
+			parser.set("record_type", "sheet");
+			parser.addColumn("text", "string");
+			parser.addColumn("text_row", "long").set("cell_row", "5").set("value", "row_number");
+			parser.addColumn("text_col", "long").set("cell_column", "6").set("value", "column_number");
+			parser.addColumn("address1", "string").set("cell_address", "B1").set("value", "cell_value");
+			parser.addColumn("address2", "string").set("cell_column", "A").set("cell_row", "4");
+			parser.addColumn("fix_row", "long").set("cell_address", "B1").set("value", "row_number");
+			parser.addColumn("fix_col", "long").set("cell_address", "B1").set("value", "column_number");
+
+			URL inFile = getClass().getResource(excelFile);
+			List<OutputRecord> result = tester.runParser(inFile, parser);
+
+			assertThat(result.size(), is(1));
+			check3(result, 0, "red");
+		}
+	}
+
+	private void check3(List<OutputRecord> result, int index, String text) {
+		OutputRecord record = result.get(index);
+		// System.out.println(record);
+		assertThat(record.getAsString("text"), is(text));
+		assertThat(record.getAsLong("text_row"), is(5L));
+		assertThat(record.getAsLong("text_col"), is(6L));
+		assertThat(record.getAsString("address1"), is("top"));
+		assertThat(record.getAsString("address2"), is("white"));
+		assertThat(record.getAsLong("fix_row"), is(1L));
+		assertThat(record.getAsLong("fix_col"), is(2L));
+	}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-poi_excel
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - hishidama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-13 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ files:
 - classpath/commons-codec-1.10.jar
 - classpath/commons-collections4-4.1.jar
 - classpath/curvesapi-1.04.jar
-- classpath/embulk-parser-poi_excel-0.1.11.jar
+- classpath/embulk-parser-poi_excel-0.1.12.jar
 - classpath/embulk-standards-0.7.5.jar
 - classpath/poi-3.17.jar
 - classpath/poi-ooxml-3.17.jar
@@ -69,6 +69,11 @@ 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/record/PoiExcelRecord.java
+- src/main/java/org/embulk/parser/poi_excel/bean/record/PoiExcelRecordColumn.java
+- src/main/java/org/embulk/parser/poi_excel/bean/record/PoiExcelRecordRow.java
+- src/main/java/org/embulk/parser/poi_excel/bean/record/PoiExcelRecordSheet.java
+- src/main/java/org/embulk/parser/poi_excel/bean/record/RecordType.java
 - src/main/java/org/embulk/parser/poi_excel/bean/util/PoiExcelCellAddress.java
 - src/main/java/org/embulk/parser/poi_excel/bean/util/SearchMergedCell.java
 - src/main/java/org/embulk/parser/poi_excel/visitor/AbstractPoiExcelCellAttributeVisitor.java
@@ -108,6 +113,7 @@ files:
 - 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_recordType.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