fluent-plugin-flatten 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4a8ba7f4d84e3a2bef454ea068925b670238f2f5
+  data.tar.gz: d87803fbf7ca88eaad5265ece23ed36a5e5d12f7
+SHA512:
+  metadata.gz: 06c0fdcadf8a1e2e2eebedf2b530c76a454f081651ac194cfcb77814bbe096a28ae0bd055122c1b53f28951834a7a3e9d25c0f1d0e9b0f962dac680ebb5cad16
+  data.tar.gz: e7220024b630036da3bb1be8c79bef88c5f2e4df2d55d5da3cdfb7eada8c86969b17c1ec2c7a5ad32c2aae726e758eaffcb3109be40faf98cb58585b16f3496e

data/fluent-plugin-flatten.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-flatten'
-  gem.version       = '0.0.6'
+  gem.version       = '0.0.7'
   gem.authors       = ['Kentaro Kuribayashi']
   gem.email         = ['kentarok@gmail.com']
   gem.homepage      = 'http://github.com/kentaro/fluent-plugin-flatten'

data/lib/fluent/plugin/out_flatten.rb

@@ -7,8 +7,9 @@ module Fluent
 
     Fluent::Plugin.register_output('flatten', self)
 
-    config_param :key,       :string
-    config_param :inner_key, :string, :default => 'value'
+    config_param :key,        :string
+    config_param :inner_key,  :string, :default => 'value'
+    config_param :parse_json, :bool,   :default => true 
 
     def configure(conf)
       super
@@ -45,10 +46,14 @@ module Fluent
         hash = nil
 
         begin
-          # XXX work-around
-          # fluentd seems to escape json value excessively
-          json = record[key].gsub(/\\"/, '"')
-          hash = JSON.parse(json)
+          if parse_json
+            # XXX work-around
+            # fluentd seems to escape json value excessively
+            json = record[key].gsub(/\\"/, '"')
+            hash = JSON.parse(json)
+          else
+            hash = record[key]
+          end
         rescue JSON::ParserError
           return flattened
         end

data/test/plugin/test_out_flatten.rb

@@ -37,6 +37,21 @@ class FlattenOutputTest < Test::Unit::TestCase
     assert_equal /^test\./,            d2.instance.remove_tag_prefix
     assert_equal 'value_for_flat_key', d2.instance.inner_key
 
+    # when `parse_json` is false
+    d3 = create_driver(%[
+      key               foo
+      add_tag_prefix    flattened.
+      remove_tag_prefix test.
+      inner_key         value_for_flat_key
+      parse_json        false
+    ])
+
+    assert_equal 'foo',                d3.instance.key
+    assert_equal 'flattened.',         d3.instance.add_tag_prefix
+    assert_equal /^test\./,            d3.instance.remove_tag_prefix
+    assert_equal 'value_for_flat_key', d3.instance.inner_key
+    assert_equal false,         d3.instance.parse_json
+
     # when mandatory keys not set
     assert_raise(Fluent::ConfigError) do
       create_driver(%[
@@ -67,30 +82,64 @@ class FlattenOutputTest < Test::Unit::TestCase
   end
 
   def test_emit
-    d = create_driver
+    # test1 default config
+    d1 = create_driver
+
+    d1.run do
+      d1.emit( 'foo' => '{"bar" : "baz"}', 'hoge' => 'fuga' )
+      d1.emit( 'foo' => '{"bar" : {"qux" : "quux", "hoe" : "poe" }, "baz" : "bazz" }', 'hoge' => 'fuga' )
+    end
+    emits1 = d1.emits
+
+    assert_equal 4, emits1.count
+
+    # ["flattened.foo.bar", 1354689632, {"value"=>"baz"}]
+    assert_equal     'flattened.foo.bar', emits1[0][0]
+    assert_equal                   'baz', emits1[0][2]['value']
+
+    # ["flattened.foo.bar.qux", 1354689632, {"value"=>"quux"}]
+    assert_equal 'flattened.foo.bar.qux', emits1[1][0]
+    assert_equal                  'quux', emits1[1][2]['value']
+
+    # ["flattened.foo.bar.hoe", 1354689632, {"value"=>"poe"}]
+    assert_equal 'flattened.foo.bar.hoe', emits1[2][0]
+    assert_equal                   'poe', emits1[2][2]['value']
+
+    # ["flattened.foo.bar.baz", 1354689632, {"value"=>"bazz"}]
+    assert_equal     'flattened.foo.baz', emits1[3][0]
+    assert_equal                  'bazz', emits1[3][2]['value']
 
-    d.run do
-      d.emit( 'foo' => '{"bar" : "baz"}', 'hoge' => 'fuga' )
-      d.emit( 'foo' => '{"bar" : {"qux" : "quux", "hoe" : "poe" }, "baz" : "bazz" }', 'hoge' => 'fuga' )
+    # test2 parse_json is set false 
+    d2 = create_driver(%[
+      key               foo 
+      add_tag_prefix    flattened.
+      remove_tag_prefix test.
+      parse_json        false
+    ])
+
+    d2.run do
+      d2.emit( 'foo' => {'bar' => 'baz'}, 'hoge' => 'fuga' )
+      d2.emit( 'foo' => {'bar' => {'qux' => 'quux', 'hoe' => 'poe' }, 'baz' => 'bazz' }, 'hoge' => 'fuga' )
     end
-    emits = d.emits
+    emits2 = d2.emits
 
-    assert_equal 4, emits.count
+    assert_equal 4, emits2.count
 
     # ["flattened.foo.bar", 1354689632, {"value"=>"baz"}]
-    assert_equal     'flattened.foo.bar', emits[0][0]
-    assert_equal                   'baz', emits[0][2]['value']
+    assert_equal     'flattened.foo.bar', emits2[0][0]
+    assert_equal                   'baz', emits2[0][2]['value']
 
     # ["flattened.foo.bar.qux", 1354689632, {"value"=>"quux"}]
-    assert_equal 'flattened.foo.bar.qux', emits[1][0]
-    assert_equal                  'quux', emits[1][2]['value']
+    assert_equal 'flattened.foo.bar.qux', emits2[1][0]
+    assert_equal                  'quux', emits2[1][2]['value']
 
     # ["flattened.foo.bar.hoe", 1354689632, {"value"=>"poe"}]
-    assert_equal 'flattened.foo.bar.hoe', emits[2][0]
-    assert_equal                   'poe', emits[2][2]['value']
+    assert_equal 'flattened.foo.bar.hoe', emits2[2][0]
+    assert_equal                   'poe', emits2[2][2]['value']
 
     # ["flattened.foo.bar.baz", 1354689632, {"value"=>"bazz"}]
-    assert_equal     'flattened.foo.baz', emits[3][0]
-    assert_equal                  'bazz', emits[3][2]['value']
+    assert_equal     'flattened.foo.baz', emits2[3][0]
+    assert_equal                  'bazz', emits2[3][2]['value']
+
   end
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-flatten
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Kentaro Kuribayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Fluentd plugin to extract values for nested key paths and re-emit them
@@ -78,27 +71,26 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/kentaro/fluent-plugin-flatten
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fluentd plugin to extract values for nested key paths and re-emit them as
   flat tag/record pairs.
 test_files: