embulk-filter-timestamp_format 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 451b88351373a8de1875a6fdc5c78e9c91b093e6
-  data.tar.gz: afdf5911609850f33f6f3351fe90eed8d96d8f81
+  metadata.gz: 94f9cf903e02ed4a2c7a2fcbcd246d54e4d79918
+  data.tar.gz: e7a9224bb84bff01a5b177e6cea65b4535142219
 SHA512:
-  metadata.gz: dc4a96d6f2b3a3743514fa175e4bfae7fe89d1f8e104b59460a4d9a70e0f9122b5eea007bfe5937782a45935b7186fe36edebdbd3e5d660e4ea6ce73654f43ae
-  data.tar.gz: b3c6057322b0620999b70ab6b49d92bd2154560120ceab0966472775ffcf0b07dbb7748cfe6dac0a53627bd657898039f2069b94eb7380c280b5e6e946883d0f
+  metadata.gz: 3b0134f40cb27a9256c8fda3b694ccd7ca4bdd56c58e91f4002b9af21dc9883dcea42d725e397de176a45986ae2fd6bb253f4162fdd51c3271ea7e250a0b1661
+  data.tar.gz: c37e4f3210911938e33aab11dd1e977167d53f0b2234537a58370ce7e94536dc37c071c3936ebbafb4cf33a53b7f44131ae84dc5f392ae942e021543280ecbbb

data/CHANGELOG.md

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

data/build.gradle

@@ -13,13 +13,13 @@ 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  "io.github.medjed:JsonPathCompiler:0.1.+"
 
     testCompile "junit:junit:4.+"

data/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jan 13 12:41:02 JST 2016
+#Wed Aug 09 13:08:20 JST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

data/src/main/java/org/embulk/filter/timestamp_format/TimestampParser.java

@@ -25,6 +25,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.joda.time.format.DateTimeFormat;
+import org.jruby.embed.ScriptingContainer;
 
 public class TimestampParser {
     public interface Task {
@@ -66,7 +67,7 @@ public class TimestampParser {
         // TODO get default current time from ExecTask.getExecTimestamp
         for (String format : formatList) {
             if (format.contains("%")) {
-                org.embulk.spi.time.TimestampParser parser = new org.embulk.spi.time.TimestampParser(format, defaultFromTimeZone);
+                org.embulk.spi.time.TimestampParser parser = getTimestampParser(format, defaultFromTimeZone);
                 this.jrubyParserList.add(parser);
             } else {
                 // special treatment for nano resolution. n is not originally supported by Joda-Time
@@ -168,4 +169,83 @@ public class TimestampParser {
         }
         return nsec;
     }
+
+    private class TimestampParserTaskImpl implements org.embulk.spi.time.TimestampParser.Task
+    {
+        private final DateTimeZone defaultTimeZone;
+        private final String defaultTimestampFormat;
+        private final String defaultDate;
+        public TimestampParserTaskImpl(
+                DateTimeZone defaultTimeZone,
+                String defaultTimestampFormat,
+                String defaultDate)
+        {
+            this.defaultTimeZone = defaultTimeZone;
+            this.defaultTimestampFormat = defaultTimestampFormat;
+            this.defaultDate = defaultDate;
+        }
+        @Override
+        public DateTimeZone getDefaultTimeZone()
+        {
+            return this.defaultTimeZone;
+        }
+        @Override
+        public String getDefaultTimestampFormat()
+        {
+            return this.defaultTimestampFormat;
+        }
+        @Override
+        public String getDefaultDate()
+        {
+            return this.defaultDate;
+        }
+        @Override
+        public ScriptingContainer getJRuby()
+        {
+            return null;
+        }
+    }
+
+    private class TimestampParserColumnOptionImpl implements org.embulk.spi.time.TimestampParser.TimestampColumnOption
+    {
+        private final Optional<DateTimeZone> timeZone;
+        private final Optional<String> format;
+        private final Optional<String> date;
+        public TimestampParserColumnOptionImpl(
+                Optional<DateTimeZone> timeZone,
+                Optional<String> format,
+                Optional<String> date)
+        {
+            this.timeZone = timeZone;
+            this.format = format;
+            this.date = date;
+        }
+        @Override
+        public Optional<DateTimeZone> getTimeZone()
+        {
+            return this.timeZone;
+        }
+        @Override
+        public Optional<String> getFormat()
+        {
+            return this.format;
+        }
+        @Override
+        public Optional<String> getDate()
+        {
+            return this.date;
+        }
+    }
+
+    private org.embulk.spi.time.TimestampParser getTimestampParser(String format, DateTimeZone timezone)
+    {
+        // ToDo: Use following codes after deciding to drop supporting embulk < 0.8.29.
+        //
+        //     return new org.embulk.spi.time.TimestampParser(format, timezone);
+        String date = "1970-01-01";
+        TimestampParserTaskImpl task = new TimestampParserTaskImpl(timezone, format, date);
+        TimestampParserColumnOptionImpl columnOption = new TimestampParserColumnOptionImpl(
+                Optional.of(timezone), Optional.of(format), Optional.of(date));
+        return new org.embulk.spi.time.TimestampParser(task, columnOption);
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-timestamp_format
 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
@@ -110,7 +110,7 @@ files:
 - src/test/java/org/embulk/filter/timestamp_format/TestTimestampUnit.java
 - classpath/accessors-smart-1.1.jar
 - classpath/asm-5.0.3.jar
-- classpath/embulk-filter-timestamp_format-0.3.0.jar
+- classpath/embulk-filter-timestamp_format-0.3.1.jar
 - classpath/json-smart-2.2.1.jar
 - classpath/JsonPathCompiler-0.1.2.jar
 - classpath/slf4j-api-1.7.21.jar