embulk-parser-query_string 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97fb67cc2b3cf2233e6e3fd248033c59edd58b70
-  data.tar.gz: 11879dcdad1b06b3ce746ce33c02816a8267f4c8
+  metadata.gz: fb9918e68aa9b4a3569fefcbb2ffa477aba99378
+  data.tar.gz: cbf1b7c3d4d14ecc0180c9de70f8e64b59c185b3
 SHA512:
-  metadata.gz: f89539141e02dcb74fbf93956d77bb94446aa4b7dcf67c14b7bc1c6ad3862a162c2fde1a5965e49ceea278da8a60e59babcd8d7f7eeb7482b76bc38e8608b096
-  data.tar.gz: 8e1de420daf02fb16f477d9aaa2f3d97fa9dbb7fca7eb86692337b76989a2867e28c603e2c03dfd5feff0c42e89c9e9cfe1c5cc0ad8fc232d2b0b890151f670e
+  metadata.gz: c60a005d7be4dd2de37445d1b7e696043824ef69f8c05c4fb90304aea8de14f0a75507031f7667ddacdcf2750806bdd2a657d47ab27a6fbcd384431e939c18fc
+  data.tar.gz: c433316f33f2b8b3ad29b7ec052f14a393c0101ace98ac103cf0d965a5a3fd43915c1e93d2c0273393f7642f53b8793355c33515923ef6e5dc2c58f7cca92094

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.3 - 2015-07-08
+
+* [enhancement] Support embulk 0.6.10 (backward compatibility) [#9](https://github.com/treasure-data/embulk-parser-query_string/pull/9)
+
 ## 0.0.2 - 2015-07-08
 
 The name of this plugin is changed to "embulk-parser-query_string" from "embulk-parser-query-string".

data/README.md

@@ -13,6 +13,8 @@ Currently, this plugin supports minimum case, some edge cases are unsupported as
 
 ## Overview
 
+Required Embulk version >= 0.6.10.
+
 * **Plugin type**: parser
 * **Guess supported**: yes
 

data/embulk-parser-query_string.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-parser-query_string"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["yoshihara", "uu59"]
   spec.summary       = "Query String parser plugin for Embulk"
   spec.description   = "Parses Query String files read by other file input plugins."
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'embulk', [">= 0.6.13", "< 1.0"]
+  spec.add_development_dependency 'embulk', [">= 0.6.10", "< 1.0"]
   spec.add_development_dependency 'bundler', ['~> 1.0']
   spec.add_development_dependency 'rake', ['>= 10.0']
   spec.add_development_dependency 'pry'

data/lib/embulk/parser/query_string.rb

@@ -10,13 +10,13 @@ module Embulk
         decoder_task = config.load_config(Java::LineDecoder::DecoderTask)
 
         task = {
-          decoder: DataSource.from_java(decoder_task.dump),
-          strip_quote: config.param("strip_quote", :bool, default: true),
-          strip_whitespace: config.param("strip_whitespace", :bool, default: true),
+          "decoder" => DataSource.from_java(decoder_task.dump),
+          "strip_quote" => config.param("strip_quote", :bool, default: true),
+          "strip_whitespace" => config.param("strip_whitespace", :bool, default: true),
         }
 
         columns = []
-        schema = config.param(:schema, :array, default: [])
+        schema = config.param("schema", :array, default: [])
         schema.each do |column|
           name = column["name"]
           type = column["type"].to_sym
@@ -29,11 +29,11 @@ module Embulk
 
       def init
         @options = {
-          strip_quote: task[:strip_quote],
-          strip_whitespace: task[:strip_whitespace],
+          strip_quote: task["strip_quote"],
+          strip_whitespace: task["strip_whitespace"],
         }
 
-        @decoder = task.param(:decoder, :hash).load_task(Java::LineDecoder::DecoderTask)
+        @decoder = task.param("decoder", :hash).load_task(Java::LineDecoder::DecoderTask)
       end
 
       def run(file_input)
@@ -69,10 +69,22 @@ module Embulk
 
         return unless record
 
-        records = schema.map do |column|
-          record[column.name]
+        # NOTE: this conversion is needless afrer Embulk 0.6.13
+        values = schema.map do |column|
+          name = column.name
+          value = record[name]
+
+          case column.type
+          when :long
+            Integer(value)
+          when :timestamp
+            Time.parse(value)
+          else
+            value.to_s
+          end
         end
-        page_builder.add(records)
+
+        page_builder.add(values)
       end
     end
   end

data/partial-config.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: ./target_file
+  path_prefix: ./file
   parser:
     strip_quote: true
     strip_whitespace: true

data/test/embulk/guess/test_query_string.rb

@@ -44,7 +44,7 @@ module Embulk
         def test_type(data)
           type, expected = data
           sample_lines = self.class.sample_lines_with_same_keys
-          config = DataSource[{parser: {type: type}}]
+          config = DataSource[{"parser" => {"type" => type}}]
 
           actual = QueryString.new.guess_lines(config, sample_lines)
           assert_equal(expected, actual)

data/test/embulk/parser/test_query_string_plugin.rb

@@ -49,33 +49,25 @@ module Embulk
         end
       end
 
-      class TestProcessBuffer < self
+      class TestProcessLine < self
         def test_process_line
-          records.each do |record|
-            mock(page_builder).add(record.values)
-          end
-
+          mock(page_builder).add(["FOO", 1, Time.parse("2015-07-08T16:25:46")])
           plugin.send(:process_line, line)
         end
 
         private
 
-        def records
-          [
-            {"foo" => "FOO", "bar" => "1"},
-          ]
-        end
-
         def line
-          "foo=FOO&bar=1"
+          "foo=FOO&bar=1&baz=2015-07-08T16:25:46"
         end
       end
 
       def test_transaction
+        expected_task = task.dup
+        expected_task.delete("schema")
+
         QueryString.transaction(config) do |actual_task, actual_columns|
-          t = task.dup
-          t.delete(:schema)
-          assert_equal(t, actual_task)
+          assert_equal(expected_task, actual_task)
           assert_equal(schema, actual_columns)
         end
       end
@@ -92,17 +84,18 @@ module Embulk
 
       def task
         {
-          decoder: {"Charset" => "UTF-8", "Newline" => "CRLF"},
-          strip_quote: true,
-          strip_whitespace: true,
-          schema: columns,
+          "decoder" => {"Charset" => "UTF-8", "Newline" => "CRLF"},
+          "strip_quote" => true,
+          "strip_whitespace" => true,
+          "schema" => columns,
         }
       end
 
       def columns
         [
-          {"name" => "foo", "type" => "string"},
-          {"name" => "bar", "type" => "string"},
+          {"name" => "foo", "type" => :string},
+          {"name" => "bar", "type" => :long},
+          {"name" => "baz", "type" => :timestamp},
         ]
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-query_string
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - yoshihara
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.13
+        version: 0.6.10
     - - <
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.13
+        version: 0.6.10
     - - <
       - !ruby/object:Gem::Version
         version: '1.0'