fluent-mixin-plaintextformatter 0.2.1 → 0.2.2

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.1"
+  gem.version       = "0.2.2"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{included to format values into json, tsv or csv}
@@ -13,8 +13,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   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

@@ -61,7 +61,7 @@ module Fluent
                              elsif @output_data_type == 'ltsv'
                                nil
                              elsif @output_data_type =~ /^attr:(.+)$/
-                               $1.split(',')
+                               $1.split(',').map(&:strip).reject(&:empty?)
                              else
                                raise Fluent::ConfigError, "invalid output_data_type:'#{@output_data_type}'"
                              end

data/test/mixin/test_plaintextformatter.rb

@@ -33,7 +33,7 @@ class PlainTextFormatterTest < Test::Unit::TestCase
   end
 
   def test_field_separator_newline_json
-    p = create_plugin_instance(Fluent::TestBOutput, "type testb\nlocaltime\n")
+    p = create_plugin_instance(Fluent::TestBOutput, "type testb\nutc\n")
     r = {'foo' => 'foo foo baz', 'bar' => 10000}
     # stringify
     assert_equal r, JSON.parse(p.stringify_record(r))
@@ -42,7 +42,7 @@ class PlainTextFormatterTest < Test::Unit::TestCase
     # add_newline false
     assert_equal line[0..-1], line.chomp
     # output_include_time true, output_include_tag true, localtime, separator COMMA
-    assert_equal ['2012-07-13T16:05:05+09:00', 'test.b'], line.chomp.split(/,/, 3)[0..1]
+    assert_equal ['2012-07-13T07:05:05Z', 'test.b'], line.chomp.split(/,/, 3)[0..1]
     # output_data_type json
     assert_equal r, JSON.parse(line.chomp.split(/,/, 3)[2])
   end
@@ -50,7 +50,7 @@ class PlainTextFormatterTest < Test::Unit::TestCase
   def test_time_format
     p = create_plugin_instance(Fluent::TestBOutput, %[
 type testb
-localtime
+utc
 time_format %Y/%m/%d %H:%M:%S
 ])
     r = {'foo' => 'foo foo baz', 'bar' => 10000}
@@ -61,14 +61,14 @@ time_format %Y/%m/%d %H:%M:%S
     # add_newline false
     assert_equal line[0..-1], line.chomp
     # output_include_time true, output_include_tag true, localtime, separator COMMA
-    assert_equal ['2012/07/13 16:05:05', 'test.b'], line.chomp.split(/,/, 3)[0..1]
+    assert_equal ['2012/07/13 07:05:05', 'test.b'], line.chomp.split(/,/, 3)[0..1]
     # output_data_type json
     assert_equal r, JSON.parse(line.chomp.split(/,/, 3)[2])
   end
   def test_separator_space_remove_prefix
     p = create_plugin_instance(Fluent::TestBOutput, %[
 type testb
-localtime
+utc
 time_format %Y/%m/%d:%H:%M:%S
 field_separator space
 remove_prefix test
@@ -81,14 +81,14 @@ remove_prefix test
     # add_newline false
     assert_equal line[0..-1], line.chomp
     # output_include_time true, output_include_tag true, localtime, separator COMMA
-    assert_equal ['2012/07/13:16:05:05', 'b'], line.chomp.split(/ /, 3)[0..1]
+    assert_equal ['2012/07/13:07:05:05', 'b'], line.chomp.split(/ /, 3)[0..1]
     # 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
+utc
 time_format %Y/%m/%d:%H:%M:%S
 field_separator soh
 remove_prefix test
@@ -101,7 +101,7 @@ remove_prefix test
     # 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]
+    assert_equal ['2012/07/13:07: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
@@ -175,16 +175,28 @@ field_separator comma
   end
 
   def test_field_separator_newline_ltsv
-    p = create_plugin_instance(Fluent::TestDOutput, "type testd\nlocaltime\n")
+    p = create_plugin_instance(Fluent::TestDOutput, "type testd\nutc\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))
+    obj_from_ltsv = LTSV.parse(p.stringify_record(r))
+    if obj_from_ltsv.is_a?(Array)
+      # LTSV breaks compatibility for LTSV.parse
+      # Results of LTSV.parse(string_of_single_object) returns Array instance after v0.0.2
+      obj_from_ltsv = obj_from_ltsv.first
+    end
+    assert_equal rs, obj_from_ltsv
 
     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]
+    assert_equal ['2012-07-13T07:05:05Z', 'test.d'], line.chomp.split(/\t/, 3)[0..1]
     # output_data_type json
-    assert_equal rs, LTSV.parse(line.chomp.split(/\t/, 3)[2])
+    obj_from_ltsv = LTSV.parse(line.chomp.split(/\t/, 3)[2])
+    if obj_from_ltsv.is_a?(Array)
+      # LTSV breaks compatibility for LTSV.parse
+      # Results of LTSV.parse(string_of_single_object) returns Array instance after v0.0.2
+      obj_from_ltsv = obj_from_ltsv.first
+    end
+    assert_equal rs, obj_from_ltsv
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-mixin-plaintextformatter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-04-08 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: :development
-  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: :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
@@ -112,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Text formatter mixin module to create fluentd plugin