fluent-plugin-filter-list 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38d4d2dffb112f1d1848a5b19b65012a8b58a98dfd109b2a8aebfc6778ef581d
-  data.tar.gz: 0ea84ac0818d740133cec309afca9a7e6dcc3fa51e9d4374dda61759da3530ae
+  metadata.gz: d213a158b64257afde99c26284bf0215c1a5d208362f0f00012580852654244e
+  data.tar.gz: 37c5a0219f4bab0de18b6aac6c75d6d90f63bd60f5eddb5399bfb0522c563706
 SHA512:
-  metadata.gz: 900364d81be98c75bee9dec18ba8d30521e05931ba692c977e7e849570df4e295e49bb0194a8718219a6037a1990835836ca7e3da28d1bfc3e2e9f99081f1f1a
-  data.tar.gz: 80c826720b8cdb2797c291d6f962d42cea8cd80d42ba5451bad75ee13f7a4e9a01d17d2debf20e77f8aeac02e37a165b7e1bd82add57745064b2135f8d0d1d36
+  metadata.gz: 776d9222ea8997eda4506348282ed67415296da63c4dcd16569f2a7db35863a5844b3e3869cff5d9dcd9a077d4738a9733e4cf3b3436bc7ec08a26b8d4d84503
+  data.tar.gz: b73678d3bd2ba2a415499256cf6b8b7ba1c8c0a88800745d6668aaea1ba049d59343ca2665063cb4a11c1d099ce9ce825fffc57465dde845ee62c34b39f3a49a

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: '20:00'
+  open-pull-requests-limit: 10

data/.rubocop.yml

@@ -1,5 +1,7 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.5
+  NewCops: enable
+
 
 Naming/MethodParameterName:
   Enabled: false
@@ -38,7 +40,7 @@ Metrics/PerceivedComplexity:
 Style/GlobalVars:
   Exclude:
     - 'test/test_helper.rb'
-Style/MethodMissingSuper:
+Lint/MissingSuper:
   Exclude:
     - 'test/test_helper.rb'
 Style/MissingRespondToMissing:
@@ -48,7 +50,7 @@ Style/TernaryParentheses:
   Enabled: false
 Style/BlockDelimiters:
   AutoCorrect: false
-Style/BracesAroundHashParameters:
-  Enabled: false
 Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
+Style/RedundantSelfAssignment:
+  Enabled: false

data/.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
 rvm:
-  - 2.3
-  - 2.4
   - 2.5
   - 2.6
+  - 2.7
 before_install:
+  - gem update --system
   - gem update --remote bundler
-  - gem install rubocop bundler
 script:
+  - bundle exec rubocop -d
   - 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.78.0', require: false, group: [:development]
+gem 'rubocop', '~> 0.92.0', require: false, group: [:development]

data/fluent-plugin-out_filter_list.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Fluent::Plugin::FilterList::VERSION
   spec.authors       = ['Shun Yanaura']
   spec.email         = ['metroplexity@gmail.com']
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.summary       = 'A fluentd output plugin to filter keywords from messages'
   spec.description   = 'A fluentd output plugin to filter keywords from messages'

data/lib/fluent/plugin/out_filter_list.rb

@@ -31,10 +31,6 @@ module Fluent
         config_param :add_prefix, :string, default: nil
       end
 
-      def initialize
-        super
-      end
-
       def validate(retag)
         return unless retag
         raise Fluent::ConfigError, "missing tag and add_prefix" unless retag.tag || retag.add_prefix
@@ -42,9 +38,9 @@ module Fluent
       end
 
       def configure_prefixes
-        @prefix_for_filtered_tag = @retag_for_filtered.add_prefix + '.' if @retag_for_filtered&.add_prefix
-        @prefix_for_filtered_tag = @retag_for_filtered&.add_prefix ? @retag_for_filtered.add_prefix + '.' : ''
-        @prefix = @retag&.add_prefix ? @retag.add_prefix + '.' : ''
+        @prefix_for_filtered_tag = "#{@retag_for_filtered.add_prefix}." if @retag_for_filtered&.add_prefix
+        @prefix_for_filtered_tag = @retag_for_filtered&.add_prefix ? "#{@retag_for_filtered.add_prefix}." : ''
+        @prefix = @retag&.add_prefix ? "#{@retag.add_prefix}." : ''
       end
 
       def configure(conf)

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

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module FilterList
-      VERSION = "0.7.0"
+      VERSION = "0.7.2"
     end
   end
 end

data/lib/matcher.rb

@@ -13,16 +13,25 @@ module Matchers
     def matches?(text)
       node = @trie.root
       text.to_s.chars.each do |char|
-        node = node.failure while node.children[char].nil? # Follow failure if it exists in case pattern doesn't match
+        failure = node.failure
         node = node.children[char]
-        return true unless node.output.nil?
+
+        return true unless node.nil? || node.output.nil?
+        return true unless failure.nil? || failure.output.nil?
+
+        # Follow failure if it exists in case pattern doesn't match
+        node = failure if node.nil?
       end
-      false
+
+      return false if node.failure.nil?
+
+      !node.failure.output.nil?
     end
   end
 
   class IPMatcher
     attr_reader :trie
+
     include IP
 
     def initialize(patterns)
@@ -40,6 +49,7 @@ module Matchers
 
   class Trie
     attr_reader :root
+
     def initialize(patterns)
       @root = Node.new
       @root.children.default = @root
@@ -59,7 +69,7 @@ module Matchers
 
     def new_queue
       q = Queue.new
-      @root.children.values.each do |child|
+      @root.children.each_value do |child|
         q.push(child)
         child.failure = @root # set root on root's children's failure
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter-list
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Shun Yanaura
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,6 +95,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -116,7 +117,7 @@ homepage: https://github.com/yanana/fluent-plugin-filter-list
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,15 +125,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A fluentd output plugin to filter keywords from messages
 test_files: []