fluent-plugin-grep 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96e41f9ac8b3207023da172df7e94f0890dda86d
-  data.tar.gz: 5e0d3601c87d4a5cba48dd0395947287e36285e9
+  metadata.gz: 2e382e08c49b5adc65ff681356c292423a90eff1
+  data.tar.gz: 6eeb7e28f4e75a25a15ff816299062625fa5939d
 SHA512:
-  metadata.gz: ec7018222ac042c04f005e9e3d294c2e32d810cd6296ddf7139b67685008546cdfcd7599e83c11a41c5cc9774f7eb7f1871a49725eccb847a5017038952a7685
-  data.tar.gz: 52f35e4778260dfffaf3ccc6b4d8ca09d37b5597e3a140a93c9201a175ed6b634f17ee6510bbaf4ee6951064c020ecbc81d0673c4934779601e9ddfe252b6e90
+  metadata.gz: eb7f1ab442ae55877b383bfacb4e8b44d723052574fdd4d870f3c32b10ca19b209a8749eeb641779cbbc9f6851167586f97b9c0f487fdf2f9d63303ea7b1c912
+  data.tar.gz: 959c770dbfc9dc31326f311c1ade4d9c85b6831a3a192dcece72d17aa7ba951e53a9dbc8eec7f91a80a4ececa3c216be7bb7b2f18cc03e6dcfabe77c4d8c26d3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.1 (2013/12/12)
+
+Features:
+
+- Allow to use `remove_tag_prefix` option alone
+
 ## 0.2.0 (2013/11/30)
 
 Features:

data/fluent-plugin-grep.gemspec

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

data/lib/fluent/plugin/out_grep.rb

@@ -5,7 +5,7 @@ class Fluent::GrepOutput < Fluent::Output
   config_param :regexp, :string, :default => nil
   config_param :exclude, :string, :default => nil
   config_param :tag, :string, :default => nil
-  config_param :add_tag_prefix, :string, :default => 'greped'
+  config_param :add_tag_prefix, :string, :default => nil
   config_param :remove_tag_prefix, :string, :default => nil
   config_param :replace_invalid_sequence, :bool, :default => false
 
@@ -15,9 +15,13 @@ class Fluent::GrepOutput < Fluent::Output
     @input_key = @input_key.to_s
     @regexp = Regexp.compile(@regexp) if @regexp
     @exclude = Regexp.compile(@exclude) if @exclude
-    @tag_prefix = "#{@add_tag_prefix}."
-    @tag_prefix_match = "#{@remove_tag_prefix}." if @remove_tag_prefix
 
+    if @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil?
+      @add_tag_prefix = 'greped' # not ConfigError to support lower version compatibility
+    end
+
+    @tag_prefix = "#{@add_tag_prefix}." if @add_tag_prefix
+    @tag_prefix_match = "#{@remove_tag_prefix}." if @remove_tag_prefix
     @tag_proc =
       if @tag
         Proc.new {|tag| @tag }

data/spec/out_grep_spec.rb

@@ -119,13 +119,12 @@ describe Fluent::GrepOutput do
       let(:config) do
         CONFIG + %[
           regexp ping
-          add_tag_prefix foo
           remove_tag_prefix syslog
         ]
       end
       before do
         Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("foo.host1", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
+        Fluent::Engine.should_receive(:emit).with("host1", time, {'foo'=>'bar', 'message'=>"2013/01/13T07:02:11.124202 INFO GET /ping"})
       end
       it { emit }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grep
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd