fluent-plugin-copy_ex 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e5b1573225969efe890856a4a5ab0ecf3e43f4c
-  data.tar.gz: 1f38b29b10d99a69f8d2c30b062d69f06272af84
+  metadata.gz: 0d312162cb51f1344bd45c89909d6188ff8d2acd
+  data.tar.gz: 7790f7b58b7a0367a25af1afcea4c9e0ea836989
 SHA512:
-  metadata.gz: 2a2828d7951cda1be2e5ed3952220c46cb670145c76efeacb0607209810259e823e0fa97dda372c9c4a1acacf2e95daeaf5b420d0fc6f3bb7c09ff02afc90df4
-  data.tar.gz: 4717f80509070ccb6f177eb0eb532bc1c9c1900d07c2989f6030903dbfbcc205fe30423d64fb58e8a92d72b31f62a860db8ec673cf67309cc8eb2c26abcecaad
+  metadata.gz: 06f889b19eb0c0f38af2e907ce39c5f7f1af4172a831ff0cae885e833286f8212401db19f6cd0d9f570aa81453508efac2bd08309ed5d177e27928cea76a4699
+  data.tar.gz: 8d7eaea66f06c7abdab6c750a2eb6e23b12564c33228672d59d21767f97733a839e931bfb536722725ef228b1a7c36eba23624c6dbd514be8ef8a06138abfebe

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.3 (2017-02-06)
+
+* Support v0.14
+
 ## 0.0.2 (2016-09-08)
 
 * Support `@type`

data/Rakefile

@@ -6,6 +6,7 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/*.rb'
   test.verbose = true
+  test.warning = false
 end
 task :default => :test
 

data/fluent-plugin-copy_ex.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-copy_ex"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-copy_ex"

data/lib/fluent/plugin/out_copy_ex.rb

@@ -10,6 +10,7 @@ module Fluent
       super
       @outputs = []
       @ignore_errors = []
+      @emit_procs = []
     end
 
     attr_reader :outputs, :ignore_errors
@@ -27,6 +28,12 @@ module Fluent
 
         output = Plugin.new_output(type)
         output.configure(e)
+        emit_proc = if output.respond_to?(:emit_events)
+                      Proc.new {|output, tag, es, _chain| output.emit_events(tag, es)}
+                    else
+                      Proc.new {|output, tag, es, _chain| output.emit(tag, es, NullOutputChain.instance)}
+                    end
+        @emit_procs << emit_proc
         @outputs << output
 
         @ignore_errors << (e.arg == "ignore_error")
@@ -58,7 +65,7 @@ module Fluent
       @outputs.each_index do |idx|
         _es = @deep_copy ? es.dup : es
         begin
-          @outputs[idx].emit(tag, _es, NullOutputChain.instance)
+          @emit_procs[idx].call(@outputs[idx], tag, _es, NullOutputChain.instance)
         rescue => e
           if @ignore_errors[idx]
             log.error :error_class => e.class, :error => e.message

data/test/plugin/test_out_copy_ex.rb

@@ -17,6 +17,10 @@ class CopyExOutputTest < Test::Unit::TestCase
     Fluent::Test.setup
   end
 
+  def config_element(name = 'test', argument = '', params = {}, elements = [])
+    Fluent::Config::Element.new(name, argument, params, elements)
+  end
+
   CONFIG = %[
     <store>
       type test
@@ -56,9 +60,9 @@ class CopyExOutputTest < Test::Unit::TestCase
 
     outputs = d.instance.outputs
     assert_equal 3, outputs.size
-    assert_equal Fluent::TestOutput, outputs[0].class
-    assert_equal Fluent::TestOutput, outputs[1].class
-    assert_equal Fluent::TestOutput, outputs[2].class
+    assert_equal Fluent::Plugin::TestOutput, outputs[0].class
+    assert_equal Fluent::Plugin::TestOutput, outputs[1].class
+    assert_equal Fluent::Plugin::TestOutput, outputs[2].class
     assert_equal "c0", outputs[0].name
     assert_equal "c1", outputs[1].name
     assert_equal "c2", outputs[2].name
@@ -93,18 +97,26 @@ class CopyExOutputTest < Test::Unit::TestCase
   def test_msgpack_es_emit_bug
     d = Fluent::Test::OutputTestDriver.new(Fluent::CopyExOutput)
 
+    emit_procs = []
     outputs = %w(p1 p2).map do |pname|
       p = Fluent::Plugin.new_output('test')
-      p.configure('name' => pname)
+      p.configure(config_element('ROOT', '', {'name' => pname}))
       p.define_singleton_method(:emit) do |tag, es, chain|
         es.each do |time, record|
           super(tag, [[time, record]], chain)
         end
       end
+      emit_proc = if p.respond_to?(:emit_events)
+                    Proc.new {|p, tag, es, _chain| p.emit_events(tag, es)}
+                  else
+                    Proc.new {|p, tag, es, _chain| p.emit(tag, es, NullOutputChain.instance)}
+                  end
+      emit_procs << emit_proc
       p
     end
 
     d.instance.instance_eval { @outputs = outputs }
+    d.instance.instance_eval { @emit_procs = emit_procs }
 
     es = if defined?(MessagePack::Packer)
            time = Time.parse("2013-05-26 06:37:22 UTC").to_i
@@ -133,27 +145,39 @@ deep_copy true
 ]
 
     output1 = Fluent::Plugin.new_output('test')
-    output1.configure('name' => 'output1')
-    output1.define_singleton_method(:emit) do |tag, es, chain|
+    output1.configure(config_element('ROOT', '', {'name' => 'output1'}))
+    output1.define_singleton_method(:emit_events) do |tag, es|
       es.each do |time, record|
         record['foo'] = 'bar'
-        super(tag, [[time, record]], chain)
+        super(tag, [[time, record]])
       end
     end
+    proc1 = if output1.respond_to?(:emit_events)
+                  Proc.new {|output1, tag, es, _chain| output1.emit_events(tag, es)}
+                else
+                  Proc.new {|output1, tag, es, _chain| output1.emit(tag, es, NullOutputChain.instance)}
+                end
 
     output2 = Fluent::Plugin.new_output('test')
-    output2.configure('name' => 'output2')
-    output2.define_singleton_method(:emit) do |tag, es, chain|
+    output2.configure(config_element('ROOT', '', {'name' => 'output2'}))
+    output2.define_singleton_method(:emit_events) do |tag, es|
       es.each do |time, record|
-        super(tag, [[time, record]], chain)
+        super(tag, [[time, record]])
       end
     end
+    proc2 = if output2.respond_to?(:emit_events)
+                  Proc.new {|output2, tag, es, _chain| output2.emit_events(tag, es)}
+                else
+                  Proc.new {|output2, tag, es, _chain| output2.emit(tag, es, NullOutputChain.instance)}
+                end
 
     outputs = [output1, output2]
+    emit_procs = [proc1, proc2]
 
     d = Fluent::Test::OutputTestDriver.new(Fluent::CopyExOutput)
     d = d.configure(deep_copy_config) if is_deep_copy
     d.instance.instance_eval { @outputs = outputs }
+    d.instance.instance_eval { @emit_procs = emit_procs }
     d
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-copy_ex
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-copy_ex
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Fluentd out_copy extension