fluent-plugin-map 0.0.1 → 0.0.2

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.1"
+  s.version     = "0.0.2"
   s.authors     = ["Kohei Tomita"]
   s.email       = ["tommy.fmale@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/tomity/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).  }
 
@@ -17,8 +17,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-  s.add_development_dependency "rake"
-  s.add_development_dependency "fluentd"
-  # s.add_runtime_dependency "rest-client"
+  s.add_development_dependency "rake", "~> 0.9.2.2"
+  s.add_development_dependency "fluentd", "~> 0.10.24"
 end

data/lib/fluent/plugin/out_map.rb

@@ -12,21 +12,30 @@ module Fluent
     end
 
     def emit(tag, es, chain)
-      tuples = []
-      es.each {|time, record|
-        new_tuple = eval(@map)
-        if @multi
-          tuples.concat new_tuple
-        else
-          tuples << new_tuple
+      begin
+        tuples = []
+        es.each {|time, record|
+          new_tuple = eval(@map)
+          if @multi
+            tuples.concat new_tuple
+          else
+            tuples << new_tuple
+          end
+        }
+        tuples.each do |tag, time, record|
+          if time == nil or record == nil
+            raise SyntaxError.new
+          end
+          $log.trace { [tag, time, record].inspect }
+          Fluent::Engine::emit(tag, time, record)
         end
-      }
-      tuples.each do |tag, time, record|
-        $log.trace { [tag, time, record].inspect }
-        Fluent::Engine::emit(tag, time, record)
+        chain.next
+        tuples
+      rescue SyntaxError => e
+        chain.next
+        $log.error "Select_if command is syntax error: #{@map}"
+        e #for test
       end
-      chain.next
-      tuples
     end
   end
 end

data/test/plugin/test_out_map.rb

@@ -47,4 +47,36 @@ class MapOutputTest < Test::Unit::TestCase
     assert_equal ["tag1", time.to_i, record], emits[0]
     assert_equal ["tag2", time.to_i, record], emits[1]
   end
+
+  def test_syntax_error
+    tag = "tag"
+    time = Time.local(2012, 10, 10, 10, 10, 0)
+    record = {'code' => '300'}
+
+    #map is syntax error
+    syntax_error_config = %[
+      map tag.
+    ]
+    d1 = create_driver(syntax_error_config, tag)
+    es = Fluent::OneEventStream.new(time.to_i, record)
+    chain = Fluent::Test::TestOutputChain.new
+    e =  d1.instance.emit(tag, es, chain)
+    assert e.kind_of?(SyntaxError)
+  end
+
+  def test_syntax_error2
+    tag = "tag"
+    time = Time.local(2012, 10, 10, 10, 10, 0)
+    record = {'code' => '300'}
+
+    #map output lligal format
+    syntax_error_config = %[
+      map tag
+    ]
+    d1 = create_driver(syntax_error_config, tag)
+    es = Fluent::OneEventStream.new(time.to_i, record)
+    chain = Fluent::Test::TestOutputChain.new
+    e =  d1.instance.emit(tag, es, chain)
+    assert e.kind_of?(SyntaxError)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-map
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000Z
+date: 2012-07-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70350721521500 !ruby/object:Gem::Requirement
+  requirement: &70329973241780 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70350721521500
+  version_requirements: *70329973241780
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &70350721520660 !ruby/object:Gem::Requirement
+  requirement: &70329973241200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.24
   type: :development
   prerelease: false
-  version_requirements: *70350721520660
+  version_requirements: *70329973241200
 description: ! 'fluent-plugin-map is the non-buffered plugin that can convert an event
   log to different event log(s).  '
 email:
@@ -49,7 +49,7 @@ files:
 - lib/fluent/plugin/out_map.rb
 - test/helper.rb
 - test/plugin/test_out_map.rb
-homepage: ''
+homepage: https://github.com/tomity/fluent-plugin-map
 licenses: []
 post_install_message: 
 rdoc_options: []