fluent-plugin-rewrite-tag-filter 1.5.1 → 1.5.2

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 
 rvm:
+  - 2.2
   - 2.1
   - 2.0.0
   - 1.9.3

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

@@ -3,8 +3,8 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-rewrite-tag-filter"
-  s.version     = "1.5.1"
-  s.license     = "Apache 2.0"
+  s.version     = "1.5.2"
+  s.license     = "Apache-2.0"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-rewrite-tag-filter"
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_development_dependency "test-unit"
   s.add_development_dependency "rake"
   s.add_runtime_dependency "fluentd"
   s.add_runtime_dependency "string-scrub", "= 0.0.3" if RUBY_VERSION.to_f < 2.1

data/lib/fluent/plugin/out_rewrite_tag_filter.rb

@@ -1,6 +1,11 @@
 class Fluent::RewriteTagFilterOutput < Fluent::Output
   Fluent::Plugin.register_output('rewrite_tag_filter', self)
 
+  # To support Fluentd v0.10.57 or earlier
+  unless method_defined?(:router)
+    define_method("router") { Fluent::Engine }
+  end
+
   config_param :capitalize_regex_backreference, :bool, :default => false
   config_param :remove_tag_prefix, :string, :default => nil
   config_param :hostname_command, :string, :default => 'hostname'
@@ -56,7 +61,7 @@ class Fluent::RewriteTagFilterOutput < Fluent::Output
     es.each do |time,record|
       rewrited_tag = rewrite_tag(tag, record)
       next if rewrited_tag.nil? || tag == rewrited_tag
-      Fluent::Engine.emit(rewrited_tag, time, record)
+      router.emit(rewrited_tag, time, record)
     end
 
     chain.next
@@ -89,17 +94,15 @@ class Fluent::RewriteTagFilterOutput < Fluent::Output
     begin
       return if regexp.nil?
       regexp.match(rewritevalue)
-      return $~
     rescue ArgumentError => e
       raise e unless e.message.index('invalid byte sequence in') == 0
       regexp.match(rewritevalue.scrub('?'))
-      return $~
     end
   end
 
   def parse_rewriterule(rule)
-    if rule.match(/^([^\s]+)\s+(.+?)\s+([^\s]+)$/)
-      return $~.captures
+    if m = rule.match(/^([^\s]+)\s+(.+?)\s+([^\s]+)$/)
+      return m.captures
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rewrite-tag-filter
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +96,7 @@ files:
 - test/plugin/test_out_rewrite_tag_filter.rb
 homepage: https://github.com/y-ken/fluent-plugin-rewrite-tag-filter
 licenses:
-- Apache 2.0
+- Apache-2.0
 post_install_message: 
 rdoc_options: []
 require_paths: