embulk-filter-typecast 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d54323014090807f457eec3b84aef29060ddd2
-  data.tar.gz: eb7be6477a3a993ce83da5a3e404fa0e7fd3a50d
+  metadata.gz: d936b48df269ca51c971f2f258c2ae54abd492b5
+  data.tar.gz: 7611a81214e865fb9f63ab3d346f45b4e2d68063
 SHA512:
-  metadata.gz: f19f899b820a7faccca9d261b8cc807ac230321b26b4ccde552e7308c6853bc01a24b7cefde15eef9061f1b06e55f0b1b31e8ff67f29ab83d4f07ac3feb488db
-  data.tar.gz: 479bce7de22d8ecefdd6ddde53cd602f44fefdab0394cb0b83df9eb1f67cf2aeb980aa87b24da62f72a3ce47192f13af5ba6b9c1006116fb1da0f64156313ad2
+  metadata.gz: 588142a7396f9a03ac3820276e5cf213345bb0674e72364faba6f0de26157d3184c16edee9d7b874fc2b0a7e73305661a74cc5f81819568c12d3c7b0d127032b
+  data.tar.gz: 6806eff6b7f631388ca2946b2a8732b824f40418b9e347fc674c9616e4cff1741278da825a3a8f2b8e987626d27dc6bc0c154bf86f71d8d459d0ea956e11ba54

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.2.0 (2017-08-23)
+
+Changes:
+
+* Support new TimestampParser and TimestampFormatter API of embulk >= 0.8.29
+  * Note that this plugin now requires embulk >= 0.8.29
+
 # 0.1.5 (2016-11-06)
 
 Enhancements:

data/build.gradle

@@ -13,13 +13,13 @@ configurations {
     provided
 }
 
-version = "0.1.5"
+version = "0.2.0"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.8.+"
-    provided "org.embulk:embulk-core:0.8.+"
+    compile  "org.embulk:embulk-core:0.8.29+"
+    provided "org.embulk:embulk-core:0.8.29+"
     compile  "io.github.medjed:JsonPathCompiler:0.1.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/typecast/ColumnCaster.java

@@ -95,14 +95,14 @@ class ColumnCaster
     {
         DateTimeZone timezone = columnConfig.getTimeZone().or(task.getDefaultTimeZone());
         String format = columnConfig.getFormat().or(task.getDefaultTimestampFormat());
-        return new TimestampParser(task.getJRuby(), format, timezone);
+        return new TimestampParser(format, timezone);
     }
 
     private TimestampFormatter getTimestampFormatter(ColumnConfig columnConfig, PluginTask task)
     {
         String format = columnConfig.getFormat().or(task.getDefaultTimestampFormat());
         DateTimeZone timezone = columnConfig.getTimeZone().or(task.getDefaultTimeZone());
-        return new TimestampFormatter(task.getJRuby(), format, timezone);
+        return new TimestampFormatter(format, timezone);
     }
 
     public void setFromBoolean(Column outputColumn, boolean value)

data/src/main/java/org/embulk/filter/typecast/TypecastFilterPlugin.java

@@ -22,7 +22,6 @@ import org.embulk.spi.Schema;
 import org.embulk.spi.type.TimestampType;
 import org.embulk.spi.type.Type;
 import org.joda.time.DateTimeZone;
-import org.jruby.embed.ScriptingContainer;
 import org.slf4j.Logger;
 
 import java.util.List;
@@ -70,9 +69,6 @@ public class TypecastFilterPlugin implements FilterPlugin
         @Config("default_timestamp_format")
         @ConfigDefault("\"%Y-%m-%d %H:%M:%S.%N %z\"")
         public String getDefaultTimestampFormat();
-
-        @ConfigInject
-        ScriptingContainer getJRuby();
     }
 
     @Override

data/src/test/java/org/embulk/filter/typecast/cast/TestStringCast.java

@@ -5,7 +5,6 @@ import org.embulk.spi.DataException;
 import org.embulk.spi.time.Timestamp;
 import org.embulk.spi.time.TimestampParser;
 import org.joda.time.DateTimeZone;
-import org.jruby.embed.ScriptingContainer;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -20,12 +19,10 @@ public class TestStringCast
 {
     @Rule
     public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
-    public ScriptingContainer jruby;
 
     @Before
     public void createResource()
     {
-        jruby = new ScriptingContainer();
     }
 
     @Test
@@ -102,7 +99,7 @@ public class TestStringCast
     public void asTimestamp()
     {
         Timestamp expected = Timestamp.ofEpochSecond(1463084053, 123456000);
-        TimestampParser parser = new TimestampParser(jruby, "%Y-%m-%d %H:%M:%S.%N", DateTimeZone.UTC);
+        TimestampParser parser = new TimestampParser("%Y-%m-%d %H:%M:%S.%N", DateTimeZone.UTC);
         assertEquals(expected, StringCast.asTimestamp("2016-05-12 20:14:13.123456", parser));
 
         try {

data/src/test/java/org/embulk/filter/typecast/cast/TestTimestampCast.java

@@ -6,7 +6,6 @@ import org.embulk.spi.time.Timestamp;
 import org.embulk.spi.time.TimestampFormatter;
 import org.embulk.spi.time.TimestampParser;
 import org.joda.time.DateTimeZone;
-import org.jruby.embed.ScriptingContainer;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -21,14 +20,12 @@ public class TestTimestampCast
 {
     @Rule
     public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
-    public ScriptingContainer jruby;
     public Timestamp timestamp;
 
     @Before
     public void createResource()
     {
         timestamp = Timestamp.ofEpochSecond(1463084053, 500000000);
-        jruby = new ScriptingContainer();
     }
 
     @Test(expected = DataException.class)
@@ -53,7 +50,7 @@ public class TestTimestampCast
     @Test
     public void asString()
     {
-        TimestampFormatter formatter = new TimestampFormatter(jruby, "%Y-%m-%d %H:%M:%S.%6N", DateTimeZone.UTC);
+        TimestampFormatter formatter = new TimestampFormatter("%Y-%m-%d %H:%M:%S.%6N", DateTimeZone.UTC);
         assertEquals("2016-05-12 20:14:13.500000", TimestampCast.asString(timestamp, formatter));
     }
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-typecast
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: bundler
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
+  prerelease: false
+  type: :development
 description: A filter plugin for Embulk to cast column type.
 email:
 - sonots@gmail.com
@@ -88,8 +88,7 @@ files:
 - src/test/java/org/embulk/filter/typecast/cast/TestTimestampCast.java
 - classpath/accessors-smart-1.1.jar
 - classpath/asm-5.0.3.jar
-- classpath/commons-lang3-3.4.jar
-- classpath/embulk-filter-typecast-0.1.5.jar
+- classpath/embulk-filter-typecast-0.2.0.jar
 - classpath/json-smart-2.2.1.jar
 - classpath/JsonPathCompiler-0.1.1.jar
 - classpath/slf4j-api-1.7.21.jar