fluent-plugin-tagged_copy 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 926a7eb28787523670d075f04e8fb1899e951942
-  data.tar.gz: 117ede3f43ccf1c475b1e93ef2630d1bc55ab328
+  metadata.gz: 38965e064c26bb7bca4fffb45b46757f7afcad8e
+  data.tar.gz: 86ec877a8d1468b8d54c7a29b3db1069b8f57eaf
 SHA512:
-  metadata.gz: d55aad021eadd884789bad83839df945a85a66bbf936c54e632544ea02edd70298f01a9fa1cd97f480cccd36659c27d3f5584cdd869fed942bb2905c7a5ea0e0
-  data.tar.gz: 128b4977d657eba9473179b44b4c3c44919f6f7842b6d6769184a6d9358b35ee73bf2550244cd133cd408cbd03323e6b35a3e84eb35af86b58a40f57548b78fe
+  metadata.gz: dba9888630a6da2be2c48b18d1e186c137c681a555e4d0802a2de7eab7994a2d89dd55023c5cda8b70dc3e71e837e6e69f135c865631d68555eb2cb0c64df7cf
+  data.tar.gz: 4ced69264a506126ebb0bc8e697bfcf65818af4fca159fd8c66e8ff010b0d2ae792c1cc3e1669635be08fa47727a883c499ad3c5d24e4be473c35b5a2e868c2a

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.0.2 (2014/04/12)
+
+Enhancements:
+
+* Add add_tag_suffix, and remove_tag_suffix options
+
 ## 0.0.1
 
 First version
+

data/README.md

@@ -44,6 +44,14 @@ But, you can specify `filter` directive with following options
 
     Remove tag prefix for output message
     
+* add_tag_suffix
+
+    Add tag suffix for output message
+
+* remove_tag_suffix
+
+    Remove tag suffix for output message
+    
 ## Contributing
 
 1. Fork it

data/fluent-plugin-tagged_copy.gemspec

@@ -3,12 +3,13 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-tagged_copy"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-tagged_copy"
   s.summary     = "Fluentd out_copy extension to do tagging before copy"
   s.description = s.summary
+  s.licenses    = ["MIT"]
 
   s.rubyforge_project = "fluent-plugin-tagged_copy"
 

data/lib/fluent/plugin/out_tagged_copy.rb

@@ -21,8 +21,13 @@ module Fluent
         log.debug "adding store type=#{type.dump}"
 
         f = e.elements.select {|i| i.name == 'filter'}.first || {}
-        tag_proc = generate_tag_proc(f['tag'], f['add_tag_prefix'], f['remove_tag_prefix'])
-        @tag_procs << tag_proc
+        @tag_procs << tag_proc(
+          f['tag'],
+          f['add_tag_prefix'],
+          f['remove_tag_prefix'],
+          f['add_tag_suffix'],
+          f['remove_tag_suffix']
+        )
 
         output = Plugin.new_output(type)
         output.configure(e)
@@ -49,25 +54,26 @@ module Fluent
 
     private
 
-    def generate_tag_proc(tag, add_tag_prefix, remove_tag_prefix)
-      tag_prefix = "#{add_tag_prefix}." if add_tag_prefix
-      tag_prefix_match = "#{remove_tag_prefix}." if remove_tag_prefix
-      if tag
-        Proc.new {|t| tag }
-      elsif tag_prefix and tag_prefix_match
-        Proc.new {|t| "#{tag_prefix}#{lstrip(t, tag_prefix_match)}" }
+    def tag_proc(tag, add_tag_prefix, remove_tag_prefix, add_tag_suffix, remove_tag_suffix)
+      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 {|t| lstrip(t, tag_prefix_match) }
-      elsif tag_prefix
-        Proc.new {|t| "#{tag_prefix}#{t}" }
+        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 {|t| t }
+        Proc.new {|tag| "#{tag_prefix}#{tag}#{tag_suffix}" }
       end
     end
-
-    def lstrip(string, substring)
-      string.index(substring) == 0 ? string[substring.size..-1] : string
-    end
   end 
 
   class TaggedOutputChain

data/test/plugin/out_tagged_copy.rb

@@ -278,4 +278,78 @@ class TaggedCopyOutputTest < Test::Unit::TestCase
       ['test', time, {"a"=>2}],
     ], second.emits
   end
+
+  def test_add_tag_suffix_emit
+    config = %[
+      <store>
+        <filter>
+          add_tag_suffix first
+        </filter>
+        type test
+        name c0
+      </store>
+      <store>
+        <filter>
+          add_tag_suffix second
+        </filter>
+        type test
+        name c0
+      </store>
+    ]
+    d = create_driver(config)
+
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    d.emit({"a"=>1}, time)
+    d.emit({"a"=>2}, time)
+
+    first = d.instance.outputs.first
+    assert_equal [
+      ['test.first', time, {"a"=>1}],
+      ['test.first', time, {"a"=>2}],
+    ], first.emits
+
+    second = d.instance.outputs[1]
+    assert_equal [
+      ['test.second', time, {"a"=>1}],
+      ['test.second', time, {"a"=>2}],
+    ], second.emits
+  end
+
+  def test_remove_tag_suffix_emit
+    config = %[
+      <store>
+        <filter>
+          remove_tag_suffix first
+        </filter>
+        type test
+        name c0
+      </store>
+      <store>
+        <filter>
+          remove_tag_suffix second
+        </filter>
+        type test
+        name c0
+      </store>
+    ]
+    d = create_driver(config)
+
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    d.tag = 'test.first'
+    d.emit({"a"=>1}, time)
+    d.tag = 'test.second'
+    d.emit({"a"=>2}, time)
+
+    first = d.instance.outputs.first
+    assert_equal [
+      ['test', time, {"a"=>1}],
+      ['test.second', time, {"a"=>2}],
+    ], first.emits
+
+    second = d.instance.outputs[1]
+    assert_equal [
+      ['test.first', time, {"a"=>1}],
+      ['test', time, {"a"=>2}],
+    ], second.emits
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-tagged_copy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -85,7 +85,8 @@ files:
 - test/helper.rb
 - test/plugin/out_tagged_copy.rb
 homepage: https://github.com/sonots/fluent-plugin-tagged_copy
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []