fluent-plugin-filter-list 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c163b0f7d168334069d8bc723d9e73ac4c660d0a
-  data.tar.gz: 5e21a35184419bacd65223f9e586a66fc91cdac7
+  metadata.gz: d59e0c9511bee9b07d913940698e10474ff94f71
+  data.tar.gz: b40e7e4c5831ccdce088917b3bd3609cbbf83f2b
 SHA512:
-  metadata.gz: 17d90e1e42ccb07028e7380382827fb297f25ae7c4de7d8ee523da86f1e65e90c161a1c696585220366e76ec92a8f7fd758fceda6329e3fadecf19a0a2595f08
-  data.tar.gz: b47dee18b5ed637d33b914e7d729f640598253bd2c6a197f0c1eef2131811c420478bbce4e1293523bac747da222a5c7dade5f7e5a3bd1a96f34454ce897590e
+  metadata.gz: d83ac5416fd197ea9c556174eebc306441edc3ebe45d4b3b156c3eabe4b3db6da5efd8f3d1f284ed5c84c97980bb40e38be62448e1e013907514bbedc1d6719e
+  data.tar.gz: 6b8fd6b97f2f30fbc98e5d95056fe56e9bb2558f353039af335cba9f090183fa7ef05c756406992f8f3ebe79d40578ce4309c35ce51754b67ce9a893d9ab246a

data/.rubocop.yml

@@ -0,0 +1,44 @@
+Metrics/LineLength:
+  Max: 160
+Style/StringLiterals:
+  Enabled: false
+Metrics/MethodLength:
+  Max: 15
+Style/Documentation:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Style/MutableConstant:
+  Enabled: false
+Metrics/AbcSize:
+  Max: 25
+Metrics/BlockLength:
+  Exclude:
+    - 'Rakefile'
+    - '**/*.rake'
+    - 'spec/**/*.rb'
+    - 'Gemfile'
+    - 'Guardfile'
+    - 'config/routes.rb'
+    - 'config/routes/**/*.rb'
+    - '*.gemspec'
+Metrics/CyclomaticComplexity:
+  Max: 10
+Metrics/PerceivedComplexity:
+  Max: 10
+Style/GlobalVars:
+  Exclude:
+    - 'test/test_helper.rb'
+Style/MethodMissing:
+  Exclude:
+    - 'test/test_helper.rb'
+Style/TernaryParentheses:
+  Enabled: false
+Style/BlockDelimiters:
+  AutoCorrect: false
+Style/BlockDelimiters:
+  AutoCorrect: false
+Style/BracesAroundHashParameters:
+  Enabled: false
+Layout/IndentHash:
+  EnforcedStyle: consistent

data/.travis.yml

@@ -3,4 +3,9 @@ rvm:
   - 2.2.4
   - 2.3.3
   - 2.4.1
-before_install: gem update bundler
+before_install:
+  - gem update --remote bundler
+  - gem update --system
+  - gem install rubocop
+script:
+  - bundle exec rake

data/Gemfile

@@ -1,4 +1,7 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in fluent-plugin-out_filter_list.gemspec
 gemspec
+
+# Added at 2017-08-14 19:47:59 +0900 by 5hun:
+gem 'rubocop', '~> 0.49.1', group: [:development]

data/Rakefile

@@ -1,5 +1,6 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
+require 'rubocop/rake_task'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test' << 'lib'
@@ -7,4 +8,6 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-task :default => :test
+RuboCop::RakeTask.new
+
+task default: %w[rubocop test]

data/fluent-plugin-out_filter_list.gemspec

@@ -1,29 +1,31 @@
 # coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+
+lib = File.expand_path('../lib', __FILE__)
+
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "fluent/plugin/out_filter_list/version"
+require 'fluent/plugin/out_filter_list/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "fluent-plugin-filter-list"
+  spec.name          = 'fluent-plugin-filter-list'
   spec.version       = Fluent::OutFilterList::VERSION
-  spec.authors       = ["Shun Yanaura"]
-  spec.email         = ["metroplexity@gmail.com"]
+  spec.authors       = ['Shun Yanaura']
+  spec.email         = ['metroplexity@gmail.com']
 
-  spec.summary       = %q{A fluentd output plugin to filter keywords from messages}
-  spec.description   = %q{A fluentd output plugin to filter keywords from messages}
-  spec.homepage      = "https://github.com/yanana/fluent-plugin-filter-list"
-  spec.license       = "MIT"
+  spec.summary       = 'A fluentd output plugin to filter keywords from messages'
+  spec.description   = 'A fluentd output plugin to filter keywords from messages'
+  spec.homepage      = 'https://github.com/yanana/fluent-plugin-filter-list'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "test-unit", "~> 3.2"
-  spec.add_runtime_dependency "fluentd", "~> 0.12", ">= 0.12.0"
+  spec.add_development_dependency 'bundler', '~> 1.15'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'test-unit', '~> 3.2'
+  spec.add_runtime_dependency 'fluentd', '~> 0.12', '>= 0.12.0'
 end

data/lib/aho_corasick.rb

@@ -7,9 +7,9 @@ module Matchers
       @trie = Trie.new patterns
     end
 
-    def matches?(str)
+    def matches?(text)
       node = @trie.root
-      str.split('').each do |char|
+      text.to_s.split('').each do |char|
         node = node.failure while node.children[char].nil? # Follow failure if it exists in case pattern doesn't match
         node = node.children[char]
         return true unless node.output.nil?
@@ -33,9 +33,7 @@ module Matchers
       current_node = @root
       pattern.split('').each_with_index do |char, i|
         current_node = current_node.insert(char)
-        if i == pattern.length - 1
-          current_node.output = pattern
-        end
+        current_node.output = pattern if i == pattern.length - 1
       end
     end
 

data/lib/fluent/plugin/filter_filter_list.rb

@@ -7,8 +7,8 @@ module Fluent
 
     Plugin.register_filter('filter_list', self)
 
-    config_param :key_to_filter, :string, :default => nil
-    config_param :patterns_file_path, :string, :default => ''
+    config_param :key_to_filter, :string, default: nil
+    config_param :patterns_file_path, :string, default: ''
 
     def configure(conf)
       super
@@ -18,7 +18,8 @@ module Fluent
 
     def filter(_tag, _time, record)
       target = record[@key_to_filter]
-      target && @matcher.matches?(target) ? nil : record
+      return nil if target && @matcher.matches?(target)
+      record
     end
   end
 end

data/lib/fluent/plugin/out_filter_list.rb

@@ -7,17 +7,17 @@ module Fluent
 
     Plugin.register_output('filter_list', self)
 
-    config_param :key_to_filter, :string, :default => nil
-    config_param :patterns_file_path, :string, :default => ''
+    config_param :key_to_filter, :string, default: nil
+    config_param :patterns_file_path, :string, default: ''
 
     config_section :retag, required: true, multi: false do
-      config_param :tag, :string, :default => nil
-      config_param :add_prefix, :string, :default => nil
+      config_param :tag, :string, default: nil
+      config_param :add_prefix, :string, default: nil
     end
 
     config_section :retag_filtered, param_name: :retag_for_filtered, required: false, multi: false do
-      config_param :tag, :string, :default => nil
-      config_param :add_prefix, :string, :default => nil
+      config_param :tag, :string, default: nil
+      config_param :add_prefix, :string, default: nil
     end
 
     def initialize
@@ -25,15 +25,15 @@ module Fluent
     end
 
     def validate(retag)
-      if !retag
-        return
-      end
-      if !(retag.tag || retag.add_prefix)
-        raise Fluent::ConfigError, "missing tag and add_prefix"
-      end
-      if retag.tag && retag.add_prefix
-        raise Fluent::ConfigError, "tag and add_prefix are mutually exclusive"
-      end
+      return unless retag
+      raise Fluent::ConfigError, "missing tag and add_prefix" unless retag.tag || retag.add_prefix
+      raise Fluent::ConfigError, "tag and add_prefix are mutually exclusive" if retag.tag && retag.add_prefix
+    end
+
+    def configure_prefixes
+      @prefix_for_filtered_tag = @retag_for_filtered.add_prefix + '.' if @retag_for_filtered && @retag_for_filtered.add_prefix
+      @prefix_for_filtered_tag = @retag_for_filtered && @retag_for_filtered.add_prefix ? @retag_for_filtered.add_prefix + '.' : ''
+      @prefix = @retag && @retag.add_prefix ? @retag.add_prefix + '.' : ''
     end
 
     def configure(conf)
@@ -41,16 +41,11 @@ module Fluent
       [@retag, @retag_for_filtered].each { |c| validate c }
       patterns = @patterns_file_path.empty? ? [] : File.readlines(@patterns_file_path).map(&:chomp).reject(&:empty?)
       @matcher = ACMatcher.new(patterns)
-      if @retag_for_filtered && @retag_for_filtered.add_prefix
-        @prefix_for_filtered_tag = @retag_for_filtered.add_prefix + "."
-      end
-      if @retag && @retag.add_prefix
-        @prefix = @retag.add_prefix + "."
-      end
-      log.debug "prefix: #{@prefix}, prefix_for_filtered_tag: #{@prefix_for_filtered_tag}"
+      configure_prefixes
+      log.debug "prefix: #{@prefix}, prefix_for_filtered_tag: #{@prefix_for_filtered_tag || ''}"
     end
 
-    def emit(tag, es, chain)
+    def emit(tag, es, _chain)
       es.each do |time, record|
         target = record[@key_to_filter]
         log.debug "target: #{target}"

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

@@ -1,5 +1,5 @@
 module Fluent
   module OutFilterList
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter-list
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Shun Yanaura
@@ -94,6 +94,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile