embulk-filter-row 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54615ee2184dfcb3791aa6d92922f1f64a9905a5
-  data.tar.gz: 5558f2a44121b9fdbfcee09d4f1d048ef934d20c
+  metadata.gz: 7c0430c1f25c684a07ddcb0112ec276efebafc20
+  data.tar.gz: 5fe2f45f5adc211e6a77f829782dd348e9182f7c
 SHA512:
-  metadata.gz: 64168aceba7a817f404a6520c3e6ba5e499e9797bb6dcf97ca71eec26684a40f93f94a687b3e8284799c4ab6e09343cef416f68159adca30546c919da8f29390
-  data.tar.gz: be28eba1b0afa8edbeae6c2857ee645ce9319b2cf10eac6ce57720321789121676ce3706dc280051bd887b51a05b61d58be6913e7638670fb1b210e92a31a852
+  metadata.gz: 99c28c3e038b21bd345da0bd20c43d61b311d884fe7d87f17d1f353f942879200a48d0a6c46e087ef274536202474929af13c3f5aa3047a7c90fb85644af428c
+  data.tar.gz: f50ab553637be0af685a8883edc49468e11388c7b30d22ffa86db33a5d1f859b1a058ee3881e1f5e2b26c239495c4e80de375d7ec99e30667143a35188af9f31

data/CHANGELOG.md

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

data/build.gradle

@@ -15,13 +15,13 @@ configurations {
     provided
 }
 
-version = "0.5.0"
+version = "0.5.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  "org.jruby.joni:joni:2.1.11"
     compile  "org.jruby.jcodings:jcodings:1.0.18"

data/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Aug 10 13:48:48 UTC 2015
+#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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

data/src/main/java/org/embulk/filter/row/condition/ConditionFactory.java

@@ -1,5 +1,6 @@
 package org.embulk.filter.row.condition;
 
+import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 
 import org.apache.commons.lang3.math.NumberUtils;
@@ -15,6 +16,7 @@ import org.embulk.spi.type.StringType;
 import org.embulk.spi.type.TimestampType;
 import org.embulk.spi.type.Type;
 import org.joda.time.DateTimeZone;
+import org.jruby.embed.ScriptingContainer;
 
 public class ConditionFactory
 {
@@ -137,7 +139,7 @@ public class ConditionFactory
             String format          = (String) conditionConfig.getFormat().get();
             DateTimeZone timezone  = DateTimeZone.forID((String) conditionConfig.getTimezone().get());
 
-            TimestampParser parser = new TimestampParser(format, timezone);
+            TimestampParser parser = getTimestampParser(format, timezone);
             try {
                 Timestamp timestamp = parser.parse(argument);
                 return new TimestampCondition(operator, timestamp, not);
@@ -150,4 +152,83 @@ public class ConditionFactory
             throw new ConfigException(String.format("RowFilterPlugin: Type mismatch on column: %s", columnName));
         }
     }
+
+    private class TimestampParserTaskImpl implements 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 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 TimestampParser getTimestampParser(String format, DateTimeZone timezone)
+    {
+        // ToDo: Use following codes after deciding to drop supporting embulk < 0.8.29.
+        //
+        //     return new 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 TimestampParser(task, columnOption);
+    }
 }

data/src/main/java/org/embulk/filter/row/where/ParserLiteral.java

@@ -1,5 +1,6 @@
 package org.embulk.filter.row.where;
 
+import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import org.embulk.config.ConfigException;
 import org.embulk.spi.Column;
@@ -16,6 +17,7 @@ import org.embulk.spi.type.StringType;
 import org.embulk.spi.type.TimestampType;
 import org.embulk.spi.type.Type;
 import org.joda.time.DateTimeZone;
+import org.jruby.embed.ScriptingContainer;
 import org.msgpack.value.Value;
 
 // Literal Node of AST (Abstract Syntax Tree)
@@ -140,7 +142,7 @@ class StringLiteral extends ParserLiteral
 class TimestampLiteral extends ParserLiteral
 {
     protected Timestamp val;
-    private static final DateTimeZone default_timezone  = DateTimeZone.forID("UTC");
+    private static final DateTimeZone defaultTimeZone  = DateTimeZone.forID("UTC");
 
     public TimestampLiteral(ParserLiteral literal)
     {
@@ -178,7 +180,7 @@ class TimestampLiteral extends ParserLiteral
         TimestampParseException ex = null;
         for (String format : formats) {
             try {
-                TimestampParser timestampParser = new TimestampParser(format, default_timezone);
+                TimestampParser timestampParser = getTimestampParser(format, defaultTimeZone);
                 this.val = timestampParser.parse(literal.val);
                 break;
             }
@@ -215,6 +217,86 @@ class TimestampLiteral extends ParserLiteral
     {
         return val;
     }
+
+    private class TimestampParserTaskImpl implements 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 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 TimestampParser getTimestampParser(String format, DateTimeZone timezone)
+    {
+        // ToDo: Use following codes after deciding to drop supporting embulk < 0.8.29.
+        //
+        //     return new 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 TimestampParser(task, columnOption);
+    }
+
 }
 
 class IdentifierLiteral extends ParserLiteral

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-row
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.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
@@ -96,7 +96,7 @@ files:
 - src/test/java/org/embulk/filter/row/condition/TestTimestampCondition.java
 - src/test/java/org/embulk/filter/row/where/TestParser.java
 - src/test/java/org/embulk/filter/row/where/TestYylex.java
-- classpath/embulk-filter-row-0.5.0.jar
+- classpath/embulk-filter-row-0.5.1.jar
 - classpath/jcodings-1.0.18.jar
 - classpath/joni-2.1.11.jar
 homepage: https://github.com/sonots/embulk-filter-row