fluent-plugin-filter 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64a2e9dee2d826e3d964fa0d58d3cb33bd9ddef1
-  data.tar.gz: 313910f1c212e5c4f35b1146660a7b2056ffedf6
+  metadata.gz: 215960b8db1dca534d808e0913b522ca527c6457
+  data.tar.gz: 81761e8e0861c39afa42fe64dd50e3cab426d63b
 SHA512:
-  metadata.gz: a223df306aedc58dbc2ee178b9acd0dbecc02780a62b4cc9cacbbb3aa56772bf853c6df60c3a5a667c5d4fc50d0131c6b33b6ccfd1cb94f748748d8b0ef811b1
-  data.tar.gz: dd3dc2d2184ad4ae9ceb74dd9f155700a631a70b0ead42339d9ca5615ba13a0714b748698fb05eb8cec4a7bbac5f03a6eee5e311c8816613d32e92fdebc3cc1b
+  metadata.gz: 087f920ff64c50ae1e6f299b6fa7d09d787e507895a3d4b640d4d653e84fd5b9dea01454dd0c2324014e8d3109fc2462e404961bef4f27e63a57afeb57c1edbb
+  data.tar.gz: c7e1bc599c28d15f4e9283bb91229dc95b05e6317b845798e90fc5ef0f16f307d587365d5c8d8e969a5bc2cb12621e2170df8865edd860351934d45efbcdd69a

data/fluent-plugin-filter.gemspec

@@ -12,13 +12,13 @@ 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.3"
+  gem.version       = "0.0.4"
 
   gem.extra_rdoc_files = [
     "ChangeLog",
     "README.rdoc"
   ]
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "fluentd"
+  gem.add_development_dependency "test-unit", "~> 3.1.0"
   gem.add_runtime_dependency "fluentd"
 end

data/lib/fluent/plugin/filter_filter.rb

@@ -0,0 +1,26 @@
+module Fluent
+class FilterFilter < Filter
+  require 'fluent/plugin/filter_util'
+  include FilterUtil
+
+  Plugin.register_filter('filter', self)
+
+  config_param :all, :string, :default => 'allow'
+  config_param :allow, :string, :default => ''
+  config_param :deny, :string, :default => ''
+
+  attr_accessor :allows
+  attr_accessor :denies
+
+  def configure(conf)
+    super
+    @allows = toMap(@allow)
+    @denies = toMap(@deny)
+  end
+
+  def filter(tag, time, record)
+    record if passRules(record)
+  end
+end
+
+end

data/lib/fluent/plugin/filter_util.rb

@@ -0,0 +1,47 @@
+module Fluent
+  module FilterUtil
+    def toMap (str)
+      str.split(/\s*,\s*/).map do|pair|
+        k, v = pair.split(/\s*:\s*/, 2)
+        if v =~ /^\d+$/
+          v = v.to_i
+        elsif v =~ /^[\d\.]+(e\d+)?$/
+          v = v.to_f
+        elsif v =~ /^\/(\\\/|[^\/])+\/$/
+          v = Regexp.new(v.gsub(/^\/|\/$/, ''))
+        else
+          v = v.gsub(/^[\"\']|[\"\']$/, '')
+        end
+        [k, v]
+      end
+    end
+
+    def passRules (record)
+      if @all == 'allow'
+        @denies.each do |deny|
+          if (deny[1].is_a? Regexp and record.has_key?(deny[0]) and record[deny[0]].match(deny[1])) or record[deny[0]] == deny[1]
+            @allows.each do |allow|
+              if (allow[1].is_a? Regexp and record.has_key?(allow[0]) and record[allow[0]].match(allow[1])) or record[allow[0]] == allow[1]
+                return true
+              end
+            end
+            return false
+          end
+        end
+        return true
+      else
+        @allows.each do |allow|
+          if (allow[1].is_a? Regexp and record.has_key?(allow[0]) and record[allow[0]].match(allow[1])) or record[allow[0]] == allow[1]
+            @denies.each do |deny|
+              if (deny[1].is_a? Regexp and record.has_key?(deny[0]) and record[deny[0]].match(deny[1])) or record[deny[0]] == deny[1]
+                return false
+              end
+            end
+            return true
+          end
+        end
+        return false
+      end
+    end
+  end
+end

data/lib/fluent/plugin/out_filter.rb

@@ -1,5 +1,8 @@
 module Fluent
 class FilterOutput < Output
+  require 'fluent/plugin/filter_util'
+  include FilterUtil
+
   Plugin.register_output('filter', self)
 
   config_param :all, :string, :default => 'allow'
@@ -16,50 +19,6 @@ class FilterOutput < Output
     @denies = toMap(@deny)
   end
 
-  def toMap (str)
-    str.split(/\s*,\s*/).map do|pair|
-      k, v = pair.split(/\s*:\s*/, 2)
-      if v =~ /^\d+$/
-        v = v.to_i
-      elsif v =~ /^[\d\.]+(e\d+)?$/
-        v = v.to_f
-      elsif v =~ /^\/(\\\/|[^\/])+\/$/
-        v = Regexp.new(v.gsub(/^\/|\/$/, ''))
-      else
-        v = v.gsub(/^[\"\']|[\"\']$/, '')
-      end
-      [k, v]
-    end
-  end
-
-  def passRules (record)
-    if @all == 'allow'
-      @denies.each do |deny|
-        if (deny[1].is_a? Regexp and record.has_key?(deny[0]) and record[deny[0]].match(deny[1])) or record[deny[0]] == deny[1]
-          @allows.each do |allow|
-            if (allow[1].is_a? Regexp and record.has_key?(allow[0]) and record[allow[0]].match(allow[1])) or record[allow[0]] == allow[1]
-              return true
-            end
-          end
-          return false
-        end
-      end
-      return true
-    else
-      @allows.each do |allow|
-        if (allow[1].is_a? Regexp and record.has_key?(allow[0]) and record[allow[0]].match(allow[1])) or record[allow[0]] == allow[1]
-          @denies.each do |deny|
-            if (deny[1].is_a? Regexp and record.has_key?(deny[0]) and record[deny[0]].match(deny[1])) or record[deny[0]] == deny[1]
-              return false
-            end
-          end
-          return true
-        end
-      end
-      return false
-    end
-  end
-
   def emit(tag, es, chain)
     if @add_prefix
       tag = @add_prefix + '.' + tag

data/test/helper.rb

@@ -23,6 +23,7 @@ unless ENV.has_key?('VERBOSE')
 end
 
 require 'fluent/plugin/out_filter'
+require 'fluent/plugin/filter_filter'
 
 class Test::Unit::TestCase
 end

data/test/plugin/test_filter_filter.rb

@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestFilterFilter < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
+  CONFIG = %[
+    all allow
+    deny status: 404
+  ]
+
+  def create_driver(conf = CONFIG, tag='test.input')
+    Fluent::Test::FilterTestDriver.new(Fluent::FilterFilter, tag).configure(conf)
+  end
+
+  data("int value" => [{"allows" => [['status', 200]], "denies" => []},
+    %[
+      all deny
+      allow status: 200
+    ]],
+       "float value" => [{"allows" => [['status', 200.0]], "denies" => []},
+    %[
+      all deny
+      allow status: 200.0
+    ]],
+      "text value" => [{"allows" => [['status', '200']], "denies" => []},
+    %[
+      all deny
+      allow status: '200'
+    ]],
+      "text value with URL" =>
+      [{"allows" => [['status', 'https://my.website.com/']], "denies" => []},
+    %[
+      all deny
+      allow status: "https://my.website.com/"
+    ]],
+      "regexp value with forward slashes" =>
+      [{"allows" => [['url', Regexp.new("\\/users\\/\\d+")]], "denies" => []},
+    %[
+      all deny
+      allow url: /\\/users\\/\\d+/
+    ]])
+  def test_configure(data)
+    expected, target = data
+    d = create_driver target
+    assert_equal expected["allows"], d.instance.allows
+    assert_equal expected["denies"], d.instance.denies
+  end
+
+  data("config" => [5, CONFIG],
+       "allow status 200" => [3,
+    %[
+      all deny
+      allow status: 200
+    ]],
+       "allow status 200 and 303" => [4,
+    %[
+      all deny
+      allow status: 200, status: 303
+    ]],
+       "allow Gecko agent" => [3,
+    %[
+      all deny
+      allow agent: Gecko
+    ]],
+       "allow \"Gecko\" agent" => [3,
+    %[
+      all deny
+      allow agent: "Gecko"
+    ]],
+       "allow /Geck/ Regexp matched agent" => [4,
+    %[
+      all deny
+      allow agent: /Geck/
+    ]],
+       "allow /\\/users\\/\\d+/ Regexp matched path" => [3,
+    %[
+      all deny
+      allow path: /\\/users\\/\\d+/
+    ]])
+  def test_filter(data)
+    expected, target = data
+    inputs = [
+      {'status' => 200, 'agent' => 'IE', 'path' => '/users/1'},
+      {'status' => 303, 'agent' => 'Gecko'},
+      {'status' => 200, 'agent' => 'IE', 'path' => '/users/2'},
+      {'status' => 401, 'agent' => 'Gecko'},
+      {'status' => 200, 'agent' => 'Gecka', 'path' => '/users/3'},
+      {'status' => 404, 'agent' => 'Gecko', 'path' => '/wrong'},
+    ]
+    d = create_driver(target, 'test.input')
+    d.run do
+      inputs.each do |dat|
+        d.filter dat
+      end
+    end
+    assert_equal expected, d.filtered_as_array.length
+  end
+
+  data("allow message2" => [1,
+     %[
+       all deny
+       allow message2: /hoge2/
+     ]],
+       "deny message2" => [1,
+     %[
+       all allow
+       deny message2: /hoge2/
+     ]])
+  def test_filter_message(data)
+    expected, target = data
+    inputs = [
+      {'message' => 'hoge', 'message2' => 'hoge2'},
+      {'message' => 'hoge3'},
+    ]
+    d = create_driver(target, 'test.input')
+    d.run do
+      inputs.each do |dat|
+        d.filter dat
+      end
+    end
+    assert_equal expected, d.filtered_as_array.length
+  end
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Muddy Dixon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !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: fluentd
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 - !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'
 description: Simple output filter
@@ -61,17 +61,20 @@ extra_rdoc_files:
 - ChangeLog
 - README.rdoc
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - ChangeLog
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - fluent-plugin-filter.gemspec
+- lib/fluent/plugin/filter_filter.rb
+- lib/fluent/plugin/filter_util.rb
 - lib/fluent/plugin/out_filter.rb
 - sample.conf
 - test/helper.rb
+- test/plugin/test_filter_filter.rb
 - test/plugin/test_out_filter.rb
 homepage: https://github.com/muddydixon/fluent-plugin-filter
 licenses: []
@@ -82,21 +85,21 @@ 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: fluent-plugin-filter
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple output filter
 test_files:
 - test/helper.rb
+- test/plugin/test_filter_filter.rb
 - test/plugin/test_out_filter.rb
-has_rdoc: