fluent-plugin-extract_query_params 0.0.1 → 0.0.2

data/README.md

@@ -34,7 +34,7 @@ Then you'll get re-emmited tag/record-s below:
 "extracted.test" => {
   "url" => "http://example.com/?foo=bar&baz=qux&hoge=fuga"
   "foo" => "bar",
-  "baz" => "quex"
+  "baz" => "qux"
 }
 ```
 

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.1'
+  gem.version       = '0.0.2'
   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

@@ -34,8 +34,9 @@ module Fluent
 
     def emit(tag, es, chain)
       es.each do |time, record|
-        filter_record(tag, time, record)
-        Engine.emit(tag, time, record)
+        t = tag.dup
+        filter_record(t, time, record)
+        Engine.emit(t, time, record)
       end
 
       chain.next
@@ -45,15 +46,17 @@ module Fluent
       if record[key]
         begin
           url = URI.parse(record[key])
-          url.query.split('&').each do |pair|
-            key, value = pair.split('=').map { |i| URI.unescape(i) }
+          unless url.query.nil?
+            url.query.split('&').each do |pair|
+              key, value = pair.split('=').map { |i| URI.unescape(i) }
 
-            if only
-              record[key] = value if @include_keys.has_key?(key)
-            elsif except
-              record[key] = value if !@exclude_keys.has_key?(key)
-            else
-              record[key] = value
+              if only
+                record[key] = value if @include_keys.has_key?(key)
+              elsif except
+                record[key] = value if !@exclude_keys.has_key?(key)
+              else
+                record[key] = value
+              end
             end
           end
         rescue URI::InvalidURIError => error

data/test/plugin/test_out_extract_query_params.rb

@@ -102,6 +102,29 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
     assert_equal 'qux',            emits[0][2]['baz']
   end
 
+  def test_emit_multi
+    d = create_driver(%[
+      key            url
+      add_tag_prefix extracted.
+      only           foo, baz
+    ])
+    d.run do
+      d.emit('url' => URL)
+      d.emit('url' => URL)
+      d.emit('url' => URL)
+    end
+    emits = d.emits
+
+    assert_equal 3, emits.count
+
+    emits.each do |e|
+      assert_equal 'extracted.test', e[0]
+      assert_equal URL,              e[2]['url']
+      assert_equal 'bar',            e[2]['foo']
+      assert_equal 'qux',            e[2]['baz']
+    end
+  end
+
   def test_emit_without_match_key
     d = create_driver(%[
       key            no_such_key

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-extract_query_params
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake