fluent-plugin-string-scrub 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdab445162d666c325c977971529e5eb25a4ffc0
-  data.tar.gz: f7eeafe31bdaf17e838db80b51e232167391ce31
+  metadata.gz: 73d0da5e8e95386a46ed8d332e3ad698448b2c5f
+  data.tar.gz: 64bd7f44ed8164404d4793c6c947f8dff9cd86ab
 SHA512:
-  metadata.gz: f850bc87770dcec1b61e92392bf7f2ba075cbbea2782c0e8a1b9b8cb65b90c7977ac1868c1500a35efeba272045606b1e9fc7842990823c443f2d2821312ffb6
-  data.tar.gz: 3f8e0e2d4d51811b69cef252a55d18a635d151794716b04661d55537138b17e1b6ab6e523272e1103a0f63bfe7089492c1103159f845e1589a68a7ca6362584a
+  metadata.gz: c960490269222cdc16e9ce8d5c1addd1747436b73ed0cc9ef099c0d33989ec148cf9f133620b03f25cb9d070a996ec9dfff110b61f3e71891ae870be56d23aeb
+  data.tar.gz: 0b1443b6c15cd8ae04915f73230ca9287a2b0b033c266a446ad97eaa958ac488c07095d3336e8b43f6b99ce89e434ef85ab004e8fe908bf5f4d8ebf420560d0f

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       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["Noriaki Katayama"]
   spec.email         = ["kataring@gmail.com"]
   spec.summary       = %q{Fluentd Output filter plugin.}

data/lib/fluent/plugin/out_string_scrub.rb

@@ -77,7 +77,11 @@ class Fluent::StringScrubOutput < Fluent::Output
       return string
     rescue ArgumentError => e
       raise e unless e.message.index("invalid byte sequence in") == 0
-      string.scrub!(@replace_char)
+      if string.frozen?
+          string = string.dup.scrub!(@replace_char)
+      else
+          string.scrub!(@replace_char)
+      end
       retry
     end
   end

data/test/plugin/test_out_string-scrub.rb

@@ -174,4 +174,31 @@ class StringScrubOutputTest < Test::Unit::TestCase
     assert_equal "scrubbed.log", e1[0]
     assert_equal orig_message + "\uFFFD".force_encoding('UTF-8'), e1[2]['message']['message_child']
   end
+
+  def test_emit5_frozen_string
+    orig_message = 'testtesttest'
+    invalid_utf8 = "\xff".force_encoding('UTF-8')
+    d1 = create_driver(CONFIG, 'input.log')
+    d1.run do
+      d1.emit({'message' => (orig_message + invalid_utf8).freeze})
+    end
+    emits = d1.emits
+    assert_equal 1, emits.length
+    
+    e1 = emits[0]
+    assert_equal "scrubbed.log", e1[0]
+    assert_equal orig_message, e1[2]['message']
+
+    invalid_ascii = "\xff".force_encoding('US-ASCII')
+    d2 = create_driver(CONFIG, 'input.log2')
+    d2.run do
+      d2.emit({'message' => (orig_message + invalid_utf8).freeze})
+    end
+    emits = d2.emits
+    assert_equal 1, emits.length
+    
+    e2 = emits[0]
+    assert_equal "scrubbed.log2", e2[0]
+    assert_equal orig_message, e2[2]['message']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-string-scrub
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Noriaki Katayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake