embulk-filter-to_json 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61aa0b5546d040c6b672178d874162e4d0aefe68
-  data.tar.gz: 35ab7bda1b560d51d4364e423a7cef2fd6bb065b
+  metadata.gz: 8a2d6613b30db7bf15e431eaa828fa6266548b09
+  data.tar.gz: e4f4bdc55bca27448165e800a3e661c63bf21f00
 SHA512:
-  metadata.gz: 1bff2741559fafdbf38e4bde4066723817de5ab026b1952f2b5ba811b635abb8cdca8e9197766b480023c6f894d5e6a00ac52fd445ed301ae92aed39e12c7895
-  data.tar.gz: e48ce9eea0782dd91a63220b6147cb8e70a8607ce7c3747275aa870066cf35f7e7edc281e53852c629ecc4384f71534db9ab337c279212c59c975eb2acc6df62
+  metadata.gz: 63edc8f69fc088734834d8672192c30fb44bb3cb6107eacb82a918fe2b2983e3156be8b5c0cd57fca0cb2d3898fcc615521647ee64ead6467ab6e7d3119e35f6
+  data.tar.gz: f104fe440ab7d1b46579d22c3a93a51abd906c9af0534a592e568d6bed5f146cea7b5412efe4c17534f094309a87f664ae609c279dfb43225580291e0b650815

data/CHENGELOG.md

@@ -1,3 +1,12 @@
+0.0.4 (2016-01-25)
+==================
+- incompatible change: `timezone` / `format` options removed
+- add: `default_timezone` / `default_format` options
+
+0.0.3 (2016-01-25)
+==================
+- add: support timezone and timestamp format options
+
 0.0.2 (2016-01-23)
 ==================
 - incompatible change: option `column_name` is removed

data/README.md

@@ -12,6 +12,8 @@ Convert a record to jsonl.
   - **name** (string, default: `"json_payload"`)
   - **type** string or json (string, default: `"string"`)
 - **skip_if_null**: input column name list (array of string, default: `[]`)
+- **default_timezone**: option for timestamp column, specify the timezone of timestamp value (string, default is `UTC`)
+- **default_format**: option for timestamp column, specify the format of timestamp value (string, default is `%Y-%m-%d %H:%M:%S.%N %z`)
 
 ## Example
 
@@ -22,6 +24,7 @@ filters:
       name: test
       type: string
     skip_if_null: [id]
+    timezone: Asia/Tokyo
 ```
 
 ## Run Example

data/build.gradle

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

data/example/config.yml

@@ -19,5 +19,6 @@ filters:
       name: test
       type: string
     skip_if_null: [id]
+    default_timezone: Asia/Tokyo
 out:
   type: stdout

data/src/main/java/org/embulk/filter/to_json/ColumnVisitorToJsonImpl.java

@@ -2,7 +2,6 @@ package org.embulk.filter.to_json;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.embulk.config.ConfigException;
@@ -10,8 +9,8 @@ import org.embulk.spi.Column;
 import org.embulk.spi.ColumnVisitor;
 import org.embulk.spi.PageBuilder;
 import org.embulk.spi.PageReader;
-import org.embulk.spi.Schema;
 import org.embulk.spi.json.JsonParser;
+import org.embulk.spi.time.TimestampFormatter;
 import org.embulk.spi.type.Types;
 
 import java.io.IOException;
@@ -107,15 +106,17 @@ public class ColumnVisitorToJsonImpl
     private final Map<String, Object> map;
     private final PageReader pageReader;
     private final ColumnSetter columnSetter;
+    private final TimestampFormatter timestampFormatter;
     private List<String> skipColumnsIfNull = Lists.newArrayList();
     private boolean skipRecordFlag = false;
 
     ColumnVisitorToJsonImpl(PageReader pageReader, PageBuilder pageBuilder,
-            Column outputColumn, List<String> skipColumnsIfNull)
+            Column outputColumn, TimestampFormatter timestampFormatter, List<String> skipColumnsIfNull)
     {
         this.map = Maps.newHashMap();
         this.pageReader = pageReader;
         this.columnSetter = new ColumnSetter(pageBuilder, outputColumn);
+        this.timestampFormatter = timestampFormatter;
         this.skipColumnsIfNull = skipColumnsIfNull;
     }
 
@@ -171,7 +172,8 @@ public class ColumnVisitorToJsonImpl
             putNull(column);
             return;
         }
-        map.put(column.getName(), pageReader.getTimestamp(column).toString());
+        String value = timestampFormatter.format(pageReader.getTimestamp(column));
+        map.put(column.getName(), value);
     }
 
     @Override

data/src/main/java/org/embulk/filter/to_json/ToJsonFilterPlugin.java

@@ -2,11 +2,10 @@ package org.embulk.filter.to_json;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigException;
+import org.embulk.config.ConfigInject;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
 import org.embulk.config.TaskSource;
@@ -19,12 +18,14 @@ import org.embulk.spi.PageBuilder;
 import org.embulk.spi.PageOutput;
 import org.embulk.spi.PageReader;
 import org.embulk.spi.Schema;
+import org.embulk.spi.time.TimestampFormatter;
 import org.embulk.spi.type.Type;
 import org.embulk.spi.type.Types;
+import org.joda.time.DateTimeZone;
+import org.jruby.embed.ScriptingContainer;
 import org.slf4j.Logger;
 
 import java.util.List;
-import java.util.Map;
 
 public class ToJsonFilterPlugin
         implements FilterPlugin
@@ -45,6 +46,17 @@ public class ToJsonFilterPlugin
         @Config("skip_if_null")
         @ConfigDefault("[]")
         List<String> getColumnNamesSkipIfNull();
+
+        @Config("default_timezone")
+        @ConfigDefault("\"UTC\"")
+        String getDefaultTimezone();
+
+        @Config("default_format")
+        @ConfigDefault("\"%Y-%m-%d %H:%M:%S.%N %z\"")
+        String getDefaultFormat();
+
+        @ConfigInject
+        ScriptingContainer getJRuby();
     }
 
     public interface JsonColumn
@@ -117,12 +129,16 @@ public class ToJsonFilterPlugin
             final Schema outputSchema, final PageOutput output)
     {
         final PluginTask task = taskSource.loadTask(PluginTask.class);
+        final DateTimeZone timezone  = DateTimeZone.forID(task.getDefaultTimezone());
+        final TimestampFormatter timestampFormatter = new TimestampFormatter(task.getJRuby(),  task.getDefaultFormat(), timezone);
+        final List<String> columnNamesSkipIfNull = task.getColumnNamesSkipIfNull();
+
         return new PageOutput()
         {
             private final PageReader pageReader = new PageReader(inputSchema);
             private final PageBuilder pageBuilder = new PageBuilder(Exec.getBufferAllocator(), outputSchema, output);
             private final ColumnVisitorToJsonImpl visitor = new ColumnVisitorToJsonImpl(pageReader, pageBuilder,
-                    outputSchema.getColumn(JSON_COLUMN_INDEX), task.getColumnNamesSkipIfNull());
+                    outputSchema.getColumn(JSON_COLUMN_INDEX), timestampFormatter, columnNamesSkipIfNull);
 
             @Override
             public void add(Page page)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-to_json
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Civitaspo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,7 +62,7 @@ files:
 - src/main/java/org/embulk/filter/to_json/ColumnVisitorToJsonImpl.java
 - src/main/java/org/embulk/filter/to_json/ToJsonFilterPlugin.java
 - src/test/java/org/embulk/filter/to_json/TestToJsonFilterPlugin.java
-- classpath/embulk-filter-to_json-0.0.2.jar
+- classpath/embulk-filter-to_json-0.0.4.jar
 homepage: https://github.com/civitaspo/embulk-filter-to_json
 licenses:
 - MIT