fluent-plugin-mail 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f96ccf9d6555c9ecff2ea89418bd070994c9a4c
-  data.tar.gz: 48ae990d610d3e05766e1cc84ff621e355da9b5c
+  metadata.gz: 3c942140f8c65ac631eb04524fa56b7b9b3a828c
+  data.tar.gz: 13d63ce8f36b574c0918db98fd26f9e182a2412e
 SHA512:
-  metadata.gz: 5dd6e69c2161fc7dbb8f88baa6be0b1e877b09354ceec2d3fe24b5bcde35de582a830bf147445f7194698e1537ba6d37a333614fb90b1acd0c838e31c3c1352f
-  data.tar.gz: c7c9543c545bb28fe5c66417071cc27c6a244c2dfb1b6ccbeaf7fc29bdfe86bb785a8521ba152b7d065d5bf351f9a80ae2d60a0b3df9c09338843e960593a3ca
+  metadata.gz: 0fe14ff31b1c4cb0bdd634ba6f399a45b761153090d057a601a595388d251661a93f43ea9bde2bb2a26fdeeb540da41289d3d9cce6957bc4389778c1a638b317
+  data.tar.gz: ea7f4254f6830d2119ff3fe12058f57d780d532f1cbcbf311d1e32eea7fe62f7e88cf4b9447470a384e303d2ce82f376f7a4ec14e8c3395b4bdd27d5f1434a74

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.1.1
+
+Enhancement:
+
+* Avoid invalid byte seuqnce in UTF-8 error
+
 # 0.1.0
 
 Enhancement:

data/fluent-plugin-mail.gemspec

@@ -12,7 +12,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-mail"
   gem.require_paths = ["lib"]
-  gem.version       = '0.1.0'
-  gem.add_development_dependency "rake"
+  gem.version       = '0.1.1'
+
   gem.add_runtime_dependency "fluentd"
+  gem.add_runtime_dependency "string-scrub" if RUBY_VERSION.to_f < 2.1
+  gem.add_development_dependency "rake"
 end

data/lib/fluent/plugin/out_mail.rb

@@ -31,6 +31,7 @@ class Fluent::MailOutput < Fluent::Output
     super
     require 'net/smtp'
     require 'kconv'
+    require 'string/scrub' if RUBY_VERSION.to_f < 2.1
   end
 
   def configure(conf)
@@ -136,7 +137,19 @@ class Fluent::MailOutput < Fluent::Output
       end
     end
 
-    (@message % values).gsub(/\\n/, "\n")
+    message = (@message % values)
+    with_scrub(message) {|str| str.gsub(/\\n/, "\n") }
+  end
+
+  def with_scrub(string)
+    begin
+      return yield(string)
+    rescue ArgumentError => e
+      raise e unless e.message.index("invalid byte sequence in") == 0
+      log.info "out_mail: invalid byte sequence is replaced in #{string}"
+      string.scrub!('?')
+      retry
+    end
   end
 
   def create_formatted_subject(tag, time, record)

data/test/plugin/test_out_mail.rb

@@ -75,5 +75,13 @@ class MailOutputTest < Test::Unit::TestCase
     end
   end
 
+  def test_with_scrub
+    d = create_driver(CONFIG_MESSAGE)
+    invalid_string = "\xff".force_encoding('UTF-8')
+    assert_nothing_raised {
+      res = d.instance.with_scrub(invalid_string) {|str| str.gsub(/\\n/, "\n") }
+      assert_equal '?', res
+    }
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mail
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yuichi UEMURA
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -26,13 +26,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fluentd
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: