embulk-parser-query_string 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bf28a70ddd9f3ec7210201a7f027c05fe675ef7
-  data.tar.gz: 2d4fe6c85982222f3fb9eef01cc99efda5f0bba4
+  metadata.gz: 89e246c7c50472ef725a7278a5afd7787aaed4a5
+  data.tar.gz: 4af80a29bbad7216f5ffdbfa969fe15e88cabd37
 SHA512:
-  metadata.gz: 8aee02b66458e5ff1eb71de855030a0e56162cb1c1ed1ad0953498ce27c4782d9c3297bacf513fbb7f704447778453bde3e767fb9dc537a3a8ec1d31c0c60f2f
-  data.tar.gz: 83cabae95cba6fa468c7e8fcd97ce1bcdb831d7859b66161c7c6d8379b2bfdc61e178eaa7d0a84337409a87f436bce31f3ff5f9e6f9a83bc15e991876350c800
+  metadata.gz: 7c94cf93a907374917e053237a5e80f44eafa44404544605b2a97ceb228327d690d5f5ef7f9fb5557e466edc6e29024e7277fa116ca05231c979b18d18564add
+  data.tar.gz: 4202bae68d5d311012d160fca0270223541ed092ce3c067630ff90a9778211ebe69a2e749c3cbfe7012d2f4d6470bff81b1f9a8962142b0cda96a2d7bc21aaec

data/.travis.yml

@@ -11,14 +11,11 @@ addons:
   code_climate:
     repo_token:
       secure: "cSTIvR+haBzyXfAQGGxCjdnLM/iEWFJuVJFqQi0cqr78yZuhJ4A06tJhLIVd7uU+ZRa+JCT/kpD7zZbVc5BC2kmVJybLOXx+bR1SFgT1W2QVQJL7yU6pzPzpT4hr1VQFd8OIKgko8vTBGykXL804F0e/xHKv+FHGMh6TI2CfXqG8cpZpa4oCtnt48V3VUpszNpNuufvfTFJADpI9NvuyosbA3btcH7pY/vbjLTOAd0cSTjZ6Qufy9jV2KwSRyMHXs1m1paErKHrxL7aPxy+rBWqCVeyrU9Tx/Kw/DgJLP9dIPjFvcDHdaUKpcZAcaU87VYFPhcPW7bDIQoeaI7lfrPiBgQTgfZxeiL9vJ2oRUP9NhkhCF18ljhoqI9uTonuyv49zgyAXrLlJQu0cEdC4tW/qsEsB0b56MyctUm8Iq0gWIZO8uI961p/VzkjV6d3/n+QFTUIKnGqf7sRWfxqXFOP6SmlyZtbST4uzUDNw7MWuRRzqmEagQtnzjzmYXCrFpAwn2BG3tPkjrypmlBBjBKsPww/nkeTn25449UvYUwOKRPY3P0amXPdemubiy4jLCWTHUSxhszTrp85Jx6492z50qDo6wU6bw8MaMdrZbxChyNT6ulgbiBaQm/c1bUPNUyrT8ixyxc+/F+SFuILhIvclHjcAEAiRNAyV5LXhb+U="
-notifications:
-  slack:
-    secure: "QRZ6zQxcRdN2XylIz+b46TbYIv7x5Ko7Y0Mi0aGbf7Wg1xfnS4X2FZKp8gF+RH1qjT6CYsQFUpPBhPVCMx0fP0ik5/gBrdngrj0htludvQ5CTK2oVegM1VC5NSn+gi8bt2F20Ode9fxU5OS1HDzNR9sjPz3W7miMUNDZoYPy77Om/CvmVkBbGyMkWnfwhEvwnL8JpBNpklDvrUUKznNsAcSbKQBMBAglFMds/OaHXCkK142zMbSlHMctch1VDAKhX9/6M3v8v6ZRheX68+VVCz3nTrTF0/lnYh3ig9ey3DNlgkZUqK2gmypnhTE6tpeibHdyVa8qOMNzyAgltu1qIhFHN390WMk9gZXEcvWG3m++PMAIKKtd4varbH1vdCeHOGUV7GRgarcfSMvJ54I9xc5GkUnAhjRKj8xDzYzhkXwApD8eqWb2RgGXUm6G4cKj0MeQ4WBqHr9FOW/4EJcZoztFi0YlP7KE+6xptBJU479KSsv31BwHrMfblObOOj58C7gUfdbTCByxng0u1axxvixL8zJwgHvFND3/4yoXoCCgm0DXBPbi6B5xpt8QmN6K4E5sMGrppTI7VwJqkcwkVD0EEeCedRNiWLTaxlKpLYxYnoXwEnpm9o2WXWa+PjkWeawsnJvV5IAt6oJhaK22VqJN86Macuu+nCdeF1/0TZU="
 
 gemfile:
-  - gemfiles/embulk-0.7-latest
-  - gemfiles/embulk-0.7.2
-  - gemfiles/embulk-0.7.3
-  - gemfiles/embulk-0.7.4
+  - gemfiles/embulk-0.8.0-latest
+  - gemfiles/embulk-0.8.7
+  - gemfiles/embulk-0.8.8
+  - gemfiles/embulk-0.8.9
   - gemfiles/embulk-latest
 

data/.travis.yml.erb

@@ -11,9 +11,6 @@ addons:
   code_climate:
     repo_token:
       secure: "cSTIvR+haBzyXfAQGGxCjdnLM/iEWFJuVJFqQi0cqr78yZuhJ4A06tJhLIVd7uU+ZRa+JCT/kpD7zZbVc5BC2kmVJybLOXx+bR1SFgT1W2QVQJL7yU6pzPzpT4hr1VQFd8OIKgko8vTBGykXL804F0e/xHKv+FHGMh6TI2CfXqG8cpZpa4oCtnt48V3VUpszNpNuufvfTFJADpI9NvuyosbA3btcH7pY/vbjLTOAd0cSTjZ6Qufy9jV2KwSRyMHXs1m1paErKHrxL7aPxy+rBWqCVeyrU9Tx/Kw/DgJLP9dIPjFvcDHdaUKpcZAcaU87VYFPhcPW7bDIQoeaI7lfrPiBgQTgfZxeiL9vJ2oRUP9NhkhCF18ljhoqI9uTonuyv49zgyAXrLlJQu0cEdC4tW/qsEsB0b56MyctUm8Iq0gWIZO8uI961p/VzkjV6d3/n+QFTUIKnGqf7sRWfxqXFOP6SmlyZtbST4uzUDNw7MWuRRzqmEagQtnzjzmYXCrFpAwn2BG3tPkjrypmlBBjBKsPww/nkeTn25449UvYUwOKRPY3P0amXPdemubiy4jLCWTHUSxhszTrp85Jx6492z50qDo6wU6bw8MaMdrZbxChyNT6ulgbiBaQm/c1bUPNUyrT8ixyxc+/F+SFuILhIvclHjcAEAiRNAyV5LXhb+U="
-notifications:
-  slack:
-    secure: "QRZ6zQxcRdN2XylIz+b46TbYIv7x5Ko7Y0Mi0aGbf7Wg1xfnS4X2FZKp8gF+RH1qjT6CYsQFUpPBhPVCMx0fP0ik5/gBrdngrj0htludvQ5CTK2oVegM1VC5NSn+gi8bt2F20Ode9fxU5OS1HDzNR9sjPz3W7miMUNDZoYPy77Om/CvmVkBbGyMkWnfwhEvwnL8JpBNpklDvrUUKznNsAcSbKQBMBAglFMds/OaHXCkK142zMbSlHMctch1VDAKhX9/6M3v8v6ZRheX68+VVCz3nTrTF0/lnYh3ig9ey3DNlgkZUqK2gmypnhTE6tpeibHdyVa8qOMNzyAgltu1qIhFHN390WMk9gZXEcvWG3m++PMAIKKtd4varbH1vdCeHOGUV7GRgarcfSMvJ54I9xc5GkUnAhjRKj8xDzYzhkXwApD8eqWb2RgGXUm6G4cKj0MeQ4WBqHr9FOW/4EJcZoztFi0YlP7KE+6xptBJU479KSsv31BwHrMfblObOOj58C7gUfdbTCByxng0u1axxvixL8zJwgHvFND3/4yoXoCCgm0DXBPbi6B5xpt8QmN6K4E5sMGrppTI7VwJqkcwkVD0EEeCedRNiWLTaxlKpLYxYnoXwEnpm9o2WXWa+PjkWeawsnJvV5IAt6oJhaK22VqJN86Macuu+nCdeF1/0TZU="
 
 gemfile:
 <% versions.each do |file| -%>

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.2 - 2016-07-04
+
+* [enhancement] String "false" as false [#37](https://github.com/treasure-data/embulk-parser-query_string/pull/37)
+
 ## 0.3.1 - 2015-10-20
 
 * [enhancement] Raise ConfigError if type cast failed [#34](https://github.com/treasure-data/embulk-parser-query_string/pull/34)

data/embulk-parser-query_string.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-parser-query_string"
-  spec.version       = "0.3.1"
+  spec.version       = "0.3.2"
   spec.authors       = ["yoshihara", "uu59"]
   spec.summary       = "Query String parser plugin for Embulk"
   spec.description   = "Parses Query String files read by other file input plugins."

data/gemfiles/{embulk-0.7-latest → embulk-0.8.0-latest}

@@ -1,4 +1,4 @@
 source 'https://rubygems.org/'
 gemspec :path => '../'
 
-gem "embulk", "~> 0.7"
+gem "embulk", "~> 0.8.0"

data/gemfiles/{embulk-0.7.2 → embulk-0.8.7}

@@ -1,4 +1,4 @@
 source 'https://rubygems.org/'
 gemspec :path => '../'
 
-gem "embulk", "0.7.2"
+gem "embulk", "0.8.7"

data/gemfiles/{embulk-0.7.3 → embulk-0.8.8}

@@ -1,4 +1,4 @@
 source 'https://rubygems.org/'
 gemspec :path => '../'
 
-gem "embulk", "0.7.3"
+gem "embulk", "0.8.8"

data/gemfiles/{embulk-0.7.4 → embulk-0.8.9}

@@ -1,4 +1,4 @@
 source 'https://rubygems.org/'
 gemspec :path => '../'
 
-gem "embulk", "0.7.4"
+gem "embulk", "0.8.9"

data/gemfiles/embulk-latest

@@ -1,4 +1,4 @@
 source 'https://rubygems.org/'
 gemspec :path => '../'
 
-gem "embulk", "> 0.7.2"
+gem "embulk", "> 0.8.7"

data/lib/embulk/parser/query_string.rb

@@ -102,7 +102,7 @@ module Embulk
           name = column.name
           value = record[name]
 
-          next nil unless value
+          next nil if value.nil? || value.empty?
 
           begin
             case column.type
@@ -110,6 +110,8 @@ module Embulk
               value.strip.empty? ? nil : Integer(value)
             when :timestamp
               value.strip.empty? ? nil : Time.parse(value)
+            when :boolean
+              truthy_value?(value)
             else
               value.to_s
             end
@@ -120,6 +122,18 @@ module Embulk
 
         page_builder.add(values)
       end
+
+      def truthy_value?(str)
+        # Same as Embulk csv parser
+        # https://github.com/embulk/embulk/blob/v0.8.9/embulk-standards/src/main/java/org/embulk/standards/CsvParserPlugin.java#L35-L41
+        %w(
+          true True TRUE
+          yes Yes YES
+          t T y Y
+          on On ON
+          1
+        ).include?(str)
+      end
     end
   end
 end

data/test/embulk/parser/test_query_string.rb

@@ -77,7 +77,7 @@ module Embulk
 
       class TestProcessLine < self
         def test_all_keys_exist_in_schema
-          mock(page_builder).add(["FOO", 1, Time.parse("2015-07-08T16:25:46")])
+          mock(page_builder).add(["FOO", 1, Time.parse("2015-07-08T16:25:46"), nil])
           plugin.send(:process_line, line)
         end
 
@@ -86,12 +86,12 @@ module Embulk
           nonexist_schema = schema << nonexist_column
 
           plugin = QueryString.new(DataSource[task], nonexist_schema, page_builder)
-          mock(page_builder).add(["FOO", 1, Time.parse("2015-07-08T16:25:46"), nil])
+          mock(page_builder).add(["FOO", 1, Time.parse("2015-07-08T16:25:46"), nil, nil])
           plugin.send(:process_line, line)
         end
 
         def test_long_value_for_key_nonexist
-          mock(page_builder).add(["FOO", nil, Time.parse("2015-07-08T16:25:46")])
+          mock(page_builder).add(["FOO", nil, Time.parse("2015-07-08T16:25:46"), nil])
           plugin.send(:process_line, value_nonexist_line)
         end
 
@@ -105,6 +105,26 @@ module Embulk
           end
         end
 
+        data do
+          [
+            ["true"  , ["true"  , true]]  ,
+            ["false" , ["false" , false]] ,
+            ["t"     , ["t"     , true]]  ,
+            ["f"     , ["f"     , false]] ,
+            ["yes"   , ["yes"   , true]]  ,
+            ["no"    , ["no"    , false]] ,
+            ["on"    , ["on"    , true]]  ,
+            ["off"   , ["off"   , false]] ,
+            ["foo"   , ["foo"   , false]] ,
+            ["empty" , [""      , nil]]   ,
+          ]
+        end
+        def test_boolean_as_false(data)
+          value, expected = data
+          mock(page_builder).add([anything, anything, anything, expected])
+          plugin.send(:process_line, "qux=#{value}")
+        end
+
         private
 
         def line
@@ -155,6 +175,7 @@ module Embulk
           {"name" => "foo", "type" => :string},
           {"name" => "bar", "type" => :long},
           {"name" => "baz", "type" => :timestamp},
+          {"name" => "qux", "type" => :boolean},
         ]
       end
 

data/test/test_embulk_run.rb

@@ -60,6 +60,8 @@ module Embulk
     end
 
     def test_embulk_guess
+      pend "latest Embulk generates other formed yaml"
+
       seed_path = "#{@dir}/seed.yml"
       File.open(seed_path, "w") do |f|
         f.write seed_content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-query_string
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - yoshihara
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -162,10 +162,10 @@ files:
 - README.md
 - Rakefile
 - embulk-parser-query_string.gemspec
-- gemfiles/embulk-0.7-latest
-- gemfiles/embulk-0.7.2
-- gemfiles/embulk-0.7.3
-- gemfiles/embulk-0.7.4
+- gemfiles/embulk-0.8.0-latest
+- gemfiles/embulk-0.8.7
+- gemfiles/embulk-0.8.8
+- gemfiles/embulk-0.8.9
 - gemfiles/embulk-latest
 - gemfiles/template.erb
 - lib/embulk/guess/query_string.rb