embulk-filter-column 0.6.0.pre1 → 0.6.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ca161d763f10dc37da758c3bac6d0384a3b4edf
-  data.tar.gz: dfe8251c7268898b6ba42c4aa0da2298b2242ba7
+  metadata.gz: 3b693b9f514309a94b2fea4e85714e6e0c9de0f1
+  data.tar.gz: ed56dc5b557605436985615eacdbc71b700a7640
 SHA512:
-  metadata.gz: c03b1816ca0d300c3b9260dea666d3a361ce9413e685e4ac419923ad27ca925428031969888c7a9d8f25cd511ae127acb987194b761b608044319fee96653ea8
-  data.tar.gz: 37d963fc19b1c78028ce043810b3c88badba92b8a72d116e2b30e208dcacdd85a88d2d55a6379cfd9fffff7d234fbd50b306c40d9a3adc74316e7cc522b295bb
+  metadata.gz: 5d1399f4e807811687c032a1738254bc2013d0a760a88343ec03d3bd3b36309cadb46f1c805859d68724a1bb40b0bc73e1908dbab939cb54e453f7a6db93b5b1
+  data.tar.gz: 7937b001df59b540c8a10fcbd4e3c707565d5e9f9ca4e919d96b7403252d74b654ee8ca0b476fe53d504192ef9302b678f209bed30071e873af48f0a74d8ae2e

data/build.gradle

@@ -15,7 +15,7 @@ configurations {
     provided
 }
 
-version = "0.6.0.pre1"
+version = "0.6.0.pre2"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 

data/src/main/java/org/embulk/filter/column/JsonVisitor.java

@@ -1,5 +1,6 @@
 package org.embulk.filter.column;
 
+import com.dena.analytics.jsonpathcompiler.InvalidPathException;
 import com.dena.analytics.jsonpathcompiler.expressions.Path;
 import com.dena.analytics.jsonpathcompiler.expressions.path.PathCompiler;
 import com.dena.analytics.jsonpathcompiler.expressions.path.PathToken;
@@ -188,7 +189,12 @@ public class JsonVisitor
             if (!PathCompiler.isProbablyJsonPath(name)) {
                 continue;
             }
-            Path path = PathCompiler.compile(name);
+            Path path;
+            try {
+                path = PathCompiler.compile(name);
+            } catch (InvalidPathException e) {
+                throw new ConfigException(String.format("path %s, %s", name, e.getMessage()));
+            }
             PathToken parts = path.getRoot();
             int count = parts.getTokenCount();
             StringBuilder partialPath = new StringBuilder("$");

data/src/test/java/org/embulk/filter/column/TestJsonVisitor.java

@@ -10,6 +10,7 @@ import org.embulk.spi.Schema;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.msgpack.value.MapValue;
 import org.msgpack.value.Value;
 import org.msgpack.value.ValueFactory;
@@ -685,7 +686,7 @@ public class TestJsonVisitor
     }
 
     // It is recognized multi properties if the square brackets does not close properly
-    @Test(expected = InvalidPathException.class)
+    @Test(expected = ConfigException.class)
     public void constructor_mustBeRaisedInvalidPathExceptionWithPropertyIsNotSeparatedByCommas()
     {
         PluginTask task = taskFromYamlString(
@@ -788,4 +789,23 @@ public class TestJsonVisitor
                 .build();
         jsonVisitor(task, inputSchema);
     }
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void constructor_mustBeRaisedConfigExceptionEffectively()
+    {
+        PluginTask task = taskFromYamlString(
+                "type: column",
+                "columns:",
+                "- name: \"$['json][''key1']\"");
+        Schema inputSchema = Schema.builder()
+                .add("json1", JSON)
+                .build();
+
+        thrown.expectMessage("path $['json][''key1'], Property must be separated by comma or Property must be terminated close square bracket at index 9");
+
+        jsonVisitor(task, inputSchema);
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-column
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre1
+  version: 0.6.0.pre2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-01 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,7 @@ files:
 - classpath/accessors-smart-1.1.jar
 - classpath/asm-5.0.3.jar
 - classpath/commons-lang3-3.4.jar
-- classpath/embulk-filter-column-0.6.0.pre1.jar
+- classpath/embulk-filter-column-0.6.0.pre2.jar
 - classpath/json-smart-2.2.1.jar
 - classpath/JsonPathCompiler-0.0.6.jar
 - classpath/slf4j-api-1.7.21.jar