embulk-formatter-single_value 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 005d2a08bb09c491286ff70df7be2131d534ece7
-  data.tar.gz: dde860334b09dfb5ef56c2c6a968806159eb61e3
+  metadata.gz: e3a9bc73a1f67dcc850a1564ca93a999eb383c2d
+  data.tar.gz: 10e86578e295468d0441f0baaad13997c1f9595c
 SHA512:
-  metadata.gz: 672273adc0a488d82fa9680a87406a3a3c32d721a7c66a5c983e801fbb6c31f76a44122fcab5c031a22de5bc4d9597dfc885f62a170e0aa9128fc4e5b02d2c20
-  data.tar.gz: 0981bb0bd9ba73e382204a7afb2c221f7859c098d4ffd7acbca2041b87919fd68acaebdc537e7f7891a64371c027b8f861934e8859dda44ec66771de0cd49f0d
+  metadata.gz: 360559b2014d06a68429f0bbb7e0d1bb9de6f66422d8e2da912a9b85688bd092d8e331185251bd4ec5931995e5e57408b9c77e2a2c9a5bbb95e94d6609cfcd41
+  data.tar.gz: f4ee47a1acf642ebcd14102e028e4107dcdb45e869b2572307fe3e863f6c49b3ab76fd399a7ff81a40a2c99b09bd63949d53f752b8a8d82be0aaedc755b3c435

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.1 (2017-08-26)
+
+Enhancements:
+
+* Use old, but non-deprecated TimestampFormatter API to support embulk < 0.8.29
+
 # 0.3.0 (2017-08-23)
 
 Changes:

data/build.gradle

@@ -13,14 +13,14 @@ configurations {
     provided
 }
 
-version = "0.3.0"
+version = "0.3.1"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.8.29+"
-    provided "org.embulk:embulk-core:0.8.29+"
+    compile  "org.embulk:embulk-core:0.8.+"
+    provided "org.embulk:embulk-core:0.8.+"
     // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
     testCompile "junit:junit:4.+"
 }

data/src/main/java/org/embulk/formatter/single_value/SingleValueFormatterPlugin.java

@@ -23,6 +23,7 @@ import org.embulk.spi.time.TimestampFormatter;
 import org.embulk.spi.util.LineEncoder;
 
 import org.joda.time.DateTimeZone;
+import org.jruby.embed.ScriptingContainer;
 import org.msgpack.value.Value;
 
 public class SingleValueFormatterPlugin
@@ -85,7 +86,7 @@ public class SingleValueFormatterPlugin
         final Schema outputSchema = getOutputSchema(inputColumnIndex, inputSchema);
         final DateTimeZone timezone  = DateTimeZone.forID(task.getTimezone());
         final TimestampFormatter timestampFormatter =
-            new TimestampFormatter(task.getTimestampFormat(), timezone);
+            getTimestampFormatter(task.getTimestampFormat(), timezone);
 
         // create a file
         encoder.nextFile();
@@ -185,4 +186,68 @@ public class SingleValueFormatterPlugin
             }
         };
     }
+
+
+    private class TimestampFormatterTaskImpl implements TimestampFormatter.Task
+    {
+        private final DateTimeZone defaultTimeZone;
+        private final String defaultTimestampFormat;
+        public TimestampFormatterTaskImpl(
+                DateTimeZone defaultTimeZone,
+                String defaultTimestampFormat)
+        {
+            this.defaultTimeZone = defaultTimeZone;
+            this.defaultTimestampFormat = defaultTimestampFormat;
+        }
+        @Override
+        public DateTimeZone getDefaultTimeZone()
+        {
+            return this.defaultTimeZone;
+        }
+        @Override
+        public String getDefaultTimestampFormat()
+        {
+            return this.defaultTimestampFormat;
+        }
+        @Override
+        public ScriptingContainer getJRuby()
+        {
+            return null;
+        }
+    }
+
+    private class TimestampFormatterColumnOptionImpl implements TimestampFormatter.TimestampColumnOption
+    {
+        private final Optional<DateTimeZone> timeZone;
+        private final Optional<String> format;
+        public TimestampFormatterColumnOptionImpl(
+                Optional<DateTimeZone> timeZone,
+                Optional<String> format)
+        {
+            this.timeZone = timeZone;
+            this.format = format;
+        }
+        @Override
+        public Optional<DateTimeZone> getTimeZone()
+        {
+            return this.timeZone;
+        }
+        @Override
+        public Optional<String> getFormat()
+        {
+            return this.format;
+        }
+    }
+
+    private TimestampFormatter getTimestampFormatter(String format, DateTimeZone timezone)
+    {
+        // ToDo: Use following codes after deciding to drop supporting embulk < 0.8.29.
+        //
+        //     return new TimestampFormatter(format, timezone);
+        TimestampFormatterTaskImpl task = new TimestampFormatterTaskImpl(
+                timezone, format);
+        TimestampFormatterColumnOptionImpl columnOption = new TimestampFormatterColumnOptionImpl(
+                Optional.of(timezone), Optional.of(format));
+        return new TimestampFormatter(task, Optional.of(columnOption));
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-formatter-single_value
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ files:
 - settings.gradle
 - src/main/java/org/embulk/formatter/single_value/SingleValueFormatterPlugin.java
 - src/test/java/org/embulk/formatter/single_value/TestSingleValueFormatterPlugin.java
-- classpath/embulk-formatter-single_value-0.3.0.jar
+- classpath/embulk-formatter-single_value-0.3.1.jar
 homepage: https://github.com/sonots/embulk-formatter-single_value
 licenses:
 - MIT