fluent-plugin-extract_query_params 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4428fe126f8c2bcdfdc73937b0b140c5740ecabf
-  data.tar.gz: 2304f1fb5c8da4aae857089d03bed3890fad7c2d
+  metadata.gz: 84f1e64b8f5690eed0b0bcebfa2d98a4733ae447
+  data.tar.gz: 65fa725473a5a549c035dd3b1f0d3c977e56a57a
 SHA512:
-  metadata.gz: 98901ac91a3dba4f4a92c6511da1761a78c769c98f70cef957d0d701c5e1a217504904ff21a3f6645c78801d4b2daa03777ac91dec3d0a33743294724e2331c9
-  data.tar.gz: bf128ba87028b8141fb6c8ce66c79df22729c6d372ea27fb1afc7483d86f389fbf224fba21c4ad7ae6cb4ecd18179437f5ee1232cae47a4313b10ad70c7b1ec9
+  metadata.gz: 17e95a517ce31448b09cecff41ecf700ef04fca39770100cb394b84fc16fabb63285a957196ff428b32fffbcdbeaaa038f7bebc722a4da189bd06be2c1e3c0ac
+  data.tar.gz: 2a83037ec33506bb2c67d1b57fa1e741d24d843569685ce2a48b1829156593cda25f37d55eec342f5354ae7daa3eeae2aa03b2e5ad36a9f3efda593d5e1ad343

data/fluent-plugin-extract_query_params.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-extract_query_params'
-  gem.version       = '0.0.5'
+  gem.version       = '0.0.6'
   gem.authors       = ['Kentaro Kuribayashi']
   gem.email         = ['kentarok@gmail.com']
   gem.homepage      = 'http://github.com/kentaro/fluent-plugin-extract_query_params'
@@ -13,6 +13,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'fluentd'
   gem.add_runtime_dependency     'fluentd'
 end

data/lib/fluent/plugin/out_extract_query_params.rb

@@ -13,6 +13,11 @@ module Fluent
     config_param :add_field_prefix, :string, :default => nil
     config_param :permit_blank_key, :bool, :default => false
 
+    def initialize
+      super
+      require 'webrick'
+    end
+
     def configure(conf)
       super
 
@@ -48,7 +53,11 @@ module Fluent
     def filter_record(tag, time, record)
       if record[key]
         begin
-          url = URI.parse(record[key])
+          url = begin
+                  URI.parse(record[key])
+                rescue URI::InvalidURIError => e
+                  URI.parse(WEBrick::HTTPUtils.escape(record[key]))
+                end
           unless url.query.nil?
             url.query.split('&').each do |pair|
               key, value = pair.split('=').map { |i| URI.unescape(i) }

data/test/plugin/test_out_extract_query_params.rb

@@ -298,4 +298,31 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
     assert_equal 'bar',                   r['']
     assert_equal 'qux',                   r['baz']
   end
+
+  def test_raw_multibyte_chars
+    d = create_driver(%[
+      key              path
+      add_tag_prefix   a.
+      permit_blank_key yes
+    ])
+
+    raw_multibytes_src = '/path/to/ほげぽす/x?a=b'
+
+    d.run {
+      d.emit({ 'path' => raw_multibytes_src.dup.encode('sjis').force_encoding('ascii-8bit') })
+      d.emit({ 'path' => raw_multibytes_src.dup.encode('eucjp').force_encoding('ascii-8bit') })
+    }
+    emits = d.emits
+
+    # nothing raised is correct
+    assert_equal 2, emits.count
+
+    r = emits.shift[2]
+    assert_equal 2, r.size
+    assert_equal 'b', r['a']
+
+    r = emits.shift[2]
+    assert_equal 2, r.size
+    assert_equal 'b', r['a']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-extract_query_params
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Kentaro Kuribayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fluentd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to extract key/values from URL query parameters