fluent-plugin-conditional_filter 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da5d5a07de7eecf356626bd2cf0bdd88c300f39e
-  data.tar.gz: 8ad55890d05c1e1ecc37264d2003c9d139968318
+  metadata.gz: 6cc5c490e9566041f5cd52dcdbccaa2e37db1477
+  data.tar.gz: bd5605aeb0b2ed35045020e9b1a45ab0e9206146
 SHA512:
-  metadata.gz: 4002c8649cb44d8a05f1219483c9998cff8d3158e489c58769f7b31b2e8f698dd292ec30c81ba8e610e3f14282762bb5cc298d17a72dfddba1ddb6313457dda0
-  data.tar.gz: 785a93b79ba285fd2c948c2d0456cf83ddd8cb8c38f3d1080c4d927605399ed353dfc764cbbbd1e8f975ab56f54eaf77bf99181639779ff1757dbc9e3c983451
+  metadata.gz: 9cda736e9cdbddc4e0d4cdec38f9c5e913bec91817c3d4085209d07d0be6164abb11615679e29bdd4b2e326b965ea5ad5bc30ce01c9aba078dde35db84926dca
+  data.tar.gz: d5d9fef02572bc606b5877382b045f1ede9975682a425d314b2d91423da8ab767308512c03b019eda1aac89e7afe677e31ea244ea6e913f63244f8b486df9694

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 
 rvm:
-  - 1.9.3
-  - 1.9.2
-  - ruby-head
-  - rbx-19mode
-
+  - 2.1
+  - 2.2
+  - 2.3.5
+  - 2.4.2

data/README.md

@@ -1,4 +1,4 @@
-# Fluent::Plugin::ConditionalFilter [![BuildStatus](https://secure.travis-ci.org/kentaro/fluent-plugin-conditional_filter.png)](http://travis-ci.org/kentaro/fluent-plugin-conditional_filter)
+# Fluent::Plugin::ConditionalFilter, a plugin for [Fluentd](http://fluentd.org) [![BuildStatus](https://secure.travis-ci.org/kentaro/fluent-plugin-conditional_filter.png)](http://travis-ci.org/kentaro/fluent-plugin-conditional_filter)
 
 ## Component
 
@@ -10,8 +10,11 @@ fluent-plugin-conditional_filter provides a simple filter that filters out key/v
 
 ### Synopsis
 
+If there's such a configuration as below:
+
 ```
 <match test.**>
+  type           conditional_filter
   add_tag_prefix filtered.
   key_pattern    @example\.com$
   condition      10
@@ -19,6 +22,24 @@ fluent-plugin-conditional_filter provides a simple filter that filters out key/v
 </match>
 ```
 
+When the log below reaches:
+
+```
+'test' => {
+  'foo@example.com' => 5,
+  'bar@example.com' => 15,
+  'baz@baz.com'     => 12,
+}
+```
+
+key/value pairs that don't match either `key_pattern` or the condition designated by `condition` and `filter` are filtered out.
+
+```
+'filtered.test' => {
+  'bar@example.com' => 15,
+}
+```
+
 ### Params
 
 #### `key_pattern` (required)

data/fluent-plugin-conditional_filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'fluent-plugin-conditional_filter'
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.authors       = ['Kentaro Kuribayashi']
   spec.email         = ['kentarok@gmail.com']
   spec.description   = %q{A fluent plugin that provides conditional filters}
@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'test-unit'
 end
-

data/lib/fluent/plugin/out_conditional_filter.rb

@@ -1,6 +1,11 @@
 class Fluent::ConditionalFilterOutput < Fluent::Output
   Fluent::Plugin.register_output('conditional_filter', self)
 
+  # Define `router` method of v0.12 to support v0.10 or earlier
+  unless method_defined?(:router)
+    define_method("router") { Fluent::Engine }
+  end
+
   include Fluent::HandleTagNameMixin
 
   config_param :key_pattern, :string
@@ -26,7 +31,7 @@ class Fluent::ConditionalFilterOutput < Fluent::Output
       record = filter_record(t, time, record)
 
       if record.any?
-        Fluent::Engine.emit(t, time, record)
+        router.emit(t, time, record)
       end
     end
 
@@ -36,6 +41,7 @@ class Fluent::ConditionalFilterOutput < Fluent::Output
   private
 
   def filter_record(tag, time, record)
+    super
     case filter
     when 'numeric_upward'
       filter_record = record.select do |key, value|

data/spec/lib/out_conditional_filter_spec.rb

@@ -225,6 +225,118 @@ describe Fluent::ConditionalFilterOutput do
         }
       end
     end
+
+    context('add_tag_prefix') do
+      let(:conf) {
+        %[
+          add_tag_prefix filtered.
+          key_pattern @example.com$
+          condition   10
+          filter      numeric_upward
+        ]
+      }
+
+      let(:driver) { Fluent::Test::OutputTestDriver.new(described_class, 'test').configure(conf) }
+      subject {
+        driver.instance
+      }
+
+      context('add tag prefix') do
+        before {
+          driver.run {
+            driver.emit('foo@example.com' => 12, 'bar@example.com' => 6, 'baz@baz.com' => 15)
+          }
+        }
+
+        it {
+          expect(driver.emits[0][0]).to be == 'filtered.test'
+        }
+      end
+    end
+
+    context('remove_tag_prefix') do
+      let(:conf) {
+        %[
+          remove_tag_prefix filtered.
+          key_pattern @example.com$
+          condition   10
+          filter      numeric_upward
+        ]
+      }
+
+      let(:driver) { Fluent::Test::OutputTestDriver.new(described_class, 'filtered.filtered.test').configure(conf) }
+      subject {
+        driver.instance
+      }
+
+      context('remove tag prefix') do
+        before {
+          driver.run {
+            driver.emit('foo@example.com' => 12, 'bar@example.com' => 6, 'baz@baz.com' => 15)
+          }
+        }
+
+        it {
+          expect(driver.emits[0][0]).to be == 'filtered.test'
+        }
+      end
+    end
+
+    context('add_tag_suffix') do
+      let(:conf) {
+        %[
+          add_tag_suffix .test
+          key_pattern @example.com$
+          condition   10
+          filter      numeric_upward
+        ]
+      }
+
+      let(:driver) { Fluent::Test::OutputTestDriver.new(described_class, 'filtered').configure(conf) }
+      subject {
+        driver.instance
+      }
+
+      context('add tag suffix') do
+        before {
+          driver.run {
+            driver.emit('foo@example.com' => 12, 'bar@example.com' => 6, 'baz@baz.com' => 15)
+          }
+        }
+
+        it {
+          expect(driver.emits[0][0]).to be == 'filtered.test'
+        }
+      end
+    end
+
+    context('remove_tag_suffix') do
+      let(:conf) {
+        %[
+          remove_tag_suffix .filtered
+          key_pattern @example.com$
+          condition   10
+          filter      numeric_upward
+        ]
+      }
+
+      let(:driver) { Fluent::Test::OutputTestDriver.new(described_class, 'filtered.test.filtered').configure(conf) }
+      subject {
+        driver.instance
+      }
+
+      context('remove tag prefix') do
+        before {
+          driver.run {
+            driver.emit('foo@example.com' => 12, 'bar@example.com' => 6, 'baz@baz.com' => 15)
+          }
+        }
+
+        it {
+          expect(driver.emits[0][0]).to be == 'filtered.test'
+        }
+      end
+    end
   end
 end
 

data/spec/spec_helper.rb

@@ -2,6 +2,9 @@ require 'fluent/test'
 require 'fluent/plugin/out_conditional_filter'
 
 RSpec.configure do |config|
+  config.before(:all) do
+    Fluent::Test.setup
+  end
 end
 
 unless ENV.has_key?('VERBOSE')

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-conditional_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kentaro Kuribayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     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: rake
   requirement: !ruby/object:Gem::Requirement
     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: rspec
   requirement: !ruby/object:Gem::Requirement
     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
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A fluent plugin that provides conditional filters
@@ -73,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -93,17 +107,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A fluent plugin that provides conditional filters