fluent-plugin-rewrite-tag-filter 1.3.0 → 1.3.1

data/README.md

@@ -24,7 +24,7 @@ gem install fluent-plugin-rewrite-tag-filter
 ### Syntax
 
 ```
-rewriterule<num:1-200> <attribute> <regex_pattern> <new_tag>
+rewriterule<num> <attribute> <regex_pattern> <new_tag>
 
 # Optional: Capitalize every matched regex backreference. (ex: $1, $2)
 capitalize_regex_backreference <yes/no> (default no)
@@ -176,9 +176,16 @@ https://gist.github.com/matsumana/4078096
 - 稼働中のFluentdにflowcounter pluginを導入してみた  
 http://dayafterneet.blogspot.jp/2012/12/fluentdflowcounter-plugin.html
 
-- fluent-plugin-rewrite-tag-filter v1.2.0 をリリースしました。新機能を紹介します。 #fluentd  
+- fluent-plugin-rewrite-tag-filter v1.2.0 をリリースしました。新機能であるremove_tag_prefix設定の使い方を解説します。 #fluentd  
 http://y-ken.hatenablog.com/entry/fluent-plugin-rewrite-tag-filter-v1.2.0
 
+- fluent-plugin-rewrite-tag-filter v1.2.1 をリリースしました。設定サンプルと共にプレースホルダ機能強化内容を紹介します。 #fluentd  
+http://y-ken.hatenablog.com/entry/fluent-plugin-rewrite-tag-filter-v1.2.1
+
+- 待望の正規表現の否定パターンに対応した fluent-plugin-rewrite-tag-filter v1.3.0 をリリースしました #fluentd  
+http://y-ken.hatenablog.com/entry/fluent-plugin-rewrite-tag-filter-v1.3.0
+
+
 ## TODO
 
 Pull requests are very welcome!!

data/fluent-plugin-rewrite-tag-filter.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-rewrite-tag-filter"
-  s.version     = "1.3.0"
+  s.version     = "1.3.1"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-rewrite-tag-filter"

data/lib/fluent/plugin/out_rewrite_tag_filter.rb

@@ -19,7 +19,7 @@ class Fluent::RewriteTagFilterOutput < Fluent::Output
       if regexp.nil? || rewritetag.nil?
         raise Fluent::ConfigError, "failed to parse rewriterules at #{key} #{conf[key]}"
       end
-      @rewriterules.push([rewritekey, Regexp.new(trim_regex_quote(regexp)), get_match_operator(regexp), rewritetag])
+      @rewriterules.push([rewritekey, /#{trim_regex_quote(regexp)}/, get_match_operator(regexp), rewritetag])
       rewriterule_names.push(rewritekey + regexp)
       $log.info "adding rewrite_tag_filter rule: #{key} #{@rewriterules.last}"
     end
@@ -32,8 +32,8 @@ class Fluent::RewriteTagFilterOutput < Fluent::Output
       raise Fluent::ConfigError, "duplicated rewriterules found #{@rewriterules.inspect}"
     end
 
-    unless conf['remove_tag_prefix'].nil?
-      @remove_tag_prefix = Regexp.new("^#{Regexp.escape(remove_tag_prefix)}\.?")
+    unless @remove_tag_prefix.nil?
+      @remove_tag_prefix = /^#{Regexp.escape(@remove_tag_prefix)}\.?/
     end
   end
 
@@ -59,9 +59,9 @@ class Fluent::RewriteTagFilterOutput < Fluent::Output
       else
         next if !matched
         backreference_table = get_backreference_table($~.captures)
-        rewritetag.gsub!(/\$\d+/, backreference_table)
+        rewritetag = rewritetag.gsub(/\$\d+/, backreference_table)
       end
-      rewritetag.gsub!(/(\${[a-z]+}|__[A-Z]+__)/, placeholder)
+      rewritetag = rewritetag.gsub(/(\${[a-z]+}|__[A-Z]+__)/, placeholder)
       return rewritetag
     end
     return nil
@@ -78,14 +78,14 @@ class Fluent::RewriteTagFilterOutput < Fluent::Output
       $log.info "rewrite_tag_filter: [DEPRECATED] Use ^....$ pattern for partial word match instead of double-quote-delimiter. #{regexp}"
       regexp = regexp[1..-2]
     end
-    if regexp.start_with?('!')
+    if regexp.start_with?(MATCH_OPERATOR_EXCLUDE)
       regexp = regexp[1, regexp.length]
     end
     return regexp
   end
 
   def get_match_operator(regexp)
-    return '!' if regexp.start_with?('!')
+    return MATCH_OPERATOR_EXCLUDE if regexp.start_with?(MATCH_OPERATOR_EXCLUDE)
     return ''
   end
 

data/test/plugin/test_out_rewrite_tag_filter.rb

@@ -30,6 +30,12 @@ class RewriteTagFilterOutputTest < Test::Unit::TestCase
     remove_tag_prefix input
   ]
 
+  # remove_tag_prefix test2
+  CONFIG_REMOVE_TAG_PREFIX_WITH_DOT = %[
+    rewriterule1 domain ^www\.google\.com$ ${tag}
+    remove_tag_prefix input.
+  ]
+
   # hostname placeholder test
   CONFIG_SHORT_HOSTNAME = %[
     rewriterule1 domain ^www\.google\.com$ ${hostname}
@@ -129,7 +135,18 @@ class RewriteTagFilterOutputTest < Test::Unit::TestCase
     assert_equal 'access', emits[0][0] # tag
   end
 
-  def test_emit4_short_hostname
+  def test_emit4_remove_tag_prefix_with_dot
+    d1 = create_driver(CONFIG_REMOVE_TAG_PREFIX_WITH_DOT, 'input.access')
+    d1.run do
+      d1.emit({'domain' => 'www.google.com', 'path' => '/foo/bar?key=value', 'agent' => 'Googlebot', 'response_time' => 1000000})
+    end
+    emits = d1.emits
+    assert_equal 1, emits.length
+    p emits[0]
+    assert_equal 'access', emits[0][0] # tag
+  end
+
+  def test_emit5_short_hostname
     d1 = create_driver(CONFIG_SHORT_HOSTNAME, 'input.access')
     d1.run do
       d1.emit({'domain' => 'www.google.com', 'path' => '/foo/bar?key=value', 'agent' => 'Googlebot', 'response_time' => 1000000})
@@ -140,7 +157,7 @@ class RewriteTagFilterOutputTest < Test::Unit::TestCase
     assert_equal `hostname -s`.chomp, emits[0][0] # tag
   end
 
-  def test_emit5_non_matching
+  def test_emit6_non_matching
     d1 = create_driver(CONFIG_NON_MATCHING, 'input.access')
     d1.run do
       d1.emit({'domain' => 'www.google.com'})
@@ -157,7 +174,7 @@ class RewriteTagFilterOutputTest < Test::Unit::TestCase
     assert_equal 'not_start_with_www', emits[2][0] # tag
   end
 
-  def test_emit6_jump_index
+  def test_emit7_jump_index
     d1 = create_driver(CONFIG_JUMP_INDEX, 'input.access')
     d1.run do
       d1.emit({'domain' => 'www.google.com', 'path' => '/', 'agent' => 'Googlebot', 'response_time' => 1000000})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rewrite-tag-filter
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake