fluent-plugin-eval-filter 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6765bfbe982ee8ab3f79203bc16c41905c367373
-  data.tar.gz: cc5f7b09aae48c79710766f835fe5cf419800209
+  metadata.gz: d49f815a9d7d68a2b0fdf1acee1863d649329984
+  data.tar.gz: a0f8bebad7623fd6404cd01b5e15bcdd55f7ae16
 SHA512:
-  metadata.gz: 05b3f8c2ea08ec5b9aa6865ce8fcee0bb1449d1ffbcbbfbc75d63127396e6b673cda42e53009a804ca47bc50681d61fdc61ca240debbf78df520bac6b3cabbdc
-  data.tar.gz: 70701cb426b287d3494faf4803a0b50306387f8a2a768de03b17e4cea34d28c5d2bc4d44273f695387305487d8469e49bc737eb5d79a288f52dde1b45ec1d7fc
+  metadata.gz: b64c70845fecf3419042615aa3caab263acb2e643555b45e56b5be424ac9316c263f713107559a1068f20235c5afece00aac702ac21b4188d07319553dc3ed14
+  data.tar.gz: abcf947942f1aa1a30a6fb8c0daa9dee18288c91ee1e33f2326592573b39f11efb16a80726a07dcdfc06b5ba03591393ae9f9e326faa24bf913e0907eb7194f2

data/fluent-plugin-eval-filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-eval-filter"
-  spec.version       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["Yuzuki Masaru"]
   spec.email         = ["ephemeralsnow@gmail.com"]
   spec.description   = %q{Fluentd Output eval filter plugin.}

data/lib/fluent/plugin/out_eval_filter.rb

@@ -39,8 +39,10 @@ class Fluent::EvalFilterOutput < Fluent::Output
   def emit(tag, es, chain)
     tag = handle_tag(tag)
     es.each do |time, record|
-      result = filter_record(tag, time, record)
-      Fluent::Engine.emit(*result) if result
+      results = filter_record(tag, time, record)
+      results.each do |result|
+        Fluent::Engine.emit(*result)
+      end
     end
     chain.next
   end
@@ -54,12 +56,16 @@ class Fluent::EvalFilterOutput < Fluent::Output
   end
 
   def filter_record(tag, time, record)
+    results = []
     @filters.each do |filter|
-      filter_result = filter.call(tag, time, record)
-      result = create_result(tag, time, record, filter_result) if filter_result
-      return result if result
+      filter_results = filter.call(tag, time, record)
+      filter_results = [filter_results] unless filter_results.instance_of?(Enumerator)
+      filter_results.each do |filter_result|
+        result = create_result(tag, time, record, filter_result) if filter_result
+        results << result if result
+      end
     end
-    nil
+    results
   end
 
   def create_result(tag, time, record, result)

data/test/plugin/test_out_eval_filter.rb

@@ -184,4 +184,116 @@ class EvalFilterTest < Test::Unit::TestCase
     assert_equal "test.#{hostname}", emits[0][0]
   end
 
+  def test_amplify_tag_filter
+    d = create_driver(%[
+      filter1 (1..3).map { |n| tag + n.to_s }.to_enum
+    ])
+
+    d.run { d.emit({}) }
+
+    emits = d.emits
+    assert_equal 3, emits.size
+    p emits[0]
+    assert_equal "test1", emits[0][0]
+    p emits[1]
+    assert_equal "test2", emits[1][0]
+    p emits[2]
+    assert_equal "test3", emits[2][0]
+  end
+
+  def test_amplify_time_filter
+    d = create_driver(%[
+      filter1 (1..3).map { |n| time + n }.to_enum
+    ])
+
+    d.run { d.emit({}) }
+
+    emits = d.emits
+    assert_equal 3, emits.size
+    p emits[0]
+    assert emits[0][1] > 0
+    p emits[1]
+    assert_equal emits[0][1] + 1, emits[1][1]
+    p emits[2]
+    assert_equal emits[1][1] + 1, emits[2][1]
+  end
+
+  def test_amplify_record_filter
+    d = create_driver(%[
+      filter1 (1..3).map { |n| record.merge({'n' => n}) }.to_enum
+    ])
+
+    d.run { d.emit({'key' => 'value'}) }
+
+    emits = d.emits
+    assert_equal 3, emits.size
+    p emits[0]
+    assert_equal 2, emits[0][2].size
+    assert_equal true, emits[0][2].key?('key')
+    assert_equal 'value', emits[0][2]['key']
+    assert_equal true, emits[0][2].key?('n')
+    assert_equal 1, emits[0][2]['n']
+    p emits[1]
+    assert_equal 2, emits[1][2].size
+    assert_equal true, emits[1][2].key?('key')
+    assert_equal 'value', emits[1][2]['key']
+    assert_equal true, emits[1][2].key?('n')
+    assert_equal 2, emits[1][2]['n']
+    p emits[2]
+    assert_equal 2, emits[2][2].size
+    assert_equal true, emits[2][2].key?('key')
+    assert_equal 'value', emits[2][2]['key']
+    assert_equal true, emits[2][2].key?('n')
+    assert_equal 3, emits[2][2]['n']
+  end
+
+  def test_split_record_filter
+    d = create_driver(%[
+      filter1 record.map { |key, value| [[tag, key].join('.'), {'key' => value}] }.to_enum
+    ])
+
+    d.run { d.emit({'key1' => 'value1', 'key2' => 'value2', 'key3' => 'value3'}) }
+
+    emits = d.emits
+    assert_equal 3, emits.size
+    p emits[0]
+    assert_equal 'test.key1', emits[0][0]
+    assert_equal 1, emits[0][2].size
+    assert_equal true, emits[0][2].key?('key')
+    assert_equal 'value1', emits[0][2]['key']
+    p emits[1]
+    assert_equal 'test.key2', emits[1][0]
+    assert_equal 1, emits[1][2].size
+    assert_equal true, emits[1][2].key?('key')
+    assert_equal 'value2', emits[1][2]['key']
+    p emits[2]
+    assert_equal 'test.key3', emits[2][0]
+    assert_equal 1, emits[2][2].size
+    assert_equal true, emits[2][2].key?('key')
+    assert_equal 'value3', emits[2][2]['key']
+  end
+
+  def test_split_array_in_record_filter
+    d = create_driver(%[
+      filter1 record['array'].map { |v| {'value' => v} }.to_enum
+    ])
+
+    d.run { d.emit({'array' => ['test1', 'test2', 'test3']}) }
+
+    emits = d.emits
+    assert_equal 3, emits.size
+    p emits[0]
+    assert_equal 1, emits[0][2].size
+    assert_equal true, emits[0][2].key?('value')
+    assert_equal 'test1', emits[0][2]['value']
+    p emits[1]
+    assert_equal 1, emits[1][2].size
+    assert_equal true, emits[1][2].key?('value')
+    assert_equal 'test2', emits[1][2]['value']
+    p emits[2]
+    assert_equal 1, emits[2][2].size
+    assert_equal true, emits[2][2].key?('value')
+    assert_equal 'test3', emits[2][2]['value']
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-eval-filter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yuzuki Masaru
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd