fluent-plugin-formatter_sprintf 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02096918dee431715480041b7b23f0040680191e
-  data.tar.gz: 92220382a6186a03b5dc37dc703d3edaac121cbd
+  metadata.gz: 5675b240999ae98824ca04a279b71c761cc7ab1b
+  data.tar.gz: 9c2cbc6f59ce9b2abdefd0e6cb79b5e6c0791dd7
 SHA512:
-  metadata.gz: ef617634e2246ce43a034caef558a629af61f0832073f81065fd88bed4abc4ec52542dd9476a0c10884678ed201e8c2a4ef95f97b7b37f2cc3cd67742512915b
-  data.tar.gz: 27495d9dfd9f7a088878320110905450de30106351d4805464ba6ad71fadbaa7a25079c2277b6dd50f92ab27a542d9ea848620955d742281b5898758b0cc1091
+  metadata.gz: 0dfbd9fa5a68e6587818b352b0f63b0b5d73756714ae90f6153314bd2892ec999359f49b9abb2c2d930405d79d0bce5ee792f3bd72acca3debfcc91c6c0c3a8a
+  data.tar.gz: 21887079b92d92c83f8b426a4b94507ea4117dee35f17f26d938718eb0968f786a37d94803005dcf378ffe0a30748f5e11778659391d1056f4793c24c70ea54a

data/.travis.yml

@@ -4,3 +4,4 @@ rvm:
   - 2.1
 gemfile:
   - Gemfile
+script: "rake test"

data/README.md

@@ -1,6 +1,6 @@
 # fluent-plugin-formatter_sprintf
 
-[![Build Status](https://secure.travis-ci.org/sonots/fluent-plugin-formatter_sprintf.png?branch=master)](http://travis-ci.org/sonots/fluent-plugin-formatter_sprintf)
+[![Build Status](https://secure.travis-ci.org/toyama0919/fluent-plugin-formatter_sprintf.png?branch=master)](http://travis-ci.org/toyama0919/fluent-plugin-formatter_sprintf)
 
 Fluentd sprintf formatter plugin
 

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.1"
+  s.version     = "0.0.2"
   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

@@ -7,6 +7,8 @@ module Fluent
       include HandleTagAndTimeMixin
 
       config_param :sprintf_format, :string
+      config_param :sprintf_blank_string, :string, :default => nil
+      config_param :sprintf_blank_record_format, :string, :default => nil
 
       def initialize
         super
@@ -18,6 +20,11 @@ module Fluent
         r = /\$\{([^}]+)\}/
         @keys = @sprintf_format.scan(r).map{ |key| key.first }
         @sprintf_format = @sprintf_format.gsub(/\$\{([^}]+)\}/, '%s')
+        if @sprintf_blank_record_format
+          @sprintf_blank_record_keys = @sprintf_blank_record_format.scan(r).map{ |key| key.first }
+          @sprintf_blank_record_format = @sprintf_blank_record_format.gsub(/\$\{([^}]+)\}/, '%s')
+        end
+
         begin
           @sprintf_format % @keys
         rescue ArgumentError => e
@@ -26,16 +33,22 @@ module Fluent
       end
 
       def format(tag, time, record)
-        values = @keys.map{ |key| 
+        if record.empty? && @sprintf_blank_record_format
+          return @sprintf_blank_record_format % get_values(@sprintf_blank_record_keys, tag, time, record)
+        end
+        @sprintf_format % get_values(@keys, tag, time, record)
+      end
+
+      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] 
+            record[key] || @sprintf_blank_string
           end
         }
-        @sprintf_format % values
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-formatter_sprintf
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Hiroshi Toyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -126,3 +126,4 @@ summary: Fluentd Free formatter plugin, Use sprintf.
 test_files:
 - test/helper.rb
 - test/test_formatter_sprintf.rb
+has_rdoc: