fluent-plugin-filter 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 215960b8db1dca534d808e0913b522ca527c6457
-  data.tar.gz: 81761e8e0861c39afa42fe64dd50e3cab426d63b
+  metadata.gz: be8cf5ff3ab2e36b58ddea36e60630cb2e4a337d
+  data.tar.gz: 3ac6af56a55b316e3e889763e962a2df39517cec
 SHA512:
-  metadata.gz: 087f920ff64c50ae1e6f299b6fa7d09d787e507895a3d4b640d4d653e84fd5b9dea01454dd0c2324014e8d3109fc2462e404961bef4f27e63a57afeb57c1edbb
-  data.tar.gz: c7e1bc599c28d15f4e9283bb91229dc95b05e6317b845798e90fc5ef0f16f307d587365d5c8d8e969a5bc2cb12621e2170df8865edd860351934d45efbcdd69a
+  metadata.gz: d9d5e44650f926f86e45445dc3a9eddc6d5f758f3089ef2e09e1907bb7acf6fe1efe33b5a43f829269cc124d296092dbff87c5536507d46d1b3b9a89537f1013
+  data.tar.gz: 7a5b25fee4361ffdd08958d8ac1b20abec0d00e5c97873332c7e6ed10d96e59f9ee25400938ffd7262feb0f8b6a89a4fd440c553953248594952a3fdec4d0968

data/.travis.yml

@@ -1,6 +1,5 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.1
+  - 2.2
 gemfile:
   - Gemfile

data/README.rdoc

@@ -42,6 +42,18 @@ So you catch "filtered" tag and do next process.
 
 You can use int, float, string, regexp in value.
 
+=== FilterFilter
+
+In fluentd >= 0.12, we can use `filter` declarative. So release Filter filter:
+
+    <filter accesslog.**>
+      type filter
+      all allow
+      deny status: 404
+    </filter>
+
+Thanks to @cosmo0920
+
 === Parameters
 
 ==== all <allow|deny>

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.4"
+  gem.version       = "0.0.5"
 
   gem.extra_rdoc_files = [
     "ChangeLog",

data/lib/fluent/plugin/filter_filter.rb

@@ -8,14 +8,15 @@ class FilterFilter < Filter
   config_param :all, :string, :default => 'allow'
   config_param :allow, :string, :default => ''
   config_param :deny, :string, :default => ''
+  config_param :delim, :string, :default => ','
 
   attr_accessor :allows
   attr_accessor :denies
 
   def configure(conf)
     super
-    @allows = toMap(@allow)
-    @denies = toMap(@deny)
+    @allows = toMap(@allow, @delim)
+    @denies = toMap(@deny, @delim)
   end
 
   def filter(tag, time, record)

data/lib/fluent/plugin/filter_util.rb

@@ -1,7 +1,7 @@
 module Fluent
   module FilterUtil
-    def toMap (str)
-      str.split(/\s*,\s*/).map do|pair|
+    def toMap (str, delim)
+      str.split(/\s*#{delim}\s*/).map do|pair|
         k, v = pair.split(/\s*:\s*/, 2)
         if v =~ /^\d+$/
           v = v.to_i

data/lib/fluent/plugin/out_filter.rb

@@ -9,14 +9,20 @@ class FilterOutput < Output
   config_param :allow, :string, :default => ''
   config_param :deny, :string, :default => ''
   config_param :add_prefix, :string, :default => 'filtered'
+  config_param :delim, :string, :default => ','
 
   attr_accessor :allows
   attr_accessor :denies
 
   def configure(conf)
     super
-    @allows = toMap(@allow)
-    @denies = toMap(@deny)
+    @allows = toMap(@allow, @delim)
+    @denies = toMap(@deny, @delim)
+  end
+
+  # Define `router` method of v0.12 to support v0.10 or earlier
+  unless method_defined?(:router)
+    define_method("router") { Fluent::Engine }
   end
 
   def emit(tag, es, chain)
@@ -25,7 +31,7 @@ class FilterOutput < Output
     end
     es.each do |time, record|
       next unless passRules(record)
-      Engine.emit(tag, time, record)
+      router.emit(tag, time, record)
     end
     chain.next
   end

data/test/plugin/test_filter_filter.rb

@@ -41,7 +41,21 @@ class TestFilterFilter < Test::Unit::TestCase
     %[
       all deny
       allow url: /\\/users\\/\\d+/
-    ]])
+    ]],
+      "test values" =>
+      [{"allows" => [['message', 'CRIT'], ['message', 'WARN']], "denies" => []},
+    %[
+      all deny
+      allow message: 'CRIT', message: 'WARN'
+    ]],
+      "test values with comma" =>
+      [{"allows" => [['message', 'CRIT,'], ['message', 'WARN']], "denies" => []},
+    %[
+      all deny
+      allow message: 'CRIT,' % message: 'WARN'
+      delim %
+    ]],
+      )
   def test_configure(data)
     expected, target = data
     d = create_driver target

data/test/plugin/test_out_filter.rb

@@ -74,6 +74,23 @@ class Filter < Test::Unit::TestCase
     assert_equal [['url', Regexp.new("\\/users\\/\\d+")]], d.instance.allows
     assert_equal [], d.instance.denies
 
+    # text values
+    d = create_driver %[
+      all deny
+      allow message: 'CRIT', message: 'WARN'
+    ]
+    assert_equal [['message', 'CRIT'], ['message', 'WARN']], d.instance.allows
+    assert_equal [], d.instance.denies
+
+    # test values with comma
+    d = create_driver %[
+      all deny
+      allow message: 'CRIT,' % message: 'WARN'
+      delim %
+    ]
+    assert_equal [['message', 'CRIT,'], ['message', 'WARN']], d.instance.allows
+    assert_equal [], d.instance.denies
+
   end
   def test_emit
     data = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Muddy Dixon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-filter
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple output filter