fluent-plugin-filter-list 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17bee9e79c216bfbdf746e8d7d089d229b2997bccf376d24c5e7311f1931f2b4
-  data.tar.gz: b00d3238b9a8d775f5f1dc2e7fd03beedde536bc6894d38f22091395d3dde1bf
+  metadata.gz: a6ecc0716888d8def1ffa0bdc4906c27aa610b6892c12d81e04fbf5f6dacd49d
+  data.tar.gz: 682c3cc3a8b27a86bb0f4cf40cc2e994444e9369d49470c611d0e47cef057425
 SHA512:
-  metadata.gz: c578ea80823b2c26e70a37cf63b3df24832bef79013fcd7e1c28cbf937d220130581bd2a382a6ef06b5c9d1b96838a12d154b1263512920214041cfdfe467ee5
-  data.tar.gz: 513142ca73ebf949f94d3f22fea2deff6e5147ffea92d65687ce33c80c6217e9d70d47dc3ec53b47858a5edb725c1b43ba70334e0feece51971978ca9fe886f4
+  metadata.gz: c52e32c0fbf6c82410adab0de450957aa7fd2567d6d69e167c8e047c3e4f64ed464b8090134dc07c9e29e81c89cd1917db18039574d6d2e5e0453962d2ed2e1e
+  data.tar.gz: 82bea7aa160a072d49356ce8e4840345d27bd547b2993d49efcae588acc4042dd24097bb43787f05a3ac93e5a9e0f04e1c6f5b02b06dfb45e91047636717355e

data/.rubocop.yml

@@ -35,7 +35,10 @@ Metrics/PerceivedComplexity:
 Style/GlobalVars:
   Exclude:
     - 'test/test_helper.rb'
-Style/MethodMissing:
+Style/MethodMissingSuper:
+  Exclude:
+    - 'test/test_helper.rb'
+Style/MissingRespondToMissing:
   Exclude:
     - 'test/test_helper.rb'
 Style/TernaryParentheses:

data/.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 rvm:
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
 before_install:
   - gem update --remote bundler
   - gem update --system
-  - gem install rubocop
+  - gem install rubocop bundler
 script:
   - bundle exec rake

data/Gemfile

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 # Added at 2017-08-14 19:47:59 +0900 by 5hun:
-gem 'rubocop', '~> 0.54.0', group: [:development]
+gem 'rubocop', '~> 0.62.0', require: false, group: [:development]

data/README.md

@@ -35,7 +35,7 @@ Use the `filter_list` filter. Configure fluentd as follows.
 
   filter AC
   key_to_filter x
-  patterns_file_path blacklist.txt
+  pattern_file_paths ["blacklist_1.txt", "blacklist_2.txt"]
   filter_empty true
 </filter>
 ```
@@ -82,7 +82,7 @@ Additionally, the following message is also omitted since `filter_empty` is `tru
 
   filter IP
   key_to_filter ip
-  patterns_file_path blacklist.txt
+  pattern_file_paths blacklist.txt
 </filter>
 ```
 
@@ -130,7 +130,7 @@ The other use case is to filter messages likewise, but process the filtered mess
   @type filter_list
 
   key_to_filter field_name_you_want_to_filter
-  patterns_file_path file_including_patterns_separated_by_new_line
+  pattern_file_paths ["file_including_patterns_separated_by_new_line"]
   filter_empty true
 
   <retag>

data/fluent-plugin-out_filter_list.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'minitest', '~> 5.11'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'test-unit', '~> 3.2'

data/lib/fluent/plugin/filter_filter_list.rb

@@ -13,18 +13,19 @@ module Fluent
 
       config_param :filter, :string, default: 'AC'
       config_param :key_to_filter, :string, default: nil
-      config_param :patterns_file_path, :string, default: ''
+      config_param :pattern_file_paths, :array, default: [], value_type: :string
       config_param :filter_empty, :bool, default: false
 
       def configure(conf)
         super
-        patterns = @patterns_file_path.empty? ? [] : File.readlines(@patterns_file_path).map(&:chomp).reject(&:empty?)
+        patterns = @pattern_file_paths.flat_map { |p| File.readlines(p).map(&:chomp).reject(&:empty?) }
         @matcher = (@filter == 'IP') ? IPMatcher.new(patterns) : ACMatcher.new(patterns)
       end
 
       def filter(_tag, _time, record)
         target = record[@key_to_filter]
         return nil if target && (@matcher.matches?(target) || (@filter_empty && target.strip.empty?))
+
         record
       end
     end

data/lib/fluent/plugin/out_filter_list.rb

@@ -15,7 +15,7 @@ module Fluent
 
       config_param :filter, :string, default: 'AC'
       config_param :key_to_filter, :string, default: nil
-      config_param :patterns_file_path, :string, default: ''
+      config_param :pattern_file_paths, :array, default: [], value_type: :string
       config_param :filter_empty, :bool, default: false
 
       config_section :retag, required: true, multi: false do
@@ -47,7 +47,7 @@ module Fluent
       def configure(conf)
         super
         [@retag, @retag_for_filtered].each { |c| validate c }
-        patterns = @patterns_file_path.empty? ? [] : File.readlines(@patterns_file_path).map(&:chomp).reject(&:empty?)
+        patterns = @pattern_file_paths.flat_map { |p| File.readlines(p).map(&:chomp).reject(&:empty?) }
         @matcher = (@filter == 'IP') ? IPMatcher.new(patterns) : ACMatcher.new(patterns)
         configure_prefixes
       end

data/lib/fluent/plugin/out_filter_list/version.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module FilterList
-      VERSION = "0.5.0"
+      VERSION = "0.6.0"
     end
   end
 end

data/lib/matcher.rb

@@ -32,6 +32,7 @@ module Matchers
 
     def matches?(text)
       return false if text.nil?
+
       ip = IPAddr.new(text).to_i.to_s(2).rjust(32, '0')
       trie.forward_match(ip)
     end
@@ -82,10 +83,12 @@ module Matchers
 
     def forward_match(pattern)
       return false if @root.children.empty?
+
       cur_node = @root
       pattern.chars.each do |char|
         return true if cur_node.children.empty?
         return false unless cur_node.children.key?(char)
+
         cur_node = cur_node.children[char]
       end
       true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter-list
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Shun Yanaura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -130,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A fluentd output plugin to filter keywords from messages