fluent-plugin-string-scrub 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cdab445162d666c325c977971529e5eb25a4ffc0
+  data.tar.gz: f7eeafe31bdaf17e838db80b51e232167391ce31
+SHA512:
+  metadata.gz: f850bc87770dcec1b61e92392bf7f2ba075cbbea2782c0e8a1b9b8cb65b90c7977ac1868c1500a35efeba272045606b1e9fc7842990823c443f2d2821312ffb6
+  data.tar.gz: 3f8e0e2d4d51811b69cef252a55d18a635d151794716b04661d55537138b17e1b6ab6e523272e1103a0f63bfe7089492c1103159f845e1589a68a7ca6362584a

data/README.md

@@ -1,4 +1,4 @@
-# fluent-plugin-string-scrub [![Build Status](https://travis-ci.org/kataring/fluent-plugin-string-scrub.svg)](https://travis-ci.org/kataring/fluent-plugin-string-scrub) 
+# fluent-plugin-string-scrub [![Gem Version](https://badge.fury.io/rb/fluent-plugin-string-scrub.svg)](http://badge.fury.io/rb/fluent-plugin-string-scrub) [![Build Status](https://travis-ci.org/kataring/fluent-plugin-string-scrub.svg)](https://travis-ci.org/kataring/fluent-plugin-string-scrub) 
 
 fluent plugin for string scrub.
 

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

data/lib/fluent/plugin/out_string_scrub.rb

@@ -27,9 +27,8 @@ class Fluent::StringScrubOutput < Fluent::Output
     if @add_prefix
       @added_prefix_string = @add_prefix + '.'
     end
-
-    if @replace_char and @replace_char.length >= 2
-        raise Fluent::ConfigError, "replace_char: mast be 1 character"
+    if @replace_char =~ /\\u\{*[A-F0-9]{4}\}*/
+      @replace_char = eval("\"#{@replace_char}\"")
     end
   end
 

data/test/plugin/test_out_string-scrub.rb

@@ -16,6 +16,18 @@ class StringScrubOutputTest < Test::Unit::TestCase
     replace_char ?
   ]
 
+  CONFIG_UNICODE_1 = %[
+    remove_prefix input
+    add_prefix scrubbed
+    replace_char \uFFFD
+  ]
+
+  CONFIG_UNICODE_2 = %[
+    remove_prefix input
+    add_prefix scrubbed
+    replace_char \u{FFFD}
+  ]
+
   def create_driver(conf=CONFIG,tag='test')
     Fluent::Test::OutputTestDriver.new(Fluent::StringScrubOutput, tag).configure(conf)
   end
@@ -119,4 +131,47 @@ class StringScrubOutputTest < Test::Unit::TestCase
     assert_equal "scrubbed.log2", e2[0]
     assert_equal orig_message + '?', e2[2]['message']
   end
+
+  def test_emit3_struct_message
+    orig_message = 'testtesttest'
+    invalid_utf8 = "\xff".force_encoding('UTF-8')
+    d1 = create_driver(CONFIG_REPLACE_CHAR, 'input.log')
+    d1.run do
+      d1.emit({'message' => {'message_child' => orig_message + invalid_utf8}})
+    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']['message_child']
+  end
+
+  def test_emit4_unicode1
+    orig_message = 'testtesttest'
+    invalid_utf8 = "\xff".force_encoding('UTF-8')
+    d1 = create_driver(CONFIG_UNICODE_1, 'input.log')
+    d1.run do
+      d1.emit({'message' => {'message_child' => orig_message + invalid_utf8}})
+    end
+    emits = d1.emits
+    assert_equal 1, emits.length
+
+    e1 = emits[0]
+    assert_equal "scrubbed.log", e1[0]
+    assert_equal orig_message + "\uFFFD".force_encoding('UTF-8'), e1[2]['message']['message_child']
+
+    orig_message = 'testtesttest'
+    invalid_utf8 = "\xff".force_encoding('UTF-8')
+    d1 = create_driver(CONFIG_UNICODE_2, 'input.log')
+    d1.run do
+      d1.emit({'message' => {'message_child' => orig_message + invalid_utf8}})
+    end
+    emits = d1.emits
+    assert_equal 1, emits.length
+
+    e1 = emits[0]
+    assert_equal "scrubbed.log", e1[0]
+    assert_equal orig_message + "\uFFFD".force_encoding('UTF-8'), e1[2]['message']['message_child']
+  end
 end

metadata

@@ -1,80 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-string-scrub
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Noriaki Katayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: string-scrub
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.5
 description: fluent plugin for string scrub.
 email:
 - kataring@gmail.com
@@ -82,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -95,27 +72,26 @@ files:
 homepage: https://github.com/kataring/fluent-plugin-string-scrub
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fluentd Output filter plugin.
 test_files:
 - test/helper.rb