fluent-plugin-filter-object-flatten 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59dcecf84b047f37b27e20f9f2f074f8664a8264
-  data.tar.gz: aa75d348ef841f95a796236763bc232a3488a504
+  metadata.gz: 53fcbfc84df372c5b8ef220d5fa80dd0d901b447
+  data.tar.gz: a7061501df7ad6c4a503f1002d44b6359817592b
 SHA512:
-  metadata.gz: 8b195f7a32780018565ef553cf94e605670d40109fa83cb89cfd0d4f4ded051e41131b1eaf10bd9120f4227d3140bae75e12c9f859303f0a947938c448977c01
-  data.tar.gz: 1753d9ca765569b475f909036e1fa8c5f858ddd7fa271076c7c6ff9f17497333a82df335df4d496d614510488af48b2cfe2ff53d2dd7b56cac3765aa757c426c
+  metadata.gz: 68c55da036e2244bccbed6f60d3a443cecc41dbc360a10ce874381de807ee5157cf1ef17c967dbfa596824176a5307b5bb83a721b9ad632c0fa97ce510e42050
+  data.tar.gz: 7c38d38c8bbeafe1e139c178d9340e8790423966fe9cec9cae80a224fcb4184ef68ab7e23f85f0a60f09bc45e85210376e408ca92e643f839c315c99ae06e6ad

data/README.md

@@ -55,19 +55,19 @@ $ fluentd -c fluent.conf
 ```
 
 ```sh
-$ echo '{"foo":"bar", "bar":"zoo"})' | fluentd test.object
+$ echo '{"foo":"bar", "bar":"zoo"}' | fluent-cat test.object
 #=> 2015-01-01 23:34:45 +0900 test.object: {"foo":"bar"}
 #=> 2015-01-01 23:34:45 +0900 test.object: {"bar":"zoo"}
 
-$ echo '{"foo":["bar", "zoo"]})' | fluentd test.object
+$ echo '{"foo":["bar", "zoo"]}' | fluent-cat test.object
 #=> 2015-01-01 23:34:45 +0900 test.object: {"foo":"bar"}
 #=> 2015-01-01 23:34:45 +0900 test.object: {"foo":"zoo"}
 
-$ echo '{"foo":{"bar1":"zoo", "bar2":"baz"}})' | fluentd test.object
+$ echo '{"foo":{"bar1":"zoo", "bar2":"baz"}}' | fluent-cat test.object
 #=> 2015-01-01 23:34:45 +0900 test.object: {"foo.bar1":"zoo"}
 #=> 2015-01-01 23:34:45 +0900 test.object: {"foo.bar2":"baz"}
 
-$ echo '{"foo1":{"bar1":"zoo", "bar2":"baz"}, "foo2":{"bar":["zoo", "baz"], "zoo":"baz"}}' | fluentd test.object
+$ echo '{"foo1":{"bar1":"zoo", "bar2":"baz"}, "foo2":{"bar":["zoo", "baz"], "zoo":"baz"}}' | fluent-cat test.object
 #=> 2015-01-01 23:34:45 +0900 test.object: {"foo1.bar1":"zoo"}
 #=> 2015-01-01 23:34:45 +0900 test.object: {"foo1.bar2":"baz"}
 #=> 2015-01-01 23:34:45 +0900 test.object: {"foo2.bar":"zoo"}

data/fluent-plugin-filter-object-flatten.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'fluentd', '>= 0.12'
-  spec.add_dependency 'object_flatten'
+  spec.add_dependency 'object_flatten', '>= 0.1.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/fluent/plugin/filter_object_flatten.rb

@@ -6,24 +6,26 @@ module Fluent
     Plugin.register_filter('object_flatten', self)
 
     config_param :separator, :string, :default => '.'
-    config_param :tr,        :array,  :default => []
+    config_param :tr,        :array,  :default => nil
 
-    def filter_stream(tag, es)
-      result_es = Fluent::MultiEventStream.new
+    def configure(conf)
+      super
+      @flatten_option = {:separator => @separator}
 
-      es.each do |time, record|
-        ObjectFlatten.flatten(record, @separator).each do |new_record|
-          unless @tr.empty?
-            new_record_with_tr = {}
+      if @tr
+        if @tr.length != 2
+          raise ConfigError, "tr: wrong length (#{@tr.length} for 2)"
+        end
 
-            new_record.each do |key, value|
-              key = key.tr(*@tr)
-              new_record_with_tr[key] = value
-            end
+        @flatten_option[:tr] = @tr
+      end
+    end
 
-            new_record = new_record_with_tr
-          end
+    def filter_stream(tag, es)
+      result_es = Fluent::MultiEventStream.new
 
+      es.each do |time, record|
+        ObjectFlatten.flatten(record, @flatten_option).each do |new_record|
           result_es.add(time, new_record)
         end
       end

data/lib/fluent_plugin_filter_object_flatten/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginFilterObjectFlatten
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter-object-flatten
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Genki Sugawara
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement