fluent-plugin-reassemble 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjZiMWJhZjY4YWEyZTI0ZWY3ODc5OTQ2ZDg5Njk4YzMyNjk1MzFiNg==
+    MmM2MjgwYTFjM2U5ZWU1OGU1MmFiMTYyNzExY2UzYjA5MGRkZTBlOA==
   data.tar.gz: !binary |-
-    MGQ0ZTFkZjNiNGYyNzkzMmI4MjU0Y2YyN2U0YjNiZmRjNWU2MjJhMQ==
+    MmI5ODI1MmE5MmI0ZWMwMzI4ZDNkNTdjNWFjMGJiYmUzOGM4NDY1NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTJmYmM0ZTIwZmYxNTg4NGJmMmQxOGRiNjBkZjkxNjNlMjU4ODhhNmJiZjRl
-    MjFkM2YxMmM5NTI0ODllZGMyMmM4ZWI2MzMxYjYyY2ZkYzc5NmZhZmUyYjNl
-    MWQyY2RmODAxNGY4MzdjODc2MWRmYzlmYjc1MDAzYzVkZTEyMDg=
+    ZDUyMjRhZDdlZDlmZDZkZTMxZDlkZGY0NDk0ZGQ0YjExY2ZiNWU4YzcxM2Nl
+    N2Y5NDVkM2QyMGYzMzE0ZTJmYzkxZDY4OGMxNDZkM2RhOWRlODYxYmZiNzA0
+    ODYwODhjMjJlOTkyYjY2YjZkMGEyZGEwMjE2YzIwNTkxMmJkZmM=
   data.tar.gz: !binary |-
-    ODQ0NzE0YzA2N2IzZDFlMjZmZDYzNTg5MWUyYmIwYzRmNzZjNWZiNDI5MDRh
-    MmE2YmVjYzE0MGI5YzFmMTExYjFmY2JiYzE4MTg5ODZhMTQzNTdlYzE1OGVh
-    YzUxZjhlMmZiNGU4ZjI0NjA3OGM0OGIxY2Q5MDUxMDE1NmIxZjU=
+    NTkyYTQ4OGZmZWE1YmFkNDk5YmEwNDRiZTAzMWQ5NmQxMTBlNGMwNDc2ZDU3
+    ZGU3M2E2MmEyN2VjZDc5NzlmMjE0ODA2YjNjYzdkM2MwMTZhNzA2MmI2NDcx
+    NDQyOTk3ZDE3ZjFkZjI3ZWE0ZjdlNGE4MjUyYzljZDk5MDM0MWI=

data/fluent-plugin-reassemble.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
     gem.name        = "fluent-plugin-reassemble"
-    gem.version     = "0.0.5"
+    gem.version     = "0.0.6"
     gem.authors     = ["moaikids"]
     gem.licenses    = ["Apache License Version 2.0"]
     gem.summary     = %q{Re-assemble a stream data for Fluentd}

data/lib/fluent/plugin/out_reassemble.rb

@@ -6,6 +6,9 @@ module Fluent
         Fluent::Plugin.register_output('reassemble', self)
         config_param :output_tag, :string, :default => nil
         config_param :assemble, :string, :default => nil
+        config_param :expand_extract_key, :string, :default => nil
+        config_param :expand_replaced_key, :string, :default => nil
+        config_param :expand_operation, :string, :default => nil
         config_param :null_to_null, :bool, :default => false
         config_param :null_to_empty, :bool, :default => false
         config_param :datetime_format, :string, :default => '%Y/%m/%d %H:%M:%S'
@@ -50,24 +53,52 @@ module Fluent
         def emit(tag, es, chain)
             chain.next
             es.each {|time,record|
-                json = {}
-                @reassemble_conf.each { |conf| 
-                    extract_key = conf[:extract]
-                    replaced_key = conf[:replace]
-                    operation = conf[:operation]
-                    val = convert(traverse(record, extract_key), operation)
-                    if !(val.nil?)
-                        json[replaced_key] = val
-                    elsif @null_to_null
-                        json[replaced_key] = nil
-                    elsif @null_to_empty
-                        json[replaced_key] = ""
+                if @expand_extract_key.nil?
+                    json = reassemble(record)
+                    Fluent::Engine.emit(@output_tag, time, json)
+                else
+                    replaced_key = @expand_replaced_key
+                    if @expand_replaced_key.nil? || @expand_replaced_key.empty?
+                        replaced_key = @expand_extract_key
+                    end
+                    operation = @expand_operation
+                    traversed = traverse(record, @expand_extract_key)
+                    if traversed
+                        traversed.each { |r|
+                            json = reassemble(record)
+                            val = convert(r, operation)
+                            if !(val.nil?)
+                                json[replaced_key] = val
+                            elsif @null_to_null
+                                json[replaced_key] = nil
+                            elsif @null_to_empty
+                                json[replaced_key] = ""
+                            end
+                            Fluent::Engine.emit(@output_tag, time, json)
+                        }
                     end
-                }
-                Fluent::Engine.emit(@output_tag, time, json)
+                end
             }
         end 
 
+        def reassemble(record)
+            json = {}
+            @reassemble_conf.each { |conf| 
+                extract_key = conf[:extract]
+                replaced_key = conf[:replace]
+                operation = conf[:operation]
+                val = convert(traverse(record, extract_key), operation)
+                if !(val.nil?)
+                    json[replaced_key] = val
+                elsif @null_to_null
+                    json[replaced_key] = nil
+                elsif @null_to_empty
+                    json[replaced_key] = ""
+                end
+            }
+            return json
+        end
+
         def traverse(data, key)
             val = data
             key.split('.').each{ |k|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-reassemble
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - moaikids
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake