fluent-plugin-grepcounter 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02fcfc4239d3f9c72ad1831c502ffa09c71552f8
-  data.tar.gz: e341d89ebae652e888159f2e830c4ed3252dcc3d
+  metadata.gz: 90eca84d0b796ebd73afe0413d519a7d5d0517ec
+  data.tar.gz: 39accc620e237df5075a40d8c752535df1c9c989
 SHA512:
-  metadata.gz: 530e25bea4620fe5798183dbb48d3c1a8a5b760fc05f28fed0bba103392ab65d02e19922946fc8b920945f069368cd0e6388885dd993dc8d77a389ed1171280a
-  data.tar.gz: cf539ce20180ab51363a4e5f03cd46179b2530322f3d1f553cbd9e9942acda61eb307ae0a1f15407021765eee34fec55855b4877b67ea8b07601ecc4eaa84e32
+  metadata.gz: e6fc4b7c068508e720d119c8ce7ed41c1b686259aac99bdaa44dd3e1ecfb0274f92eb6371eab2aee7cef510a437aa5c65f0ecd9c6469af5d53965f9b1d6e0c01
+  data.tar.gz: fdf50b8f80388238581370f1491a967af796f2cd4dcebaca5be2a0293157a72d5b7098d4d36369193567843740ae8d42b8d8a552706deeaf21716f35ddb89e2e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.4 (2014/04/12)
+
+Changes:
+
+* Allow . in tag options to support compatibility with HandleTagNameMixin
+
 ## 0.5.3 (2014/04/11)
 
 Enhancement:

data/fluent-plugin-grepcounter.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-grepcounter"
-  s.version     = "0.5.3"
+  s.version     = "0.5.4"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-grepcounter"

data/lib/fluent/plugin/out_grepcounter.rb

@@ -97,22 +97,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
     if @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil? and @add_tag_suffix.nil? and @remove_tag_suffix.nil?
       @add_tag_prefix = 'count' # not ConfigError to support lower version compatibility
     end
-    @tag_prefix = "#{@add_tag_prefix}." if @add_tag_prefix
-    @tag_suffix = ".#{@add_tag_suffix}" if @add_tag_suffix
-    @tag_prefix_match = "#{@remove_tag_prefix}." if @remove_tag_prefix
-    @tag_suffix_match = ".#{@remove_tag_suffix}" if @remove_tag_suffix
-    @tag_proc =
-      if @tag
-        Proc.new {|tag| @tag }
-      elsif @tag_prefix_match and @tag_suffix_match
-        Proc.new {|tag| "#{@tag_prefix}#{rstrip(lstrip(tag, @tag_prefix_match), @tag_suffix_match)}#{@tag_suffix}" }
-      elsif @tag_prefix_match
-        Proc.new {|tag| "#{@tag_prefix}#{lstrip(tag, @tag_prefix_match)}#{@tag_suffix}" }
-      elsif @tag_suffix_match
-        Proc.new {|tag| "#{@tag_prefix}#{rstrip(tag, @tag_suffix_match)}#{@tag_suffix}" }
-      else
-        Proc.new {|tag| "#{@tag_prefix}#{tag}#{@tag_suffix}" }
-      end
+    @tag_proc = tag_proc
 
     case @aggregate
     when 'all'
@@ -249,12 +234,25 @@ class Fluent::GrepCounterOutput < Fluent::Output
     output
   end
 
-  def rstrip(string, substring)
-    string.chomp(substring)
-  end
-
-  def lstrip(string, substring)
-    string.index(substring) == 0 ? string[substring.size..-1] : string
+  def tag_proc
+    rstrip = Proc.new {|str, substr| str.chomp(substr) }
+    lstrip = Proc.new {|str, substr| str.start_with?(substr) ? str[substr.size..-1] : str }
+    tag_prefix = "#{rstrip.call(@add_tag_prefix, '.')}." if @add_tag_prefix
+    tag_suffix = ".#{lstrip.call(@add_tag_suffix, '.')}" if @add_tag_suffix
+    tag_prefix_match = "#{rstrip.call(@remove_tag_prefix, '.')}." if @remove_tag_prefix
+    tag_suffix_match = ".#{lstrip.call(@remove_tag_suffix, '.')}" if @remove_tag_suffix
+    tag_fixed = @tag if @tag
+    if tag_fixed
+      Proc.new {|tag| tag_fixed }
+    elsif tag_prefix_match and tag_suffix_match
+      Proc.new {|tag| "#{tag_prefix}#{rstrip.call(lstrip.call(tag, tag_prefix_match), tag_suffix_match)}#{tag_suffix}" }
+    elsif tag_prefix_match
+      Proc.new {|tag| "#{tag_prefix}#{lstrip.call(tag, tag_prefix_match)}#{tag_suffix}" }
+    elsif tag_suffix_match
+      Proc.new {|tag| "#{tag_prefix}#{rstrip.call(tag, tag_suffix_match)}#{tag_suffix}" }
+    else
+      Proc.new {|tag| "#{tag_prefix}#{tag}#{tag_suffix}" }
+    end
   end
 
   def match(regexp, string)

data/spec/out_grepcounter_spec.rb

@@ -355,6 +355,46 @@ describe Fluent::GrepCounterOutput do
       it { emit }
     end
 
+    context 'add_tag_prefix.' do
+      let(:config) { CONFIG + %[add_tag_prefix foo.] }
+      let(:tag) { 'syslog.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("foo.#{tag}", time, expected)
+      end
+      it { emit }
+    end
+
+    context 'remove_tag_prefix.' do
+      let(:config) { CONFIG + %[remove_tag_prefix syslog.] }
+      let(:tag) { 'syslog.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("host1", time, expected)
+      end
+      it { emit }
+    end
+
+    context '.add_tag_suffix' do
+      let(:config) { CONFIG + %[add_tag_suffix .foo] }
+      let(:tag) { 'syslog.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("#{tag}.foo", time, expected)
+      end
+      it { emit }
+    end
+
+    context '.remove_tag_suffix' do
+      let(:config) { CONFIG + %[remove_tag_suffix .host1] }
+      let(:tag) { 'syslog.host1' }
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("syslog", time, expected)
+      end
+      it { emit }
+    end
+
     context 'output_with_joined_delimiter (obsolete)' do
       # \\n shall be \n in config file
       let(:config) { CONFIG + %[output_with_joined_delimiter \\n] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grepcounter
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Naotoshi Seo