fluent-plugin-map 0.0.3 → 0.0.3.1

data/fluent-plugin-map.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-map"
-  s.version     = "0.0.3"
+  s.version     = "0.0.3.1"
   s.authors     = ["Kohei Tomita"]
   s.email       = ["tommy.fmale@gmail.com"]
   s.homepage    = "https://github.com/tomity/fluent-plugin-map"

data/lib/fluent/plugin/out_map.rb

@@ -4,7 +4,8 @@ module Fluent
     Fluent::Plugin.register_output('map', self)
 
     config_param :map, :string, :default => nil
-    config_param :key, :string, :default => nil
+    config_param :tag, :string, :default => nil
+    config_param :key, :string, :default => nil #deprected
     config_param :time, :string, :default => nil
     config_param :record, :string, :default => nil
     config_param :multi, :bool, :default => false
@@ -14,9 +15,10 @@ module Fluent
       if @map
         $log.debug { "map: #{@map}" }
         @mode = "tuple"
-      elsif @key && @time && @record
-        raise ConfigError, "multi and 3 parameters(key, time, and record) are not compatible" if @multi
-        $log.debug { "key: #{@key}, time: #{@time}, record: #{@record}" }
+      elsif (@tag || @key) && @time && @record
+        @tag ||= @key
+        raise ConfigError, "multi and 3 parameters(tag, time, and record) are not compatible" if @multi
+        $log.debug { "tag: #{@tag}, time: #{@time}, record: #{@record}" }
         @mode = "each"
       else
         raise ConfigError, "Either map or 3 parameters(key, time, and record) is required "
@@ -36,10 +38,10 @@ module Fluent
               tuples << new_tuple
             end
           when "each"
-            new_key = eval(@key)
+            new_tag = eval(@tag)
             new_time = eval(@time)
             new_record = eval(@record)
-            tuples << [new_key, new_time, new_record]
+            tuples << [new_tag, new_time, new_record]
           end
         }
         tuples.each do |tag, time, record|

data/test/plugin/test_out_map.rb

@@ -80,6 +80,25 @@ class MapOutputTest < Test::Unit::TestCase
     assert e.kind_of?(SyntaxError)
   end
 
+  def test_tag_convert_using_tag_time_record
+    tag = 'tag'
+    time = Time.local(2012, 10, 10, 10, 10, 10)
+    record = {'code' => '300'}
+
+    d1 = create_driver %[
+      tag "newtag"
+      time time
+      record record
+    ], tag
+    d1.run do
+      d1.emit(record, time)
+    end
+    emits = d1.emits
+    assert_equal 1, emits.length
+    assert_equal ["newtag", time.to_i, record], emits[0]
+  end
+
+  #deprected specification test
   def test_tag_convert_using_key_time_record
     tag = 'tag'
     time = Time.local(2012, 10, 10, 10, 10, 10)
@@ -98,7 +117,7 @@ class MapOutputTest < Test::Unit::TestCase
     assert_equal ["newtag", time.to_i, record], emits[0]
   end
 
-  def test_config_error_key
+  def test_config_error_tag
     tag = "tag"
     time = Time.local(2012, 10, 10, 10, 10, 0)
     record = {'code' => '300'}
@@ -119,7 +138,7 @@ class MapOutputTest < Test::Unit::TestCase
     #require time
     assert_raise(Fluent::ConfigError){
       create_driver %[
-        key "newtag"
+        tag "newtag"
         record record
       ], tag
     }
@@ -132,7 +151,7 @@ class MapOutputTest < Test::Unit::TestCase
     #require record
     assert_raise(Fluent::ConfigError){
       create_driver %[
-        key "newtag"
+        tag "newtag"
         time time
       ], tag
     }
@@ -147,7 +166,7 @@ class MapOutputTest < Test::Unit::TestCase
     #require time
     assert_raise(Fluent::ConfigError){
       create_driver %[
-        key "newtag"
+        tag "newtag"
         time time
         record record
         multi true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-map
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70263359418000 !ruby/object:Gem::Requirement
+  requirement: &70202612149300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70263359418000
+  version_requirements: *70202612149300
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &70263359417460 !ruby/object:Gem::Requirement
+  requirement: &70202612148700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.10.24
   type: :development
   prerelease: false
-  version_requirements: *70263359417460
+  version_requirements: *70202612148700
 description: ! 'fluent-plugin-map is the non-buffered plugin that can convert an event
   log to different event log(s).  '
 email: