embulk-filter-to_json 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a2d6613b30db7bf15e431eaa828fa6266548b09
-  data.tar.gz: e4f4bdc55bca27448165e800a3e661c63bf21f00
+  metadata.gz: d8fbca15491e71b243c408b5754567d915cedf6e
+  data.tar.gz: e0b1398e5c5abc50b3898d500daaa15e463dffad
 SHA512:
-  metadata.gz: 63edc8f69fc088734834d8672192c30fb44bb3cb6107eacb82a918fe2b2983e3156be8b5c0cd57fca0cb2d3898fcc615521647ee64ead6467ab6e7d3119e35f6
-  data.tar.gz: f104fe440ab7d1b46579d22c3a93a51abd906c9af0534a592e568d6bed5f146cea7b5412efe4c17534f094309a87f664ae609c279dfb43225580291e0b650815
+  metadata.gz: 9beae4e09a010357a338dad9acbb6edd217dd8b392a530f8c1039cd654bfc255a2710fad14f1d90620699f602d4a23f945f2c84d3dea6b5db35907f8202330d6
+  data.tar.gz: b79a0459d1b8c747cddf860127fc49f9a885eacb767a3adf6f5f1e264c359bb7a9158edabdd2508be64fffb7df0706fa4ce81fcac9ccae4de2714fb931cb7da1

data/CHENGELOG.md

@@ -1,3 +1,8 @@
+0.0.5 (2017-11-17)
+==================
+- Use traditional constructors of TimestampFormatter against Embulk core deprecation.
+  - https://github.com/civitaspo/embulk-filter-to_json/pull/6
+
 0.0.4 (2016-01-25)
 ==================
 - incompatible change: `timezone` / `format` options removed

data/README.md

@@ -24,7 +24,7 @@ filters:
       name: test
       type: string
     skip_if_null: [id]
-    timezone: Asia/Tokyo
+    default_timezone: Asia/Tokyo
 ```
 
 ## Run Example

data/build.gradle

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

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

@@ -22,7 +22,6 @@ 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;
@@ -54,9 +53,6 @@ public class ToJsonFilterPlugin
         @Config("default_format")
         @ConfigDefault("\"%Y-%m-%d %H:%M:%S.%N %z\"")
         String getDefaultFormat();
-
-        @ConfigInject
-        ScriptingContainer getJRuby();
     }
 
     public interface JsonColumn
@@ -124,13 +120,23 @@ public class ToJsonFilterPlugin
         return new Schema(builder.build());
     }
 
+    private static interface FormatterIntlTask extends Task, TimestampFormatter.Task {}
+    private static interface FormatterIntlColumnOption extends Task, TimestampFormatter.TimestampColumnOption {}
+
     @Override
     public PageOutput open(TaskSource taskSource, final Schema inputSchema,
             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 DateTimeZone timezone = DateTimeZone.forID(task.getDefaultTimezone());
+        // TODO: Switch to a newer TimestampFormatter constructor after a reasonable interval.
+        // Traditional constructor is used here for compatibility.
+        final ConfigSource configSource = Exec.newConfigSource();
+        configSource.set("format", task.getDefaultFormat());
+        configSource.set("timezone", timezone);
+        final TimestampFormatter timestampFormatter = new TimestampFormatter(
+            Exec.newConfigSource().loadConfig(FormatterIntlTask.class),
+            Optional.fromNullable(configSource.loadConfig(FormatterIntlColumnOption.class)));
         final List<String> columnNamesSkipIfNull = task.getColumnNamesSkipIfNull();
 
         return new PageOutput()

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-to_json
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Civitaspo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: bundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: To Json
 email:
 - civitaspo@gmail.com
@@ -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.4.jar
+- classpath/embulk-filter-to_json-0.0.5.jar
 homepage: https://github.com/civitaspo/embulk-filter-to_json
 licenses:
 - MIT