fluent-plugin-extract_query_params 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 172e07237ab226e9898f9027becf4e2a11bc0ec6
-  data.tar.gz: 7b262ace7e04bb2b01475bccbeffe4da4fbfcebe
+  metadata.gz: 4428fe126f8c2bcdfdc73937b0b140c5740ecabf
+  data.tar.gz: 2304f1fb5c8da4aae857089d03bed3890fad7c2d
 SHA512:
-  metadata.gz: adfcafa57eccff147dfff505af4966223e32e1c2debc9705c1f5c556c507280247ba9b83261cc15268f08f894fb67ca444a77dc356afd18da5225236f331d937
-  data.tar.gz: 9bf7c62140559f4d6a233e0e785bf64835863ff132a7dc00dd69e8af7272d68f1cdde621b7f741a856602fd8ab8a3ecad4ba3ced35d0ded3bc11eed56c5bbaf5
+  metadata.gz: 98901ac91a3dba4f4a92c6511da1761a78c769c98f70cef957d0d701c5e1a217504904ff21a3f6645c78801d4b2daa03777ac91dec3d0a33743294724e2331c9
+  data.tar.gz: bf128ba87028b8141fb6c8ce66c79df22729c6d372ea27fb1afc7483d86f389fbf224fba21c4ad7ae6cb4ecd18179437f5ee1232cae47a4313b10ad70c7b1ec9

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.4'
+  gem.version       = '0.0.5'
   gem.authors       = ['Kentaro Kuribayashi']
   gem.email         = ['kentarok@gmail.com']
   gem.homepage      = 'http://github.com/kentaro/fluent-plugin-extract_query_params'

data/lib/fluent/plugin/out_extract_query_params.rb

@@ -11,6 +11,7 @@ module Fluent
     config_param :except, :string, :default => nil
     config_param :discard_key, :bool, :default => false
     config_param :add_field_prefix, :string, :default => nil
+    config_param :permit_blank_key, :bool, :default => false
 
     def configure(conf)
       super
@@ -51,6 +52,9 @@ module Fluent
           unless url.query.nil?
             url.query.split('&').each do |pair|
               key, value = pair.split('=').map { |i| URI.unescape(i) }
+              next if (key.nil? || key.empty?) && (!@permit_blank_key || value.nil? || value.empty?)
+              key ||= ''
+              value ||= ''
 
               key = @add_field_prefix + key if @add_field_prefix
               if only

data/test/plugin/test_out_extract_query_params.rb

@@ -191,4 +191,111 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
     assert_equal 'extracted.test', emits[0][0]
     assert_equal 'invalid url',    emits[0][2]['url']
   end
+
+  DIRTY_PATH_BLANK_1 = '/dummy?&baz=qux'
+  DIRTY_PATH_BLANK_2 = '/dummy?foo=bar&'
+  DIRTY_PATH_BLANK_3 = '/dummy?foo=bar&&baz=qux'
+  DIRTY_PATH_BLANK_4 = '/dummy?=&baz=qux'
+  DIRTY_PATH_KEY_ONLY_1 = '/dummy?foo=&baz=qux'
+  DIRTY_PATH_KEY_ONLY_2 = '/dummy?foo&baz=qux'
+  DIRTY_PATH_KEY_ONLY_3 = '/dummy?baz=qux&foo'
+  DIRTY_PATH_VALUE_ONLY_1 = '/dummy?=bar&baz=qux'
+  DIRTY_PATH_VALUE_ONLY_2 = '/dummy?baz=qux&=bar'
+
+  def test_emit_with_dirty_paths
+    d = create_driver(%[
+      key            path
+      add_tag_prefix a.
+    ])
+    d.run {
+      d.emit({ 'path' => DIRTY_PATH_BLANK_1 })
+      d.emit({ 'path' => DIRTY_PATH_BLANK_2 })
+      d.emit({ 'path' => DIRTY_PATH_BLANK_3 })
+      d.emit({ 'path' => DIRTY_PATH_BLANK_4 })
+      d.emit({ 'path' => DIRTY_PATH_KEY_ONLY_1 })
+      d.emit({ 'path' => DIRTY_PATH_KEY_ONLY_2 })
+      d.emit({ 'path' => DIRTY_PATH_KEY_ONLY_3 })
+      d.emit({ 'path' => DIRTY_PATH_VALUE_ONLY_1 })
+      d.emit({ 'path' => DIRTY_PATH_VALUE_ONLY_2 })
+    }
+    emits = d.emits
+
+    assert_equal 9, emits.count
+
+    r = emits.shift[2]
+    assert_equal 2, r.size
+    assert_equal DIRTY_PATH_BLANK_1, r['path']
+    assert_equal 'qux',              r['baz']
+
+    r = emits.shift[2]
+    assert_equal 2, r.size
+    assert_equal DIRTY_PATH_BLANK_2, r['path']
+    assert_equal 'bar',              r['foo']
+
+    r = emits.shift[2]
+    assert_equal 3, r.size
+    assert_equal DIRTY_PATH_BLANK_3, r['path']
+    assert_equal 'bar',              r['foo']
+    assert_equal 'qux',              r['baz']
+
+    r = emits.shift[2]
+    assert_equal 2, r.size
+    assert_equal DIRTY_PATH_BLANK_4, r['path']
+    assert_equal 'qux',              r['baz']
+
+    r = emits.shift[2]
+    assert_equal 3, r.size
+    assert_equal DIRTY_PATH_KEY_ONLY_1, r['path']
+    assert_equal '',                    r['foo']
+    assert_equal 'qux',                 r['baz']
+
+    r = emits.shift[2]
+    assert_equal 3, r.size
+    assert_equal DIRTY_PATH_KEY_ONLY_2, r['path']
+    assert_equal '',                    r['foo']
+    assert_equal 'qux',                 r['baz']
+
+    r = emits.shift[2]
+    assert_equal 3, r.size
+    assert_equal DIRTY_PATH_KEY_ONLY_3, r['path']
+    assert_equal '',                    r['foo']
+    assert_equal 'qux',                 r['baz']
+
+    r = emits.shift[2]
+    assert_equal 2, r.size
+    assert_equal DIRTY_PATH_VALUE_ONLY_1, r['path']
+    assert_equal 'qux',                   r['baz']
+
+    r = emits.shift[2]
+    assert_equal 2, r.size
+    assert_equal DIRTY_PATH_VALUE_ONLY_2, r['path']
+    assert_equal 'qux',                   r['baz']
+  end
+
+  def test_emit_with_permit_blank_key
+    d = create_driver(%[
+      key              path
+      add_tag_prefix   a.
+      permit_blank_key yes
+    ])
+    d.run {
+      d.emit({ 'path' => DIRTY_PATH_VALUE_ONLY_1 })
+      d.emit({ 'path' => DIRTY_PATH_VALUE_ONLY_2 })
+    }
+    emits = d.emits
+
+    assert_equal 2, emits.count
+
+    r = emits.shift[2]
+    assert_equal 3, r.size
+    assert_equal DIRTY_PATH_VALUE_ONLY_1, r['path']
+    assert_equal 'bar',                   r['']
+    assert_equal 'qux',                   r['baz']
+
+    r = emits.shift[2]
+    assert_equal 3, r.size
+    assert_equal DIRTY_PATH_VALUE_ONLY_2, r['path']
+    assert_equal 'bar',                   r['']
+    assert_equal 'qux',                   r['baz']
+  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.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kentaro Kuribayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake