fluent-plugin-string-scrub 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0432a5e1ae4e3970f96b80134b6ae8ffdad9fed1da59cac7807fe2562e8b65c0
-  data.tar.gz: 53ef421c743a333bea35e451c0151510a6d5b4fcac49468e8501029d617f5d35
+  metadata.gz: 3ec5362da8587dc2196f07f27308802fc95533ebea82e77fdca905744a907594
+  data.tar.gz: fad0bd42b3aeb35fcf2a980efd0de44db63d6b2886fad7569891e6d4c8773b85
 SHA512:
-  metadata.gz: 4130308daf2d991ed36a75a684333a8cb5fe99a009833f9a1589e5ab67d56374db2492725cc99b2067d7c1fa10d68700dffd1697a3f09f997ce11d0835a6872c
-  data.tar.gz: eea555503b11318fc088825cce59c85991d6216de287918740c329cdf6810576967ac374a862f587f44b50932a870957761c8fbf9acd8f14b4cc7787b8b6b26d
+  metadata.gz: 5d6cefbd65bfa5770618d9d0182aa8de32a2b066911b04b394d7b08f5553282426ffa4d77d04fa2db52c65ae43dcea3c6807698ca381d5e59b0b749d2ddcac7a
+  data.tar.gz: e3f0c80c0af477a33751e1375b576281ad051aef7f9a88cad893e3de9334e28b375cefe3e4b1a6cecfd963859ae1fc25b88708b8dcafcd1c7b65546c21fb96b2

data/.travis.yml

@@ -6,7 +6,10 @@ rvm:
   - 2.2
   - 2.3
   - 2.4
-  - 2.5.2
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
 
   #- ruby-head
 gemfile:

data/README.md

@@ -27,7 +27,7 @@ Or install it yourself as:
 
 ```
 <match **>
-  type string_scrub
+  @type string_scrub
   tag scrubbed.string
   replace_char ?
 </match>
@@ -37,17 +37,17 @@ Or install it yourself as:
 
 ```
 <source>
-  type forward
+  @type forward
 </source>
 
 <match raw.**>
-  type string_scrub
+  @type string_scrub
   remove_prefix raw
   add_prefix scrubbed
 </match>
 
 <match scrubbed.**>
-  type stdout
+  @type stdout
 </match>
 ```
 
@@ -57,16 +57,16 @@ Fluentd >= v0.12 can use filter plugin.
 
 ```
 <source>
-  type forward
+  @type forward
 </source>
 
 <filter **>
-  type string_scrub
+  @type string_scrub
   replace_char ?
 </filter>
 
 <match **>
-  type stdout
+  @type stdout
 </match>
 ```
 

data/fluent-plugin-string-scrub.gemspec

@@ -3,7 +3,7 @@ lib = File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-string-scrub"
-  spec.version       = "1.0.0"
+  spec.version       = "1.0.1"
   spec.authors       = ["Noriaki Katayama"]
   spec.email         = ["kataring@gmail.com"]
   spec.summary       = %q{Fluentd Output filter plugin.}

data/lib/fluent/plugin/filter_string_scrub.rb

@@ -23,7 +23,7 @@ class Fluent::Plugin::StringScrubFilter < Fluent::Plugin::Filter
       begin
         scrubbed = recv_record(record)
         next if scrubbed.nil?
-        new_es.add(time, record)
+        new_es.add(time, scrubbed)
       rescue => e
         router.emit_error_event(tag, time, record, e)
       end
@@ -37,6 +37,8 @@ class Fluent::Plugin::StringScrubFilter < Fluent::Plugin::Filter
     record.each do |k,v|
       if v.instance_of? Hash
         scrubbed[with_scrub(k)] = recv_record(v)
+      elsif v.instance_of? Integer
+        scrubbed[k] = v
       else
         scrubbed[with_scrub(k)] = with_scrub(v)
       end

data/lib/fluent/plugin/out_string_scrub.rb

@@ -68,6 +68,8 @@ class Fluent::Plugin::StringScrubOutput < Fluent::Plugin::Output
     record.each do |k,v|
       if v.instance_of? Hash
         scrubbed[with_scrub(k)] = recv_record(v)
+      elsif v.instance_of? Integer
+        scrubbed[k] = v
       else
         scrubbed[with_scrub(k)] = with_scrub(v)
       end

data/test/plugin/test_filter_string-scrub.rb

@@ -43,4 +43,17 @@ class StringScrubFilterTest < Test::Unit::TestCase
     assert_equal([{"message" => orig_message + '?'}], filtered)
   end
 
+  def test_filter2_frozen_string
+    orig_message = 'testtesttest'
+    invalid_utf8 = "\xff".force_encoding('UTF-8')
+    msg = {"message" => (orig_message + invalid_utf8).freeze}
+    filtered = filter(CONFIG, [msg])
+    assert_equal([{"message" => orig_message + '?'}], filtered)
+
+  def test_filter_integer
+    orig_message = 123456789
+    msg = {"message" => orig_message}
+    filtered = filter(CONFIG, [msg])
+    assert_equal([{"message" => orig_message}], filtered)
+  end
 end

data/test/plugin/test_out_string-scrub.rb

@@ -201,4 +201,18 @@ class StringScrubOutputTest < Test::Unit::TestCase
     assert_equal "scrubbed.log2", e2[0]
     assert_equal orig_message, e2[2]['message']
   end
+
+  def test_emit6_integer
+    orig_message = 123456789
+    d1 = create_driver(CONFIG)
+    d1.run(default_tag: 'input.log') do
+      d1.feed({'message' => orig_message})
+    end
+    emits = d1.events
+    assert_equal 1, emits.length
+
+    e1 = emits[0]
+    assert_equal "scrubbed.log", e1[0]
+    assert_equal orig_message, e1[2]['message']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-string-scrub
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Noriaki Katayama
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2021-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,7 +81,7 @@ homepage: https://github.com/kataring/fluent-plugin-string-scrub
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,9 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Fluentd Output filter plugin.
 test_files: