fluent-plugin-formatter_sprintf 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c29fa74f14ed89372ce1790fc6e840cb18bd026c
-  data.tar.gz: 25575cb703755f1039806fa596686ab645b957dd
+  metadata.gz: 0a1ce6bc172f625cbd6b94723ea9f7e54f4fbe07
+  data.tar.gz: fa4978e679300e261940494a8844c85fba30d836
 SHA512:
-  metadata.gz: 94666c65e0d2321805d2207ca2f8ab800df4963be57ee09d3a611ae6895417f60df6f5b4b38062338fbe512d3cb717a1584309739309854936545bef5e9e57d4
-  data.tar.gz: 81bf567361de1e809d011e9d18c291ef2b090b843d9e2d445b93d8d99f97a01ff51c286d2de77c7c179da124b50a1b2229b1f6d96d8f419df6ad97b5a0158488
+  metadata.gz: 3ba2e31925a7e61344f45c1016b2f8402e3e0ca2149b0c14b042c575fb1194db8173f716ef4f6a5cae1ea135f7f6b8c14d002a826c16f52489d62337105c1823
+  data.tar.gz: c049c276211a87372f7b0583762404dbd363c5e717f2aa47b216558c1d336a75bd65be9bb24e8bbd84e3110b2bfb51fc99ce68bec425fd5469b92d8cbd1932bc

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 2.0.0
   - 2.1.*
   - 2.2.*
   - 2.3.0

data/README.md

@@ -22,8 +22,10 @@ gem install fluent-plugin-formatter_sprintf
 <match test.file>
   type file
   path /tmp/test.log
-  format sprintf
-  sprintf_format "${tag} ${time} ${url} ${ip_address}\n"
+  <format>
+    @type sprintf
+    sprintf_format "${tag} ${time} ${url} ${ip_address}\n"
+  </format>
   time_format "%Y-%m-%d %H:%M:%S"
 </match>
 ```
@@ -47,18 +49,21 @@ gem install fluent-plugin-formatter_sprintf
   time_format %Y-%m-%d %H:%M:%S,%3N
   store_as text
 
-  format sprintf
-  sprintf_format "${tag} ${time} ${url} ${ip_address}\n"
-
+  <format>
+    @type sprintf
+    sprintf_format "${tag} ${time} ${url} ${ip_address}\n"
+  </format>
 </match>
 ```
 
 ### blank string(include [nil, empty?, blank?])
 
 ```apache
-  format sprintf
-  sprintf_format "${tag} ${time} ${url} ${ip_address}\n"
-  sprintf_blank_string -
+  <format>
+    @type sprintf
+    sprintf_format "${tag} ${time} ${url} ${ip_address}\n"
+    sprintf_blank_string -
+  </format>
 ```
 
 ##### input
@@ -73,8 +78,12 @@ analysis.pageview 2016-01-01 00:00:00 - -
 
 ### bad syntax(at error)
 
+```apache
+<format>
+  @type sprintf
   sprintf_format "%s ${tag} ${time} ${url} ${ip_address}\n"
-
+</format>
+```
 
 ## ChangeLog
 

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.4"
+  s.version     = "0.1.0"
   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

@@ -1,10 +1,9 @@
+require 'fluent/plugin/formatter'
+
 module Fluent
-  module TextFormatter
+  module Plugin
     class SprintfFormatter < Formatter
-      Plugin.register_formatter('sprintf', self)
-
-      include Configurable
-      include HandleTagAndTimeMixin
+      Fluent::Plugin.register_formatter('sprintf', self)
 
       config_param :sprintf_format, :string
       config_param :sprintf_blank_string, :string, :default => nil

data/test/test_formatter_sprintf.rb

@@ -1,4 +1,5 @@
 require_relative 'helper'
+require 'fluent/test/driver/formatter'
 require 'fluent/formatter'
 require 'fluent/plugin/formatter_sprintf'
 
@@ -9,7 +10,7 @@ class SprintfFormatterTest < ::Test::Unit::TestCase
   end
 
   def create_driver(conf={})
-    Fluent::Test::FormatterTestDriver.new(Fluent::TextFormatter::SprintfFormatter).configure(conf)
+    Fluent::Test::Driver::Formatter.new(Fluent::Plugin::SprintfFormatter).configure(conf)
   end
 
   def configure(conf)
@@ -21,7 +22,7 @@ class SprintfFormatterTest < ::Test::Unit::TestCase
     tag = 'file.test'
     record = {"url" => "/", "ip_address" => "127.0.0.1"}
 
-    formatted = @formatter.format(tag, @time, record)
+    formatted = @formatter.instance.format(tag, @time, record)
     assert_equal("file.test / 127.0.0.1\n", formatted)
   end
 
@@ -30,7 +31,7 @@ class SprintfFormatterTest < ::Test::Unit::TestCase
     tag = 'file.test'
     record = {"url" => "/", "ip_address" => "127.0.0.1"}
 
-    formatted = @formatter.format(tag, @time, record)
+    formatted = @formatter.instance.format(tag, @time, record)
     assert_equal("file.test\t/\t127.0.0.1\n", formatted)
   end
 
@@ -53,7 +54,7 @@ class SprintfFormatterTest < ::Test::Unit::TestCase
     tag = 'file.test'
     record = {"id" => 1, "ip_address" => "127.0.0.1"}
 
-    formatted = @formatter.format(tag, @time, record)
+    formatted = @formatter.instance.format(tag, @time, record)
     assert_equal("file.test\t1\t127.0.0.1\n", formatted)
   end
 
@@ -67,7 +68,7 @@ class SprintfFormatterTest < ::Test::Unit::TestCase
     tag = 'file.test'
     record = {"id" => nil, "ip_address" => "", "space" => " "}
 
-    formatted = @formatter.format(tag, @time, record)
+    formatted = @formatter.instance.format(tag, @time, record)
     assert_equal("file.test\t-\t-\t-\n", formatted)
   end
 
@@ -81,7 +82,7 @@ class SprintfFormatterTest < ::Test::Unit::TestCase
     tag = 'file.test'
     record = {"array" => []}
 
-    formatted = @formatter.format(tag, @time, record)
+    formatted = @formatter.instance.format(tag, @time, record)
     assert_equal("file.test\t-\n", formatted)
   end
 
@@ -96,7 +97,7 @@ class SprintfFormatterTest < ::Test::Unit::TestCase
     tag = 'file.test'
     record = {}
 
-    formatted = @formatter.format(tag, @time, record)
+    formatted = @formatter.instance.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.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Hiroshi Toyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-formatter_sprintf
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Fluentd Free formatter plugin, Use sprintf.