fluent-plugin-map 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b302dc881feff3cac6eaeb20d2fb12f9ad1ae4a1
-  data.tar.gz: c3112052a37a51f54261c3fb8f7d5ca1261c20e2
+  metadata.gz: a4ad3a04fd6a20ad899c5bbcdc8677c4a168d99e
+  data.tar.gz: e71017da3b0fc6996bd61cda02a65250115e0c0d
 SHA512:
-  metadata.gz: f44a0174b92c370bfa09516e8cf4eb1fec642c72811c9b40d338dcbcae71fc1c995b45e8f1fdcee7990ba64af1226406f74e0b7eccbbfdb462389cebf80fa630
-  data.tar.gz: 902ad79813947cc1710a3afe161ecb102372061904982d1a86afef26bbaf675e9ef33f6b3f6f1fd824507f0a13acc2a25fda484feb217533e3babeea37138248
+  metadata.gz: b31eac601f6eaca70e7a13248ffd0d9933577e457358a41ad52cda3652d79fa4d13e2295d126d86a8a543bd77f363e60a52042fc3af76f2e5cc2a74e9d564649
+  data.tar.gz: cae9c24f03345592f87087e3ac1ab1f5557bbc57cd3825fea2c94a94956e4201f0771f4d5dcde31e53c54e761eb8f3f239c1e4f3025c279dc1b3001a6334e7bc

data/README.markdown

@@ -1,6 +1,6 @@
 # fluent-plugin-map
 
-[![Build Status](https://travis-ci.org/tomity/fluent-plugin-map.svg?branch=master)](https://travis-ci.org/tomity/fluent-plugin-map)
+[![Build Status](https://travis-ci.org/fluent-plugins-nursery/fluent-plugin-map.svg?branch=master)](https://travis-ci.org/fluent-plugins-nursery/fluent-plugin-map)
 
 fluent-plugin-map(out\_map) is the non-buffered plugin that can convert an event log to different event log(s)
 

data/fluent-plugin-map.gemspec

@@ -3,10 +3,10 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-map"
-  s.version     = "0.0.6"
-  s.authors     = ["Kohei Tomita"]
-  s.email       = ["tommy.fmale@gmail.com"]
-  s.homepage    = "https://github.com/tomity/fluent-plugin-map"
+  s.version     = "0.1.0"
+  s.authors     = ["Kohei Tomita", "Hiroshi Hatake", "Kenji Okomoto"]
+  s.email       = ["tommy.fmale@gmail.com", "cosmo0920.oucc@gmail.com", "okkez000@gmail.com"]
+  s.homepage    = "https://github.com/fluent-plugins-nursery/fluent-plugin-map"
   s.summary     = %q{fluent-plugin-map is the non-buffered plugin that can convert an event log to different event log(s). }
   s.description = %q{fluent-plugin-map is the non-buffered plugin that can convert an event log to different event log(s).  }
 
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.license       = "Apache-2.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "fluentd", [">= 0.10.24", "< 2"]

data/lib/fluent/plugin/out_map.rb

@@ -1,3 +1,18 @@
+#
+# fluent-plugin-map
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
 
 module Fluent
   class MapOutput < Fluent::Output
@@ -8,6 +23,10 @@ module Fluent
       define_method("router") { Fluent::Engine }
     end
 
+    unless method_defined?(:log)
+      define_method("log") { $log }
+    end
+
     config_param :map, :string, :default => nil
     config_param :tag, :string, :default => nil
     config_param :key, :string, :default => nil #deprecated
@@ -24,6 +43,11 @@ module Fluent
       @format = determine_format()
       configure_format()
       @map = create_map(conf)
+      singleton_class.module_eval(<<-CODE)
+        def map_func(tag, time, record)
+          #{@map}
+        end
+      CODE
     end
 
     def determine_format()
@@ -110,7 +134,7 @@ module Fluent
         tag_output_es
       rescue SyntaxError => e
         chain.next
-        $log.error "map command is syntax error: #{@map}"
+        log.error "map command is syntax error: #{@map}"
         e #for test
       end
     end
@@ -124,7 +148,7 @@ module Fluent
           raise SyntaxError.new
         end
         tag_output_es[tag].add(time, record)
-        $log.trace { [tag, time, record].inspect }
+        log.trace { [tag, time, record].inspect }
       end
       tag_output_es
     end
@@ -132,7 +156,7 @@ module Fluent
     def generate_tuples(tag, es)
       tuples = []
       es.each {|time, record|
-        new_tuple = eval(@map)
+        new_tuple = map_func(tag, time, record)
         tuples.concat new_tuple
       }
       tuples
@@ -144,7 +168,7 @@ module Fluent
           yield
         }
       rescue Timeout::Error
-        $log.error {"Timeout: #{Time.at(time)} #{tag} #{record.inspect}"}
+        log.error {"Timeout: #{Time.at(time)} #{tag} #{record.inspect}"}
       end
     end
   end

data/test/plugin/test_out_map.rb

@@ -57,11 +57,9 @@ class MapOutputTest < Test::Unit::TestCase
     syntax_error_config = %[
       map tag.
     ]
-    d1 = create_driver(syntax_error_config, tag)
-    es = Fluent::OneEventStream.new(time, record)
-    chain = Fluent::Test::TestOutputChain.new
-    e =  d1.instance.emit(tag, es, chain)
-    assert e.kind_of?(SyntaxError)
+    assert_raise SyntaxError do
+      d1 = create_driver(syntax_error_config, tag)
+    end
   end
 
   def test_syntax_error2
@@ -173,22 +171,19 @@ class MapOutputTest < Test::Unit::TestCase
     }
   end
 
-  def test_timeout
+  def test_config_error_sleep
     tag = 'tag'
     time = Time.local(2012, 10, 10, 10, 10, 10).to_i
     record = {'code' => '300'}
 
-    d1 = create_driver %[
-      key "newtag"
-      time sleep 10
-      record record
-      timeout 1s
-    ], tag
-    d1.run do
-      d1.emit(record, time)
-    end
-    emits = d1.emits
-    assert_equal 0, emits.length
+    assert_raise(SyntaxError) {
+      create_driver %[
+        key "newtag"
+        time sleep 10
+        record record
+        timeout 1s
+      ], tag
+    }
   end
 
   # Add format test

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-map
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Kohei Tomita
+- Hiroshi Hatake
+- Kenji Okomoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,6 +78,8 @@ description: 'fluent-plugin-map is the non-buffered plugin that can convert an e
   log to different event log(s).  '
 email:
 - tommy.fmale@gmail.com
+- cosmo0920.oucc@gmail.com
+- okkez000@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -94,8 +98,9 @@ files:
 - lib/fluent/plugin/out_map.rb
 - test/helper.rb
 - test/plugin/test_out_map.rb
-homepage: https://github.com/tomity/fluent-plugin-map
-licenses: []
+homepage: https://github.com/fluent-plugins-nursery/fluent-plugin-map
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -113,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-map
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: fluent-plugin-map is the non-buffered plugin that can convert an event log