fluent-plugin-record_indexing 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cda0290a81edfabb93f0dc7739dc1889c2e7f599b3ee674c0baaffebfb7d2a7d
-  data.tar.gz: 0b9a9a50bc274c4e1c2aef91482bbbb7c7ea3e0c047dc5fe192735cc03623765
+  metadata.gz: b42b59a9bee0a768347ad76f149c631d930bc0fe56b3d8c9761de45a27a7958d
+  data.tar.gz: 57a58f3625de7c3c31a3d5e36426e8ab575f796da9d4fb8d7ed6a18f983b4c53
 SHA512:
-  metadata.gz: 196d17bfa5b24665b6e1a4d2bda1d0b100032dc30fa6da1e91ed9567444ec8d99a4224daf1df4135e1a5e97dc90d1b2d7494df96639bc82372f44f7eb6fdbc75
-  data.tar.gz: 5831f0607dfb888932a4d7476a7e8bb1fd247a2c3e82a1e0a34b0a0cae77276715b579579d3723cb42d2f0f6bad5d5602cd296ba66e585ad4e4056374c341fd8
+  metadata.gz: 2f627a68a573dc16849ce53506d8a4119571d81d3f433aaf7571beb2bd9a31c688d9af2a9ee78b010d2d67b0c37434bbdcf57ffe9bd54bd1305b13e79c119900
+  data.tar.gz: a9f3621addcd73beb52028ec73ccaab98a74bfffdce4197d11bf86bdba9bd74741783af8d214b0b92b6e075c169216935b25498e06ecbd7e92351fb87a1a3e05

data/README.md

@@ -60,7 +60,34 @@ Out:
 In:
 {"foo" => "bar", "baz"=>[{"a"=>1}, {"a"=>2}, {"b"=>3}] , "daz" => [{"a"=>1}, {"a"=>2}, {"b"=>3}]}
 Out:
-{"foo"=>"bar", "baz"=>[{"a"=>1}, {"a"=>2}, {"b"=>3}], "2"=>{"b"=>3}}, "daz"=>{"0"=>{"a"=>1} , "1"=>{"a"=>2}, "2"=>{"b"=>3}}}
+{"foo"=>"bar", "baz"=>[{"a"=>1}, {"a"=>2}, {"b"=>3}], "2"=>{"b"=>3}], "daz"=>{"0"=>{"a"=>1} , "1"=>{"a"=>2}, "2"=>{"b"=>3}}}
+```
+
+```
+<filter test**>
+    @type                record_indexing
+    exclude_keys         baz
+</filter>
+
+In:
+{"foo" => "bar", "baz"=>[{"a"=>1}, {"a"=>2}, {"b"=>3}] , "daz" => [{"name"=>1, "value"=>2}, {"a"=>2}, {"b"=>3}]}
+Out:
+{"foo"=>"bar", "baz"=>[{"a"=>1}, {"a"=>2}, {"b"=>3}], "2"=>{"b"=>3}], "daz"=>{"a"=>2 , "1"=>{"a"=>2}, "2"=>{"b"=>3}}}
+```
+
+```
+ignore_length by default set true
+
+<filter test**>
+    @type                record_indexing
+    ignore_length        false
+    exclude_keys         baz
+</filter>
+
+In:
+{"foo" => "bar", "baz"=>[{"a"=>1}, {"a"=>2}, {"b"=>3}] , "daz" => [{"name"=>1}]}
+Out:
+{"foo"=>"bar", "baz"=>[{"a"=>1}, {"a"=>2}, {"b"=>3}], "2"=>{"b"=>3}], "daz"=>[{"a"=>2}]}
 ```
 
 ## Installation

data/fluent-plugin-record_indexing.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-record_indexing"
-  spec.version       = "0.2.2"
+  spec.version       = "0.2.3"
   spec.authors       = ["imcotop"]
   spec.email         = ["imcotop@icloud.com"]
 

data/lib/fluent/plugin/filter_record_indexing.rb

@@ -8,13 +8,12 @@ module Fluent
     config_param :key_names, :array, default: []
     config_param :key_prefix, :string, default: nil
     config_param :check_all_key, :bool, default: true
+    config_param :ignore_length, :bool, default: true
     config_param :exclude_keys, :array, default: []
 
     def filter(tag, time, record)
-      if check_all_key == false
-        unless key_names.any?
-          raise ArgumentError, "key_names parameter is required if check_all_key set false"
-        end
+      if !@check_all_key && key_names.empty?
+        raise ArgumentError, "key_names parameter is required if check_all_key set false"
       end
       new_record = {}
       each_with_index(record, new_record)
@@ -23,17 +22,28 @@ module Fluent
     end
 
     def each_with_index(record, new_record)
+      seen_keys = {}  # To keep track of duplicate names
       record.each do |key, value|
-        if check_all_key || key_names.include?(key)
-          if exclude_keys.include?(key)
+        if @check_all_key || @key_names.include?(key)
+          if @exclude_keys.include?(key)
             new_record[key] = value  # Keep the value as is without indexing
           elsif value.is_a?(Array)
-            if value.length == 1
+            if !@ignore_length && value.length == 1
               new_record[key] = value.first
             else
               new_record[key] = {}
               value.each_with_index do |item, index|
-                new_record[key]["#{key_prefix}#{index}"] = item
+                if item.is_a?(Hash) && item.key?("name") && item.key?("value")
+                  item_name = item["name"]
+                  if seen_keys[item_name]
+                    new_record[key]["#{@key_prefix}#{index}"] = item
+                  else
+                    new_record[key][item_name] = item["value"]
+                    seen_keys[item_name] = true
+                  end
+                else
+                  new_record[key]["#{@key_prefix}#{index}"] = item
+                end
               end
             end
           elsif value.is_a?(Hash)
@@ -62,4 +72,3 @@ module Fluent
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-record_indexing
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - imcotop
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,7 @@ homepage: https://github.com/imcotop/fluent-plugin-record_indexing
 licenses:
 - apache2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -93,8 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.7
+signing_key:
 specification_version: 4
 summary: A fluentd filter plugin that will be used to Iterate over the object with
   its index and returns the value of the given object.