embulk-parser-query_string 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a2f6dd8e7b04e7bcb973b5b8ef66d475a2301e5
-  data.tar.gz: 7177bc35ee74ee4e4753f835b115d9fefc464ee5
+  metadata.gz: 7bf28a70ddd9f3ec7210201a7f027c05fe675ef7
+  data.tar.gz: 2d4fe6c85982222f3fb9eef01cc99efda5f0bba4
 SHA512:
-  metadata.gz: 7939b0f651563a556eb28c086298c02edaeab5db3642156e360bc350b4bfbc2403683de9ab5d01ad9fae4255b08377da5697b55d04707fcdfaa0ef84f6baa193
-  data.tar.gz: 03607bea2d57d0480070877bc0e7cb2b54c2ebc2b2878d56d6ff324903940d31b3372e9ce76070640126ceb8bcfc9b4d0238aab761dfb07b1d7d61a84173f629
+  metadata.gz: 8aee02b66458e5ff1eb71de855030a0e56162cb1c1ed1ad0953498ce27c4782d9c3297bacf513fbb7f704447778453bde3e767fb9dc537a3a8ec1d31c0c60f2f
+  data.tar.gz: 83cabae95cba6fa468c7e8fcd97ce1bcdb831d7859b66161c7c6d8379b2bfdc61e178eaa7d0a84337409a87f436bce31f3ff5f9e6f9a83bc15e991876350c800

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
-- jruby-9000
-
-before_install:
-- rvm get head
-- rvm use jruby-9.0.1.0 --install
+  - jruby-9.0.1.0
+jdk:
+  - oraclejdk8
+env:
+  global:
+    - JRUBY_OPTS="-Xcli.debug=true --debug"
 
 addons:
   code_climate:
@@ -13,8 +14,6 @@ addons:
 notifications:
   slack:
     secure: "QRZ6zQxcRdN2XylIz+b46TbYIv7x5Ko7Y0Mi0aGbf7Wg1xfnS4X2FZKp8gF+RH1qjT6CYsQFUpPBhPVCMx0fP0ik5/gBrdngrj0htludvQ5CTK2oVegM1VC5NSn+gi8bt2F20Ode9fxU5OS1HDzNR9sjPz3W7miMUNDZoYPy77Om/CvmVkBbGyMkWnfwhEvwnL8JpBNpklDvrUUKznNsAcSbKQBMBAglFMds/OaHXCkK142zMbSlHMctch1VDAKhX9/6M3v8v6ZRheX68+VVCz3nTrTF0/lnYh3ig9ey3DNlgkZUqK2gmypnhTE6tpeibHdyVa8qOMNzyAgltu1qIhFHN390WMk9gZXEcvWG3m++PMAIKKtd4varbH1vdCeHOGUV7GRgarcfSMvJ54I9xc5GkUnAhjRKj8xDzYzhkXwApD8eqWb2RgGXUm6G4cKj0MeQ4WBqHr9FOW/4EJcZoztFi0YlP7KE+6xptBJU479KSsv31BwHrMfblObOOj58C7gUfdbTCByxng0u1axxvixL8zJwgHvFND3/4yoXoCCgm0DXBPbi6B5xpt8QmN6K4E5sMGrppTI7VwJqkcwkVD0EEeCedRNiWLTaxlKpLYxYnoXwEnpm9o2WXWa+PjkWeawsnJvV5IAt6oJhaK22VqJN86Macuu+nCdeF1/0TZU="
-jdk:
-- oraclejdk8
 
 gemfile:
   - gemfiles/embulk-0.7-latest
@@ -23,6 +22,3 @@ gemfile:
   - gemfiles/embulk-0.7.4
   - gemfiles/embulk-latest
 
-matrix:
-  allow_failures:
-    - gemfile: gemfiles/embulk-0.6.22

data/.travis.yml.erb

@@ -1,6 +1,12 @@
 language: ruby
 rvm:
-- jruby-19mode
+  - jruby-9.0.1.0
+jdk:
+  - oraclejdk8
+env:
+  global:
+    - JRUBY_OPTS="-Xcli.debug=true --debug"
+
 addons:
   code_climate:
     repo_token:
@@ -8,14 +14,9 @@ addons:
 notifications:
   slack:
     secure: "QRZ6zQxcRdN2XylIz+b46TbYIv7x5Ko7Y0Mi0aGbf7Wg1xfnS4X2FZKp8gF+RH1qjT6CYsQFUpPBhPVCMx0fP0ik5/gBrdngrj0htludvQ5CTK2oVegM1VC5NSn+gi8bt2F20Ode9fxU5OS1HDzNR9sjPz3W7miMUNDZoYPy77Om/CvmVkBbGyMkWnfwhEvwnL8JpBNpklDvrUUKznNsAcSbKQBMBAglFMds/OaHXCkK142zMbSlHMctch1VDAKhX9/6M3v8v6ZRheX68+VVCz3nTrTF0/lnYh3ig9ey3DNlgkZUqK2gmypnhTE6tpeibHdyVa8qOMNzyAgltu1qIhFHN390WMk9gZXEcvWG3m++PMAIKKtd4varbH1vdCeHOGUV7GRgarcfSMvJ54I9xc5GkUnAhjRKj8xDzYzhkXwApD8eqWb2RgGXUm6G4cKj0MeQ4WBqHr9FOW/4EJcZoztFi0YlP7KE+6xptBJU479KSsv31BwHrMfblObOOj58C7gUfdbTCByxng0u1axxvixL8zJwgHvFND3/4yoXoCCgm0DXBPbi6B5xpt8QmN6K4E5sMGrppTI7VwJqkcwkVD0EEeCedRNiWLTaxlKpLYxYnoXwEnpm9o2WXWa+PjkWeawsnJvV5IAt6oJhaK22VqJN86Macuu+nCdeF1/0TZU="
-jdk:
-- oraclejdk8
 
 gemfile:
 <% versions.each do |file| -%>
   - gemfiles/<%= file %>
 <% end -%>
 
-matrix:
-  allow_failures:
-    - gemfile: gemfiles/embulk-0.6.22

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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)
+* [maintenance] Use addressable gem to parse uri [#35](https://github.com/treasure-data/embulk-parser-query_string/pull/35)
+* [maintenance] Fix coverage [#36](https://github.com/treasure-data/embulk-parser-query_string/pull/36)
+
 ## 0.3.0 - 2015-10-06
 
 **This version supports Embulk 0.7 or later, and drops Embulk 0.6 or earlier, so if you want to use this plugin with Embulk 0.6 or earlier, please use 0.2.1.**

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.0"
+  spec.version       = "0.3.1"
   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,6 +13,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency 'addressable'
   spec.add_development_dependency 'embulk', [">= 0.7.2", "< 1.0"]
   spec.add_development_dependency 'bundler', ['~> 1.0']
   spec.add_development_dependency 'everyleaf-embulk_helper'

data/lib/embulk/parser/query_string.rb

@@ -1,4 +1,4 @@
-require "uri"
+require "addressable/uri"
 
 module Embulk
   module Parser
@@ -50,6 +50,20 @@ module Embulk
         page_builder.finish
       end
 
+      def self.valid_query_string?(qs)
+        if qs.match(/[\s]/)
+          Embulk.logger.warn "'#{qs}' contains unescaped space"
+          return false
+        end
+
+        if qs.match(/[^\x20-\x7e]/)
+          Embulk.logger.warn "'#{qs}' contains non-ascii character (maybe unescaped)"
+          return false
+        end
+
+        true
+      end
+
       def self.parse(line, options = {})
         if options[:capture]
           line = line.match(options[:capture]).to_a[1] || ""
@@ -64,7 +78,12 @@ module Embulk
         end
 
         begin
-          Hash[URI.decode_www_form(line)]
+          uri = Addressable::URI.parse("?#{line}")
+          if valid_query_string?(uri.query)
+            uri.query_values(Hash)
+          else
+            nil
+          end
         rescue ArgumentError
           Embulk.logger.warn "Failed parse: #{line}"
           nil
@@ -95,8 +114,7 @@ module Embulk
               value.to_s
             end
           rescue => e
-            Embulk.logger.error "Cast failed '#{value}' as '#{column.type}' (key is '#{column.name}')"
-            raise e
+            raise ConfigError.new("Cast failed '#{value}' as '#{column.type}' (key is '#{column.name}')")
           end
         end
 

data/test/embulk/guess/test_query_string.rb

@@ -30,7 +30,7 @@ module Embulk
         end
 
         def test_warn_invalid_columns
-          mock(Embulk.logger).warn(/Failed parse/)
+          mock(Embulk.logger).warn(anything)
 
           QueryString.new.guess_lines(config, self.class.sample_lines_with_invalid)
         end

data/test/embulk/parser/test_query_string.rb

@@ -6,6 +6,7 @@ module Embulk
   module Parser
     class QueryStringTest < Test::Unit::TestCase
       class TestParse < self
+
         def test_without_options
           result = QueryString.parse(line)
           assert_equal(expected, result)
@@ -32,7 +33,7 @@ module Embulk
         end
 
         def test_with_invalid
-          mock(Embulk.logger).warn(/#{invalid_line}/) # display whole line if given line is invalid
+          mock(Embulk.logger).warn(/'#{invalid_line}'/) # display whole line if given line is invalid
           result = QueryString.parse(invalid_line)
           assert_nil(result)
         end
@@ -94,6 +95,16 @@ module Embulk
           plugin.send(:process_line, value_nonexist_line)
         end
 
+        def test_wrong_type_configured
+          # NOTE: assert_raise(Embulk::ConfigError) do ... end can't detect correctly
+          begin
+            plugin.send(:process_line, value_invalid_data_type)
+            assert false
+          rescue => e
+            assert e.is_a?(Embulk::ConfigError)
+          end
+        end
+
         private
 
         def line
@@ -103,6 +114,10 @@ module Embulk
         def value_nonexist_line
           "foo=FOO&bar=&baz=2015-07-08T16:25:46"
         end
+
+        def value_invalid_data_type
+          "foo=FOO&bar=&baz=not+a+time"
+        end
       end
 
       def test_transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-query_string
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - yoshihara
@@ -9,8 +9,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: addressable
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: