fluent-plugin-fields-parser 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a4469d964d78e15cc78e179a61f24e0ada3e49a2
+  data.tar.gz: 8f557a228d09be7eea53329b262094694a4274ca
+SHA512:
+  metadata.gz: c1da9beeebfa4a08ba0be782b15423cd1f0857d245c98698b1f3907206c23113110054deab81ece237d22944bd7d2a3272b9370b9de39e9513afc9828a64032d
+  data.tar.gz: 6f27be00797bf5d196006a95ed7503246de335fe564a8f51250fd17d5bd88b8225064ef86e22ec115a9d3a187cec7c5608281069e8e96121fcebb4421f5b11c4

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+    - 2.4.2
+    - 2.3.5
+    - 2.2
+    - 2.1

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/README.md

@@ -1,5 +1,4 @@
-fluent-plugin-fields-parser
-===========================
+# fluent-plugin-fields-parser [![Build Status](https://travis-ci.org/tomas-zemres/fluent-plugin-fields-parser.png)](https://travis-ci.org/tomas-zemres/fluent-plugin-fields-parser)
 
 Fluent output filter plugin for parsing key/value fields in records
 based on <key>=<value> pattern.

data/Rakefile

@@ -11,4 +11,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => [:build]
+task :default => :test

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/fluent-plugin-fields-parser.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |gem|
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency "fluentd"
+  gem.add_dependency "fluentd", '>= 0.14.0'
   gem.add_dependency "logfmt"
   gem.add_development_dependency "rake"
+  gem.add_development_dependency 'test-unit'
 end
 

data/lib/fluent/plugin/out_fields_parser.rb

@@ -1,9 +1,12 @@
 require "logfmt"
+require "fluent/plugin/output"
 
-module Fluent
-  class OutputFieldsParser < Fluent::Output
+module Fluent::Plugin
+  class OutputFieldsParser < Output
     Fluent::Plugin.register_output('fields_parser', self)
 
+    helpers :event_emitter
+
     config_param :remove_tag_prefix,  :string, :default => nil
     config_param :add_tag_prefix,     :string, :default => nil
     config_param :parse_key,          :string, :default => 'message'
@@ -16,12 +19,11 @@ module Fluent
       @compiled_pattern ||= Regexp.new(pattern)
     end
 
-    def emit(tag, es, chain)
+    def process(tag, es)
       tag = update_tag(tag)
       es.each { |time, record|
-        Engine.emit(tag, time, parse_fields(record))
+        router.emit(tag, time, parse_fields(record))
       }
-      chain.next
     end
 
     def update_tag(tag)

data/test/out_fields_parser.rb

@@ -1,4 +1,5 @@
 require 'fluent/test'
+require 'fluent/test/driver/output'
 require 'fluent/plugin/out_fields_parser'
 
 class FieldsParserOutputTest < Test::Unit::TestCase
@@ -6,24 +7,24 @@ class FieldsParserOutputTest < Test::Unit::TestCase
     Fluent::Test.setup
   end
 
-  def create_driver(conf='', tag='orig.test.tag')
-    Fluent::Test::OutputTestDriver.new(Fluent::OutputFieldsParser, tag).configure(conf)
+  def create_driver(conf='')
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::OutputFieldsParser).configure(conf)
   end
 
   def test_config_defaults
     d = create_driver()
 
     orig_message = %{parse this num=-56.7 tok=abc%25 null=}
-    d.run do
-      d.emit({
+    d.run(default_tag: 'orig.test.tag') do
+      d.feed({
         'message' => orig_message,
         'other_key' => %{ test2 a=b },
       })
     end
 
-    emits = d.emits
-    assert_equal 1, emits.size
-    assert_equal "orig.test.tag", emits[0][0]
+    events = d.events
+    assert_equal 1, events.size
+    assert_equal "orig.test.tag", events[0][0]
     assert_equal(
       {
         'message' => orig_message,
@@ -32,7 +33,7 @@ class FieldsParserOutputTest < Test::Unit::TestCase
         'tok' => 'abc%25',
         'null' => '',
       },
-      emits[0][2]
+      events[0][2]
     )
   end
 
@@ -40,15 +41,15 @@ class FieldsParserOutputTest < Test::Unit::TestCase
     d = create_driver()
 
     orig_message = %{blax dq="asd ' asd +3" sq='as " s " 4' s=yu 6}
-    d.run do
-      d.emit({
+    d.run(default_tag: 'orig.test.tag') do
+      d.feed({
         'message' => orig_message,
       })
     end
 
-    emits = d.emits
-    assert_equal 1, emits.size
-    assert_equal "orig.test.tag", emits[0][0]
+    events = d.events
+    assert_equal 1, events.size
+    assert_equal "orig.test.tag", events[0][0]
     assert_equal(
       {
         'message' => orig_message,
@@ -56,23 +57,23 @@ class FieldsParserOutputTest < Test::Unit::TestCase
         'sq' => 'as " s " 4',
         's' => 'yu'
       },
-      emits[0][2]
+      events[0][2]
     )
   end
 
   def test_parsed_key_is_missing
     d = create_driver()
 
-    d.run do
-      d.emit({})
+    d.run(default_tag: 'orig.test.tag') do
+      d.feed({})
     end
 
-    emits = d.emits
-    assert_equal 1, emits.size
-    assert_equal "orig.test.tag", emits[0][0]
+    events = d.events
+    assert_equal 1, events.size
+    assert_equal "orig.test.tag", events[0][0]
     assert_equal(
       {},
-      emits[0][2]
+      events[0][2]
     )
   end
 
@@ -80,20 +81,20 @@ class FieldsParserOutputTest < Test::Unit::TestCase
     d = create_driver()
 
     orig_message = %{mock a=77 message=blax a=999 e=5}
-    d.run do
-      d.emit({'message' => orig_message, 'e' => nil })
+    d.run(default_tag: 'orig.test.tag') do
+      d.feed({'message' => orig_message, 'e' => nil })
     end
 
-    emits = d.emits
-    assert_equal 1, emits.size
-    assert_equal "orig.test.tag", emits[0][0]
+    events = d.events
+    assert_equal 1, events.size
+    assert_equal "orig.test.tag", events[0][0]
     assert_equal(
       {
         'message' => orig_message,
         'a' => '77',
         'e' => nil,
       },
-      emits[0][2]
+      events[0][2]
     )
   end
 
@@ -103,80 +104,80 @@ class FieldsParserOutputTest < Test::Unit::TestCase
       add_tag_prefix      new
     })
 
-    d.run do
-      d.emit({ message => 'abc' })
+    d.run(default_tag: 'orig.test.tag') do
+      d.feed({ 'message' => 'abc' })
     end
 
-    emits = d.emits
-    assert_equal 1, emits.size
-    assert_equal "new.test.tag", emits[0][0]
+    events = d.events
+    assert_equal 1, events.size
+    assert_equal "new.test.tag", events[0][0]
 
     d = create_driver(%{
       remove_tag_prefix   orig
       add_tag_prefix      new
-    }, tag=nil)
+    })
 
-    d.run do
-      d.emit({ message => 'abc' })
+    d.run(default_tag: '') do
+      d.feed({ 'message' => 'abc' })
     end
 
-    emits = d.emits
-    assert_equal 1, emits.size
-    assert_equal "new", emits[0][0]
+    events = d.events
+    assert_equal 1, events.size
+    assert_equal "new", events[0][0]
 
     d = create_driver(%{
       remove_tag_prefix   orig
       add_tag_prefix      new
-    }, tag='original')
+    })
 
-    d.run do
-      d.emit({ message => 'abc' })
+    d.run(default_tag: 'original') do
+      d.feed({ 'message' => 'abc' })
     end
 
-    emits = d.emits
-    assert_equal 1, emits.size
-    assert_equal "new.original", emits[0][0]
+    events = d.events
+    assert_equal 1, events.size
+    assert_equal "new.original", events[0][0]
 
     d = create_driver(%{
       remove_tag_prefix   orig
       add_tag_prefix      new
-    }, tag='orig')
+    })
 
-    d.run do
-      d.emit({ message => 'abc' })
+    d.run(default_tag: 'orig') do
+      d.feed({ 'message' => 'abc' })
     end
 
-    emits = d.emits
-    assert_equal 1, emits.size
-    assert_equal "new", emits[0][0]
+    events = d.events
+    assert_equal 1, events.size
+    assert_equal "new", events[0][0]
   end
 
   def test_parse_key
     d = create_driver('parse_key  custom_key')
 
