fluent-mixin-plaintextformatter 0.1.0 → 0.2.0

data/LICENSE.txt

@@ -0,0 +1,13 @@
+Copyright (c) 2012- TAGOMORI Satoshi
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -7,7 +7,7 @@ This module provides features to:
 * format whole data as serialized JSON, single attribute or separated multi attributes
 * include time as line header (formatted by time_format in UTC(default) or localtime), or not
 * include tag as line header (remove_prefix available), or not
-* change field separator (TAB(default), SPACE or COMMA)
+* change field separator (TAB(default), SPACE, COMMA or SOH(\\001))
 * add new line as termination, or not
 
 ## Usage
@@ -72,7 +72,7 @@ Provided configurations are below:
 * output\_data\_type
   * 'json': output by JSON
   * 'attr:key1,key2,key3': values of 'key1' and 'key2' and ..., with separator specified by 'field_separator'
-* field\_separator [TAB/SPACE/COMMA]
+* field\_separator [TAB/SPACE/COMMA/SOH]
 * add_newline [yes/no]
 * time_format
   * format string like '%Y-%m-%d %H:%M:%S' or you want
@@ -80,9 +80,12 @@ Provided configurations are below:
   * 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'
 
-## AUTHORS
+## AUTHOR / CONTRIBUTORS
 
-* TAGOMORI Satoshi <tagomoris@gmail.com>
+* AUTHOR
+  * TAGOMORI Satoshi <tagomoris@gmail.com>
+* CONTRIBUTORS
+  * wolfg1969 https://github.com/wolfg1969
 
 ## 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.1.0"
+  gem.version       = "0.2.0"
   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

@@ -25,6 +25,7 @@ module Fluent
         @f_separator = case @field_separator
                        when /SPACE/i then ' '
                        when /COMMA/i then ','
+                       when /SOH/i then "\x01"
                        else "\t"
                        end
 

data/test/mixin/test_plaintextformatter.rb

@@ -85,7 +85,27 @@ remove_prefix test
     # output_data_type json
     assert_equal r, JSON.parse(line.chomp.split(/ /, 3)[2])
   end
+  def test_separator_soh_remove_prefix
+    p = create_plugin_instance(Fluent::TestBOutput, %[
+type testb
+localtime
+time_format %Y/%m/%d:%H:%M:%S
+field_separator soh
+remove_prefix test
+])
+    r = {'foo' => 'foo foo baz', 'bar' => 10000}
+    # stringify
+    assert_equal r, JSON.parse(p.stringify_record(r))
 
+    line = p.format('test.b', 1342163105, r)
+    # add_newline false
+    assert_equal line[0..-1], line.chomp
+    # output_include_time true, output_include_tag true, localtime, separator SOH
+    assert_equal ['2012/07/13:16:05:05', 'b'], line.chomp.split(/\001/, 3)[0..1]
+    # 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}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-mixin-plaintextformatter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -52,7 +52,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - fluent-mixin-plaintextformatter.gemspec

data/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2012 TAGOMORI Satoshi
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.