embulk-parser-variable_length_bytes 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a57c31f4ee057c374f90d256ba36c8056a9338c0
-  data.tar.gz: 63ed701986a6ad4537e0e4018a2612c825688e77
+  metadata.gz: 7e989400587d6450b34c2805d5747ded0a97c036
+  data.tar.gz: 85d3ac18255d16726f074d7051ed8ccae672dbe9
 SHA512:
-  metadata.gz: 1a79d0ea9573060d3f11a4d68340a44733460af71136a8a232d3b0ab00988b893b82db30f743c120dfbb4df9a157c1027bcb9cdb1743c1c7c6279d4964e2701d
-  data.tar.gz: b5057178b22c5c27b7bbcbb9d95e9fa7ecc5c3df29b2d39d76e98356194b66dc1b5166ff44f58d28d82f8c458077fd84d133fe3e966964c365362413a3cb239c
+  metadata.gz: af303c131a2984b44126cbdd9876e8b61ec46933ae83e1124aa0c8d5955e5f01d8e7c711a183f45c6b1b8aa8f60f7d52e31f6694986b92ea81319960a07472e1
+  data.tar.gz: 6dc42d0699a64b213a65393f28fec47d27335395021f44cd6c63f8d04b3a7d4a9631ff5419e0df8fc2d4dad39154d04cdf53597deef2596928319bf0b774bfd7

data/README.md

@@ -1,5 +1,7 @@
 # Variable Length Bytes parser plugin for Embulk
 
+[![Gem Version](https://badge.fury.io/rb/embulk-parser-variable_length_bytes.svg)](https://badge.fury.io/rb/embulk-parser-variable_length_bytes)
+
 Variable length bytes record parser plugin for Embulk.
 
 ## Overview
@@ -7,6 +9,11 @@ Variable length bytes record parser plugin for Embulk.
 * **Plugin type**: parser
 * **Guess supported**: no
 
+## Install
+
+```shell script
+$ embulk gem install embulk-parser-variable_length_bytes
+```
 ## Configuration
 
 - **columns**: Specify column name and type, range of bytes('\<start\>..\<end\>'). If the last column has a variable length, specify it as '\<start\>...'. (array, required)
@@ -32,20 +39,9 @@ in:
     - {name: description, type: string, pos: '20...'}
 ```
 
+## Build
 
-## Install plugin
-
-Currently the status of this plugin is work in progress.
-
-To install manually.
-
-```
-$ git clone https://github.com/koji-m/embulk-parser-variable_length_bytes.git
-$ cd embulk-parser-variable_length_bytes
-$ ./gradlew package
-
-# prepare config.yml file
-
-$ embulk run -L path/to/embulk-parser-variable_length_bytes config.yml
+```shell script
+$ ./gradlew gem
 ```
 

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.0"
+version = "0.1.1"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

data/src/main/java/org/embulk/parser/variable_length_bytes/VariableLengthBytesParserPlugin.java

@@ -4,6 +4,7 @@ import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
+import org.embulk.config.ConfigException;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
 import org.embulk.config.TaskSource;
@@ -167,8 +168,7 @@ public class VariableLengthBytesParserPlugin
                 }
             }
             catch (UnsupportedEncodingException e) {
-                // ToDo
-                System.err.println("UnsupportedEncoding");
+                throw new DataException("Could not decode with specified charset");
             }
         }
         pageBuilder.addRecord();
@@ -202,8 +202,7 @@ public class VariableLengthBytesParserPlugin
                 }
             }
             catch (UnsupportedEncodingException e) {
-                // ToDo
-                System.err.println("UnsupportedEncoding");
+                throw new DataException("Could not decode with specified charset");
             }
         }
         Column varLenColumn = columns.get(numColumns - 1);
@@ -268,8 +267,7 @@ public class VariableLengthBytesParserPlugin
             }
         }
         catch (UnsupportedEncodingException e) {
-            // ToDo
-            System.err.println("UnsupportedEncoding");
+            throw new DataException("Could not decode with specified charset");
         }
         pageBuilder.addRecord();
     }
@@ -313,6 +311,9 @@ public class VariableLengthBytesParserPlugin
                     while (true) {
                         int len = is.read(buf, totalLen, bufSize - totalLen);
                         if (len < 0) {
+                            if (totalLen > 0) {
+                                throw new DataException("File ended with insufficient record length");
+                            }
                             break;
                         }
                         totalLen += len;
@@ -330,6 +331,9 @@ public class VariableLengthBytesParserPlugin
                     while (true) {
                         int len = is.read(buf, totalLen, bufSize - totalLen);
                         if (len < 0) {
+                            if (totalLen > 0) {
+                                throw new DataException("File ended with insufficient record length");
+                            }
                             break;
                         }
                         totalLen += len;
@@ -339,7 +343,7 @@ public class VariableLengthBytesParserPlugin
                         if (invalidRecordSeparator(buf, recordSeparator,
                                 recordSize, recordSeparatorSize)) {
                             if (stopOnInvalidRecord) {
-                                throw new RecordException(String.format("Invalid record separator(%s): %d", fileName));
+                                throw new DataException(String.format("Invalid record separator(%s): %d", fileName));
                             }
                             logger.warn(String.format("Skipped record: file: %s, record-separator:%d,%d:%s", fileName, buf[bufSize - 2], buf[bufSize - 1],
                                     new String(buf, java.nio.charset.Charset.forName("Shift_JIS"))));
@@ -352,24 +356,6 @@ public class VariableLengthBytesParserPlugin
                 }
                 pageBuilder.finish();
             }
-        } catch (Exception e) {
-            // ToDo
-        }
-    }
-
-    static class RecordException extends DataException
-    {
-        RecordException(String cause)
-        {
-            super(cause);
-        }
-    }
-
-    static class ConfigException extends DataException
-    {
-        ConfigException(String cause)
-        {
-            super(cause);
         }
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-variable_length_bytes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Koji Matsumoto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ files:
 - LICENSE.txt
 - README.md
 - build.gradle
-- classpath/embulk-parser-variable_length_bytes-0.1.0.jar
+- classpath/embulk-parser-variable_length_bytes-0.1.1.jar
 - config/checkstyle/checkstyle.xml
 - config/checkstyle/default.xml
 - gradle/wrapper/gradle-wrapper.jar