fluent-plugin-formatter_sprintf 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 680811c15a315a52cf2906c81909a4be47fe21e8
-  data.tar.gz: 5c26a569349c7525e385ba919eb6979c181f5ddd
+  metadata.gz: c29fa74f14ed89372ce1790fc6e840cb18bd026c
+  data.tar.gz: 25575cb703755f1039806fa596686ab645b957dd
 SHA512:
-  metadata.gz: 3d782c2973084909961205d341ab5134e49c529880c8caa98b0bf127b3f5b307cac28e060bbf9d6d649a3f16e9b989556cc5fcd16366ab88df6b4dbc3f7879b1
-  data.tar.gz: bae6243e0718c75c6056d939ed7ec0498d96f4d9d863ca37a216f96b630ea0e6e609324a1844e2ac0e8ad66f41c52b89eb53168592f084c554e188150383d0b3
+  metadata.gz: 94666c65e0d2321805d2207ca2f8ab800df4963be57ee09d3a611ae6895417f60df6f5b4b38062338fbe512d3cb717a1584309739309854936545bef5e9e57d4
+  data.tar.gz: 81bf567361de1e809d011e9d18c291ef2b090b843d9e2d445b93d8d99f97a01ff51c286d2de77c7c179da124b50a1b2229b1f6d96d8f419df6ad97b5a0158488

data/.travis.yml

@@ -1,7 +1,9 @@
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1
+  - 2.1.*
+  - 2.2.*
+  - 2.3.0
 gemfile:
   - Gemfile
+before_install: gem update bundler
 script: "rake test"

data/README.md

@@ -53,6 +53,24 @@ gem install fluent-plugin-formatter_sprintf
 </match>
 ```
 
+### blank string(include [nil, empty?, blank?])
+
+```apache
+  format sprintf
+  sprintf_format "${tag} ${time} ${url} ${ip_address}\n"
+  sprintf_blank_string -
+```
+
+##### input
+```json
+2016-03-15 14:21:40 +0900 analysis.pageview: { "url": null, "ip_address": null }
+```
+
+##### output
+```
+analysis.pageview 2016-01-01 00:00:00 - -
+```
+
 ### bad syntax(at error)
 
   sprintf_format "%s ${tag} ${time} ${url} ${ip_address}\n"

data/fluent-plugin-formatter_sprintf.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-formatter_sprintf"
-  s.version     = "0.0.3"
+  s.version     = "0.0.4"
   s.authors     = ["Hiroshi Toyama"]
   s.email       = ["toyama0919@gmail.com"]
   s.homepage    = "https://github.com/toyama0919/fluent-plugin-formatter_sprintf"

data/lib/fluent/plugin/formatter_sprintf.rb

@@ -41,15 +41,26 @@ module Fluent
 
       def get_values(keys, tag, time, record)
         keys.map{ |key|
-          if key == 'tag'
-            tag
-          elsif key == 'time'
-            Time.at(time).strftime(@time_format)
-          else
-            (record[key].nil? || record[key].empty?) ? @sprintf_blank_string : record[key]
-          end
+          get_value(key, tag, time, record)
         }
       end
+
+      def get_value(key, tag, time, record)
+        if key == 'tag'
+          tag
+        elsif key == 'time'
+          Time.at(time).strftime(@time_format)
+        else
+          return @sprintf_blank_string if record[key].nil?
+          if record[key].respond_to?(:empty?) && record[key].empty?
+            return @sprintf_blank_string
+          end
+          if record[key].class == String && record[key].strip.empty?
+            return @sprintf_blank_string
+          end
+          record[key]
+        end
+      end
     end
   end
 end

data/sample/fluent.conf

@@ -1,4 +1,9 @@
-<match test.file>
+<source>
+  type forward
+  port 24224
+</source>
+
+<match **>
   type file
   path /tmp/test.log
   format sprintf

data/test/test_formatter_sprintf.rb

@@ -8,11 +8,16 @@ class SprintfFormatterTest < ::Test::Unit::TestCase
     @time = Fluent::Engine.now
   end
 
+  def create_driver(conf={})
+    Fluent::Test::FormatterTestDriver.new(Fluent::TextFormatter::SprintfFormatter).configure(conf)
+  end
+
   def configure(conf)
+    @formatter = create_driver(conf)
   end
 
   def test_format_space
-    @formatter.configure({'sprintf_format' => "${tag} ${url} ${ip_address}\n"})
+    configure({'sprintf_format' => "${tag} ${url} ${ip_address}\n"})
     tag = 'file.test'
     record = {"url" => "/", "ip_address" => "127.0.0.1"}
 
@@ -21,7 +26,7 @@ class SprintfFormatterTest < ::Test::Unit::TestCase
   end
 
   def test_format_tsv
-    @formatter.configure({'sprintf_format' => "${tag}\t${url}\t${ip_address}\n"})
+    configure({'sprintf_format' => "${tag}\t${url}\t${ip_address}\n"})
     tag = 'file.test'
     record = {"url" => "/", "ip_address" => "127.0.0.1"}
 
@@ -31,15 +36,67 @@ class SprintfFormatterTest < ::Test::Unit::TestCase
 
   def test_format_literal_error
     assert_raise(Fluent::ConfigError) do
-      @formatter.configure({'sprintf_format' => "%s\t${url}\t${ip_address}\n"})
+      configure({'sprintf_format' => "%s\t${url}\t${ip_address}\n"})
     end    
 
     assert_raise(Fluent::ConfigError) do
-      @formatter.configure({'sprintf_format' => "${url}\t${ip_address}\t%s"})
+      configure({'sprintf_format' => "${url}\t${ip_address}\t%s"})
     end    
 
     assert_raise(Fluent::ConfigError) do
-      @formatter.configure({'sprintf_format' => "${url}\t%s\t${ip_address}\t"})
+      configure({'sprintf_format' => "${url}\t%s\t${ip_address}\t"})
     end    
   end
+
+  def test_fixnum
+    configure({'sprintf_format' => "${tag}\t${id}\t${ip_address}\n"})
+    tag = 'file.test'
+    record = {"id" => 1, "ip_address" => "127.0.0.1"}
+
+    formatted = @formatter.format(tag, @time, record)
+    assert_equal("file.test\t1\t127.0.0.1\n", formatted)
+  end
+
+  def test_sprintf_blank_string
+    configure(
+      {
+        'sprintf_format' => "${tag}\t${id}\t${ip_address}\t${space}\n",
+        'sprintf_blank_string' => "-",
+      }
+    )
+    tag = 'file.test'
+    record = {"id" => nil, "ip_address" => "", "space" => " "}
+
+    formatted = @formatter.format(tag, @time, record)
+    assert_equal("file.test\t-\t-\t-\n", formatted)
+  end
+
+  def test_sprintf_blank_string_with_array
+    configure(
+      {
+        'sprintf_format' => "${tag}\t${array}\n",
+        'sprintf_blank_string' => "-",
+      }
+    )
+    tag = 'file.test'
+    record = {"array" => []}
+
+    formatted = @formatter.format(tag, @time, record)
+    assert_equal("file.test\t-\n", formatted)
+  end
+
+  def test_sprintf_blank_record_format
+    configure(
+      {
+        'sprintf_format' => "${tag}\t${id}\t${ip_address}\t${space}\n",
+        'sprintf_blank_string' => "-",
+        'sprintf_blank_record_format' => "---\n",
+      }
+    )
+    tag = 'file.test'
+    record = {}
+
+    formatted = @formatter.format(tag, @time, record)
+    assert_equal("---\n", formatted)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-formatter_sprintf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Hiroshi Toyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -119,11 +119,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-formatter_sprintf
-rubygems_version: 2.4.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Fluentd Free formatter plugin, Use sprintf.
 test_files:
 - test/helper.rb
 - test/test_formatter_sprintf.rb
-has_rdoc: