fluent-plugin-flatten-hash 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b43a1bd48124ebae2cdfda2410712b64d997392
-  data.tar.gz: dc2a4abef6d63a83aaf219fc3e8954b7c710d101
+  metadata.gz: fc9aa975dd6c6a5ae056a1ade23882751d3cb9a7
+  data.tar.gz: b076a3184513e59221f1dd2dcc8ead6099052406
 SHA512:
-  metadata.gz: debb2ff1e583180759ffc8a2919f271dfc602cc461a9ed5d18b105490aa2c791dfbe262ea024495599250e215efd34125d6afd69b7e621c9ef4d6d08c1dbabd1
-  data.tar.gz: d271c774d81be375b0e6c0c43b4ef528cc5cb26910f928b757f0d21f95e8e86decd9518c0e665f4ec920ecaceb7491fa38ec3f7922a5768618895b6e8fc11f99
+  metadata.gz: 580e9e5392a343865bf8849cceaca44d67fb6eea4ecc805d6f4b0cfc5d305cd09446808e3a5bb37d55bc5f770af5c3459b42fc7651cbace91690a5ae1d2bbbac
+  data.tar.gz: f194a77a00a8473921ae3465dd7e7505829814c29438cf511dc7c230405a04f68a679e3b3df6fb60c27e571be4c740022780d8943db8fc707279526a88c658ad

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 2.1
   - 2.2
+  - 2.3.1
 
 script:
   - bundle exec rake test

data/fluent-plugin-flatten-hash.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-flatten-hash"
-  spec.version       = "0.4.1"
+  spec.version       = "0.5.0"
   spec.authors       = ["Masahiro Sano"]
   spec.email         = ["sabottenda@gmail.com"]
   spec.description   = %q{A fluentd plugin to flatten nested hash structure as a flat record}
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fluentd", ["~> 0.12.0"]
+  spec.add_dependency "fluentd", [">= 0.14.8", "< 2"]
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit"
 end

data/lib/fluent/plugin/filter_flatten_hash.rb

@@ -1,13 +1,15 @@
-module Fluent
+require 'fluent/plugin/filter'
+
+module Fluent::Plugin
   class FlattenHashFilter < Filter
-    Plugin.register_filter('flatten_hash', self)
+    Fluent::Plugin.register_filter('flatten_hash', self)
 
     require_relative 'flatten_hash_util'
-    include FlattenHashUtil
+    include Fluent::FlattenHashUtil
 
     config_param :separator, :string, :default => '.'
     config_param :flatten_array, :bool, :default => true
-    
+
     def configure(conf)
       super
     end
@@ -15,5 +17,5 @@ module Fluent
     def filter(tag, time, record)
       flatten_record(record, [])
     end
-  end if defined?(Filter)
+  end
 end

data/lib/fluent/plugin/out_flatten_hash.rb

@@ -1,10 +1,14 @@
-module Fluent
+require 'fluent/plugin/output'
+
+module Fluent::Plugin
   class FlattenHashOutput < Output
     include Fluent::HandleTagNameMixin
     Fluent::Plugin.register_output('flatten_hash', self)
 
+    helpers :event_emitter
+
     require_relative 'flatten_hash_util'
-    include FlattenHashUtil
+    include Fluent::FlattenHashUtil
 
     config_param :tag, :string, :default => nil
     config_param :separator, :string, :default => '.'
@@ -21,11 +25,11 @@ module Fluent
           !remove_tag_suffix &&
           !add_tag_prefix &&
           !add_tag_suffix )
-        raise ConfigError, "out_flatten_hash: No tag parameters are set"
+        raise Fluent::ConfigError, "out_flatten_hash: No tag parameters are set"
       end
     end
 
-    def emit(tag, es, chain)
+    def process(tag, es)
       tag = @tag || tag
       es.each do |time, record|
         record = flatten_record(record, [])
@@ -33,7 +37,6 @@ module Fluent
         filter_record(t, time, record)
         router.emit(t, time, record)
       end
-      chain.next
     end
   end
 end

data/test/plugin/test_filter_flatten_array.rb

@@ -1,8 +1,8 @@
 require 'helper'
+require 'fluent/test/driver/filter'
 require 'fluent/plugin/filter_flatten_hash'
 
 class FlattenHashFlattenArrayFilterTest < Test::Unit::TestCase
-  include Fluent
 
   BASE_CONFIG = %[
     type flatten_hash
@@ -18,7 +18,7 @@ class FlattenHashFlattenArrayFilterTest < Test::Unit::TestCase
   end
 
   def create_driver(conf = '')
-    Test::FilterTestDriver.new(FlattenHashFilter).configure(conf, true)
+    Fluent::Test::Driver::Filter.new(Fluent::Plugin::FlattenHashFilter).configure(conf, syntax: :v1)
   end
 
   def test_flatten_record_flatten_array_false
@@ -26,13 +26,13 @@ class FlattenHashFlattenArrayFilterTest < Test::Unit::TestCase
     es = Fluent::MultiEventStream.new
     now = Fluent::Engine.now
 
-    d.run do
-      d.emit({'message' => {'foo' => 'bar'}})
-      d.emit({"message" => {'foo' => 'bar', 'hoge' => 'fuga'}})
-      d.emit({"message" => {'nest' => {'foo' => 'bar'}}})
-      d.emit({"message" => {'nest' => {'nest' => {'foo' => 'bar'}}}})
-      d.emit({"message" => {'array' => ['foo', 'bar']}})
-      d.emit({"message" => {'array' => [{'foo' => 'bar'}, {'hoge' => 'fuga'}]}})
+    d.run(default_tag: 'test') do
+      d.feed({'message' => {'foo' => 'bar'}})
+      d.feed({"message" => {'foo' => 'bar', 'hoge' => 'fuga'}})
+      d.feed({"message" => {'nest' => {'foo' => 'bar'}}})
+      d.feed({"message" => {'nest' => {'nest' => {'foo' => 'bar'}}}})
+      d.feed({"message" => {'array' => ['foo', 'bar']}})
+      d.feed({"message" => {'array' => [{'foo' => 'bar'}, {'hoge' => 'fuga'}]}})
     end
 
     assert_equal [
@@ -42,6 +42,6 @@ class FlattenHashFlattenArrayFilterTest < Test::Unit::TestCase
       {"message.nest.nest.foo" => "bar"},
       {"message.array"=>["foo", "bar"]},
       {"message.array"=>[{"foo"=>"bar"}, {"hoge"=>"fuga"}]},
-    ], d.filtered_as_array.map{|x| x[2]}
+    ], d.filtered.map{|x| x[1]}
   end
 end

data/test/plugin/test_filter_flatten_hash.rb

@@ -1,8 +1,8 @@
 require 'helper'
+require 'fluent/test/driver/filter'
 require 'fluent/plugin/filter_flatten_hash'
 
 class FlattenHashFilterTest < Test::Unit::TestCase
-  include Fluent
 
   BASE_CONFIG = %[
     type flatten_hash
@@ -17,7 +17,7 @@ class FlattenHashFilterTest < Test::Unit::TestCase
   end
 
   def create_driver(conf = '')
-    Test::FilterTestDriver.new(FlattenHashFilter).configure(conf, true)
+    Fluent::Test::Driver::Filter.new(Fluent::Plugin::FlattenHashFilter).configure(conf, syntax: :v1)
   end
 
   def test_flatten_record
@@ -25,13 +25,13 @@ class FlattenHashFilterTest < Test::Unit::TestCase
     es = Fluent::MultiEventStream.new
     now = Fluent::Engine.now
 
-    d.run do
-      d.emit({'message' => {'foo' => 'bar'}})
-      d.emit({"message" => {'foo' => 'bar', 'hoge' => 'fuga'}})
-      d.emit({"message" => {'nest' => {'foo' => 'bar'}}})
-      d.emit({"message" => {'nest' => {'nest' => {'foo' => 'bar'}}}})
-      d.emit({"message" => {'array' => ['foo', 'bar']}})
-      d.emit({"message" => {'array' => [{'foo' => 'bar'}, {'hoge' => 'fuga'}]}})
+    d.run(default_tag: 'test') do
+      d.feed({'message' => {'foo' => 'bar'}})
+      d.feed({"message" => {'foo' => 'bar', 'hoge' => 'fuga'}})
+      d.feed({"message" => {'nest' => {'foo' => 'bar'}}})
+      d.feed({"message" => {'nest' => {'nest' => {'foo' => 'bar'}}}})
+      d.feed({"message" => {'array' => ['foo', 'bar']}})
+      d.feed({"message" => {'array' => [{'foo' => 'bar'}, {'hoge' => 'fuga'}]}})
     end
 
     assert_equal [
@@ -41,17 +41,17 @@ class FlattenHashFilterTest < Test::Unit::TestCase
       {"message.nest.nest.foo" => "bar"},
       {"message.array.0" => "foo", "message.array.1" => "bar"},
       {"message.array.0.foo" => "bar", "message.array.1.hoge" => "fuga"},
-    ], d.filtered_as_array.map{|x| x[2]}
+    ], d.filtered.map{|x| x[1]}
   end
 
   def test_separator
     d = create_driver CONFIG + %[separator /]
 
-    d.run do
-      d.emit({"message" => {'nest' => {'foo' => 'bar'}}})
+    d.run(default_tag: 'test') do
+      d.feed({"message" => {'nest' => {'foo' => 'bar'}}})
     end
     assert_equal [
       {"message/nest/foo" => "bar"},
-    ], d.filtered_as_array.map{|x| x[2]}
+    ], d.filtered.map{|x| x[1]}
   end
 end

data/test/plugin/test_out_flatten_hash.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'fluent/test/driver/output'
 require 'fluent/plugin/out_flatten_hash'
 
 class FlattenHashOutputTest < Test::Unit::TestCase
@@ -13,8 +14,8 @@ class FlattenHashOutputTest < Test::Unit::TestCase
     add_tag_prefix flattened
   ]
 
-  def create_driver(conf = CONFIG, tag='test')
-    Fluent::Test::OutputTestDriver.new(Fluent::FlattenHashOutput, tag).configure(conf)
+  def create_driver(conf = CONFIG)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::FlattenHashOutput).configure(conf)
   end
 
   def test_configure
@@ -51,13 +52,13 @@ class FlattenHashOutputTest < Test::Unit::TestCase
   def test_flatten_record
     d = create_driver
 
-    d.run do
-      d.emit({'message' => {'foo' => 'bar'}})
-      d.emit({"message" => {'foo' => 'bar', 'hoge' => 'fuga'}})
-      d.emit({"message" => {'nest' => {'foo' => 'bar'}}})
-      d.emit({"message" => {'nest' => {'nest' => {'foo' => 'bar'}}}})
-      d.emit({"message" => {'array' => ['foo', 'bar']}})
-      d.emit({"message" => {'array' => [{'foo' => 'bar'}, {'hoge' => 'fuga'}]}})
+    d.run(default_tag: 'test') do
+      d.feed({'message' => {'foo' => 'bar'}})
+      d.feed({"message" => {'foo' => 'bar', 'hoge' => 'fuga'}})
+      d.feed({"message" => {'nest' => {'foo' => 'bar'}}})
+      d.feed({"message" => {'nest' => {'nest' => {'foo' => 'bar'}}}})
+      d.feed({"message" => {'array' => ['foo', 'bar']}})
+      d.feed({"message" => {'array' => [{'foo' => 'bar'}, {'hoge' => 'fuga'}]}})
     end
 
     assert_equal [
@@ -67,53 +68,53 @@ class FlattenHashOutputTest < Test::Unit::TestCase
       {"message.nest.nest.foo" => "bar"},
       {"message.array.0" => "foo", "message.array.1" => "bar"},
       {"message.array.0.foo" => "bar", "message.array.1.hoge" => "fuga"},
-    ], d.records
+    ], d.events.map{|e| e[2]}
   end
 
   def test_separator
     d = create_driver CONFIG + %[separator /]
 
-    d.run do
-      d.emit({"message" => {'nest' => {'foo' => 'bar'}}})
+    d.run(default_tag: 'test') do
+      d.feed({"message" => {'nest' => {'foo' => 'bar'}}})
     end
 
     assert_equal [
       {"message/nest/foo" => "bar"},
-    ], d.records
+    ], d.events.map{|e| e[2]}
   end
 
   def test_emit_with_add_tag_prefix
     d = create_driver BASE_CONFIG + %[
       add_tag_prefix flattened.
     ]
-    d.run do
-      d.emit({'message' => {'foo' => 'bar'}})
-      d.emit({'message' => {'foo' => 'bar'}})
-      d.emit({'message' => {'foo' => 'bar'}})
+    d.run(default_tag: 'test') do
+      d.feed({'message' => {'foo' => 'bar'}})
+      d.feed({'message' => {'foo' => 'bar'}})
+      d.feed({'message' => {'foo' => 'bar'}})
     end
-    emits = d.emits
-    emits.each do |e|
+    events = d.events
+    events.each do |e|
       assert_equal 'flattened.test', e[0]
       assert_equal 'bar', e[2]["message.foo"]
     end
-    assert_equal 3, emits.count
+    assert_equal 3, events.count
   end
 
   def test_emit_with_remove_tag_prefix
     tag = 'prefix.prefix.test'
     d = create_driver BASE_CONFIG + %[
       remove_tag_prefix prefix.
-    ], tag
-    d.run do
-      d.emit({'message' => {'foo' => 'bar'}})
-      d.emit({'message' => {'foo' => 'bar'}})
-      d.emit({'message' => {'foo' => 'bar'}})
+    ]
+    d.run(default_tag: tag) do
+      d.feed({'message' => {'foo' => 'bar'}})
+      d.feed({'message' => {'foo' => 'bar'}})
+      d.feed({'message' => {'foo' => 'bar'}})
     end
-    emits = d.emits
-    emits.each do |e|
+    events = d.events
+    events.each do |e|
       assert_equal 'prefix.test', e[0]
       assert_equal 'bar', e[2]["message.foo"]
     end
-    assert_equal 3, emits.count
+    assert_equal 3, events.count
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-flatten-hash
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Masahiro Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-12 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.8
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.8
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A fluentd plugin to flatten nested hash structure as a flat record