fluent-plugin-rewrite 0.0.13 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40314ef9366b2cf1732c79b0e5a6ab867730442c
-  data.tar.gz: 7a457baa66e080cadb1abb01874eb571911a6b37
+  metadata.gz: ab3e54318cc3b8fd6ddc45766eb8e035c60d18ea
+  data.tar.gz: e6dbbdb1e22264cc26980df004ff0b119f9d5ff7
 SHA512:
-  metadata.gz: 05200ecb8ae2de70ef77e99ae5e9355930516dbaa52b6fef0d8b9b1c06af7116815ee21cec74ad9cfcf6ed0d257c79f60ac39e6f4f9eef8462581930ed2da505
-  data.tar.gz: 323146000fbba0988f5f695643d52ded4121726edc11488ec8f06d08e38592035e811c3f8334fc4be96ef2d2c6e78af17cfdbd9a24475db49d9254a2c3c5ce26
+  metadata.gz: 3ac903ed8fd460b43d625e2bcec91d45fc49fcce0dd27d1cb146881a6934d0764e1fa1244f6b5b0b14733708317e875b91cbf5387ac87e727ba3a34203d784a2
+  data.tar.gz: 1eb9034188bb8f0724363301e7f7700b5b531628371123ea4d912c7331d7774db720dc7f0887968f300341e70a2a795ea7c4100eb31b388f49b83c60ccd51756

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+gemfile:
+- gemfiles/fluentd_0.14.gemfile
+rvm:
+- 2.3.1
+- 2.2
+- 2.1
+script:
+- bundle exec rake test

data/Appraisals

@@ -0,0 +1,3 @@
+appraise "fluentd_0.14" do
+  gem "fluentd", "~> 0.14.0"
+end

data/README.md

@@ -11,7 +11,7 @@ matching and re-emit them.
 
 ```
 <match apache.log.**>
-  type rewrite
+  @type rewrite
 
   remove_prefix apache.log
   add_prefix    filtered
@@ -220,6 +220,55 @@ will be replaced by the second rule as usual.
 { "path" => "/baz" }
 ```
 
+### RewriteFilter
+
+Filter plugin to modify messages' values along with pattern
+matching and filter them.
+
+Note that filter version of rewrite plugin does not have append/add tags functionality.
+
+Thus, this filter version does not able to specify `append_to_tag`, `tag`, and `fallback` rules.
+
+## Synopsis
+
+```
+<filter apache.log.**>
+  @type rewrite
+
+  <rule>
+    key     path
+    pattern \\?.+$
+    replace
+  </rule>
+  <rule>
+    key     path
+    pattern (/[^/]+)\\?([^=]+)=(\\d)
+    replace \\1/\\2/\\3
+  </rule>
+  <rule>
+    key     status
+    pattern ^500$
+    ignore  true
+  </rule>
+</match>
+```
+
+## Configuration
+
+Note: This filter version of rewrite plugin does not have `remove_prefix` and `add_prefix` configuration.
+
+### rule: replace
+
+Same as OutputRewrite section's [rule: replace](#rule-replace).
+
+### rule: ignore
+
+Same as OutputRewrite section's [rule: ignore](#rule-ignore).
+
+### rule: last
+
+Same as OutputRewrite section's [rule: last](#rule-last).
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/fluent-plugin-rewrite.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-rewrite"
-  gem.version       = '0.0.13'
+  gem.version       = '0.1.0'
   gem.authors       = ["Kentaro Kuribayashi"]
   gem.email         = ["kentarok@gmail.com"]
   gem.homepage      = "http://github.com/kentaro/fluent-plugin-rewrite"
@@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "test-unit", "~> 3.1"
-  gem.add_runtime_dependency     "fluentd"
+  gem.add_development_dependency "appraisal"
+  gem.add_runtime_dependency     "fluentd", [">= 0.14.8", "< 2"]
 end
-

data/gemfiles/fluentd_0.14.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "fluentd", "~> 0.14.0"
+
+gemspec :path => "../"

data/lib/fluent/plugin/filter_rewrite.rb

@@ -0,0 +1,26 @@
+module Fluent::Plugin
+  class RewriteFilter < Filter
+    Fluent::Plugin.register_filter('rewrite', self)
+
+    attr_reader :rewrite_rule
+
+    def configure(conf)
+      require 'fluent/plugin/rewrite_rule'
+
+      super
+
+      @rewrite_rule = Fluent::RewriteRule.new(self, conf)
+    end
+
+    def filter_stream(tag, es)
+      new_es = Fluent::MultiEventStream.new
+
+      es.each do |time, record|
+        record = @rewrite_rule.rewrite(record)
+        new_es.add(time, record) if record
+      end
+
+      new_es
+    end
+  end
+end

data/lib/fluent/plugin/out_rewrite.rb

@@ -1,19 +1,22 @@
-module Fluent
+require 'fluent/plugin/output'
+
+module Fluent::Plugin
   class RewriteOutput < Output
     Fluent::Plugin.register_output('rewrite', self)
 
-    # Define `router` method of v0.12 to support v0.10.57 or earlier
-    unless method_defined?(:router)
-      define_method("router") { Engine }
-    end
+    helpers :event_emitter
 
-    config_param :remove_prefix,   :string, :default => nil
-    config_param :add_prefix,      :string, :default => nil
+    config_param :remove_prefix,   :string, :default => nil,
+                 deprecated: "use @label instead for event routing"
+    config_param :add_prefix,      :string, :default => nil,
+                 deprecated: "use @label instead for event routing"
     config_param :enable_warnings, :bool,   :default => false
 
-    attr_reader  :rules
+    attr_reader  :rewrite_rule
 
     def configure(conf)
+      require 'fluent/plugin/rewrite_rule'
+
       super
 
       if @remove_prefix
@@ -24,15 +27,7 @@ module Fluent
         @added_prefix_string = @add_prefix + '.'
       end
 
-      @rules = conf.elements.select {|element| element.name == 'rule' }.map do |element|
-        rule = {}
-        element.keys.each do |key|
-          # read and throw away to supress unread configuration warning
-          rule[key] = element[key]
-        end
-        rule["regex"] = Regexp.new(element["pattern"]) if element.has_key?("pattern")
-        rule
-      end
+      @rewrite_rule = Fluent::RewriteRule.new(self, conf)
     end
 
     def start
@@ -43,7 +38,7 @@ module Fluent
       super
     end
 
-    def emit(tag, es, chain)
+    def process(tag, es)
       _tag = tag.clone
 
       if @remove_prefix and
@@ -56,7 +51,7 @@ module Fluent
       end
 
       es.each do |time, record|
-        filtered_tag, record = rewrite(tag, record)
+        filtered_tag, record = @rewrite_rule.rewrite(tag, record)
         if filtered_tag && record && _tag != filtered_tag
           router.emit(filtered_tag, time, record)
         else
@@ -65,58 +60,6 @@ module Fluent
           end
         end
       end
-
-      chain.next
-    end
-
-    def rewrite(tag, record)
-      rules.each do |rule|
-        tag, record, last = apply_rule(rule, tag, record)
-
-        break  if last
-        return if !tag && !record
-      end
-
-      [tag, record]
-    end
-
-    def apply_rule(rule, tag, record)
-      tag_prefix = tag && tag.length > 0 ? "." : ""
-      key        = rule["key"]
-      pattern    = rule["pattern"]
-      last       = nil
-
-      return [tag, record] if !key || !record.has_key?(key)
-      return [tag, record] unless pattern
-
-      if matched = record[key].match(rule["regex"])
-        return if rule["ignore"]
-
-        if rule["replace"]
-          replace = rule["replace"]
-          record[key] = record[key].gsub(rule["regex"], replace)
-        end
-
-        if rule["append_to_tag"]
-          if rule["tag"]
-            tag += (tag_prefix + rule["tag"])
-          else
-            matched.captures.each do |m|
-              tag += (tag_prefix + "#{m}")
-            end
-          end
-        end
-
-        if rule["last"]
-          last = true
-        end
-      else
-        if rule["append_to_tag"] && rule["fallback"]
-          tag += (tag_prefix + rule["fallback"])
-        end
-      end
-
-      [tag, record, last]
     end
   end
 end

data/lib/fluent/plugin/rewrite_rule.rb

@@ -0,0 +1,73 @@
+module Fluent
+  class RewriteRule
+    attr_reader :rules
+
+    def initialize(plugin, conf)
+      @plugin = plugin
+      @rules = conf.elements.select {|element| element.name == 'rule' }.map do |element|
+        rule = {}
+        element.keys.each do |key|
+          # read and throw away to supress unread configuration warning
+          rule[key] = element[key]
+        end
+        rule["regex"] = Regexp.new(element["pattern"]) if element.has_key?("pattern")
+        rule
+      end
+    end
+
+    def rewrite(tag=nil, record)
+      @rules.each do |rule|
+        tag, record, last = apply_rule(rule, tag, record)
+
+        break  if last
+        if @plugin.is_a?(Fluent::Plugin::Output)
+          return if !tag && !record
+        else
+          return if !record
+        end
+      end
+
+      return [record] if not @plugin.is_a?(Fluent::Plugin::Output)
+      return [tag, record] if @plugin.is_a?(Fluent::Plugin::Output)
+    end
+
+    def apply_rule(rule, tag=nil, record)
+      tag_prefix = tag && tag.length > 0 ? "." : ""
+      key        = rule["key"]
+      pattern    = rule["pattern"]
+      last       = nil
+
+      return [tag, record] if !key || !record.has_key?(key)
+      return [tag, record] unless pattern
+
+      if matched = record[key].match(rule["regex"])
+        return if rule["ignore"]
+
+        if rule["replace"]
+          replace = rule["replace"]
+          record[key] = record[key].gsub(rule["regex"], replace)
+        end
+
+        if rule["append_to_tag"] && @plugin.is_a?(Fluent::Plugin::Output)
+          if rule["tag"]
+            tag += (tag_prefix + rule["tag"])
+          else
+            matched.captures.each do |m|
+              tag += (tag_prefix + "#{m}")
+            end
+          end
+        end
+
+        if rule["last"]
+          last = true
+        end
+      else
+        if rule["append_to_tag"] && rule["fallback"] && @plugin.is_a?(Fluent::Plugin::Output)
+          tag += (tag_prefix + rule["fallback"])
+        end
+      end
+
+      return [tag, record, last]
+    end
+  end
+end

data/test/plugin/test_filter_rewrite.rb

@@ -0,0 +1,213 @@
+require 'test_helper'
+require 'fluent/test/driver/filter'
+
+class RewriteFilterTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
+  def create_driver(conf)
+    Fluent::Test::Driver::Filter.new(Fluent::Plugin::RewriteFilter).configure(conf)
+  end
+
+  def test_configure
+    d = create_driver(%[
+      <rule>
+        key foo
+      </rule>
+      <to_be_ignored>
+        key bar
+      </to_be_ignored>
+      <rule>
+        key baz
+      </rule>
+    ])
+
+    assert_equal 2, d.instance.rewrite_rule.rules.size
+  end
+
+  class TestRewrite < self
+    def test_replace
+      d = create_driver(%[
+        <rule>
+          key     path
+          pattern \\?.+$
+          replace
+        </rule>
+      ])
+
+      assert_equal(
+        [ { "path" => "/foo" } ],
+        d.instance.rewrite_rule.rewrite({ "path" => "/foo?bar=1" })
+      )
+    end
+
+    def test_replace_with_capture
+      d = create_driver(%[
+        <rule>
+          key     path
+          pattern (/[^/]+)\\?([^=]+)=(\\d)
+          replace \\1/\\2/\\3
+        </rule>
+      ])
+
+      assert_equal(
+        [ { "path" => "/foo/bar/1" } ],
+        d.instance.rewrite_rule.rewrite({ "path" => "/foo?bar=1" })
+      )
+    end
+  end
+
+  class TestRewriteIgnore < self
+    def test_pattern
+      d = create_driver(%[
+        <rule>
+          key     status
+          pattern ^500$
+          ignore  true
+        </rule>
+      ])
+
+      assert_equal(
+        nil,
+        d.instance.rewrite_rule.rewrite({ "status" => "500" })
+      )
+    end
+
+    def test_negate_pattern
+      d = create_driver(%[
+        <rule>
+          key     status
+          pattern ^(?!200)\\d+$
+          ignore  true
+        </rule>
+      ])
+
+      assert_equal(
+        [ { "status" => "200" } ],
+        d.instance.rewrite_rule.rewrite({ "status" => "200" })
+      )
+      %w[301 404 500].each do |status|
+        assert_equal(
+          nil,
+          d.instance.rewrite_rule.rewrite({ "status" => status })
+        )
+      end
+    end
+
+    def test_entire_ignore
+      d = create_driver(%[
+        <rule>
+          key     flag
+          pattern ^$
+          ignore  true
+        </rule>
+      ])
+
+      assert_equal(
+        nil,
+        d.instance.rewrite_rule.rewrite({ "flag" => "" })
+      )
+    end
+  end
+
+  def test_last
+    d = create_driver(%[
+      <rule>
+        key     path
+        pattern ^/foo$
+        replace /bar
+        last    true
+      </rule>
+      <rule>
+        key     path
+        pattern ^/bar$
+        replace /baz
+      </rule>
+    ])
+
+    assert_equal(
+      [ { "path" => "/bar" } ],
+      d.instance.rewrite_rule.rewrite({ "path" => "/foo" })
+    )
+    assert_equal(
+      [ { "path" => "/baz" } ],
+      d.instance.rewrite_rule.rewrite({ "path" => "/bar" })
+    )
+  end
+
+  def test_rewrite_rules
+    d = create_driver(%[
+      <rule>
+        key     path
+        pattern \\?.+$
+        replace
+      </rule>
+      <rule>
+        key     status
+        pattern ^500$
+        ignore  true
+      </rule>
+    ])
+
+    assert_equal(
+      [ { "path" => "/foo" } ],
+      d.instance.rewrite_rule.rewrite({ "path" => "/foo?bar=1" })
+    )
+    assert_equal(
+      [ { "path" => "/users/antipop" } ],
+      d.instance.rewrite_rule.rewrite({ "path" => "/users/antipop?hoge=1" })
+    )
+    assert_equal(
+      nil,
+      d.instance.rewrite_rule.rewrite({ "path" => "/foo?bar=1", "status" => "500" })
+    )
+  end
+
+  class TestFilter < self
+    def test_with_multiple_rules
+      d = create_driver(%[
+        <rule>
+          key     path
+          pattern \\?.+$
+          replace
+        </rule>
+        <rule>
+          key     status
+          pattern ^500$
+          ignore  true
+        </rule>
+      ])
+
+      d.run(default_tag: 'test') do
+        d.feed({ "path" => "/foo?bar=1" })
+        d.feed({ "path" => "/foo?bar=1", "status" => "500" })
+        d.feed({ "path" => "/users/antipop" })
+        d.feed({ "path" => "/users/kentaro" })
+      end
+      filtered = d.filtered
+
+      assert_equal 3, filtered.size
+      assert_equal([{ "path" => "/foo" }], filtered[0][1])
+      assert_equal([{ "path" => "/users/antipop" }], filtered[1][1]) # nothing to do
+      assert_equal([{ "path" => "/users/kentaro" }], filtered[2][1]) # nothing to do
+    end
+
+    def test_remove_query_params
+      d = create_driver(%[
+        <rule>
+          key     path
+          pattern \\?.+$
+          replace
+        </rule>
+      ])
+      d.run(default_tag: 'test') do
+        d.feed({ "path" => "/foo?bar=1" })
+      end
+      filtered = d.filtered
+
+      assert_equal 1, filtered.size
+      assert_equal([{ "path" => "/foo" }], filtered[0][1])
+    end
+  end
+end

data/test/plugin/test_out_rewrite.rb

@@ -1,12 +1,13 @@
 require 'test_helper'
+require 'fluent/test/driver/output'
 
 class RewriteOutputTest < Test::Unit::TestCase
   def setup
     Fluent::Test.setup
   end
 
-  def create_driver(conf, tag = 'test')
-    Fluent::Test::OutputTestDriver.new(Fluent::RewriteOutput, tag).configure(conf)
+  def create_driver(conf)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::RewriteOutput).configure(conf)
   end
 
   def test_configure
@@ -27,7 +28,7 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     assert_equal "test",     d.instance.remove_prefix
     assert_equal "filtered", d.instance.add_prefix
-    assert_equal 2, d.instance.rules.size
+    assert_equal 2, d.instance.rewrite_rule.rules.size
   end
 
   def test_rewrite_replace
@@ -41,7 +42,7 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     assert_equal(
       [ "test", { "path" => "/foo" } ],
-      d1.instance.rewrite("test", { "path" => "/foo?bar=1" })
+      d1.instance.rewrite_rule.rewrite("test", { "path" => "/foo?bar=1" })
     )
 
     d2 = create_driver(%[
@@ -54,7 +55,7 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     assert_equal(
       [ "test", { "path" => "/foo/bar/1" } ],
-      d2.instance.rewrite("test", { "path" => "/foo?bar=1" })
+      d2.instance.rewrite_rule.rewrite("test", { "path" => "/foo?bar=1" })
     )
   end
 
@@ -69,7 +70,7 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     assert_equal(
       nil,
-      d1.instance.rewrite("test", { "status" => "500" })
+      d1.instance.rewrite_rule.rewrite("test", { "status" => "500" })
     )
 
     d2 = create_driver(%[
@@ -82,12 +83,12 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     assert_equal(
       [ "test", { "status" => "200" } ],
-      d2.instance.rewrite("test", { "status" => "200" })
+      d2.instance.rewrite_rule.rewrite("test", { "status" => "200" })
     )
     %w[301 404 500].each do |status|
       assert_equal(
         nil,
-        d2.instance.rewrite("test", { "status" => status })
+        d2.instance.rewrite_rule.rewrite("test", { "status" => status })
       )
     end
 
@@ -101,7 +102,7 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     assert_equal(
       nil,
-      d3.instance.rewrite("test", { "flag" => "" })
+      d3.instance.rewrite_rule.rewrite("test", { "flag" => "" })
     )
   end
 
@@ -116,11 +117,11 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     assert_equal(
       [ "test.users", { "path" => "/users/antipop" } ],
-      d1.instance.rewrite("test", { "path" => "/users/antipop" })
+      d1.instance.rewrite_rule.rewrite("test", { "path" => "/users/antipop" })
     )
     assert_equal(
       [ "test", { "path" => "/unmatched/path" } ],
-      d1.instance.rewrite("test", { "path" => "/unmatched/path" })
+      d1.instance.rewrite_rule.rewrite("test", { "path" => "/unmatched/path" })
     )
 
     d2 = create_driver(%[
@@ -134,11 +135,11 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     assert_equal(
       [ "test.users", { "path" => "/users/antipop" } ],
-      d2.instance.rewrite("test", { "path" => "/users/antipop" })
+      d2.instance.rewrite_rule.rewrite("test", { "path" => "/users/antipop" })
     )
     assert_equal(
       [ "test.others", { "path" => "/unmatched/path" } ],
-      d2.instance.rewrite("test", { "path" => "/unmatched/path" })
+      d2.instance.rewrite_rule.rewrite("test", { "path" => "/unmatched/path" })
     )
 
     d3 = create_driver(%[
@@ -152,11 +153,11 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     assert_equal(
       [ "test.user", { "is_logged_in" => "1" } ],
-      d3.instance.rewrite("test", { "is_logged_in" => "1" })
+      d3.instance.rewrite_rule.rewrite("test", { "is_logged_in" => "1" })
     )
     assert_equal(
       [ "test", { "is_logged_in" => "0" } ],
-      d3.instance.rewrite("test", { "is_logged_in" => "0" })
+      d3.instance.rewrite_rule.rewrite("test", { "is_logged_in" => "0" })
     )
 
     d4 = create_driver(%[
@@ -169,7 +170,7 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     assert_equal(
       [ "test.users", { "path" => "/users/antipop" } ],
-      d4.instance.rewrite("test", { "path" => "/users/antipop" })
+      d4.instance.rewrite_rule.rewrite("test", { "path" => "/users/antipop" })
     )
 
     d5 = create_driver(%[
@@ -183,7 +184,7 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     assert_equal(
       [ "test.user", { "is_logged_in" => "1" } ],
-      d5.instance.rewrite("test", { "is_logged_in" => "1" })
+      d5.instance.rewrite_rule.rewrite("test", { "is_logged_in" => "1" })
     )
   end
 
@@ -204,11 +205,11 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     assert_equal(
       [ "test", { "path" => "/bar" } ],
-      d.instance.rewrite("test", { "path" => "/foo" })
+      d.instance.rewrite_rule.rewrite("test", { "path" => "/foo" })
     )
     assert_equal(
       [ "test", { "path" => "/baz" } ],
-      d.instance.rewrite("test", { "path" => "/bar" })
+      d.instance.rewrite_rule.rewrite("test", { "path" => "/bar" })
     )
   end
 
@@ -234,15 +235,15 @@ class RewriteOutputTest < Test::Unit::TestCase
 
     assert_equal(
       [ "test.others", { "path" => "/foo" } ],
-      d.instance.rewrite("test", { "path" => "/foo?bar=1" })
+      d.instance.rewrite_rule.rewrite("test", { "path" => "/foo?bar=1" })
     )
     assert_equal(
       [ "test.users", { "path" => "/users/antipop" } ],
-      d.instance.rewrite("test", { "path" => "/users/antipop?hoge=1" })
+      d.instance.rewrite_rule.rewrite("test", { "path" => "/users/antipop?hoge=1" })
     )
     assert_equal(
       nil,
-      d.instance.rewrite("test", { "path" => "/foo?bar=1", "status" => "500" })
+      d.instance.rewrite_rule.rewrite("test", { "path" => "/foo?bar=1", "status" => "500" })
     )
   end
 
@@ -269,24 +270,24 @@ class RewriteOutputTest < Test::Unit::TestCase
       </rule>
     ])
 
-    d1.run do
-      d1.emit({ "path" => "/foo?bar=1" })
-      d1.emit({ "path" => "/foo?bar=1", "status" => "500" })
-      d1.emit({ "path" => "/users/antipop" })
-      d1.emit({ "path" => "/users/kentaro" })
-      d1.emit({ "path" => "/entries/1" })
+    d1.run(default_tag: 'test') do
+      d1.feed({ "path" => "/foo?bar=1" })
+      d1.feed({ "path" => "/foo?bar=1", "status" => "500" })
+      d1.feed({ "path" => "/users/antipop" })
+      d1.feed({ "path" => "/users/kentaro" })
+      d1.feed({ "path" => "/entries/1" })
     end
-    emits = d1.emits
-
-    assert_equal 4, emits.size
-    assert_equal('filtered.others', emits[0][0])
-    assert_equal({ "path" => "/foo" }, emits[0][2])
-    assert_equal('filtered.users', emits[1][0])
-    assert_equal({ "path" => "/users/antipop" }, emits[1][2])
-    assert_equal('filtered.users', emits[2][0])
-    assert_equal({ "path" => "/users/kentaro" }, emits[2][2])
-    assert_equal('filtered.entries', emits[3][0])
-    assert_equal({ "path" => "/entries/1" }, emits[3][2])
+    events = d1.events
+
+    assert_equal 4, events.size
+    assert_equal('filtered.others', events[0][0])
+    assert_equal({ "path" => "/foo" }, events[0][2])
+    assert_equal('filtered.users', events[1][0])
+    assert_equal({ "path" => "/users/antipop" }, events[1][2])
+    assert_equal('filtered.users', events[2][0])
+    assert_equal({ "path" => "/users/kentaro" }, events[2][2])
+    assert_equal('filtered.entries', events[3][0])
+    assert_equal({ "path" => "/entries/1" }, events[3][2])
 
     d2 = create_driver(%[
       add_prefix filtered
@@ -297,14 +298,14 @@ class RewriteOutputTest < Test::Unit::TestCase
         replace
       </rule>
     ])
-    d2.run do
-      d2.emit({ "path" => "/foo?bar=1" })
+    d2.run(default_tag: 'test') do
+      d2.feed({ "path" => "/foo?bar=1" })
     end
-    emits = d2.emits
+    events = d2.events
 
-    assert_equal 1, emits.size
-    assert_equal('filtered.test', emits[0][0])
-    assert_equal({ "path" => "/foo" }, emits[0][2])
+    assert_equal 1, events.size
+    assert_equal('filtered.test', events[0][0])
+    assert_equal({ "path" => "/foo" }, events[0][2])
 
     # Test for not emit if the tag has not changed.
     d3 = create_driver(%[
@@ -314,11 +315,11 @@ class RewriteOutputTest < Test::Unit::TestCase
         replace
       </rule>
     ])
-    d3.run do
-      d3.emit({ "path" => "/foo?bar=1" })
+    d3.run(default_tag: 'test') do
+      d3.feed({ "path" => "/foo?bar=1" })
     end
 
-    assert_equal 0, d3.emits.size
+    assert_equal 0, d3.events.size
 
     # Emit message if the rewrite tag rules have been defined, even if (add|remove)_prefix option is not set.
     d4 = create_driver(%[
@@ -328,13 +329,13 @@ class RewriteOutputTest < Test::Unit::TestCase
         append_to_tag true
       </rule>
     ])
-    d4.run do
-      d4.emit({ "path" => "/users/studio3104" })
+    d4.run(default_tag: 'test') do
+      d4.feed({ "path" => "/users/studio3104" })
     end
-    emits = d4.emits
+    events = d4.events
 
-    assert_equal 1, emits.size
-    assert_equal('test.users', emits[0][0])
-    assert_equal({ "path" => "/users/studio3104" }, emits[0][2])
+    assert_equal 1, events.size
+    assert_equal('test.users', events[0][0])
+    assert_equal({ "path" => "/users/studio3104" }, events[0][2])
   end
 end

data/test/test_helper.rb

@@ -27,6 +27,7 @@ unless ENV.has_key?('VERBOSE')
 end
 
 require 'fluent/plugin/out_rewrite'
+require 'fluent/plugin/filter_rewrite'
 
 class Test::Unit::TestCase
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rewrite
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors:
 - Kentaro Kuribayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,19 +39,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: fluentd
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !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: '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: '2'
 description: Fluentd plugin to rewrite tags/values along with pattern matching and
   re-emit them.
 email:
@@ -61,12 +81,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - fluent-plugin-rewrite.gemspec
+- gemfiles/fluentd_0.14.gemfile
+- lib/fluent/plugin/filter_rewrite.rb
 - lib/fluent/plugin/out_rewrite.rb
+- lib/fluent/plugin/rewrite_rule.rb
+- test/plugin/test_filter_rewrite.rb
 - test/plugin/test_out_rewrite.rb
 - test/test_helper.rb
 homepage: http://github.com/kentaro/fluent-plugin-rewrite
@@ -89,11 +115,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to rewrite tags/values along with pattern matching and re-emit
   them.
 test_files:
+- test/plugin/test_filter_rewrite.rb
 - test/plugin/test_out_rewrite.rb
 - test/test_helper.rb