fluent-plugin-sensu 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+## 1.0.1 (2015-11-24)
+
+Bugfixes:
+
+  - escape non-ASCII characters (#6)
+
+## 1.0.0 (2015-08-30)
+
+  - initial release

data/fluent-plugin-sensu.gemspec

@@ -6,7 +6,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-sensu"
-  spec.version       = '1.0.0'
+  spec.version       = '1.0.1'
   spec.authors       = ["MIYAKAWA Taku"]
   spec.email         = ["miyakawa.taku@gmail.com"]
   spec.description   = 'Fluentd output plugin to send checks' +

data/lib/fluent/plugin/out_sensu.rb

@@ -186,7 +186,7 @@ module Fluent
     # Send a check result to sensu-client.
     private
     def send_check(server, port, check_result)
-      json = check_result.to_json
+      json = to_json(check_result)
       sensu_client = TCPSocket.open(@server, @port)
       begin
         sensu_client.puts(json)
@@ -195,6 +195,18 @@ module Fluent
       end
     end
 
+    # Make a json from the data.
+    public
+    def to_json(data)
+      raw_json = data.to_json.force_encoding(Encoding::BINARY)
+      regex = /[\xc0-\xdf][\x80-\xbf]
+              |[\xe0-\xef][\x80-\xbf]{2}
+              |[\xf0-\xf7][\x80-\xbf]{3}/nx
+      return raw_json.gsub(regex) { |ch|
+        ch.unpack('U*').pack('n*').unpack('H*')[0].gsub(/.+/, %q(\\\\u\&))
+      }
+    end
+
     # Adds an attribute to the check result if present.
     private
     def add_attribute_if_present(check_result, name, value)

data/test/plugin/test_out_sensu.rb

@@ -674,5 +674,23 @@ class SensuOutputTest < Test::Unit::TestCase
   end
 
   # }}}1
+  # JSON serialization {{{1
+
+  # ASCII characters are serialized literally.
+  def test_serialize_ascii_data_to_json
+    data = {"foo" => "FOO"}
+    driver = create_driver('')
+    assert_equal('{"foo":"FOO"}', driver.instance.to_json(data))
+  end
+
+  # Non-ASCII characters are Unicode-escaped.
+  def test_serialize_non_ascii_data_to_json
+    data = {"foo" => "\u3042\u4e9c\u03b1"}
+    driver = create_driver('')
+    assert_equal(%q({"foo":"\u3042\u4e9c\u03b1"}), driver.instance.to_json(data))
+  end
+
+  # }}}1
+
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sensu
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -107,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3828489535949594290
+      hash: 2209701766942156983
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3828489535949594290
+      hash: 2209701766942156983
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23