fluent-plugin-mutate_filter 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db927fe75f56601c192cfa5fd529914924e5687657a378689f6f8592bf5086e3
-  data.tar.gz: 1ff7de058212f4a1fe40b7551aaba991bb639adc1f826ebdc1c2d9c32f330842
+  metadata.gz: 79f746bd9c44d86ef7ab074a10776185edd537fb420d0cdef9c4f73ae7caa043
+  data.tar.gz: baeed48ef9eced0336745871771a724ebcd759e48f09f700b367a60abe0af97c
 SHA512:
-  metadata.gz: 22493004009aec2f36b024b9e6974420f2adf2afa22440ca94c824510beb8bf943d8c72b2f0aaa7725af303d25aa60654da0180262b67928ebe9eff8563f409f
-  data.tar.gz: 87685349ff798b6e423d125fd23709d0e195d11d00d55826de8094142fd2d293405f18c5db5735cde2a98bf3372a1ac552010407198b056e7ab8aadeb8a81a1b
+  metadata.gz: f1bc65b2293d7bd5bacd2141f6ab9c9c1986c01f9a7bbe687636daef2fe5cc86765b674a6d56131b6e7b36e61ec85044c872e484fc5c101510d9079850d1c125
+  data.tar.gz: 9a79a1e2cb37ffbc1c04690fde427f8a995b61f0008ba94a843ba9975ce5ae37e1be73fe432c06b73c563507874e9b5d16cb8a3d8e8be10f0291615cdc3fae08

data/fluent-plugin-mutate_filter.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-mutate_filter"
-  spec.version = "1.0.2"
+  spec.version = "1.0.3"
   spec.authors = ["Jonathan Serafini"]
   spec.email   = ["jonathan@serafini.ca"]
 

data/lib/fluent/plugin/filter_mutate.rb

@@ -4,8 +4,8 @@ require "fluent/plugin/mixin/mutate_event"
 
 module Fluent
   module Plugin
-    class MutateFilter < Fluent::Plugin::Filter
-      Fluent::Plugin.register_filter("mutate", self)
+    class MutateFilter2 < Fluent::Plugin::Filter
+      Fluent::Plugin.register_filter("mutate2", self)
 
       # Treat periods as nested field names
       config_param :expand_nesting, :bool, default: true
@@ -171,31 +171,27 @@ module Fluent
       def expand_references(event, string)
         new_string = ''
 
-        position = 0
-        matches = string.scan(TEMPLATE_TAG_REGEXP).map{|m| $~}
-
-        matches.each do |match|
+        while match = string.match(TEMPLATE_TAG_REGEXP) do
           reference_tag = match[0][2..-2]
           reference_value = case reference_tag
                             when "event_time" then event.event_time.to_s
                             when "event_tag"  then event.event_tag
                             else  event.get(reference_tag.downcase).to_s
                             end
-          if reference_value.nil?
+
+          if reference_value == ""
             @log.error "failed to replace tag", field: reference_tag.downcase
             reference_value = match.to_s
           end
 
           start = match.offset(0).first
-          new_string << string[position..(start-1)] if start > 0
+          new_string << string[0..(start-1)] if start > 0
           new_string << reference_value
-          position = match.offset(0).last
-        end
 
-        if position < string.size
-          new_string << string[position..-1]
+          string = string[match.offset(0).last..-1]
         end
 
+        new_string << string
         new_string
       end
 
@@ -205,30 +201,26 @@ module Fluent
       def expand_environment(event, string)
         new_string = ''
 
-        position = 0
-        matches = string.scan(ENVIRONMENT_TAG_REGEXP).map{|m| $~}
-
-        matches.each do |match|
+        while match = string.match(ENVIRONMENT_TAG_REGEXP) do
           reference_tag = match[0][3..-2]
           reference_value = case reference_tag
                             when "hostname" then Socket.gethostname
                             else ENV[reference_tag]
                             end
-          if reference_value.nil?
+
+          if reference_value == ""
             @log.error "failed to replace tag", field: reference_tag
             reference_value = match.to_s
           end
 
           start = match.offset(0).first
-          new_string << string[position..(start-1)] if start > 0
+          new_string << string[0..(start-1)] if start > 0
           new_string << reference_value
-          position = match.offset(0).last
-        end
 
-        if position < string.size
-          new_string << string[position..-1]
+          string = string[match.offset(0).last..-1]
         end
 
+        new_string << string
         new_string
       end
 

data/lib/fluent/plugin/mixin/mutate_event.rb

@@ -29,9 +29,22 @@ module Fluent
         end
 
         def prune
-          delete_proc = proc do |_,v|
-            v.delete_if(&delete_proc) if v.respond_to?(:delete_if)
-            v.nil? || v.respond_to?(:empty?) && v.empty?
+          delete_proc = proc do |*args|
+            v = args[-1]
+
+            if v.respond_to?(:delete_if)
+              v.delete_if(&delete_proc)
+            end
+
+            if v.respond_to?(:strip)
+              v = v.strip
+            end
+
+            if v.respond_to?(:empty?) and v.empty?
+              v = nil
+            end
+
+            v.nil?
           end
 
           @record.delete_if(&delete_proc)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mutate_filter
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jonathan Serafini