fluent-mixin-plaintextformatter 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d3f892bb7a90ccd8e91cae4e9581ac540b1365c4
+  data.tar.gz: 04b6d2744aa25081c5e8e6b7f629f0b4d60fa9de
+SHA512:
+  metadata.gz: 6a5b50af5b252f1b30c292cab814b501ca84656f3dc802cb5eed660973ade3bf1351e44ddc457071b004470c21b5f0e0823be0e4cdb40d91a0625c9908fe3b19
+  data.tar.gz: e6c183f7a11465843e1aa4fc291f572ee03ef839bcae67e2240c011f080e989fc67b296261365289efa894ef121610b92b0e036bb293510e646e0aaff0d1096b

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/fluent-mixin-plaintextformatter.gemspec

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-mixin-plaintextformatter"
-  gem.version       = "0.2.2"
+  gem.version       = "0.2.3"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{included to format values into json, tsv or csv}
   gem.summary       = %q{Text formatter mixin module to create fluentd plugin}
   gem.homepage      = "https://github.com/tagomoris/fluent-mixin-plaintextformatter"
+  gem.license       = "APLv2"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -15,4 +16,5 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "fluentd"
   gem.add_runtime_dependency "ltsv"
+  gem.add_development_dependency "rake"
 end

data/lib/fluent/mixin/plaintextformatter.rb

@@ -77,7 +77,7 @@ module Fluent
           end
         else
           @custom_attributes.map{|attr|
-            (record[attr] || 'NULL').to_s
+            record[attr].nil? ? 'NULL' : record[attr].to_s
           }.join(@f_separator)
         end
       end
@@ -100,7 +100,18 @@ module Fluent
                   else
                     ''
                   end
-        time_str + tag_str + stringify_record(record) + (@add_newline ? "\n" : '')
+        begin
+          time_str + tag_str + stringify_record(record) + (@add_newline ? "\n" : '')
+        rescue JSON::GeneratorError => e
+          # partial character in source, but hit end
+          # source sequence is illegal/malformed utf-8
+          $log.error e.message + ", ignored", :error_class => e.class, :tag => tag, :record => record.inspect # quote explicitly
+          ''
+        rescue ArgumentError => e
+          raise unless e.message == 'invalid byte sequence in UTF-8'
+          $log.error e.message + ", ignored", :error_class => e.class, :tag => tag, :record => record.inspect # quote explicitly
+          ''
+        end
       end
     end
   end

data/test/mixin/test_plaintextformatter.rb

@@ -105,7 +105,7 @@ remove_prefix test
     # output_data_type json
     assert_equal r, JSON.parse(line.chomp.split(/\001/, 3)[2])
   end
-  
+
   def test_default_without_time_tag
     p = create_plugin_instance(Fluent::TestCOutput, "type testc\n")
     r = {'foo' => 'foo foo baz', 'bar' => 10000}
@@ -174,6 +174,31 @@ field_separator comma
     assert_equal "10000,foo foo baz\n", p.format('test.a', 1342163105, r)
   end
 
+  def test_format_invalid_utf8_sequence
+    invalid_str = [0xFA, 0xFB].pack('CC').force_encoding('utf-8')
+    valid_str = [0xFF, 0xE3].pack("U*")
+
+    p1 = create_plugin_instance(Fluent::TestAOutput, %[
+type testa
+output_include_time true
+output_include_tag  true
+output_data_type json
+])
+    r1 = p1.format('tag', Fluent::Engine.now, {'foo' => valid_str, 'bar' => invalid_str + valid_str})
+    # #format should logs for this record (but we cannot test it...)
+    assert_equal '', r1
+
+    p2 = create_plugin_instance(Fluent::TestAOutput, %[
+type testa
+output_include_time true
+output_include_tag  true
+output_data_type ltsv
+])
+    r2 = p2.format('tag', Fluent::Engine.now, {'foo' => valid_str, 'bar' => invalid_str + valid_str})
+    # #format should logs for this record (but we cannot test it...)
+    assert_equal '', r2
+  end
+
   def test_field_separator_newline_ltsv
     p = create_plugin_instance(Fluent::TestDOutput, "type testd\nutc\n")
     r = {'foo' => 'foo foo baz', 'bar' => 10000}
@@ -199,4 +224,18 @@ field_separator comma
     end
     assert_equal rs, obj_from_ltsv
   end
+
+  def test_format_boolean_attribute
+    p = create_plugin_instance(Fluent::TestAOutput, %[
+type testa
+output_include_time true
+output_include_tag true
+output_data_type attr:foo,bar
+])
+    r = {'foo' => true, 'bar' => false}
+    # stringify
+    assert_equal "true\tfalse", p.stringify_record(r)
+    # format
+    assert_equal "2012-07-13T07:05:05Z\ttest.a\ttrue\tfalse\n", p.format('test.a', 1342163105, r)
+  end
 end

metadata

@@ -1,46 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: fluent-mixin-plaintextformatter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ltsv
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: included to format values into json, tsv or csv
@@ -51,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -61,30 +71,31 @@ files:
 - test/mixin/test_plaintextformatter.rb
 - test/output.rb
 homepage: https://github.com/tagomoris/fluent-mixin-plaintextformatter
-licenses: []
+licenses:
+- APLv2
+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
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Text formatter mixin module to create fluentd plugin
 test_files:
 - test/helper.rb
 - test/mixin/test_plaintextformatter.rb
 - test/output.rb
+has_rdoc: