embulk-parser-csv_guessable 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bd20694daee60a0018828d263039d4fcbdc28bf
-  data.tar.gz: 34b6b8c95c8e8e375059d7ff87dd46314fb3ef55
+  metadata.gz: 9cfb187d0ece1ab6bc1a9798e671c1beef48c58b
+  data.tar.gz: e4027715432a5a797ffffc67366863fc35a93c54
 SHA512:
-  metadata.gz: 844084c1b76193789c12821bf9eb76a3fef969b33e42e2ea9ff6b9935848276412c3fee3af558d04aef3414ba1e93e72bfbab35393cc0a935d994b9f98ff8e4e
-  data.tar.gz: 57c246a6c2d551a55de98e8f420354da9c51970ef1e53184d87c0f6a22dd1dde47e9f49e3df4e1a6987a76fd71aac7ee84590e2c06be50a5a1bf2296bcd26398
+  metadata.gz: 5b82123b220cd203b749ea8604983eac5c0aab4352b5b5f484b35e78ad7f462a964c39b7be98f314b446b306104478dbba3b2724a5181bc7f971f1a38da2c156
+  data.tar.gz: 9646c871c87790b9d36c804c9080144f12f2a2ffe0ee8ef8a16e71ca2ebac69be391e9a3397edbc8ecdc5be8290fe4bc453d05f77d804c4291365063f4f17db1

data/README.md

@@ -55,7 +55,7 @@ in:
   parser:
     type: csv
     skip_header_lines: 1
-    column:
+    columns:
     - {name: id, type: string}
     - {name: title, type: string}
     - {name: description, type: string}

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.3"
+version = "0.1.4"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/java/org/embulk/parser/csv_guessable/CsvGuessableParserPlugin.java

@@ -36,7 +36,7 @@ import org.slf4j.Logger;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -137,7 +137,7 @@ public class CsvGuessableParserPlugin
             int schemaLine = task.getSchemaLine();
             task.setSkipHeaderLines(schemaLine); // TODO: use 'skip_header_line'
 
-            String header = readHeader(task.getSchemaFile().get().getPath(), schemaLine);
+            String header = readHeader(task.getSchemaFile().get().getPath(), schemaLine, task.getCharset());
             log.debug(header);
             ArrayList<ColumnConfig> schema = newColumns(header, config);
 
@@ -155,7 +155,7 @@ public class CsvGuessableParserPlugin
                     for (int i = 0; i < schema.size(); ++i) {
                         ColumnConfig c = schema.get(i);
                         if (c.getName().equals(name)) {
-                            schema.set(i, new ColumnConfig(name, column.getType(), column.getOption()));
+                            schema.set(i, new ColumnConfig(column.getName(), column.getType(), column.getOption()));
                         }
                     }
                 }
@@ -374,14 +374,14 @@ public class CsvGuessableParserPlugin
         }
     }
 
-    private String readHeader(Path path, int schemaLine)
+    private String readHeader(Path path, int schemaLine, Charset charset)
     {
         if (schemaLine <= 0) {
             throw new ConfigException("'schemaLine' must be set '> 0'");
         }
 
         String line = null;
-        try (BufferedReader br = Files.newBufferedReader(path, StandardCharsets.UTF_8)) {
+        try (BufferedReader br = Files.newBufferedReader(path, charset)) {
             for (int i = 1; i <= schemaLine; ++i) {
                 line = br.readLine();
                 if (line == null) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-csv_guessable
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - koooge
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -61,13 +61,13 @@ files:
 - src/main/java/org/embulk/parser/csv_guessable/CsvTokenizer.java
 - src/test/java/org/embulk/parser/csv_guessable/TestCsvGuessableParserPlugin.java
 - src/test/resources/org/embulk/parser/csv_guessable/data/test.csv
-- src/test/resources/org/embulk/parser/csv_guessable/data/test_alias.yml
+- src/test/resources/org/embulk/parser/csv_guessable/data/test_alias.csv
 - src/test/resources/org/embulk/parser/csv_guessable/yml/guess_and_set_type.yml
 - src/test/resources/org/embulk/parser/csv_guessable/yml/guess_from_header.yml
 - src/test/resources/org/embulk/parser/csv_guessable/yml/original-csv.yml
 - src/test/resources/org/embulk/parser/csv_guessable/yml/replace_column_name.yml
 - classpath/commons-lang3-3.5.jar
-- classpath/embulk-parser-csv_guessable-0.1.3.jar
+- classpath/embulk-parser-csv_guessable-0.1.4.jar
 - classpath/opencsv-3.9.jar
 - classpath/commons-beanutils-1.9.3.jar
 - classpath/commons-compress-1.10.jar