fluent-mixin-plaintextformatter 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a8f706410fb735c2cf645b5a11eb1b67f6afc82
-  data.tar.gz: dc8832c1ab304abe876300f83a367fd7201ed216
+  metadata.gz: c7580967d97e92a5898d818ebdc023e4ee64abcc
+  data.tar.gz: a1f8aa1a8d94d56b0ca8d19f845fe6abc28c5724
 SHA512:
-  metadata.gz: 8b18fcd7738dd940b2d297e9b5e8802e20653bc4eaa189801af644c39361b1aa32bcfc430ddd93746a7c2a0cb0afbcff6bd9b3f1c2978fb384ee7295351c6df2
-  data.tar.gz: 9ee257ee3a95d62953e8e343139bc4634d9c91e6ab0ccc0b84f28a9c53568d5f54c28f4f129efb2515f35e45e9221b823b0e985d4f492ef0f24ec75c0ac4657a
+  metadata.gz: 921894b09e85ee4765173f072ef6fc9643e296cb1c76dd7a7f6e0ff1b2f085177b68ac6d7b3ee0daf12fc530dd8ddc5f0ff62573d83a0c1378f348ca6c89307a
+  data.tar.gz: 4cd1a15ddad15d57a62631b8af51d580cd61dc75b6d655bd0dedd7fc194f3bdd091f3ff676d55d95edddd52c264b4970e9974e586f174adcac8455de50ecb292

data/README.md

@@ -61,6 +61,7 @@ And you can overwrite default formatting configurations on your plugin (values b
       config_set_default :time_format, nil   # nil means ISO8601 '2012-07-13T19:29:49+09:00'
       config_set_default :remove_prefix, nil
       config_set_default :default_tag, nil
+      config_set_default :null_value, 'NULL'
       
       # ...
     end
@@ -80,6 +81,8 @@ Provided configurations are below:
 * remove_prefix
   * input tag 'test.foo' with 'remove_prefix test', output tag is 'foo'.
   * 'default\_tag' configuration is used when input tag is completely equal to 'remove\_prefix'
+* null_value
+  * output value if value is null(nil). default is 'NULL'.
 
 ## AUTHOR / CONTRIBUTORS
 
@@ -87,6 +90,7 @@ Provided configurations are below:
   * TAGOMORI Satoshi <tagomoris@gmail.com>
 * CONTRIBUTORS
   * wolfg1969 https://github.com/wolfg1969
+  * Shinya Okano <tokibito@gmail.com>
 
 ## LICENSE
 

data/fluent-mixin-plaintextformatter.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-mixin-plaintextformatter"
-  gem.version       = "0.2.4"
+  gem.version       = "0.2.5"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{included to format values into json, tsv or csv}

data/lib/fluent/mixin/plaintextformatter.rb

@@ -7,6 +7,7 @@ module Fluent
       attr_accessor :output_include_time, :output_include_tag, :output_data_type
       attr_accessor :add_newline, :field_separator
       attr_accessor :remove_prefix, :default_tag
+      attr_accessor :null_value
 
       attr_accessor :suppress_log_broken_string
 
@@ -46,6 +47,8 @@ module Fluent
           end
         end
 
+        @null_value = first_value( conf['null_value'], @null_value, 'NULL' )
+
         # default timezone: utc
         if not conf.has_key?('localtime') and not conf.has_key?('utc')
           @localtime = false
@@ -85,7 +88,7 @@ module Fluent
           end
         else
           @custom_attributes.map{|attr|
-            record[attr].nil? ? 'NULL' : record[attr].to_s
+            record[attr].nil? ? @null_value : record[attr].to_s
           }.join(@f_separator)
         end
       end

data/test/mixin/test_plaintextformatter.rb

@@ -289,4 +289,33 @@ output_data_type attr:foo,bar
     # format
     assert_equal "2012-07-13T07:05:05Z\ttest.a\ttrue\tfalse\n", p.format('test.a', 1342163105, r)
   end
+
+  def test_null_value_default
+    p = create_plugin_instance(Fluent::TestAOutput, %[
+type testa
+output_include_time false
+output_include_tag false
+output_data_type attr:foo
+])
+    r = {'foo' => nil}
+    # stringify
+    assert_equal "NULL", p.stringify_record(r)
+    # format
+    assert_equal "NULL\n", p.format('test.a', 1342163105, r)
+  end
+
+  def test_null_value_custom
+    p = create_plugin_instance(Fluent::TestAOutput, %[
+type testa
+output_include_time false
+output_include_tag false
+output_data_type attr:foo
+null_value \\N
+])
+    r = {'foo' => nil}
+    # stringify
+    assert_equal "\\N", p.stringify_record(r)
+    # format
+    assert_equal "\\N\n", p.format('test.a', 1342163105, r)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-mixin-plaintextformatter
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd