fluent-plugin-filter_linefeeder 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66883b27b28fa3518b6999804326c7039493b617
-  data.tar.gz: b2661252f996455df9b74e7538353dc706758de3
+  metadata.gz: 49230790cad9dc3fa4539a4061c9622cb2eaaf52
+  data.tar.gz: c4f87c213aaed77b1cec61da9d49ca63519537bb
 SHA512:
-  metadata.gz: 8260a22c6cd57da7b7e6e6defc0d9050c240bcaa408f22df857fba740c7db21a84218d81409dd0d5edfc89058d84228de77791df73e669a55c5b3f1b3739eb02
-  data.tar.gz: f09a890ffb835e2b3faebdcd37d7acc50a84ebda4a0a1bc529c66fbb2ab9392003d1a72dc1f828846cba858785e78b8d65f4ad85c2d051ddfe6fffeb95130816
+  metadata.gz: bcdf2bb366b66ac6a53c28c64fd3e612cbed5214721eaf3f539c21c12a71bb857b054bcbf7190ed5ae1c1388119723d3718e2c8cb82b7f524d0dcc78a0094be2
+  data.tar.gz: 4a0d52a98a928c086498af53a2563b32ab43d1c5cbcb211284423d77de8e3d9bfe27090a0deebfd0cb5d361df520055472e5114b77a99795b8cc795925983d75

data/CHANGELOG.md

@@ -1,4 +1,11 @@
+## 0.0.2
+
+Enhancements:
+
+* Add filter_linetrimer (would be moved to another gem)
+
 ## 0.0.1
 
 First version
 
+

data/fluent-plugin-filter_linefeeder.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-filter_linefeeder"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-filter_linefeeder"

data/lib/fluent/plugin/filter_linetrimer.rb

@@ -0,0 +1,33 @@
+module Fluent
+  class LinetrimerFilter < Filter
+    Fluent::Plugin.register_filter('linetrimer', self)
+
+    config_param :key, :string
+    config_param :num, :integer
+
+    def initialize
+      require 'string/scrub' if RUBY_VERSION.to_f < 2.1
+      super
+    end
+
+    def configure(conf)
+      super
+    end
+
+    def filter(tag, time, record)
+      return record unless record[key]
+      record[key] = trim(record[key], num)
+      record
+    end
+
+    def trim(string, num)
+      begin
+        string.split("\n")[0...num].join("\n")
+      rescue ArgumentError => e
+        raise e unless e.message.index("invalid byte sequence in") == 0
+        string.scrub!('?')
+        retry
+      end
+    end
+  end
+end

data/test/test_filter_linetrimer.rb

@@ -0,0 +1,48 @@
+require_relative 'helper'
+require 'fluent/plugin/filter_linetrimer'
+
+class LinetrimerFilterTest < Test::Unit::TestCase
+  include Fluent
+
+  setup do
+    Fluent::Test.setup
+    @time = Fluent::Engine.now
+  end
+
+  def create_driver(conf = '')
+    Test::FilterTestDriver.new(LinetrimerFilter).configure(conf, true)
+  end
+
+  def filter(d, msg)
+    d.run { d.filter(msg, @time) }
+    d.filtered_as_array.first[2]
+  end
+
+  sub_test_case 'configure' do
+    def test_keys
+      assert_raise Fluent::ConfigError do
+        create_driver('')
+      end
+
+      d = create_driver(%[key a\nnum 10])
+      assert_equal "a", d.instance.key
+      assert_equal 10,  d.instance.num
+    end
+  end
+
+  sub_test_case 'filter' do
+    def test_trim
+      d = create_driver(%[key message\nnum 2])
+      msg = { 'message' => "foo\nbar\nbaz" }
+      filtered = filter(d, msg)
+      assert_equal "foo\nbar", filtered['message']
+    end
+
+    def test_scrub
+      d = create_driver(%[key message\nnum 2])
+      msg = { 'message' => "\xff".force_encoding('UTF-8') }
+      filtered = filter(d, msg)
+      assert_equal "?", filtered['message']
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter_linefeeder
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Naotoshi Seo
@@ -97,8 +97,10 @@ files:
 - example.conf
 - fluent-plugin-filter_linefeeder.gemspec
 - lib/fluent/plugin/filter_linefeeder.rb
+- lib/fluent/plugin/filter_linetrimer.rb
 - test/helper.rb
 - test/test_filter_linefeeder.rb
+- test/test_filter_linetrimer.rb
 homepage: https://github.com/sonots/fluent-plugin-filter_linefeeder
 licenses:
 - MIT
@@ -126,3 +128,4 @@ summary: A Fluentd filter plugin to convert ' ' to " " (line feed)
 test_files:
 - test/helper.rb
 - test/test_filter_linefeeder.rb
+- test/test_filter_linetrimer.rb