fluent-plugin-string-scrub 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 22a7e6ce42d946054cdfb80294dbc339215242e5
-  data.tar.gz: 282dccc73abfd4f2c14209a3478f9d3bbe733ccd
+SHA256:
+  metadata.gz: 0432a5e1ae4e3970f96b80134b6ae8ffdad9fed1da59cac7807fe2562e8b65c0
+  data.tar.gz: 53ef421c743a333bea35e451c0151510a6d5b4fcac49468e8501029d617f5d35
 SHA512:
-  metadata.gz: 6f812ab0fbe3bc87f5e8a46e1a3d715a2da4950e0334631ca456606dbd77b8acd027517a334bea0afcb9e3a75180a5a746c4b0bd1dd82290620f62cb8fc93136
-  data.tar.gz: 8646f2982fe4ca357512f739f67d246c3a6808584798b6f64f16167316a8fab8e95725a9212109b5023fc2d9e0caeba6825def2d490e3e6f388c43f6db695147
+  metadata.gz: 4130308daf2d991ed36a75a684333a8cb5fe99a009833f9a1589e5ab67d56374db2492725cc99b2067d7c1fa10d68700dffd1697a3f09f997ce11d0835a6872c
+  data.tar.gz: eea555503b11318fc088825cce59c85991d6216de287918740c329cdf6810576967ac374a862f587f44b50932a870957761c8fbf9acd8f14b4cc7787b8b6b26d

data/.travis.yml

@@ -1,8 +1,15 @@
 language: ruby
+script: bundle exec rake
+sudo: false
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.*
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5.2
+
+  #- ruby-head
 gemfile:
   - Gemfile
-  - Gemfile.fluentd.lt.0.12
+before_install:
+  - gem update bundler

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in fluent-plugin-string-scrub.gemspec
 gemspec

data/README.md

@@ -73,7 +73,7 @@ Fluentd >= v0.12 can use filter plugin.
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/fluent-plugin-string-scrub/fork )
+1. Fork it ( https://github.com/kataring/fluent-plugin-string-scrub/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/fluent-plugin-string-scrub.gemspec

@@ -3,7 +3,7 @@ lib = File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-string-scrub"
-  spec.version       = "0.1.0"
+  spec.version       = "1.0.0"
   spec.authors       = ["Noriaki Katayama"]
   spec.email         = ["kataring@gmail.com"]
   spec.summary       = %q{Fluentd Output filter plugin.}
@@ -15,9 +15,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.1".freeze)
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit"
-  spec.add_development_dependency "fluentd"
-  spec.add_runtime_dependency "string-scrub", "~> 0.0.5" if RUBY_VERSION.to_f < 2.1
+  spec.add_development_dependency "fluentd", [">= 0.14.0", "< 2"]
 end

data/lib/fluent/plugin/filter_string_scrub.rb

@@ -1,11 +1,12 @@
-class Fluent::StringScrubFilter < Fluent::Filter
+require 'fluent/plugin/filter'
+
+class Fluent::Plugin::StringScrubFilter < Fluent::Plugin::Filter
   Fluent::Plugin.register_filter('string_scrub', self)
 
   config_param :replace_char, :string, :default => ''
 
   def initialize
     super
-    require 'string/scrub' if RUBY_VERSION.to_f < 2.1
   end
 
   def configure(conf)
@@ -57,4 +58,4 @@ class Fluent::StringScrubFilter < Fluent::Filter
       retry
     end
   end
-end if defined?(Fluent::Filter) # Support only >= v0.12
+end

data/lib/fluent/plugin/out_string_scrub.rb

@@ -1,19 +1,17 @@
-class Fluent::StringScrubOutput < Fluent::Output
+require 'fluent/plugin/output'
+
+class Fluent::Plugin::StringScrubOutput < Fluent::Plugin::Output
   Fluent::Plugin.register_output('string_scrub', self)
 
+  helpers :event_emitter
+
   config_param :tag, :string, :default => nil
   config_param :remove_prefix, :string, :default => nil
   config_param :add_prefix, :string, :default => nil
   config_param :replace_char, :string, :default => ''
 
-  # Define `router` method of v0.12 to support v0.10 or earlier
-  unless method_defined?(:router)
-    define_method("router") { Fluent::Engine }
-  end
-
   def initialize
     super
-    require 'string/scrub' if RUBY_VERSION.to_f < 2.1
   end
 
   def configure(conf)
@@ -40,7 +38,7 @@ class Fluent::StringScrubOutput < Fluent::Output
     end
   end
 
-  def emit(tag, es, chain)
+  def process(tag, es)
     tag = if @tag
             @tag
           else
@@ -63,8 +61,6 @@ class Fluent::StringScrubOutput < Fluent::Output
       next if scrubbed.nil?
       router.emit(tag, time, scrubbed)
     end
-
-    chain.next
   end
 
   def recv_record(record)

data/test/helper.rb

@@ -12,16 +12,9 @@ require 'test/unit'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'fluent/test'
-unless ENV.has_key?('VERBOSE')
-  nulllogger = Object.new
-  nulllogger.instance_eval {|obj|
-    def method_missing(method, *args)
-      # pass
-    end
-  }
-  $log = nulllogger
-end
-
+require 'fluent/version'
+require 'fluent/test/driver/output'
+require 'fluent/test/driver/filter'
 require 'fluent/plugin/out_string_scrub'
 require 'fluent/plugin/filter_string_scrub'
 

data/test/plugin/test_filter_string-scrub.rb

@@ -20,24 +20,22 @@ class StringScrubFilterTest < Test::Unit::TestCase
     replace_char \u{FFFD}
   ]
 
-  def create_driver(conf=CONFIG, tag='test.filter')
-    Fluent::Test::FilterTestDriver.new(Fluent::StringScrubFilter).configure(conf, tag)
+  def create_driver(conf=CONFIG)
+    Fluent::Test::Driver::Filter.new(Fluent::Plugin::StringScrubFilter).configure(conf)
   end
 
   def filter(config, msgs)
     d = create_driver(config)
-    d.run {
+    d.run(default_tag: 'test.filter') {
       msgs.each {|msg|
-        d.filter(msg, @time)
+        d.feed(@time, msg)
       }
     }
-    filtered = d.filtered_as_array
-    filtered.map {|m| m[2] }
+    filtered = d.filtered
+    filtered.map {|m| m[1] }
   end
 
   def test_filter1
-    return unless defined? Fluent::Filter
-
     orig_message = 'testtesttest'
     invalid_utf8 = "\xff".force_encoding('UTF-8')
     msg = {"message" => orig_message + invalid_utf8}

data/test/plugin/test_out_string-scrub.rb

@@ -28,8 +28,8 @@ class StringScrubOutputTest < Test::Unit::TestCase
     replace_char \u{FFFD}
   ]
 
-  def create_driver(conf = CONFIG, tag = 'test', use_v1_config = true)
-    Fluent::Test::OutputTestDriver.new(Fluent::StringScrubOutput, tag).configure(conf, use_v1_config)
+  def create_driver(conf = CONFIG)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::StringScrubOutput).configure(conf)
   end
 
   def test_configure
@@ -78,48 +78,28 @@ class StringScrubOutputTest < Test::Unit::TestCase
     }
   end
 
-  def test_emit_fluentd_0_12
-    if Fluent::VERSION >= "0.12"
-      in_tag = 'input.log'
-      orig_message = 'testtesttest'
-      Fluent::Engine.root_agent.add_label('@foo')
-      d = create_driver(%[
-                        @label @foo
-                        ], in_tag)
-      label = Fluent::Engine.root_agent.find_label('@foo')
-      assert_equal(label.event_router, d.instance.router)
-
-      d.run do
-        d.emit({'message' => orig_message})
-      end
-      emits = d.emits
-      tag, time, record = emits.first
-      assert_equal(in_tag, tag)
-    end
-  end
-
   def test_emit1_invalid_string
     orig_message = 'testtesttest'
     invalid_utf8 = "\xff".force_encoding('UTF-8')
-    d1 = create_driver(CONFIG, 'input.log')
-    d1.run do
-      d1.emit({'message' => orig_message + invalid_utf8})
+    d1 = create_driver(CONFIG)
+    d1.run(default_tag: 'input.log') do
+      d1.feed({'message' => orig_message + invalid_utf8})
     end
-    emits = d1.emits
+    emits = d1.events
     assert_equal 1, emits.length
-    
+
     e1 = emits[0]
     assert_equal "scrubbed.log", e1[0]
     assert_equal orig_message, e1[2]['message']
 
     invalid_ascii = "\xff".force_encoding('US-ASCII')
-    d2 = create_driver(CONFIG, 'input.log2')
-    d2.run do
-      d2.emit({'message' => orig_message + invalid_utf8})
+    d2 = create_driver(CONFIG)
+    d2.run(default_tag: 'input.log2') do
+      d2.feed({'message' => orig_message + invalid_utf8})
     end
-    emits = d2.emits
+    emits = d2.events
     assert_equal 1, emits.length
-    
+
     e2 = emits[0]
     assert_equal "scrubbed.log2", e2[0]
     assert_equal orig_message, e2[2]['message']
@@ -128,11 +108,11 @@ class StringScrubOutputTest < Test::Unit::TestCase
   def test_emit2_replace_char
     orig_message = 'testtesttest'
     invalid_utf8 = "\xff".force_encoding('UTF-8')
-    d1 = create_driver(CONFIG_REPLACE_CHAR, 'input.log')
-    d1.run do
-      d1.emit({'message' => orig_message + invalid_utf8})
+    d1 = create_driver(CONFIG_REPLACE_CHAR)
+    d1.run(default_tag: 'input.log') do
+      d1.feed({'message' => orig_message + invalid_utf8})
     end
-    emits = d1.emits
+    emits = d1.events
     assert_equal 1, emits.length
 
     e1 = emits[0]
@@ -140,11 +120,11 @@ class StringScrubOutputTest < Test::Unit::TestCase
     assert_equal orig_message + '?', e1[2]['message']
 
     invalid_ascii = "\xff".force_encoding('US-ASCII')
-    d2 = create_driver(CONFIG_REPLACE_CHAR, 'input.log2')
-    d2.run do
-        d2.emit({'message' => orig_message + invalid_utf8})
+    d2 = create_driver(CONFIG_REPLACE_CHAR)
+    d2.run(default_tag: 'input.log2') do
+        d2.feed({'message' => orig_message + invalid_utf8})
     end
-    emits = d2.emits
+    emits = d2.events
     assert_equal 1, emits.length
 
     e2 = emits[0]
@@ -155,11 +135,11 @@ class StringScrubOutputTest < Test::Unit::TestCase
   def test_emit3_struct_message
     orig_message = 'testtesttest'
     invalid_utf8 = "\xff".force_encoding('UTF-8')
-    d1 = create_driver(CONFIG_REPLACE_CHAR, 'input.log')
-    d1.run do
-      d1.emit({'message' => {'message_child' => orig_message + invalid_utf8}})
+    d1 = create_driver(CONFIG_REPLACE_CHAR)
+    d1.run(default_tag: 'input.log') do
+      d1.feed({'message' => {'message_child' => orig_message + invalid_utf8}})
     end
-    emits = d1.emits
+    emits = d1.events
     assert_equal 1, emits.length
 
     e1 = emits[0]
@@ -170,11 +150,11 @@ class StringScrubOutputTest < Test::Unit::TestCase
   def test_emit4_unicode1
     orig_message = 'testtesttest'
     invalid_utf8 = "\xff".force_encoding('UTF-8')
-    d1 = create_driver(CONFIG_UNICODE_1, 'input.log')
-    d1.run do
-      d1.emit({'message' => {'message_child' => orig_message + invalid_utf8}})
+    d1 = create_driver(CONFIG_UNICODE_1)
+    d1.run(default_tag: 'input.log') do
+      d1.feed({'message' => {'message_child' => orig_message + invalid_utf8}})
     end
-    emits = d1.emits
+    emits = d1.events
     assert_equal 1, emits.length
 
     e1 = emits[0]
@@ -183,11 +163,11 @@ class StringScrubOutputTest < Test::Unit::TestCase
 
     orig_message = 'testtesttest'
     invalid_utf8 = "\xff".force_encoding('UTF-8')
-    d1 = create_driver(CONFIG_UNICODE_2, 'input.log')
-    d1.run do
-      d1.emit({'message' => {'message_child' => orig_message + invalid_utf8}})
+    d1 = create_driver(CONFIG_UNICODE_2)
+    d1.run(default_tag: 'input.log') do
+      d1.feed({'message' => {'message_child' => orig_message + invalid_utf8}})
     end
-    emits = d1.emits
+    emits = d1.events
     assert_equal 1, emits.length
 
     e1 = emits[0]
@@ -198,25 +178,25 @@ class StringScrubOutputTest < Test::Unit::TestCase
   def test_emit5_frozen_string
     orig_message = 'testtesttest'
     invalid_utf8 = "\xff".force_encoding('UTF-8')
-    d1 = create_driver(CONFIG, 'input.log')
-    d1.run do
-      d1.emit({'message' => (orig_message + invalid_utf8).freeze})
+    d1 = create_driver(CONFIG)
+    d1.run(default_tag: 'input.log') do
+      d1.feed({'message' => (orig_message + invalid_utf8).freeze})
     end
-    emits = d1.emits
+    emits = d1.events
     assert_equal 1, emits.length
-    
+
     e1 = emits[0]
     assert_equal "scrubbed.log", e1[0]
     assert_equal orig_message, e1[2]['message']
 
     invalid_ascii = "\xff".force_encoding('US-ASCII')
-    d2 = create_driver(CONFIG, 'input.log2')
-    d2.run do
-      d2.emit({'message' => (orig_message + invalid_utf8).freeze})
+    d2 = create_driver(CONFIG)
+    d2.run(default_tag: 'input.log2') do
+      d2.feed({'message' => (orig_message + invalid_utf8).freeze})
     end
-    emits = d2.emits
+    emits = d2.events
     assert_equal 1, emits.length
-    
+
     e2 = emits[0]
     assert_equal "scrubbed.log2", e2[0]
     assert_equal orig_message, e2[2]['message']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-string-scrub
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Noriaki Katayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: fluent plugin for string scrub.
 email:
 - kataring@gmail.com
@@ -62,7 +68,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.fluentd.lt.0.12
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -84,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -92,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Fluentd Output filter plugin.

data/Gemfile.fluentd.lt.0.12

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-gem 'fluentd', '~> 0.10.43'
-gemspec