fluent-plugin-rewrite 0.0.2 → 0.0.3

data/README.md

@@ -145,6 +145,49 @@ This time, the messabe above will be re-emmited as the message below:
 apache.log.others { "path" : "/foo/bar" }
 ```
 
+### rule: last
+
+If you set `last` option to true, rewriting chain stops applying rule where the pattern matches first.
+
+```
+<rule>
+  key     path
+  pattern ^/foo$
+  replace /bar
+  last    true
+</rule>
+<rule>
+  key     path
+  pattern ^/bar$
+  replace /baz
+</rule>
+```
+
+This rules will be applied like below:
+
+```
+{ "path" => "/foo" }
+```
+
+will be replaced with
+
+```
+{ "path" => "/bar" }
+```
+
+and the chain stops here. Therefore, the second rule is never
+applied.
+
+```
+{ "path" => "/bar" }
+```
+
+will be replaced by the second rule as usual.
+
+```
+{ "path" => "/baz" }
+```
+
 ## 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.2'
+  gem.version       = '0.0.3'
   gem.authors       = ["Kentaro Kuribayashi"]
   gem.email         = ["kentarok@gmail.com"]
   gem.homepage      = "http://github.com/kentaro/fluent-plugin-rewrite"

data/lib/fluent/plugin/out_rewrite.rb

@@ -66,7 +66,9 @@ module Fluent
       end
 
       rules.each do |rule|
-        tag, record = apply_rule(rule, tag, record)
+        tag, record, last = apply_rule(rule, tag, record)
+
+        break  if last
         return if !tag && !record
       end
 
@@ -77,6 +79,7 @@ module Fluent
       tag     = rule["append_to_tag"] ? tag.dup : tag
       key     = rule["key"]
       pattern = rule["pattern"]
+      last    = nil
 
       return [tag, record] if !key || !record.has_key?(key)
       return [tag, record] unless pattern
@@ -85,20 +88,24 @@ module Fluent
         return if rule["ignore"]
 
         if rule["replace"]
-          replace = rule["replace"].to_s
+          replace = rule["replace"]
           record[key] = record[key].gsub(rule["regex"], replace)
         end
 
         if rule["append_to_tag"]
           matched.captures.each { |m| tag << ".#{m}" }
         end
+
+        if rule["last"]
+          last = true
+        end
       else
         if rule["append_to_tag"] && rule["fallback"]
           tag << ".#{rule["fallback"]}"
         end
       end
 
-      [tag, record]
+      [tag, record, last]
     end
   end
 end

data/test/plugin/test_out_rewrite.rb

@@ -142,6 +142,31 @@ class RewriteOutputTest < Test::Unit::TestCase
     )
   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(
+      [ "test", { "path" => "/bar" } ],
+      d.instance.rewrite("test", { "path" => "/foo" })
+    )
+    assert_equal(
+      [ "test", { "path" => "/baz" } ],
+      d.instance.rewrite("test", { "path" => "/bar" })
+    )
+  end
+
   def test_rewrite_rules
     d = create_driver(%[
       <rule>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rewrite
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake