fluent-plugin-retag 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1a56b2c7c9ff8c152f581ebef1909dc4ba0749f
-  data.tar.gz: 109309b4d2773227e2d5e79ba5513228ebab9612
+  metadata.gz: 274ade0964d0e63df8227fe94598a609106a53fd
+  data.tar.gz: 774a744bdbde01aa4f643e25d588c8178246585c
 SHA512:
-  metadata.gz: bb325a2f3a08c6590f9cff36f812d6e70c46f02c673272c83f63350b1e8db4034850aff91adb1c9019ef576d751e6e9108fc2d620f3fc8b7c3f0316fc522dc51
-  data.tar.gz: 666943f651598f0429ea4fcfeecc48d15907d6bfe3563783230cca5d0e954f28c43013164bc2f49a2f82c92b88665bd60ab90ef0f244e5447294dbe8c93d1557
+  metadata.gz: ab34927fba8fc079b7a2a22e2bd1e3e0e7669ecedc8a353ab2e91ba791762e6706fd6184f05a5588c3966802a59940ed0b552fae64fa09dc38b703ebb7bd8fb1
+  data.tar.gz: c02f15e992779ac29e630bf88a496b54000f66f40c8f51f2fbba02ceae583a6527ba002a062613b24094b11d389240a92aea61d348540889cff4cd537b60194a

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in fluent-plugin-retag.gemspec
 gemspec
-gem "rake"
-gem "test-unit"

data/README.md

@@ -15,14 +15,14 @@ Output plugin only retagging.
 To retag foo.bar to hoge.fuga:
 
     <match foo.bar>
-      type retag
+      @type retag
       tag hoge.fuga
     </match>
 
 To retag foo.bar.** to xyz.bar.**:
 
     <match foo.bar>
-      type retag
+      @type retag
       remove_prefix foo
       add_prefix xyz
     </match>
@@ -32,9 +32,9 @@ To retag foo.bar.** to xyz.bar.**:
 If you want to use branch condition, it is useful to use out_copy with fluent-plugin-retag.
 
     <match foo.bar.**>
-      type copy
+      @type copy
       <store>
-        type retag
+        @type retag
         add_prefix copied
       </store>
       <store>

data/fluent-plugin-retag.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-retag"
-  gem.version       = "0.0.2"
+  gem.version       = "0.1.0"
   gem.authors       = ["Masahiro Yamauchi"]
   gem.email         = ["sgt.yamauchi@gmail.com"]
   gem.description   = %q{Output filter plugin to retag}
@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_development_dependency "fluentd"
-  gem.add_runtime_dependency "fluentd"
+  gem.add_development_dependency "rake", "~> 12.0"
+  gem.add_development_dependency "test-unit", "~> 3.2"
+  gem.add_runtime_dependency "fluentd", [">= 0.14.8", "< 2"]
 end

data/lib/fluent/plugin/out_retag.rb

@@ -1,6 +1,10 @@
-class Fluent::RetagOutput < Fluent::Output
+require 'fluent/plugin/output'
+
+class Fluent::Plugin::RetagOutput < Fluent::Plugin::Output
   Fluent::Plugin.register_output('retag', self)
 
+  helpers :event_emitter
+
   config_param :tag, :string, :default => nil
   config_param :remove_prefix, :string, :default => nil
   config_param :add_prefix, :string, :default => nil
@@ -29,11 +33,11 @@ class Fluent::RetagOutput < Fluent::Output
       @removed_suffix_pos = 0 - @removed_suffix_length
     end
     if @add_suffix
-      @added_suffix_string = '.' + @add_suffix 
+      @added_suffix_string = '.' + @add_suffix
     end
   end
 
-  def emit(tag, es, chain)
+  def process(tag, es)
     tag = if @tag
             @tag
           else
@@ -44,15 +48,15 @@ class Fluent::RetagOutput < Fluent::Output
             if @remove_prefix and
                 ( (tag.start_with?(@removed_prefix_string) and tag.length > @removed_length) or tag == @remove_prefix)
               tag = tag[@removed_length..-1]
-            end 
-            if @add_prefix 
+            end
+            if @add_prefix
               tag = if tag and tag.length > 0
                       @added_prefix_string + tag
                     else
                       @add_prefix
                     end
             end
-            if @add_suffix 
+            if @add_suffix
               tag = if tag and tag.length > 0
                       tag + @added_suffix_string
                     else
@@ -64,7 +68,5 @@ class Fluent::RetagOutput < Fluent::Output
     es.each do |time,record|
       router.emit(tag, time, record)
     end
-    chain.next
   end
 end
-

data/test/helper.rb

@@ -12,6 +12,8 @@ require 'test/unit'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'fluent/test'
+require 'fluent/test/helpers'
+require 'fluent/test/driver/output'
 unless ENV.has_key?('VERBOSE')
   nulllogger = Object.new
   nulllogger.instance_eval {|obj|
@@ -25,5 +27,5 @@ end
 require 'fluent/plugin/out_retag'
 
 class Test::Unit::TestCase
+  include Fluent::Test::Helpers
 end
-

data/test/plugin/test_out_retag.rb

@@ -16,8 +16,8 @@ class RetagOutputTest < Test::Unit::TestCase
     add_prefix head
   ]
 
-  def create_driver(conf = CONFIG, tag='test')
-    Fluent::Test::OutputTestDriver.new(Fluent::RetagOutput, tag).configure(conf)
+  def create_driver(conf = CONFIG)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::RetagOutput).configure(conf)
   end
 
   def test_configure
@@ -51,46 +51,42 @@ class RetagOutputTest < Test::Unit::TestCase
   end
 
   def test_emit
-    d = create_driver(CONFIG, 'foo.bar')
-    time = Time.parse('2011-03-11 14:46:01').to_i
-    d.run do
-      d.emit({'a' => 'b'})
-      d.emit({'c' => 'd'})
+    d = create_driver(CONFIG)
+    time = event_time('2011-03-11 14:46:01')
+    d.run(default_tag: 'foo.bar') do
+      d.feed(time, {'a' => 'b'})
+      d.feed(time, {'c' => 'd'})
     end
-    emits = d.emits
+    emits = d.events
     assert_equal 2, emits.length
-    p emits[0]
     assert_equal 'hoge', emits[0][0]
     assert_equal 'b', emits[0][2]['a']
   end
 
   def test_emit2
-    d = create_driver(CONFIG2, 'foo.bar')
-    time = Time.parse('2011-03-11 14:46:01').to_i
-    d.run do
-      d.emit({'a' => 'b'})
-      d.emit({'c' => 'd'})
+    d = create_driver(CONFIG2)
+    time = event_time('2011-03-11 14:46:01')
+    d.run(default_tag: 'foo.bar') do
+      d.feed(time, {'a' => 'b'})
+      d.feed(time, {'c' => 'd'})
     end
-    emits = d.emits
+    emits = d.events
     assert_equal 2, emits.length
-    p emits[0]
     assert_equal 'bar', emits[0][0]
     assert_equal 'b', emits[0][2]['a']
   end
 
   def test_emit3
-    d = create_driver(CONFIG3, 'foo.bar')
-    time = Time.parse('2011-03-11 14:46:01').to_i
-    d.run do
-      d.emit({'a' => 'b'})
-      d.emit({'c' => 'd'})
+    d = create_driver(CONFIG3)
+    time = event_time('2011-03-11 14:46:01')
+    d.run(default_tag: 'foo.bar') do
+      d.feed(time, {'a' => 'b'})
+      d.feed(time, {'c' => 'd'})
     end
-    emits = d.emits
+    emits = d.events
     assert_equal 2, emits.length
-    p emits[0]
     assert_equal 'head.bar', emits[0][0]
     assert_equal 'b', emits[0][2]['a']
   end
 
 end
-

metadata

@@ -1,43 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-retag
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Masahiro Yamauchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fluentd
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Output filter plugin to retag
 email:
 - sgt.yamauchi@gmail.com