-    d.run do
-      d.emit({
+    d.run(default_tag: 'orig.test.tag') do
+      d.feed({
         'message' => %{ test2 c=d },
         'custom_key' => %{ test2 a=b },
       })
-      d.emit({})
+      d.feed({})
     end
 
-    emits = d.emits
-    assert_equal 2, emits.size
-    assert_equal "orig.test.tag", emits[0][0]
+    events = d.events
+    assert_equal 2, events.size
+    assert_equal "orig.test.tag", events[0][0]
     assert_equal(
       {
         'message' => %{ test2 c=d },
         'custom_key' => %{ test2 a=b },
         'a' => 'b'
       },
-      emits[0][2]
+      events[0][2]
     )
     assert_equal(
       {
       },
-      emits[1][2]
+      events[1][2]
     )
   end
 
@@ -184,13 +185,13 @@ class FieldsParserOutputTest < Test::Unit::TestCase
     d = create_driver("fields_key output-key")
 
     orig_message = %{parse this num=-56.7 tok=abc%25 message=a+b}
-    d.run do
-      d.emit({'message' => orig_message})
+    d.run(default_tag: 'orig.test.tag') do
+      d.feed({'message' => orig_message})
     end
 
-    emits = d.emits
-    assert_equal 1, emits.size
-    assert_equal "orig.test.tag", emits[0][0]
+    events = d.events
+    assert_equal 1, events.size
+    assert_equal "orig.test.tag", events[0][0]
     assert_equal(
       {
         'message' => orig_message,
@@ -200,7 +201,7 @@ class FieldsParserOutputTest < Test::Unit::TestCase
           'message' => 'a+b',
         }
       },
-      emits[0][2]
+      events[0][2]
     )
   end
 
@@ -208,63 +209,62 @@ class FieldsParserOutputTest < Test::Unit::TestCase
     d = create_driver("pattern (\\w+):(\\d+)")
 
     orig_message = %{parse this a:44 b:ignore-this h=7 bbb:999}
-    d.run do
-      d.emit({'message' => orig_message})
-      d.emit({'message' => 'a'})
+    d.run(default_tag: 'orig.test.tag') do
+      d.feed({'message' => orig_message})
+      d.feed({'message' => 'a'})
     end
 
-    emits = d.emits
-    assert_equal 2, emits.size
-    assert_equal "orig.test.tag", emits[0][0]
+    events = d.events
+    assert_equal 2, events.size
+    assert_equal "orig.test.tag", events[0][0]
     assert_equal(
       {
         'message' => orig_message,
         'a' => '44',
         'bbb' => '999',
       },
-      emits[0][2]
+      events[0][2]
     )
     assert_equal(
       {
         'message' => 'a',
       },
-      emits[1][2]
+      events[1][2]
     )
   end
 
-def test_strict_key_value
-  d = create_driver("strict_key_value true")
-
-  orig_message = %{msg="Audit log" user=Johnny action="add-user" dontignore=don't-ignore-this result=success iVal=23 fVal=1.02 bVal=true}
-  d.run do
-    d.emit({'message' => orig_message})
-    d.emit({'message' => 'a'})
-  end
+  def test_strict_key_value
+    d = create_driver("strict_key_value true")
 
-  emits = d.emits
-  assert_equal 2, emits.size
-  assert_equal "orig.test.tag", emits[0][0]
-  assert_equal(
-    {
-      'message' => orig_message,
-      "msg"=>"Audit log",
-      'user' => "Johnny",
-      'action' => 'add-user',
-      'dontignore' => "don't-ignore-this",
-      'result' => 'success',
-      'iVal' => 23,
-      'fVal' => 1.02,
-      'bVal' => "true"
-    },
-    emits[0][2]
-  )
-  assert_equal(
-    {
-      'message' => 'a',
-    },
-    emits[1][2]
-  )
-end
+    orig_message = %{msg="Audit log" user=Johnny action="add-user" dontignore=don't-ignore-this result=success iVal=23 fVal=1.02 bVal=true}
+    d.run(default_tag: 'orig.test.tag') do
+      d.feed({'message' => orig_message})
+      d.feed({'message' => 'a'})
+    end
 
+    events = d.events
+    assert_equal 2, events.size
+    assert_equal "orig.test.tag", events[0][0]
+    assert_equal(
+      {
+        'message' => orig_message,
+        "msg"=>"Audit log",
+        'user' => "Johnny",
+        'action' => 'add-user',
+        'dontignore' => "don't-ignore-this",
+        'result' => 'success',
+        'iVal' => 23,
+        'fVal' => 1.02,
+        'bVal' => "true"
+      },
+      events[0][2]
+    )
+    assert_equal(
+      {
+        'message' => 'a',
+      },
+      events[1][2]
+    )
+  end
 
 end

metadata

@@ -1,62 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-fields-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Tomas Pokorny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2017-12-21 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'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: logfmt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    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'
 description: Fluent output filter plugin for parsing key/value fields in records
@@ -66,7 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
 - README.md
 - Rakefile
 - VERSION
@@ -76,26 +85,26 @@ files:
 homepage: https://github.com/tomas-zemres/fluent-plugin-fields-parser
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.5.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fluent output filter plugin for parsing key/value fields in records
-test_files: []
+test_files:
+- test/out_fields_parser.rb