fluent-plugin-lookup 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc552128863c56880e1ed789e3dc9956f8063bfe
-  data.tar.gz: a870d43673d7027df0f90fdf6343dae2f4f397f1
+  metadata.gz: 5ac6a0b2172ab5435936e89fa771c3612039d93c
+  data.tar.gz: f7646ff1776bc57cb6519adc9b29e09f07d042fe
 SHA512:
-  metadata.gz: a4752b33dcba97bd4aaa359e63678efc02437f61315f3ea5c858715bb406ba22ca134aebc7299bdff21f0be591341c84851dfe88bbe986893b1533ddb01cddcc
-  data.tar.gz: 45bcabbafc264a61d6686ed6c305997d88b7726760da4102428c26db0537caca08697e50e6ae1a93a070abd176d75b53602c975a057fecacc90ec90e4c169f3d
+  metadata.gz: c7aed8a806f45ba877107089297bcf8770dcc3e4e49f878e5ec2372c40294915d2953516bf3138211e64f74a92d4a8b9caa0c1f68f3feaf3ba0cce7fe204ea3e
+  data.tar.gz: fcebd49bb86c18a85503bd68dd0743b9cc5f3a2c8ddc36d4ff6a79c1868de07af4cdf444b99bbee3a69c2b7801d35c91f8fcccc13f9fff68a712044ba059bfcc

data/fluent-plugin-lookup.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-lookup"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Neozaru"]
   spec.email         = ["neozaru@mailoo.org"]
   spec.description   = %q{Fluentd custom plugin to replace fields values using lookup table file}

data/lib/fluent/plugin/out_lookup.rb

@@ -58,8 +58,18 @@ module Fluent
       end
 
       @lookup_table = create_lookup_table(table_file)
-      @field = field
-      @output_field = output_field || field
+      @field = field.split(".")
+
+      if (output_field.nil?)
+        @filter_method = method(:filter_no_output)
+      else
+        @output_field = output_field.split(".")
+        @filter_method = method(:filter_with_output)
+      end
+
+      @assign_method = method(:assign)
+      @assign_self_method = method(:assign_self)
+      @return_method = method(:return)
 
     end
 
@@ -75,12 +85,56 @@ module Fluent
 
     private
 
+    def assign_self(record, key, value)
+      assign(record, key, record[key])
+    end
+
+    def assign(record, key, value)
+      record[key] = process(value) || value
+    end
+
+    def return(record, key, value) 
+      return record[key]
+    end
+
+
     def filter_record(tag, time, record)
       super(tag, time, record)
-      if (not record.has_key?(@field))
-        return
+      @filter_method.call(record)
+    end
+
+    # Same input/output : Get and set (dig once)
+    def filter_no_output(record)
+      dig_cb(record, @field, nil, false, @assign_self_method)
+    end
+
+    # Different input/output : Get, then set (dig twice)
+    def filter_with_output(record)
+      value = dig_cb(record, @field, nil, false, @return_method)
+      if (!value.nil?)
+        dig_cb(record, @output_field, value, true, @assign_method)
       end
-      record[@output_field] = process(record[@field]) || record[@field]
+    end
+
+    # Generic function to dig into map. 
+    def dig_cb(record, path, value, alter, cb)
+      digged_record = record
+      path.each_with_index {|key, index|
+        # If enabled, creates new path in the record
+        if (!digged_record.has_key?(key))
+          if (!alter) 
+            return nil
+          end
+          digged_record[key] = {}
+        end
+
+        if (index == path.length - 1)
+          return cb.call(digged_record, key, value)
+        else
+          digged_record = digged_record[key]
+        end
+      }
+      return nil
     end
 
     def process(value)

data/test/plugin/test_out_lookup.rb

@@ -33,8 +33,7 @@ class LookupOutputTest < Test::Unit::TestCase
     ])
 
     assert_equal 'lookup.', d.instance.add_tag_prefix
-    assert_equal 'key1',    d.instance.field
-    assert_equal 'key2', d.instance.output_field
+    assert_equal ['key1'],    d.instance.field
     assert_equal true, d.instance.strict
     assert_equal @correct_file, d.instance.table_file
 
@@ -48,8 +47,7 @@ class LookupOutputTest < Test::Unit::TestCase
     ])
 
     assert_equal 'lookup.', d.instance.add_tag_prefix
-    assert_equal 'key1',    d.instance.field
-    assert_equal 'key2', d.instance.output_field
+    assert_equal ['key1'],    d.instance.field
     assert_equal false, d.instance.strict
     assert_equal @correct_file, d.instance.table_file
 
@@ -63,8 +61,7 @@ class LookupOutputTest < Test::Unit::TestCase
     ])
 
     assert_equal 'lookup.', d.instance.add_tag_prefix
-    assert_equal 'key1',    d.instance.field
-    assert_equal 'key1', d.instance.output_field
+    assert_equal ['key1'],    d.instance.field
     assert_equal true, d.instance.strict
     assert_equal @correct_file, d.instance.table_file
 
@@ -79,8 +76,7 @@ class LookupOutputTest < Test::Unit::TestCase
     ])
 
     assert_equal 'lookup.', d.instance.add_tag_prefix
-    assert_equal 'key1',    d.instance.field
-    assert_equal 'key2', d.instance.output_field
+    assert_equal ['key1'],    d.instance.field
     assert_equal false, d.instance.strict
     assert_equal @duplicates_file, d.instance.table_file
 
@@ -95,8 +91,7 @@ class LookupOutputTest < Test::Unit::TestCase
     ])
 
     assert_equal 'lookup.', d.instance.add_tag_prefix
-    assert_equal 'key1',    d.instance.field
-    assert_equal 'key2', d.instance.output_field
+    assert_equal ['key1'],    d.instance.field
     assert_equal false, d.instance.strict
     assert_equal @empty_file, d.instance.table_file
 
@@ -352,6 +347,96 @@ class LookupOutputTest < Test::Unit::TestCase
     assert_equal 'cage', emits[0][2]['key1']
   end
 
+
+
+  def test_emit_nested_without_output_field
+    d = create_driver(%[
+      add_tag_prefix lookup.
+      table_file #{@correct_file}
+      field nested.key1
+    ])
+
+    record = {
+      'nested' => {
+        'key1' => "nicolas",
+      },
+      'foo' => "bar"
+    }
+
+    d.run { d.emit(record) }
+    emits = d.emits
+
+    assert_equal 1,           emits.count
+    assert_equal 'lookup.test', emits[0][0]
+    assert_equal 'cage', emits[0][2]['nested']['key1']
+  end
+
+
+  def test_emit_nested_with_non_existing_output_field
+    d = create_driver(%[
+      add_tag_prefix lookup.
+      table_file #{@correct_file}
+      field nested.key1
+      output_field new.foo
+    ])
+
+    record = {
+      'nested' => {
+        'key1' => "nicolas",
+      },
+      'foo' => "bar"
+    }
+
+    d.run { d.emit(record) }
+    emits = d.emits
+
+    assert_equal 1,           emits.count
+    assert_equal 'lookup.test', emits[0][0]
+    assert_equal 'cage', emits[0][2]['new']['foo']
+  end
+
+  # Checks that the record is not modified if the input_field is not found
+  def test_emit_nested_with_non_existing_input_field
+    d = create_driver(%[
+      add_tag_prefix lookup.
+      table_file #{@correct_file}
+      field nested.key1
+      output_field new.foo
+    ])
+
+    record = {
+      'foo' => "bar"
+    }
+
+    d.run { d.emit(record) }
+    emits = d.emits
+
+    assert_equal 1,           emits.count
+    assert_equal 'lookup.test', emits[0][0]
+    assert_equal nil, emits[0][2]['nested']
+    assert_equal nil, emits[0][2]['new']
+  end
+
+  # Checks that the record is not modified if the input_field is not found
+  def test_emit_nested_with_non_existing_input_field_no_output
+    d = create_driver(%[
+      add_tag_prefix lookup.
+      table_file #{@correct_file}
+      field nested.key1
+    ])
+
+    record = {
+      'foo' => "bar"
+    }
+
+    d.run { d.emit(record) }
+    emits = d.emits
+
+    assert_equal 1,           emits.count
+    assert_equal 'lookup.test', emits[0][0]
+    assert_equal nil, emits[0][2]['nested']
+  end
+
   def test_emit_without_output_field_no_correspondance
     d = create_driver(%[
       add_tag_prefix lookup.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-lookup
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Neozaru
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler