embulk-filter-timestamp_format 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb300296d9f472df63c5d7f3bf6c7b2fadbf730d
-  data.tar.gz: d50abbc10df9eb9723c33b6b27f420d789fdfd6c
+  metadata.gz: 7a2a594a84f03137480454f65b2ee9f5e3bbc58a
+  data.tar.gz: 836fb23b2550507518b6f2de9ca77b3220e09457
 SHA512:
-  metadata.gz: 7a275c35383b7e607ffdc69335c36c9087f5db8ae1aaf10d6af5cb0a71407a5f82d40b999b46722bd0ae28806c53392c815ac93f7fefc842bec6c77a126de51c
-  data.tar.gz: 980e5f1414dca7036618ecc8d50d5559a28882d2f02cdd60ce56ee4959bc49476aa206b3a9714cb889f211ffe1eb3db89380ecf553c16a106640a0659ec15430
+  metadata.gz: b7deb792bec505f3cd70e0e191d98473d383d4f58dddba199dad285c47f0cf2fb003fb2e8face50336bfb9577e769b7d673fa99e2ce4be2a21269a0a2b0cb831
+  data.tar.gz: 0135e7bca5a55b62b31e6768e3b1a7e3e4ebfa1caa66bd289187d1a8fdd512bd270041d626205a10bad1d6abe33e36834a87aea3da3cca93e52cff6c2325ae1d

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.2.3 (2016-10-25)
+
+Fixes:
+
+* Fix the case of top-level array such as `$.array_timestamp[*]`
+
+# 0.2.2 (2016-10-07)
+
+yanked
+
 # 0.2.1 (2016-05-19)
 
 Enhancements:

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.2.1"
+version = "0.2.3"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 

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

@@ -50,7 +50,8 @@ public class ColumnVisitorImpl
             String name = columnConfig.getName();
             if (name.startsWith("$.")) {
                 String firstName = name.split("\\.", 3)[1]; // check only top level column name
-                shouldCastSet.add(firstName);
+                String firstPartName = firstName.split("\\[")[0];
+                shouldCastSet.add(firstPartName);
                 continue;
             }
             shouldCastSet.add(name);

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

@@ -78,9 +78,9 @@ public class JsonVisitor
         return shouldVisitSet.contains(jsonPath);
     }
 
-    public Value visit(String jsonPath, Value value)
+    public Value visit(String rootPath, Value value)
     {
-        if (!shouldVisit(jsonPath)) {
+        if (!shouldVisit(rootPath)) {
             return value;
         }
         if (value.isArrayValue()) {
@@ -88,9 +88,9 @@ public class JsonVisitor
             int size = arrayValue.size();
             Value[] newValue = new Value[size];
             for (int i = 0; i < size; i++) {
-                String k = new StringBuilder(jsonPath).append("[").append(Integer.toString(i)).append("]").toString();
+                String k = new StringBuilder(rootPath).append("[").append(Integer.toString(i)).append("]").toString();
                 if (!shouldVisit(k)) {
-                    k = new StringBuilder(jsonPath).append("[*]").toString(); // try [*] too
+                    k = new StringBuilder(rootPath).append("[*]").toString(); // try [*] too
                 }
                 Value v = arrayValue.get(i);
                 newValue[i] = visit(k, v);
@@ -105,7 +105,7 @@ public class JsonVisitor
             for (Map.Entry<Value, Value> entry : mapValue.entrySet()) {
                 Value k = entry.getKey();
                 Value v = entry.getValue();
-                String newPath = new StringBuilder(jsonPath).append(".").append(k.asStringValue().asString()).toString();
+                String newPath = new StringBuilder(rootPath).append(".").append(k.asStringValue().asString()).toString();
                 Value r = visit(newPath, v);
                 newValue[i++] = k;
                 newValue[i++] = r;
@@ -113,15 +113,15 @@ public class JsonVisitor
             return ValueFactory.newMap(newValue, true);
         }
         else if (value.isIntegerValue()) {
-            ColumnConfig columnConfig = jsonPathColumnConfigMap.get(jsonPath);
+            ColumnConfig columnConfig = jsonPathColumnConfigMap.get(rootPath);
             return jsonCaster.fromLong(columnConfig, value.asIntegerValue());
         }
         else if (value.isFloatValue()) {
-            ColumnConfig columnConfig = jsonPathColumnConfigMap.get(jsonPath);
+            ColumnConfig columnConfig = jsonPathColumnConfigMap.get(rootPath);
             return jsonCaster.fromDouble(columnConfig, value.asFloatValue());
         }
         else if (value.isStringValue()) {
-            ColumnConfig columnConfig = jsonPathColumnConfigMap.get(jsonPath);
+            ColumnConfig columnConfig = jsonPathColumnConfigMap.get(rootPath);
             return jsonCaster.fromString(columnConfig, value.asStringValue());
         }
         else {

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-timestamp_format
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: bundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: A filter plugin for Embulk to change timestamp format.
 email:
 - sonots@gmail.com
@@ -102,7 +102,7 @@ files:
 - src/main/java/org/embulk/filter/timestamp_format/cast/TimestampCast.java
 - src/test/java/org/embulk/filter/timestamp_format/TestTimestampFormatConverter.java
 - src/test/java/org/embulk/filter/timestamp_format/TestTimestampUnit.java
-- classpath/embulk-filter-timestamp_format-0.2.1.jar
+- classpath/embulk-filter-timestamp_format-0.2.3.jar
 homepage: https://github.com/sonots/embulk-filter-timestamp_format
 licenses:
 - MIT