embulk-filter-query_string 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e23eed64d1e327f08947f81c6b6244455c12e57d
-  data.tar.gz: 14a42b37b91926e1b51cbbcfbd9ddc97f8e86269
+  metadata.gz: d3af78f6e9fa1f55d7a8817b3439b2465b958778
+  data.tar.gz: 18c445e7f9a77f1031fb8208327cf87505c9016c
 SHA512:
-  metadata.gz: d4aab3501d0169dc55b68fe1e9f44c728a3abcb83060a77e9ce251f69d527f4f6d58c4ab297f0c3ef3717a492cf144149ec6a0bfbe02b88ae4456d91361498c1
-  data.tar.gz: 70a4113aaf1b485e8bfefd09c453a9367fa8fd30999fada48c06270892d7c15b4633ce3bdf1815e01c9db1d79d4b576da4ba1f8d59f25aeda790a28c0bac03fc
+  metadata.gz: 4b971c444060d50586dfdbe435ec1c4b21ed654331a15869c9f1365f7bba4e69470342af9202a2d9e4873fd093f632077f611483df3a3a540cee0470312265c9
+  data.tar.gz: eac337937754d47bd4e6ed5e154e65427d6718eae9fdefa91bfc61157894e431137ef5d2ce1e4efff20e7638ac394bc47bf9d3a542dc59af0914ae50928a7b19

data/NOTICE

@@ -0,0 +1,2 @@
+Query String filter plugin for Embulk
+Copyright 2016 Minnano Wedding Co., Ltd.

data/README.md

@@ -2,6 +2,8 @@
 
 The query string filter plugin parses the column contents as query string and insert columns from that field.
 
+[![Circle CI](https://circleci.com/gh/mwed/embulk-filter-query_string.svg?style=svg)](https://circleci.com/gh/mwed/embulk-filter-query_string)
+
 ## Overview
 
 * **Plugin type**: filter

data/build.gradle

@@ -79,7 +79,7 @@ task gemspec {
         gemspecFile.write($/
 Gem::Specification.new do |spec|
   spec.name          = "embulk-filter-query_string"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   spec.authors       = ["Minnano Wedding Co., Ltd."]
   spec.summary       = %[Query String filter plugin for Embulk]
   spec.description   = %[The query string filter plugin parses the column contents as query string and insert columns from that field.]

data/src/main/java/org/embulk/filter/query_string/QueryStringFilterPlugin.java

@@ -115,7 +115,12 @@ public class QueryStringFilterPlugin
                     String key = queryString.substring(keyStart, keyEnd);
                     String value = queryString.substring(valueStart, valueEnd);
 
-                    storage.put(key, Double.parseDouble(value));
+                    try {
+                        storage.put(key, Double.parseDouble(value));
+                    }
+                    catch (NumberFormatException e) {
+                        storage.put(key, null);
+                    }
                 }
             };
 
@@ -125,9 +130,15 @@ public class QueryStringFilterPlugin
                 public void parseKeyValuePair(String queryString, int keyStart, int keyEnd, int valueStart, int valueEnd, Map<String, Object> storage)
                 {
                     String key = queryString.substring(keyStart, keyEnd);
-                    long value = ParseUtils.parseUnsignedLong(queryString, valueStart, valueEnd);
 
-                    storage.put(key, value);
+                    try {
+                        long value = ParseUtils.parseUnsignedLong(queryString, valueStart, valueEnd);
+
+                        storage.put(key, value);
+                    }
+                    catch (NumberFormatException e) {
+                        storage.put(key, null);
+                    }
                 }
             };
 
@@ -137,9 +148,15 @@ public class QueryStringFilterPlugin
                 public void parseKeyValuePair(String queryString, int keyStart, int keyEnd, int valueStart, int valueEnd, Map<String, Object> storage)
                 {
                     String key = queryString.substring(keyStart, keyEnd);
-                    long value = ParseUtils.parseUnsignedLong(queryString, valueStart, valueEnd);
 
-                    storage.put(key, Timestamp.ofEpochSecond(value));
+                    try {
+                        long value = ParseUtils.parseUnsignedLong(queryString, valueStart, valueEnd);
+
+                        storage.put(key, Timestamp.ofEpochSecond(value));
+                    }
+                    catch (NumberFormatException e) {
+                        storage.put(key, null);
+                    }
                 }
             };
 

data/src/test/java/org/embulk/filter/query_string/TestQueryStringFilterPlugin.java

@@ -29,6 +29,7 @@ import org.embulk.spi.PageReader;
 import org.embulk.spi.PageTestUtils;
 import org.embulk.spi.Schema;
 import org.embulk.spi.TestPageBuilderReader;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -38,7 +39,9 @@ import java.util.List;
 
 import static org.embulk.spi.type.Types.STRING;
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 public class TestQueryStringFilterPlugin
 {
@@ -106,13 +109,49 @@ public class TestQueryStringFilterPlugin
 
                     assertThat(pageReader.getString(0), is("before"));
                     assertThat(pageReader.getString(1), is("one"));
-                    assertThat(pageReader.getLong(2), is(Long.valueOf(2L)));
+                    assertEquals(2L, pageReader.getLong(2));
                     assertThat(pageReader.getString(3), is("after"));
                 }
             }
         });
     }
 
+    @Ignore
+    @Test
+    public void testOpenWithInvalidValue()
+    {
+        ConfigSource configSource = loadConfigSource("testOpenWithInvalidValue.yml");
+        final Schema inputSchema = Schema.builder()
+                .add("qs", STRING)
+                .build();
+
+        final QueryStringFilterPlugin plugin = new QueryStringFilterPlugin();
+        plugin.transaction(configSource, inputSchema, new FilterPlugin.Control()
+        {
+            @Override
+            public void run(TaskSource taskSource, Schema outputSchema)
+            {
+                TestPageBuilderReader.MockPageOutput mockPageOutput = new TestPageBuilderReader.MockPageOutput();
+                PageOutput pageOutput = plugin.open(taskSource, inputSchema, outputSchema, mockPageOutput);
+
+                List<Page> pages = PageTestUtils.buildPage(runtime.getBufferAllocator(), inputSchema, "/path?q1=alpha");
+                for (Page page : pages) {
+                    pageOutput.add(page);
+                }
+
+                pageOutput.finish();
+                pageOutput.close();
+
+                PageReader pageReader = new PageReader(outputSchema);
+                for (Page page : mockPageOutput.pages) {
+                    pageReader.setPage(page);
+
+                    assertTrue(pageReader.isNull(0));
+                }
+            }
+        });
+    }
+
     private ConfigSource loadConfigSource(String yamlPath)
     {
         try {

data/src/test/resources/testOpenWithInvalidValue.yml

@@ -0,0 +1,4 @@
+type: query_string
+query_string_column_name: qs
+expanded_columns:
+  - {name: q1, type: long}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-query_string
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Minnano Wedding Co., Ltd.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -46,7 +46,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- LICENSE.txt
+- LICENSE
+- NOTICE
 - README.md
 - build.gradle
 - config/checkstyle/checkstyle.xml
@@ -59,6 +60,7 @@ files:
 - src/main/java/org/embulk/filter/query_string/QueryStringFilterPlugin.java
 - src/test/java/org/embulk/filter/query_string/TestQueryStringFilterPlugin.java
 - src/test/resources/testOpen.yml
+- src/test/resources/testOpenWithInvalidValue.yml
 - src/test/resources/testTransaction.yml
 - classpath/commons-codec-1.9.jar
 - classpath/commons-logging-1.2.jar