embulk-parser-csv_guessable 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf39985065e771f33ffee0a47f7866f4377ac933
-  data.tar.gz: 521303beddd8bb591d4b8f619f4561846eb8c1ab
+  metadata.gz: 90dc39f04076979425a69d11b3177e1e4b1d5e7a
+  data.tar.gz: 5dca8965baaeb7fbe51f5f9df63f385b09d9bdb1
 SHA512:
-  metadata.gz: 0cf15b12d61bafe9c8742797b88caf0a88f6982acf635643eb6baee109cc63d226992856efe3e8df21bc4579a54d1d419789c0c63c45ca53cda36bd03557d84c
-  data.tar.gz: a3ab77844c86c449f322a67d5de57a47315c56c67f94a524feb6195a15b6c197335d9676ddb3a597a6cffd748fc3c7fb125cc789bbe8750b09ae5641f5cd5093
+  metadata.gz: 61bd54ee36352ab6667654f6dfdfcccd77de37efdd49f3325924538ba3d921737a1e9139691cc8aa8617f47893cef8219f0f50bff454a456df01309ed4668617
+  data.tar.gz: d6ab6e9d35ae8932ee5aa1a035c8f1440e6c4d1cf41565010278ca88d13a91cd85e2444476106a29cae6bd4312c5b2987d1211dfb45c26e7b6ae9bf511e12b75

data/README.md

@@ -1,5 +1,6 @@
 # Csv Guessable parser plugin for Embulk
-**embulk-parser-csv_gussable** guesses and parses csv which has schema in header.
+**embulk-parser-csv_gussable** (runtime) guesses and parses csv which has schema in header.
+This plugin is useful in case of target csv schema changes frequently.
 
 Also it can behave as original csv parser without **embulk-parser-csv_guessable** specified configs.
 
@@ -12,11 +13,11 @@ Also it can behave as original csv parser without **embulk-parser-csv_guessable*
 
 - **schema_file**: filename which has schema.(string, default: `null`)
 - **schema_line**: schema line in header. (integer default: `"1"`)
-- **columns**: Columns hint for guess (hash, default: `null`)
+- **(TODO)columns**: Columns attributes for parse. `embulk-parser-csv_guessable` use this config only when `"schema_file"` is set. If `"schema_file"` isn't set, this is same as original csv parser's `"columns"`. (hash, default: `null`)
 - any other csv configs: see [www.embulk.org](http://www.embulk.org/docs/built-in.html#csv-parser-plugin)
 
 ## Example
-data/test.csv
+test.csv
 
 ```csv
 id, title, description
@@ -35,16 +36,31 @@ in:
     schema_line: 1
 ```
 
+(To explain)
+In case original csv parser 
+config.yml
+```yaml
+in:
+  type: any file input plugin type
+  parser:
+    type: csv
+    skip_header_lines: 1
+    column:
+    - {name: id, type: string}
+    - {name: title, type: string}
+    - {name: description, type: string}
+```
+
 <!--
 (If guess supported) you don't have to write `parser:` section in the configuration file. After writing `in:` section, you can let embulk guess `parser:` section using this command:
 -->
 
 ```
 $ embulk gem install embulk-parser-csv_guessable
+```
 <!--
 $ embulk guess -g csv_guessable config.yml -o guessed.yml
 -->
-```
 
 ## Build
 

data/build.gradle

@@ -13,14 +13,14 @@ configurations {
     provided
 }
 
-version = "0.1.1"
+version = "0.1.2"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
     compile "org.embulk:embulk-core:0.8.22"
+    compile "org.embulk:embulk-standards:0.8.22"
     compile "com.opencsv:opencsv:3.9"
     provided "org.embulk:embulk-core:0.8.22"
     testCompile "junit:junit:4.+"

data/gradlew.bat

@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

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

@@ -2,19 +2,10 @@ package org.embulk.parser.csv_guessable;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
-import java.io.BufferedReader;
 import com.opencsv.CSVReader; // TODO: use embulk's parser
-import java.io.IOException;
-import java.io.StringReader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import org.slf4j.Logger;
 
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
-import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigException;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
@@ -25,22 +16,31 @@ import org.embulk.spi.ColumnVisitor;
 import org.embulk.spi.DataException;
 import org.embulk.spi.Exec;
 import org.embulk.spi.FileInput;
-import org.embulk.spi.json.JsonParser;
-import org.embulk.spi.json.JsonParseException;
 import org.embulk.spi.PageBuilder;
 import org.embulk.spi.PageOutput;
 import org.embulk.spi.ParserPlugin;
 import org.embulk.spi.Schema;
 import org.embulk.spi.SchemaConfig;
-import org.embulk.spi.time.TimestampParser;
+import org.embulk.spi.json.JsonParseException;
+import org.embulk.spi.json.JsonParser;
 import org.embulk.spi.time.TimestampParseException;
+import org.embulk.spi.time.TimestampParser;
 import org.embulk.spi.type.Types;
 import org.embulk.spi.unit.LocalFile;
 import org.embulk.spi.util.LineDecoder;
 import org.embulk.spi.util.Timestamps;
-
 import org.embulk.standards.CsvParserPlugin;
 
+import org.slf4j.Logger;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+
 public class CsvGuessableParserPlugin
         extends CsvParserPlugin
 {
@@ -136,7 +136,8 @@ public class CsvGuessableParserPlugin
             if (task.getHeaderLine().isPresent()) {
                 // TODO: use 'columns' as hints for guess
                 throw new ConfigException("embulk-parsre-csv_gussable will use 'columnes' as hints for guess as hints for guess. Please delete 'columnes' now.");
-            } else { /* guess from header */
+            }
+            else { /* guess from header */
                 int schemaLine = task.getSchemaLine();
                 task.setSkipHeaderLines(schemaLine); // TODO: use 'skip_header_line'
 
@@ -146,7 +147,8 @@ public class CsvGuessableParserPlugin
                 log.debug(columns.toString());
                 schemaConfig = new SchemaConfig(columns);
             }
-        } else { /* embulk-parser-csv embulk */
+        }
+        else { /* embulk-parser-csv embulk */
             // backward compatibility
             if (task.getHeaderLine().isPresent()) {
                 if (task.getSkipHeaderLines() > 0) {
@@ -154,7 +156,8 @@ public class CsvGuessableParserPlugin
                 }
                 if (task.getHeaderLine().get()) {
                     task.setSkipHeaderLines(1);
-                } else {
+                }
+                else {
                     task.setSkipHeaderLines(0);
                 }
             }
@@ -199,80 +202,96 @@ public class CsvGuessableParserPlugin
 
                     try {
                         schema.visitColumns(new ColumnVisitor() {
+                            @Override
                             public void booleanColumn(Column column)
                             {
                                 String v = nextColumn();
                                 if (v == null) {
                                     pageBuilder.setNull(column);
-                                } else {
+                                }
+                                else {
                                     pageBuilder.setBoolean(column, TRUE_STRINGS.contains(v));
                                 }
                             }
 
+                            @Override
                             public void longColumn(Column column)
                             {
                                 String v = nextColumn();
                                 if (v == null) {
                                     pageBuilder.setNull(column);
-                                } else {
+                                }
+                                else {
                                     try {
                                         pageBuilder.setLong(column, Long.parseLong(v));
-                                    } catch (NumberFormatException e) {
+                                    }
+                                    catch (NumberFormatException e) {
                                         // TODO support default value
                                         throw new CsvRecordValidateException(e);
                                     }
                                 }
                             }
 
+                            @Override
                             public void doubleColumn(Column column)
                             {
                                 String v = nextColumn();
                                 if (v == null) {
                                     pageBuilder.setNull(column);
-                                } else {
+                                }
+                                else {
                                     try {
                                         pageBuilder.setDouble(column, Double.parseDouble(v));
-                                    } catch (NumberFormatException e) {
+                                    }
+                                    catch (NumberFormatException e) {
                                         // TODO support default value
                                         throw new CsvRecordValidateException(e);
                                     }
                                 }
                             }
 
+                            @Override
                             public void stringColumn(Column column)
                             {
                                 String v = nextColumn();
                                 if (v == null) {
                                     pageBuilder.setNull(column);
-                                } else {
+                                }
+                                else {
                                     pageBuilder.setString(column, v);
                                 }
                             }
 
+                            @Override
                             public void timestampColumn(Column column)
                             {
                                 String v = nextColumn();
                                 if (v == null) {
                                     pageBuilder.setNull(column);
-                                } else {
+                                }
+                                else {
                                     try {
 //                                        pageBuilder.setTimestamp(column, timestampParsers[column.getIndex()].parse(v));
-                                    } catch (TimestampParseException e) {
+                                    }
+                                    catch (TimestampParseException e) {
                                         // TODO support default value
                                         throw new CsvRecordValidateException(e);
                                     }
                                 }
                             }
 
+                            @Override
                             public void jsonColumn(Column column)
                             {
                                 String v = nextColumn();
                                 if (v == null) {
                                     pageBuilder.setNull(column);
-                                } else {
+                                }
+                                else {
                                     try {
                                         pageBuilder.setJson(column, jsonParser.parse(v));
-                                    } catch (JsonParseException e) {
+                                    }
+                                    catch (JsonParseException e) {
                                         // TODO support default value
                                         throw new CsvRecordValidateException(e);
                                     }
@@ -291,19 +310,21 @@ public class CsvGuessableParserPlugin
 
                         try {
                             hasNextRecord = tokenizer.nextRecord();
-                        } catch (CsvTokenizer.TooManyColumnsException ex) {
+                        }
+                        catch (CsvTokenizer.TooManyColumnsException ex) {
                             if (allowExtraColumns) {
                                 String tooManyColumnsLine = tokenizer.skipCurrentLine();
                                 // TODO warning
                                 hasNextRecord = tokenizer.nextRecord();
-                            } else {
+                            }
+                            else {
                                 // this line will be skipped at the following catch section
                                 throw ex;
                             }
                         }
                         pageBuilder.addRecord();
-
-                    } catch (CsvTokenizer.InvalidFormatException | CsvTokenizer.InvalidValueException | CsvRecordValidateException e) {
+                    }
+                    catch (CsvTokenizer.InvalidFormatException | CsvTokenizer.InvalidValueException | CsvRecordValidateException e) {
                         String skippedLine = tokenizer.skipCurrentLine();
                         long lineNumber = tokenizer.getCurrentLineNumber();
                         if (stopOnInvalidRecord) {
@@ -334,14 +355,15 @@ public class CsvGuessableParserPlugin
         }
     }
 
-    private String readHeader(Path path, int schemaLine) {
+    private String readHeader(Path path, int schemaLine)
+    {
         if (schemaLine <= 0) {
             throw new ConfigException("'schemaLine' must be set '> 0'");
         }
 
         String line = null;
         try (BufferedReader br = Files.newBufferedReader(path, StandardCharsets.UTF_8)) {
-            for (int i=1; i <= schemaLine; ++i) {
+            for (int i = 1; i <= schemaLine; ++i) {
                 line = br.readLine();
                 if (line == null) {
                     throw new ConfigException("not found 'schema_line' in 'schema_file'");
@@ -353,13 +375,14 @@ public class CsvGuessableParserPlugin
         return line;
     }
 
-    private ArrayList<ColumnConfig> newColumns(String header, ConfigSource config) {
-        ArrayList columns = new ArrayList<ArrayList>(); 
+    private ArrayList<ColumnConfig> newColumns(String header, ConfigSource config)
+    {
+        ArrayList columns = new ArrayList<ArrayList>();
         PluginTask task = config.loadConfig(PluginTask.class);
 
         try (CSVReader reader = new CSVReader(new StringReader(header))) {
             String[] csv = reader.readNext();
-            for (String column: csv) {
+            for (String column : csv) {
                 columns.add(new ColumnConfig(column, Types.STRING, config));
             }
         } catch (IOException e) {

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

@@ -1,13 +1,14 @@
 package org.embulk.parser.csv_guessable;
 
 import com.google.common.base.Preconditions;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Deque;
-import java.util.ArrayDeque;
+import org.embulk.config.ConfigException;
 import org.embulk.spi.DataException;
 import org.embulk.spi.util.LineDecoder;
-import org.embulk.config.ConfigException;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.List;
 
 public class CsvTokenizer
 {
@@ -50,11 +51,13 @@ public class CsvTokenizer
         String delimiter = task.getDelimiter();
         if (delimiter.length() == 0) {
             throw new ConfigException("Empty delimiter is not allowed");
-        } else {
+        }
+        else {
             this.delimiterChar = delimiter.charAt(0);
             if (delimiter.length() > 1) {
                 delimiterFollowingString = delimiter.substring(1);
-            } else {
+            }
+            else {
                 delimiterFollowingString = null;
             }
         }
@@ -88,7 +91,8 @@ public class CsvTokenizer
         String skippedLine;
         if (quotedValueLines.isEmpty()) {
             skippedLine = line;
-        } else {
+        }
+        else {
             // recover lines of quoted value
             skippedLine = quotedValueLines.remove(0);  // TODO optimize performance
             unreadLines.addAll(quotedValueLines);
@@ -129,7 +133,8 @@ public class CsvTokenizer
         if (hasNext) {
             recordState = RecordState.NOT_END;
             return true;
-        } else {
+        }
+        else {
             return false;
         }
     }
@@ -139,7 +144,8 @@ public class CsvTokenizer
         while (true) {
             if (!unreadLines.isEmpty()) {
                 line = unreadLines.removeFirst();
-            } else {
+            }
+            else {
                 line = input.poll();
                 if (line == null) {
                     return false;
@@ -189,7 +195,8 @@ public class CsvTokenizer
                         // empty value
                         if (delimiterFollowingString == null) {
                             return "";
-                        } else if (isDelimiterFollowingFrom(linePos)) {
+                        }
+                        else if (isDelimiterFollowingFrom(linePos)) {
                             linePos += delimiterFollowingString.length();
                             return "";
                         }
@@ -199,17 +206,17 @@ public class CsvTokenizer
                         // empty value
                         recordState = RecordState.END;
                         return "";
-
-                    } else if (isSpace(c) && trimIfNotQuoted) {
+                    }
+                    else if (isSpace(c) && trimIfNotQuoted) {
                         columnState = ColumnState.FIRST_TRIM;
-
-                    } else if (isQuote(c)) {
+                    }
+                    else if (isQuote(c)) {
                         valueStartPos = linePos;  // == 1
                         wasQuotedColumn = true;
                         quotedValue = new StringBuilder();
                         columnState = ColumnState.QUOTED_VALUE;
-
-                    } else {
+                    }
+                    else {
                         columnState = ColumnState.VALUE;
                     }
                     break;
@@ -219,7 +226,8 @@ public class CsvTokenizer
                         // empty value
                         if (delimiterFollowingString == null) {
                             return "";
-                        } else if (isDelimiterFollowingFrom(linePos)) {
+                        }
+                        else if (isDelimiterFollowingFrom(linePos)) {
                             linePos += delimiterFollowingString.length();
                             return "";
                         }
@@ -229,18 +237,18 @@ public class CsvTokenizer
                         // empty value
                         recordState = RecordState.END;
                         return "";
-
-                    } else if (isQuote(c)) {
+                    }
+                    else if (isQuote(c)) {
                         // column has heading spaces and quoted. TODO should this be rejected?
                         valueStartPos = linePos;
                         wasQuotedColumn = true;
                         quotedValue = new StringBuilder();
                         columnState = ColumnState.QUOTED_VALUE;
-
-                    } else if (isSpace(c)) {
+                    }
+                    else if (isSpace(c)) {
                         // skip this character
-
-                    } else {
+                    }
+                    else {
                         valueStartPos = linePos - 1;
                         columnState = ColumnState.VALUE;
                     }
@@ -250,7 +258,8 @@ public class CsvTokenizer
                     if (isDelimiter(c)) {
                         if (delimiterFollowingString == null) {
                             return line.substring(valueStartPos, linePos - 1);
-                        } else if (isDelimiterFollowingFrom(linePos)) {
+                        }
+                        else if (isDelimiterFollowingFrom(linePos)) {
                             String value = line.substring(valueStartPos, linePos - 1);
                             linePos += delimiterFollowingString.length();
                             return value;
@@ -260,8 +269,8 @@ public class CsvTokenizer
                     if (isEndOfLine(c)) {
                         recordState = RecordState.END;
                         return line.substring(valueStartPos, linePos);
-
-                    } else if (isSpace(c) && trimIfNotQuoted) {
+                    }
+                    else if (isSpace(c) && trimIfNotQuoted) {
                         valueEndPos = linePos - 1;  // this is possibly end of value
                         columnState = ColumnState.LAST_TRIM_OR_VALUE;
 
@@ -270,8 +279,8 @@ public class CsvTokenizer
                     //    // In RFC4180, If fields are not enclosed with double quotes, then
                     //    // double quotes may not appear inside the fields. But they are often
                     //    // included in the fields. We should care about them later.
-
-                    } else {
+                    }
+                    else {
                         // keep VALUE state
                     }
                     break;
@@ -280,21 +289,23 @@ public class CsvTokenizer
                     if (isDelimiter(c)) {
                         if (delimiterFollowingString == null) {
                             return line.substring(valueStartPos, valueEndPos);
-                        } else if (isDelimiterFollowingFrom(linePos)) {
+                        }
+                        else if (isDelimiterFollowingFrom(linePos)) {
                             linePos += delimiterFollowingString.length();
                             return line.substring(valueStartPos, valueEndPos);
-                        } else {
+                        }
+                        else {
                             // not a delimiter
                         }
                     }
                     if (isEndOfLine(c)) {
                         recordState = RecordState.END;
                         return line.substring(valueStartPos, valueEndPos);
-
-                    } else if (isSpace(c)) {
+                    }
+                    else if (isSpace(c)) {
                         // keep LAST_TRIM_OR_VALUE state
-
-                    } else {
+                    }
+                    else {
                         // this spaces are not trailing spaces. go back to VALUE state
                         columnState = ColumnState.VALUE;
                     }
@@ -310,18 +321,19 @@ public class CsvTokenizer
                             throw new InvalidValueException("Unexpected end of line during parsing a quoted value");
                         }
                         valueStartPos = 0;
-
-                    } else if (isQuote(c)) {
+                    }
+                    else if (isQuote(c)) {
                         char next = peekNextChar();
                         if (isQuote(next)) { // escaped quote
                             quotedValue.append(line.substring(valueStartPos, linePos));
                             valueStartPos = ++linePos;
-                        } else {
+                        }
+                        else {
                             quotedValue.append(line.substring(valueStartPos, linePos - 1));
                             columnState = ColumnState.AFTER_QUOTED_VALUE;
                         }
-
-                    } else if (isEscape(c)) {  // isQuote must be checked first in case of quote == escape
+                    }
+                    else if (isEscape(c)) {  // isQuote must be checked first in case of quote == escape
                         // In RFC 4180, CSV's escape char is '\"'. But '\\' is often used.
                         char next = peekNextChar();
                         if (isEndOfLine(c)) {
@@ -332,15 +344,16 @@ public class CsvTokenizer
                                 throw new InvalidValueException("Unexpected end of line during parsing a quoted value");
                             }
                             valueStartPos = 0;
-                        } else if (isQuote(next) || isEscape(next)) { // escaped quote
+                        }
+                        else if (isQuote(next) || isEscape(next)) { // escaped quote
                             quotedValue.append(line.substring(valueStartPos, linePos - 1));
                             quotedValue.append(next);
                             valueStartPos = ++linePos;
                         }
-
-                    } else {
+                    }
+                    else {
                         if ((linePos - valueStartPos) + quotedValue.length() > maxQuotedSizeLimit) {
-                            throw new QuotedSizeLimitExceededException("The size of the quoted value exceeds the limit size ("+maxQuotedSizeLimit+")");
+                            throw new QuotedSizeLimitExceededException("The size of the quoted value exceeds the limit size (" + maxQuotedSizeLimit + ")");
                         }
                         // keep QUOTED_VALUE state
                     }
@@ -350,7 +363,8 @@ public class CsvTokenizer
                     if (isDelimiter(c)) {
                         if (delimiterFollowingString == null) {
                             return quotedValue.toString();
-                        } else if (isDelimiterFollowingFrom(linePos)) {
+                        }
+                        else if (isDelimiterFollowingFrom(linePos)) {
                             linePos += delimiterFollowingString.length();
                             return quotedValue.toString();
                         }
@@ -359,11 +373,11 @@ public class CsvTokenizer
                     if (isEndOfLine(c)) {
                         recordState = RecordState.END;
                         return quotedValue.toString();
-
-                    } else if (isSpace(c)) {
+                    }
+                    else if (isSpace(c)) {
                         // column has trailing spaces and quoted. TODO should this be rejected?
-
-                    } else {
+                    }
+                    else {
                         throw new InvalidValueException(String.format("Unexpected extra character '%c' after a value quoted by '%c'", c, quote));
                     }
                     break;
@@ -411,7 +425,8 @@ public class CsvTokenizer
 
         if (linePos >= line.length()) {
             return END_OF_LINE;
-        } else {
+        }
+        else {
             return line.charAt(linePos++);
         }
     }
@@ -422,7 +437,8 @@ public class CsvTokenizer
 
         if (linePos >= line.length()) {
             return END_OF_LINE;
-        } else {
+        }
+        else {
             return line.charAt(linePos);
         }
     }

data/src/test/java/org/embulk/parser/csv_guessable/TestCsvGuessableParserPlugin.java

@@ -1,17 +1,16 @@
 package org.embulk.parser.csv_guessable;
 
+import org.embulk.EmbulkTestRuntime;
 import org.embulk.config.ConfigException;
 import org.embulk.config.ConfigLoader;
 import org.embulk.config.ConfigSource;
-import org.embulk.EmbulkTestRuntime;
 import org.embulk.spi.Exec;
 import org.junit.Rule;
-import org.junit.rules.ExpectedException;
 import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
+import org.junit.rules.ExpectedException;
 
 import static org.embulk.parser.csv_guessable.CsvGuessableParserPlugin.PluginTask;
+import static org.junit.Assert.assertFalse;
 
 public class TestCsvGuessableParserPlugin
 {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-csv_guessable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - koooge
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -57,7 +57,6 @@ files:
 - gradlew.bat
 - lib/embulk/guess/csv_guessable.rb
 - lib/embulk/parser/csv_guessable.rb
-- libs/embulk-standards-0.8.22.jar
 - src/main/java/org/embulk/parser/csv_guessable/CsvGuessableParserPlugin.java
 - src/main/java/org/embulk/parser/csv_guessable/CsvTokenizer.java
 - src/test/java/org/embulk/parser/csv_guessable/TestCsvGuessableParserPlugin.java
@@ -67,9 +66,10 @@ files:
 - src/test/resources/yml/original-csv.yml
 - src/test/resources/yml/replace_column_name.yml
 - classpath/commons-lang3-3.5.jar
-- classpath/embulk-parser-csv_guessable-0.1.1.jar
 - classpath/opencsv-3.9.jar
 - classpath/commons-beanutils-1.9.3.jar
+- classpath/commons-compress-1.10.jar
+- classpath/embulk-parser-csv_guessable-0.1.2.jar
 - classpath/embulk-standards-0.8.22.jar
 - classpath/commons-collections-3.2.2.jar
 - classpath/commons-logging-1.2.jar