fluent-mixin-plaintextformatter 0.2.0 → 0.2.1

data/README.md

@@ -71,6 +71,7 @@ Provided configurations are below:
 * output\_include\_tag [yes/no]
 * output\_data\_type
   * 'json': output by JSON
+  * 'ltsv': output by LTSV, see: http://ltsv.org/
   * 'attr:key1,key2,key3': values of 'key1' and 'key2' and ..., with separator specified by 'field_separator'
 * field\_separator [TAB/SPACE/COMMA/SOH]
 * add_newline [yes/no]

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.0"
+  gem.version       = "0.2.1"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{included to format values into json, tsv or csv}
@@ -14,5 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "fluentd"
+  gem.add_development_dependency "ltsv"
   gem.add_runtime_dependency "fluentd"
+  gem.add_runtime_dependency "ltsv"
 end

data/lib/fluent/mixin/plaintextformatter.rb

@@ -1,4 +1,5 @@
 require 'fluent/config'
+require 'ltsv'
 
 module Fluent
   module Mixin
@@ -57,6 +58,8 @@ module Fluent
 
         @custom_attributes = if @output_data_type == 'json'
                                nil
+                             elsif @output_data_type == 'ltsv'
+                               nil
                              elsif @output_data_type =~ /^attr:(.+)$/
                                $1.split(',')
                              else
@@ -66,7 +69,12 @@ module Fluent
 
       def stringify_record(record)
         if @custom_attributes.nil?
-          record.to_json
+          case @output_data_type
+          when 'json'
+            record.to_json
+          when 'ltsv'
+            LTSV.dump(record)
+          end
         else
           @custom_attributes.map{|attr|
             (record[attr] || 'NULL').to_s

data/test/mixin/test_plaintextformatter.rb

@@ -173,4 +173,18 @@ field_separator comma
     # format
     assert_equal "10000,foo foo baz\n", p.format('test.a', 1342163105, r)
   end
+
+  def test_field_separator_newline_ltsv
+    p = create_plugin_instance(Fluent::TestDOutput, "type testd\nlocaltime\n")
+    r = {'foo' => 'foo foo baz', 'bar' => 10000}
+    rs = {:foo => 'foo foo baz', :bar => "10000"}
+    # stringify
+    assert_equal rs, LTSV.parse(p.stringify_record(r))
+
+    line = p.format('test.d', 1342163105, r)
+    # output_include_time true, output_include_tag true, localtime, separator COMMA
+    assert_equal ['2012-07-13T16:05:05+09:00', 'test.d'], line.chomp.split(/\t/, 3)[0..1]
+    # output_data_type json
+    assert_equal rs, LTSV.parse(line.chomp.split(/\t/, 3)[2])
+  end
 end

data/test/output.rb

@@ -61,4 +61,21 @@ module Fluent
     end
   end
 
+  class TestDOutput < Fluent::BufferedOutput
+    Fluent::Plugin.register_output('testa', self)
+
+    config_set_default :buffer_type, 'memory'
+
+    include Fluent::Mixin::PlainTextFormatter
+
+    config_set_default :output_include_time, true
+    config_set_default :output_include_tag, true
+    config_set_default :output_data_type, 'ltsv'
+    config_set_default :remove_prefix, nil
+    config_set_default :default_tag, 'tag.blank'
+
+    def configure(conf)
+      super
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-mixin-plaintextformatter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !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: :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
@@ -43,6 +59,22 @@ dependencies:
     - - ! '>='
       - !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'
 description: included to format values into json, tsv or csv
 email:
 - tagomoris@gmail.com