embulk-parser-jsonl 0.1.2 → 0.2.0

data/src/test/java/org/embulk/parser/jsonl/cast/TestBooleanCast.java

@@ -0,0 +1,56 @@
+package org.embulk.parser.jsonl.cast;
+
+import org.embulk.spi.DataException;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class TestBooleanCast
+{
+    @Test
+    public void asBoolean()
+    {
+        assertEquals(true, BooleanCast.asBoolean(true));
+        assertEquals(false, BooleanCast.asBoolean(false));
+    }
+
+    @Test
+    public void asLong()
+    {
+        assertEquals(1, BooleanCast.asLong(true));
+        assertEquals(0, BooleanCast.asLong(false));
+    }
+
+    @Test
+    public void asDouble()
+    {
+        try {
+            BooleanCast.asDouble(true);
+            fail();
+        }
+        catch (Throwable t) {
+            assertTrue(t instanceof DataException);
+        }
+    }
+
+    @Test
+    public void asString()
+    {
+        assertEquals("true", BooleanCast.asString(true));
+        assertEquals("false", BooleanCast.asString(false));
+    }
+
+    @Test
+    public void asTimestamp()
+    {
+        try {
+            BooleanCast.asTimestamp(true);
+            fail();
+        }
+        catch (Throwable t) {
+            assertTrue(t instanceof DataException);
+        }
+    }
+}

data/src/test/java/org/embulk/parser/jsonl/cast/TestDoubleCast.java

@@ -0,0 +1,50 @@
+package org.embulk.parser.jsonl.cast;
+
+import org.embulk.spi.DataException;
+import org.embulk.spi.time.Timestamp;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class TestDoubleCast
+{
+    @Test
+    public void asBoolean()
+    {
+        try {
+            DoubleCast.asBoolean(0.5);
+            fail();
+        }
+        catch (Throwable t) {
+            assertTrue(t instanceof DataException);
+        }
+    }
+
+    @Test
+    public void asLong()
+    {
+        assertEquals(0, DoubleCast.asLong(0.5));
+    }
+
+    @Test
+    public void asDouble()
+    {
+        assertEquals(0.5, DoubleCast.asDouble(0.5), 0.0);
+    }
+
+    @Test
+    public void asString()
+    {
+        assertEquals("0.5", DoubleCast.asString(0.5));
+    }
+
+    @Test
+    public void asTimestamp()
+    {
+        Timestamp expected = Timestamp.ofEpochSecond(1, 500000000);
+        assertEquals(expected, DoubleCast.asTimestamp(1.5));
+    }
+}
+

data/src/test/java/org/embulk/parser/jsonl/cast/TestJsonCast.java

@@ -0,0 +1,80 @@
+package org.embulk.parser.jsonl.cast;
+
+import org.embulk.spi.DataException;
+import org.junit.Before;
+import org.junit.Test;
+import org.msgpack.value.Value;
+import org.msgpack.value.ValueFactory;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class TestJsonCast
+{
+    public Value value;
+
+    @Before
+    public void createResource()
+    {
+        Value[] kvs = new Value[2];
+        kvs[0] = ValueFactory.newString("k");
+        kvs[1] = ValueFactory.newString("v");
+        value = ValueFactory.newMap(kvs);
+    }
+
+    @Test
+    public void asBoolean()
+    {
+        try {
+            JsonCast.asBoolean(value);
+            fail();
+        }
+        catch (Throwable t) {
+            assertTrue(t instanceof DataException);
+        }
+    }
+
+    @Test
+    public void asLong()
+    {
+        try {
+            JsonCast.asLong(value);
+            fail();
+        }
+        catch (Throwable t) {
+            assertTrue(t instanceof DataException);
+        }
+    }
+
+    @Test
+    public void asDouble()
+    {
+        try {
+            JsonCast.asDouble(value);
+            fail();
+        }
+        catch (Throwable t) {
+            assertTrue(t instanceof DataException);
+        }
+    }
+
+    @Test
+    public void asString()
+    {
+        assertEquals("{\"k\":\"v\"}", JsonCast.asString(value));
+    }
+
+    @Test
+    public void asTimestamp()
+    {
+        try {
+            JsonCast.asTimestamp(value);
+            fail();
+        }
+        catch (Throwable t) {
+            assertTrue(t instanceof DataException);
+        }
+    }
+}
+

data/src/test/java/org/embulk/parser/jsonl/cast/TestLongCast.java

@@ -0,0 +1,42 @@
+package org.embulk.parser.jsonl.cast;
+
+import org.embulk.spi.time.Timestamp;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class TestLongCast
+{
+    @Test
+    public void asBoolean()
+    {
+        assertEquals(true, LongCast.asBoolean(1));
+        assertEquals(false, LongCast.asBoolean(0));
+    }
+
+    @Test
+    public void asLong()
+    {
+        assertEquals(1, LongCast.asLong(1));
+    }
+
+    @Test
+    public void asDouble()
+    {
+        assertEquals(1.0, LongCast.asDouble(1), 0.0);
+    }
+
+    @Test
+    public void asString()
+    {
+        assertEquals("1", LongCast.asString(1));
+    }
+
+    @Test
+    public void asTimestamp()
+    {
+        Timestamp expected = Timestamp.ofEpochSecond(1);
+        assertEquals(expected, LongCast.asTimestamp(1));
+    }
+}
+

data/src/test/java/org/embulk/parser/jsonl/cast/TestStringCast.java

@@ -0,0 +1,103 @@
+package org.embulk.parser.jsonl.cast;
+
+import org.embulk.EmbulkTestRuntime;
+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;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class TestStringCast
+{
+    @Rule
+    public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
+    public ScriptingContainer jruby;
+
+    @Before
+    public void createResource()
+    {
+        jruby = new ScriptingContainer();
+    }
+
+    @Test
+    public void asBoolean()
+    {
+        for (String str : StringCast.TRUE_STRINGS) {
+            assertEquals(true, StringCast.asBoolean(str));
+        }
+        for (String str : StringCast.FALSE_STRINGS) {
+            assertEquals(false, StringCast.asBoolean(str));
+        }
+        try {
+            StringCast.asBoolean("foo");
+        }
+        catch (Throwable t) {
+            assertTrue(t instanceof DataException);
+        }
+    }
+
+    @Test
+    public void asLong()
+    {
+        assertEquals(1, StringCast.asLong("1"));
+        try {
+            StringCast.asLong("1.5");
+            fail();
+        }
+        catch (Throwable t) {
+            assertTrue(t instanceof DataException);
+        }
+        try {
+            StringCast.asLong("foo");
+            fail();
+        }
+        catch (Throwable t) {
+            assertTrue(t instanceof DataException);
+        }
+    }
+
+    @Test
+    public void asDouble()
+    {
+        assertEquals(1.0, StringCast.asDouble("1"), 0.0);
+        assertEquals(1.5, StringCast.asDouble("1.5"), 0.0);
+        try {
+            StringCast.asDouble("foo");
+            fail();
+        }
+        catch (Throwable t) {
+            assertTrue(t instanceof DataException);
+        }
+    }
+
+    @Test
+    public void asString()
+    {
+        assertEquals("1", StringCast.asString("1"));
+        assertEquals("1.5", StringCast.asString("1.5"));
+        assertEquals("foo", StringCast.asString("foo"));
+    }
+
+    @Test
+    public void asTimestamp()
+    {
+        Timestamp expected = Timestamp.ofEpochSecond(1463084053, 123456000);
+        TimestampParser parser = new TimestampParser(jruby, "%Y-%m-%d %H:%M:%S.%N", DateTimeZone.UTC);
+        assertEquals(expected, StringCast.asTimestamp("2016-05-12 20:14:13.123456", parser));
+
+        try {
+            StringCast.asTimestamp("foo", parser);
+            fail();
+        }
+        catch (Throwable t) {
+            assertTrue(t instanceof DataException);
+        }
+    }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-jsonl
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Shunsuke Mikami
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -51,9 +51,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bench/gen_dummy.rb
+- bench/typecast.yml
+- bench/without_typecast.yml
 - build.gradle
 - embulk-parser-jsonl.gemspec
+- example/compat.yml
 - example/example.yml
+- example/example_without_typecast.yml
 - example/sample.json
 - gradle/wrapper/gradle-wrapper.jar
 - gradle/wrapper/gradle-wrapper.properties
@@ -62,15 +67,24 @@ files:
 - lib/embulk/guess/jsonl.rb
 - lib/embulk/parser/jsonl.rb
 - settings.gradle
+- src/main/java/org/embulk/parser/jsonl/ColumnCaster.java
+- src/main/java/org/embulk/parser/jsonl/ColumnVisitorImpl.java
 - src/main/java/org/embulk/parser/jsonl/JsonRecordValidateException.java
-- src/main/java/org/embulk/parser/jsonl/JsonlColumnOption.java
 - src/main/java/org/embulk/parser/jsonl/JsonlParserPlugin.java
-- src/main/java/org/embulk/parser/jsonl/getter/ColumnGetterFactory.java
-- src/main/java/org/embulk/parser/jsonl/getter/CommonColumnGetter.java
-- src/main/java/org/embulk/parser/jsonl/getter/StringColumnGetter.java
+- src/main/java/org/embulk/parser/jsonl/cast/BooleanCast.java
+- src/main/java/org/embulk/parser/jsonl/cast/DoubleCast.java
+- src/main/java/org/embulk/parser/jsonl/cast/JsonCast.java
+- src/main/java/org/embulk/parser/jsonl/cast/LongCast.java
+- src/main/java/org/embulk/parser/jsonl/cast/StringCast.java
+- src/test/java/org/embulk/parser/jsonl/TestColumnCaster.java
 - src/test/java/org/embulk/parser/jsonl/TestJsonlParserPlugin.java
+- src/test/java/org/embulk/parser/jsonl/cast/TestBooleanCast.java
+- src/test/java/org/embulk/parser/jsonl/cast/TestDoubleCast.java
+- src/test/java/org/embulk/parser/jsonl/cast/TestJsonCast.java
+- src/test/java/org/embulk/parser/jsonl/cast/TestLongCast.java
+- src/test/java/org/embulk/parser/jsonl/cast/TestStringCast.java
 - src/test/resources/org/embulk/parser/jsonl/use_column_options.yml
-- classpath/embulk-parser-jsonl-0.1.2.jar
+- classpath/embulk-parser-jsonl-0.2.0.jar
 homepage: https://github.com/shun0102/embulk-parser-jsonl
 licenses:
 - MIT

data/src/main/java/org/embulk/parser/jsonl/JsonlColumnOption.java

@@ -1,16 +0,0 @@
-package org.embulk.parser.jsonl;
-
-import org.embulk.config.Config;
-import org.embulk.config.ConfigDefault;
-import org.embulk.config.Task;
-import org.embulk.spi.type.Type;
-
-import com.google.common.base.Optional;
-
-public interface JsonlColumnOption
-    extends Task
-{
-    @Config("type")
-    @ConfigDefault("null")
-    Optional<Type> getType();
-}

data/src/main/java/org/embulk/parser/jsonl/getter/ColumnGetterFactory.java

@@ -1,24 +0,0 @@
-package org.embulk.parser.jsonl.getter;
-
-import org.embulk.spi.ColumnConfig;
-import org.embulk.spi.PageBuilder;
-import org.embulk.spi.time.TimestampParser;
-
-public class ColumnGetterFactory {
-    private PageBuilder pageBuilder;
-    private TimestampParser[] timestampParsers;
-
-    public ColumnGetterFactory(PageBuilder pageBuilder, TimestampParser[] timestampParsers) {
-        this.pageBuilder = pageBuilder;
-        this.timestampParsers = timestampParsers;
-    }
-
-    public CommonColumnGetter newColumnGetter(ColumnConfig columnConfig) {
-        switch (columnConfig.getType().getName()) {
-        case "string":
-            return new StringColumnGetter(pageBuilder, timestampParsers);
-        default:
-            return new CommonColumnGetter(pageBuilder, timestampParsers);
-        }
-    }
-}

data/src/main/java/org/embulk/parser/jsonl/getter/CommonColumnGetter.java

@@ -1,131 +0,0 @@
-package org.embulk.parser.jsonl.getter;
-
-import org.embulk.parser.jsonl.JsonRecordValidateException;
-import org.embulk.spi.Column;
-import org.embulk.spi.ColumnVisitor;
-import org.embulk.spi.PageBuilder;
-import org.embulk.spi.time.TimestampParser;
-import org.msgpack.core.MessageTypeException;
-import org.msgpack.value.BooleanValue;
-import org.msgpack.value.FloatValue;
-import org.msgpack.value.IntegerValue;
-import org.msgpack.value.Value;
-
-public class CommonColumnGetter implements ColumnVisitor {
-    protected final PageBuilder pageBuilder;
-    protected final TimestampParser[] timestampParsers;
-
-    protected Value value;
-
-    public CommonColumnGetter(PageBuilder pageBuilder, TimestampParser[] timestampParsers)
-    {
-        this.pageBuilder = pageBuilder;
-        this.timestampParsers = timestampParsers;
-    }
-
-    public void setValue(Value value)
-    {
-        this.value = value;
-    }
-
-    @Override
-    public void booleanColumn(Column column)
-    {
-        if (isNil(value)) {
-            pageBuilder.setNull(column);
-        }
-        else {
-            try {
-                pageBuilder.setBoolean(column, ((BooleanValue) value).getBoolean());
-            }
-            catch (MessageTypeException e) {
-                throw new JsonRecordValidateException(e);
-            }
-        }
-    }
-
-    @Override
-    public void longColumn(Column column)
-    {
-        if (isNil(value)) {
-            pageBuilder.setNull(column);
-        }
-        else {
-            try {
-                pageBuilder.setLong(column, ((IntegerValue) value).asLong());
-            }
-            catch (MessageTypeException e) {
-                throw new JsonRecordValidateException(e);
-            }
-        }
-    }
-
-    @Override
-    public void doubleColumn(Column column)
-    {
-        if (isNil(value)) {
-            pageBuilder.setNull(column);
-        }
-        else {
-            try {
-                pageBuilder.setDouble(column, ((FloatValue) value).toDouble());
-            }
-            catch (MessageTypeException e) {
-                throw new JsonRecordValidateException(e);
-            }
-        }
-    }
-
-    @Override
-    public void stringColumn(Column column)
-    {
-        if (isNil(value)) {
-            pageBuilder.setNull(column);
-        }
-        else {
-            try {
-                pageBuilder.setString(column, value.toString());
-            }
-            catch (MessageTypeException e) {
-                throw new JsonRecordValidateException(e);
-            }
-        }
-    }
-
-    @Override
-    public void timestampColumn(Column column)
-    {
-        if (isNil(value)) {
-            pageBuilder.setNull(column);
-        }
-        else {
-            try {
-                pageBuilder.setTimestamp(column, timestampParsers[column.getIndex()].parse(value.toString()));
-            }
-            catch (MessageTypeException e) {
-                throw new JsonRecordValidateException(e);
-            }
-        }
-    }
-
-    @Override
-    public void jsonColumn(Column column)
-    {
-        if (isNil(value)) {
-            pageBuilder.setNull(column);
-        }
-        else {
-            try {
-                pageBuilder.setJson(column, value);
-            }
-            catch (MessageTypeException e) {
-                throw new JsonRecordValidateException(e);
-            }
-        }
-    }
-
-    protected boolean isNil(Value v)
-    {
-        return v == null || v.isNilValue();
-    }
-}