fluent-plugin-array-splitter 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b744e9de9c27aef607ee4954f10942b1a1de51ed36767ead52026abe028b171
-  data.tar.gz: b456cd234a8940164f8d4efd4372724224fb504cd55ab5b81a4435445a2d5655
+  metadata.gz: 0bf5d03998979b55a12ce89992692bbda3b010bfbccb2b1cf9dbd670a3c63cec
+  data.tar.gz: 311c9c506b8e7e3b1a48fa77df5e500ac630b7df3797066756beafe985e4468b
 SHA512:
-  metadata.gz: d666f6b204fd61c70a2e033edce5fde4a174d8e36e549eda9330b97bf5cc47eb9ad994e088185e56cda0884728546090095b532896ee28f6985c6675c609ee9b
-  data.tar.gz: b39b59481bf68ffe1b1831904d1a356fc5a4567818419e30881f882bd81a3ceed9755d101c81634136c6fef2c53a5d029da4c23f7c8c87505d1cf76f0c25e4ea
+  metadata.gz: 789c595e0ae1f9c8cc14d8668e25dba1984e72f1df6c8c51eb29ecb5299ee2fa3482936e78d9ba28427cf7f25c38dc45a336b26080960934af54b6e0f7ec93e2
+  data.tar.gz: 00e5532d24f9eb2e2e0ecc7829356daca338f5a26f79deaaccae09ec1414aba3c74fabe65e7f83dfe2daffa8ab0d5645e3bfdae673bab0879106210c56c5a13b

data/fluent-plugin-array-splitter.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-array-splitter"
-  spec.version = "0.1.0"
+  spec.version = "0.1.2"
   spec.authors = ["pcoffmanjr"]
   spec.email   = ["pcoffman@ctc-america.com"]
 

data/lib/fluent/plugin/filter_array_splitter.rb

@@ -7,28 +7,30 @@ module Fluent
     class ArraySplitterFilter < Fluent::Plugin::Filter
       Fluent::Plugin.register_filter("array_splitter", self)
 
+      desc 'The field name to split and expand array values'
+      config_param :array_key, :string, default: 'message'
+
       def configure(conf)
         super
+        raise Fluent::ConfigError, "'array_key' parameter is required" unless conf.has_key?('array_key')
         log.info "Configuring Array Splitter Filter"
       end
 
       def filter_stream(tag, es)
         new_es = Fluent::MultiEventStream.new
         es.each do |time, record|
-          if record['message'].is_a?(Array)
-            record['message'].each do |value|
+          if record[@array_key].is_a?(Array)
+            record[@array_key].each do |value|
               new_record = record.dup
-              new_record['message'] = value
-              new_es.add(time, new_record)
-            end
-          elsif record['target_field'].is_a?(Array)
-            record['target_field'].each do |hash|
-              hash.each do |k, v|
-                new_record = record.dup
-                new_record.delete('target_field')
-                new_record[k] = v
-                new_es.add(time, new_record)
+              new_record.delete(@array_key)
+              if value.is_a?(Hash)
+                value.each do |k, v|
+                  new_record[k] = v
+                end
+              else
+                new_record[@array_key] = value
               end
+              new_es.add(time, new_record)
             end
           else
             new_es.add(time, record)

data/test/plugin/test_filter_array_splitter.rb

@@ -4,7 +4,9 @@ require "fluent/plugin/filter_array_splitter.rb"
 class ArraySplitterFilterTest < Test::Unit::TestCase
   setup do
     Fluent::Test.setup
-    @driver = create_driver
+    @driver = create_driver(%[
+      array_key message
+    ])
   end
 
   def create_driver(conf = "")
@@ -29,7 +31,45 @@ class ArraySplitterFilterTest < Test::Unit::TestCase
       assert_equal("v3", filtered_records[2]["message"])
     end
 
-    # More tests for other cases...
+    test "expand array with hashes in message field" do
+      record = {
+        "key1" => "foo",
+        "key2" => "bar",
+        "message" => [{"k1" => "hoge"}, {"k2" => "foobar"}]
+      }
+      @driver.run(default_tag: "test") do
+        @driver.feed(record)
+      end
+      filtered_records = @driver.filtered_records
+      assert_equal(2, filtered_records.size)
+      assert_equal("foo", filtered_records[0]["key1"])
+      assert_equal("bar", filtered_records[0]["key2"])
+      assert_equal("hoge", filtered_records[0]["k1"])
+      assert_nil(filtered_records[0]["message"])
+      assert_equal("foo", filtered_records[1]["key1"])
+      assert_equal("bar", filtered_records[1]["key2"])
+      assert_equal("foobar", filtered_records[1]["k2"])
+      assert_nil(filtered_records[1]["message"])
+    end
+
+    test "expand array with custom key" do
+      driver = create_driver(%[
+        array_key record
+      ])
+      record = {
+        "key1" => "foo",
+        "key2" => "bar",
+        "record" => ["v1", "v2", "v3"]
+      }
+      driver.run(default_tag: "test") do
+        driver.feed(record)
+      end
+      filtered_records = driver.filtered_records
+      assert_equal(3, filtered_records.size)
+      assert_equal("v1", filtered_records[0]["record"])
+      assert_equal("v2", filtered_records[1]["record"])
+      assert_equal("v3", filtered_records[2]["record"])
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-array-splitter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - pcoffmanjr