fluent-plugin-flatten 0.0.4 → 0.0.5

data/fluent-plugin-flatten.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-flatten'
-  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-flatten'

data/lib/fluent/plugin/out_flatten.rb

@@ -41,14 +41,18 @@ module Fluent
     def flatten(record)
       flattened = {}
 
-      if record.has_key?(key)
-        hash      = JSON.parse(record[key])
-        processor = lambda do |root, hash|
-          unless hash.is_a?(Hash)
-            raise Error.new('The value to be flattened must be a Hash: #{hash}')
-          end
+      if record.has_key?(key) && !record[key].empty?
+        hash = nil
 
+        begin
+          hash = JSON.parse(record[key])
+        rescue JSON::ParserError
+          return flattened
+        end
+
+        processor = lambda do |root, hash|
           flattened = {}
+          return flattened unless hash.is_a?(Hash)
 
           hash.each do |path, value|
             keypath = [root, path].join('.')

data/test/plugin/test_out_flatten.rb

@@ -52,10 +52,13 @@ class FlattenOutputTest < Test::Unit::TestCase
     flattened = d.instance.flatten({ 'foo' => '{"bar" : "baz"}', 'hoge' => 'fuga' })
     assert_equal({ 'foo.bar' => { 'value' => 'baz' } }, flattened)
 
-    # when not hash value is passed
-    assert_raise(Fluent::FlattenOutput::Error) do
-      d.instance.flatten({ 'foo' => '["bar", "baz"]' })
-    end
+    # when empty value is passed
+    flattened = d.instance.flatten({ 'foo' => '' })
+    assert_equal({}, flattened)
+
+    # when invalid json value is passed
+    flattened = d.instance.flatten({ 'foo' => '-' })
+    assert_equal({}, flattened)
   end
 
   def test_emit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-flatten
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake