fluent-plugin-filter 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be8cf5ff3ab2e36b58ddea36e60630cb2e4a337d
-  data.tar.gz: 3ac6af56a55b316e3e889763e962a2df39517cec
+  metadata.gz: 677804cde241741f2449565acd4400e4020b5078
+  data.tar.gz: 4fba58dbc973ae62fa23e5894d0f324ff6dfc0a0
 SHA512:
-  metadata.gz: d9d5e44650f926f86e45445dc3a9eddc6d5f758f3089ef2e09e1907bb7acf6fe1efe33b5a43f829269cc124d296092dbff87c5536507d46d1b3b9a89537f1013
-  data.tar.gz: 7a5b25fee4361ffdd08958d8ac1b20abec0d00e5c97873332c7e6ed10d96e59f9ee25400938ffd7262feb0f8b6a89a4fd440c553953248594952a3fdec4d0968
+  metadata.gz: f1acce40701456fe992258b189574214f74afdb3b7403a84cbc9760c6e83358ee8ff36ca43ff34eb826ac3bbd890f6c1f5c02f801b3cbf7b3e3ad5ec6176cc73
+  data.tar.gz: 60ccbab7eb21d8ba9181b5aa13446508785642d4ead72711938aa2b755f7e663f8498b49a37f3fbdecd8209db6cfdb6cd4f37ca2095c69e7cc9ba236d1569012

data/.travis.yml

@@ -1,5 +1,7 @@
 rvm:
   - 2.1
   - 2.2
+  - 2.3.4
+  - 2.4.1
 gemfile:
   - Gemfile

data/fluent-plugin-filter.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-filter"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.5"
+  gem.version       = "0.1.0"
 
   gem.extra_rdoc_files = [
     "ChangeLog",
@@ -20,5 +20,5 @@ Gem::Specification.new do |gem|
   ]
   gem.add_development_dependency "rake"
   gem.add_development_dependency "test-unit", "~> 3.1.0"
-  gem.add_runtime_dependency "fluentd"
+  gem.add_runtime_dependency "fluentd", [">= 0.14.15", "< 2"]
 end

data/lib/fluent/plugin/filter_filter.rb

@@ -1,9 +1,10 @@
-module Fluent
+require 'fluent/plugin/filter_util'
+require 'fluent/plugin/filter'
+module Fluent::Plugin
 class FilterFilter < Filter
-  require 'fluent/plugin/filter_util'
   include FilterUtil
 
-  Plugin.register_filter('filter', self)
+  Fluent::Plugin.register_filter('filter', self)
 
   config_param :all, :string, :default => 'allow'
   config_param :allow, :string, :default => ''

data/lib/fluent/plugin/filter_util.rb

@@ -1,4 +1,4 @@
-module Fluent
+module Fluent::Plugin
   module FilterUtil
     def toMap (str, delim)
       str.split(/\s*#{delim}\s*/).map do|pair|

data/lib/fluent/plugin/out_filter.rb

@@ -1,9 +1,14 @@
-module Fluent
+require 'fluent/plugin/filter_util'
+require 'fluent/plugin/output'
+
+module Fluent::Plugin
 class FilterOutput < Output
-  require 'fluent/plugin/filter_util'
+
+  helpers :event_emitter
+
   include FilterUtil
 
-  Plugin.register_output('filter', self)
+  Fluent::Plugin.register_output('filter', self)
 
   config_param :all, :string, :default => 'allow'
   config_param :allow, :string, :default => ''
@@ -25,7 +30,7 @@ class FilterOutput < Output
     define_method("router") { Fluent::Engine }
   end
 
-  def emit(tag, es, chain)
+  def process(tag, es)
     if @add_prefix
       tag = @add_prefix + '.' + tag
     end
@@ -33,7 +38,6 @@ class FilterOutput < Output
       next unless passRules(record)
       router.emit(tag, time, record)
     end
-    chain.next
   end
 end
 

data/test/plugin/test_filter_filter.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'helper'
+require 'fluent/test/driver/filter'
 
 class TestFilterFilter < Test::Unit::TestCase
   def setup
@@ -11,8 +12,8 @@ class TestFilterFilter < Test::Unit::TestCase
     deny status: 404
   ]
 
-  def create_driver(conf = CONFIG, tag='test.input')
-    Fluent::Test::FilterTestDriver.new(Fluent::FilterFilter, tag).configure(conf)
+  def create_driver(conf = CONFIG)
+    Fluent::Test::Driver::Filter.new(Fluent::Plugin::FilterFilter).configure(conf)
   end
 
   data("int value" => [{"allows" => [['status', 200]], "denies" => []},
@@ -104,13 +105,13 @@ class TestFilterFilter < Test::Unit::TestCase
       {'status' => 200, 'agent' => 'Gecka', 'path' => '/users/3'},
       {'status' => 404, 'agent' => 'Gecko', 'path' => '/wrong'},
     ]
-    d = create_driver(target, 'test.input')
-    d.run do
+    d = create_driver(target)
+    d.run(default_tag: 'test') do
       inputs.each do |dat|
-        d.filter dat
+        d.feed dat
       end
     end
-    assert_equal expected, d.filtered_as_array.length
+    assert_equal expected, d.filtered.map{|e| e.last}.length
   end
 
   data("allow message2" => [1,
@@ -129,12 +130,12 @@ class TestFilterFilter < Test::Unit::TestCase
       {'message' => 'hoge', 'message2' => 'hoge2'},
       {'message' => 'hoge3'},
     ]
-    d = create_driver(target, 'test.input')
-    d.run do
+    d = create_driver(target)
+    d.run(default_tag: 'test.input') do
       inputs.each do |dat|
-        d.filter dat
+        d.feed dat
       end
     end
-    assert_equal expected, d.filtered_as_array.length
+    assert_equal expected, d.filtered.map{|e| e.last}.length
   end
 end

data/test/plugin/test_out_filter.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'helper'
+require 'fluent/test/driver/output'
 
 class Filter < Test::Unit::TestCase
   def setup
@@ -11,8 +12,8 @@ class Filter < Test::Unit::TestCase
     deny status: 404
   ]
 
-  def create_driver(conf = CONFIG, tag='test.input')
-    Fluent::Test::OutputTestDriver.new(Fluent::FilterOutput, tag).configure(conf)
+  def create_driver(conf = CONFIG)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::FilterOutput).configure(conf)
   end
 
   def test_configure
@@ -102,104 +103,104 @@ class Filter < Test::Unit::TestCase
       {'status' => 404, 'agent' => 'Gecko', 'path' => '/wrong'},
     ]
 
-    d = create_driver(CONFIG, 'test.input')
-    d.run do
+    d = create_driver(CONFIG)
+    d.run(default_tag: 'test.input') do
       data.each do |dat|
-        d.emit dat
+        d.feed dat
       end
     end
-    assert_equal 5, d.emits.length
+    assert_equal 5, d.events.length
 
     d = create_driver(%[
       all deny
       allow status: 200
-    ], 'test.input')
-    d.run do
+    ])
+    d.run(default_tag: 'test.input') do
       data.each do |dat|
-        d.emit dat
+        d.feed dat
       end
     end
-    assert_equal 3, d.emits.length
+    assert_equal 3, d.events.length
 
     d = create_driver(%[
       all deny
       allow status: 200, status: 303
-    ], 'test.input')
-    d.run do
+    ])
+    d.run(default_tag: 'test.input') do
       data.each do |dat|
-        d.emit dat
+        d.feed dat
       end
     end
-    assert_equal 4, d.emits.length
+    assert_equal 4, d.events.length
 
     d = create_driver(%[
       all deny
       allow agent: Gecko
-    ], 'test.input')
-    d.run do
+    ])
+    d.run(default_tag: 'test.input') do
       data.each do |dat|
-        d.emit dat
+        d.feed dat
       end
     end
-    assert_equal 3, d.emits.length
+    assert_equal 3, d.events.length
 
     d = create_driver(%[
       all deny
       allow agent: "Gecko"
-    ], 'test.input')
-    d.run do
+    ])
+    d.run(default_tag: 'test') do
       data.each do |dat|
-        d.emit dat
+        d.feed dat
       end
     end
-    assert_equal 3, d.emits.length
+    assert_equal 3, d.events.length
 
     d = create_driver(%[
       all deny
       allow agent: "Gecko"
       deny status: 200
-    ], 'test.input')
-    d.run do
+    ])
+    d.run(default_tag: 'test.input') do
       data.each do |dat|
-        d.emit dat
+        d.feed dat
       end
     end
-    assert_equal 3, d.emits.length
+    assert_equal 3, d.events.length
 
     d = create_driver(%[
       all deny
       allow agent: /Geck/
-    ], 'test.input')
-    d.run do
+    ])
+    d.run(default_tag: 'test') do
       data.each do |dat|
-        d.emit dat
+        d.feed dat
       end
     end
-    assert_equal 4, d.emits.length
+    assert_equal 4, d.events.length
 
     d = create_driver(%[
       all deny
       allow agent: /Geck/
       add_prefix hoge
-    ], 'test.input')
-    d.run do
+    ])
+    d.run(default_tag: 'test.input') do
       data.each do |dat|
-        d.emit dat
+        d.feed dat
       end
     end
-    assert_equal "hoge.test.input", d.emits[0][0]
+    assert_equal "hoge.test.input", d.events[0][0]
 
     d = create_driver(%[
       all deny
       allow path: /\\/users\\/\\d+/
-    ], 'test.input')
+    ])
 
-    d.run do
+    d.run(default_tag: 'test.input') do
       data.each do |dat|
-        d.emit dat
+        d.feed dat
       end
     end
-    assert_equal 3, d.emits.length
+    assert_equal 3, d.events.length
 
     data = [
       {'message' => 'hoge', 'message2' => 'hoge2'},
@@ -209,26 +210,26 @@ class Filter < Test::Unit::TestCase
     d = create_driver(%[
       all deny
       allow message2: /hoge2/
-    ], 'test.input')
+    ])
 
-    d.run do
+    d.run(default_tag: 'test.input') do
       data.each do |dat|
-        d.emit dat
+        d.feed dat
       end
     end
-    assert_equal 1, d.emits.length
+    assert_equal 1, d.events.length
 
     d = create_driver(%[
       all allow
       deny message2: /hoge2/
-    ], 'test.input')
+    ])
 
-    d.run do
+    d.run(default_tag: 'test.input') do
       data.each do |dat|
-        d.emit dat
+        d.feed dat
       end
     end
-    assert_equal 1, d.emits.length
+    assert_equal 1, d.events.length
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Muddy Dixon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.15
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.15
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Simple output filter
 email:
 - muddydixon@gmail.com
@@ -95,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-filter
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Simple output filter