fluent-plugin-filter 0.0.1 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 64a2e9dee2d826e3d964fa0d58d3cb33bd9ddef1
+  data.tar.gz: 313910f1c212e5c4f35b1146660a7b2056ffedf6
+SHA512:
+  metadata.gz: a223df306aedc58dbc2ee178b9acd0dbecc02780a62b4cc9cacbbb3aa56772bf853c6df60c3a5a667c5d4fc50d0131c6b33b6ccfd1cb94f748748d8b0ef811b1
+  data.tar.gz: dd3dc2d2184ad4ae9ceb74dd9f155700a631a70b0ead42339d9ca5615ba13a0714b748698fb05eb8cec4a7bbac5f03a6eee5e311c8816613d32e92fdebc3cc1b

data/.travis.yml

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

data/ChangeLog

@@ -0,0 +1,7 @@
+0.0.2 2013-11-25
+
+  Merge care multiple condition by ainoya
+
+0.0.1 2012-08-30
+
+  First commit

data/README.rdoc

@@ -42,6 +42,25 @@ So you catch "filtered" tag and do next process.
 
 You can use int, float, string, regexp in value.
 
+=== Parameters
+
+==== all <allow|deny>
+Specify basic policy.
+
+==== allow field:<Pattern> / deny field:<Pattern>
+Specify each field policies.
+If a value for the field matches the pattern, the allow or deny rule is applied.
+
+===== Pattern := <String|Integer|Float|Regexp>
+
+Patten is parsed by following rules.
+
+* Integer: a value consisted of degits without ".". e.g. status:200, price:10000
+* Float: a value consisted of degits with "." (if you force the value float, set 200.0). e.g. average:145.0
+* Regexp: a value starting with "/" and end with "/". e.g. path:/\/user\/\d+/
+  * thx @mmacvicar !
+* String: a value unmatched below rule or enveloped with \" or \'.
+
 == Contributing
 
 1. Fork it

data/fluent-plugin-filter.gemspec

@@ -12,12 +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.1"
+  gem.version       = "0.0.3"
 
   gem.extra_rdoc_files = [
     "ChangeLog",
     "README.rdoc"
-  ] 
+  ]
+  gem.add_development_dependency "rake"
   gem.add_development_dependency "fluentd"
   gem.add_runtime_dependency "fluentd"
 end

data/lib/fluent/plugin/out_filter.rb

@@ -6,7 +6,7 @@ class FilterOutput < Output
   config_param :allow, :string, :default => ''
   config_param :deny, :string, :default => ''
   config_param :add_prefix, :string, :default => 'filtered'
-  
+
   attr_accessor :allows
   attr_accessor :denies
 
@@ -23,7 +23,7 @@ class FilterOutput < Output
         v = v.to_i
       elsif v =~ /^[\d\.]+(e\d+)?$/
         v = v.to_f
-      elsif v =~ /^\/[^\/]+\/$/
+      elsif v =~ /^\/(\\\/|[^\/])+\/$/
         v = Regexp.new(v.gsub(/^\/|\/$/, ''))
       else
         v = v.gsub(/^[\"\']|[\"\']$/, '')
@@ -35,9 +35,9 @@ class FilterOutput < Output
   def passRules (record)
     if @all == 'allow'
       @denies.each do |deny|
-        if (deny[1].is_a? Regexp and record[deny[0]].match(deny[1])) or record[deny[0]] == deny[1]
+        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[allow[0]].match(allow[1])) or record[allow[0]] == allow[1]
+            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
@@ -47,9 +47,9 @@ class FilterOutput < Output
       return true
     else
       @allows.each do |allow|
-        if (allow[1].is_a? Regexp and record[allow[0]].match(allow[1])) or record[allow[0]] == allow[1]
+        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[deny[0]].match(deny[1])) or record[deny[0]] == deny[1]
+            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

data/test/plugin/test_out_filter.rb

@@ -65,16 +65,24 @@ class Filter < Test::Unit::TestCase
     ]
     assert_equal [['url', /hoge/]], d.instance.allows
     assert_equal [], d.instance.denies
-    
+
+    # regexp value with forward slashes
+    d = create_driver %[
+      all deny
+      allow url: /\\/users\\/\\d+/
+    ]
+    assert_equal [['url', Regexp.new("\\/users\\/\\d+")]], d.instance.allows
+    assert_equal [], d.instance.denies
+
   end
   def test_emit
     data = [
-      {'status' => 200, 'agent' => 'IE'},
+      {'status' => 200, 'agent' => 'IE', 'path' => '/users/1'},
       {'status' => 303, 'agent' => 'Gecko'},
-      {'status' => 200, 'agent' => 'IE'},
+      {'status' => 200, 'agent' => 'IE', 'path' => '/users/2'},
       {'status' => 401, 'agent' => 'Gecko'},
-      {'status' => 200, 'agent' => 'Gecka'},
-      {'status' => 404, 'agent' => 'Gecko'},
+      {'status' => 200, 'agent' => 'Gecka', 'path' => '/users/3'},
+      {'status' => 404, 'agent' => 'Gecko', 'path' => '/wrong'},
     ]
 
     d = create_driver(CONFIG, 'test.input')
@@ -164,5 +172,46 @@ class Filter < Test::Unit::TestCase
     end
     assert_equal "hoge.test.input", d.emits[0][0]
 
+    d = create_driver(%[
+      all deny
+      allow path: /\\/users\\/\\d+/
+    ], 'test.input')
+
+    d.run do
+      data.each do |dat|
+        d.emit dat
+      end
+    end
+    assert_equal 3, d.emits.length
+
+    data = [
+      {'message' => 'hoge', 'message2' => 'hoge2'},
+      {'message' => 'hoge3'},
+    ]
+
+    d = create_driver(%[
+      all deny
+      allow message2: /hoge2/
+    ], 'test.input')
+
+    d.run do
+      data.each do |dat|
+        d.emit dat
+      end
+    end
+    assert_equal 1, d.emits.length
+
+    d = create_driver(%[
+      all allow
+      deny message2: /hoge2/
+    ], 'test.input')
+
+    d.run do
+      data.each do |dat|
+        d.emit dat
+      end
+    end
+    assert_equal 1, d.emits.length
+
   end
 end

metadata

@@ -1,38 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Muddy Dixon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2014-12-24 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
-  requirement: &2160456580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160456580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &2160456040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160456040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple output filter
 email:
 - muddydixon@gmail.com
@@ -43,6 +62,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .gitignore
+- .travis.yml
 - ChangeLog
 - Gemfile
 - LICENSE
@@ -55,28 +75,28 @@ files:
 - test/plugin/test_out_filter.rb
 homepage: https://github.com/muddydixon/fluent-plugin-filter
 licenses: []
+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: fluent-plugin-filter
-rubygems_version: 1.8.11
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple output filter
 test_files:
 - test/helper.rb
 - test/plugin/test_out_filter.rb
+has_rdoc: