daioikachan 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47150b0d6c93fcda75508f92aa41cd335e5f656c
-  data.tar.gz: 107674f0f8f789feb52d7b9a29b453cbd7083e0d
+  metadata.gz: e5840423a172e0e011f0d5f30bd60a7b55b215d4
+  data.tar.gz: 3dac386902fc7017fb970798e777ffd86247dcd2
 SHA512:
-  metadata.gz: 06ea59e9cbbf5e86fc1c45f1664bcfd546817cb7fcc73f4721a85b260194c79f76f5cc664e023a56f16c1ff05a53d9abbcaffdc3c8e8759bcfc5d55430bcb5c4
-  data.tar.gz: 4edb9ea8b4a7159ed26f2b823915a62b446cb31ba3548f408fc3b9922beae99a6dbb669688642791ac3307478b78823377ee9d824f665373ca79d599452c4114
+  metadata.gz: 4bbb9657e14b15c38e7c1a95577d0446d5751bec857d9f5bdc4e0c4f91e5439548f80cc3d3817bb489dafc710b5895e11536c0268b5cb56cb72e4fa47e0c6ebe
+  data.tar.gz: e237eafcb3c952b7f2e4f9f609b459721c8fdc6eb0137d72a35de6e853fe64a8381cbe42369a6710ab8bbb90440f5f040aeb30547b696e8d5a47fc71325e9925

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.0.6 (2015/03/31)
+
+Enhancements
+
+* Add `filter_string_irc_slack`
+* log.error InternalServerError
+
 # 0.0.5 (2015/03/30)
 
 Changes:

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/daioikachan.gemspec

@@ -21,9 +21,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency "puma"
   gem.add_dependency "fluent-plugin-irc", ">= 0.0.7"
   gem.add_dependency "fluent-plugin-slack", ">= 0.5.0"
+  gem.add_dependency "string-scrub" if RUBY_VERSION.to_f < 2.1
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "test-unit"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-nav"
+  gem.add_development_dependency "string-irc"
 end

data/examples/example.conf

@@ -44,6 +44,9 @@
 </label>
 
 <label @slack>
+  <filter **>
+    type string_irc_slack # convert IRC color code to slack preformat ``
+  </filter>
   <match **>
     type slack
     token "#{ENV['SLACK_API_TOKEN']}"
@@ -52,6 +55,7 @@
     channel_keys channel
     color good
     icon_emoji :ghost:
+    mrkdwn true
     flush_interval 1s # slack API has limit as a post / sec
   </match>
 </label>

data/examples/multi_slack.conf

@@ -30,6 +30,7 @@
     channel general
     color bad
     icon_emoji :ghost:
+    mrkdwn true
     flush_interval 1s # slack API has limit as a post / sec
   </match>
   # other channels => default_team.slack.com#${channel}
@@ -41,6 +42,7 @@
     channel_keys channel
     color bad
     icon_emoji :ghost:
+    mrkdwn true
     flush_interval 1s # slack API has limit as a post / sec
   </match>
 </label>

data/lib/fluent/plugin/filter_string_irc_slack.rb

@@ -0,0 +1,46 @@
+require 'string/scrub' if RUBY_VERSION.to_f < 2.1
+
+module Fluent
+  class StringIrcSlackFilter < Filter
+    Plugin.register_filter('string_irc_slack', self)
+
+    COLOR_CODE = "\x03" # \u0003
+    BOLD       = "\x02" # \u0002
+    UNDERLINE  = "\x1f" # \u001F
+    INVERSE    = "\x16" # \u0016
+    CLEAR      = "\x0f" # \u000F
+
+    def configure(conf)
+      @start_code = Regexp.new("(#{COLOR_CODE}[0-9][0-9](,[0-9][0-9])?|#{BOLD}|#{UNDERLINE}|#{INVERSE})+")
+      @stop_code  = Regexp.new(CLEAR)
+      super
+    end
+
+    def start
+      super
+    end
+
+    def shutdown
+      super
+    end
+
+    def filter(tag, time, record)
+      if message = record['message']
+        filtered_message = with_scrub(message) {|str| str.gsub(@start_code, '`').gsub(@stop_code, '`') }
+        record = record.dup.tap {|r| r['message'] = filtered_message }
+      end
+      record
+    end
+
+    def with_scrub(string)
+      begin
+        return yield(string)
+      rescue ArgumentError => e
+        raise e unless e.message.index("invalid byte sequence in") == 0
+        log.info "filter_string_irc_slack: invalid byte sequence is replaced in #{string}"
+        string.scrub!('?')
+        retry
+      end
+    end
+  end
+end

data/lib/fluent/plugin/in_daioikachan.rb

@@ -60,8 +60,6 @@ module Fluent
 
     class App
       class BadRequest < StandardError; end
-      class InternalServerError < StandardError; end
-      class NotFound < StandardError; end
 
       attr_reader :router, :log
 
@@ -92,12 +90,10 @@ module Fluent
           end
         rescue BadRequest => e
           bad_request(e.message)
-        rescue NotFound => e
-          not_found(e.message)
-        rescue InternalServerError => e
-          internal_server_error(e.message)
         rescue => e
-          internal_server_error("#{e.class} #{e.message} #{e.backtrace.first}")
+          log.error "out_slack:", :error => e.to_s, :error_class => e.class.to_s
+          log.warn_backtrace e.backtrace
+          internal_server_error
         else
           ok
         end

data/test/plugin/test_filter_string_irc_slack.rb

@@ -0,0 +1,49 @@
+require_relative '../helper'
+require 'fluent/plugin/filter_string_irc_slack'
+require 'string-irc'
+
+class StringIrcSlackFilterTest < Test::Unit::TestCase
+  include Fluent
+
+  setup do
+    Fluent::Test.setup
+    @time = Fluent::Engine.now
+  end
+
+  def create_driver(conf = '')
+    Test::FilterTestDriver.new(StringIrcSlackFilter).configure(conf, true)
+  end
+
+  def filter(config, msgs)
+    d = create_driver(config)
+    d.run {
+      msgs.each {|msg|
+        d.filter(msg, @time)
+      }
+    }
+    filtered = d.filtered_as_array
+    filtered.map {|m| m[2] }
+  end
+
+  sub_test_case 'configure' do
+    test 'check default' do
+      assert_nothing_raised { create_driver }
+    end
+  end
+
+  def test_filter
+    si1 = StringIrc.new('hello').red.underline.to_s
+    si2 = StringIrc.new('world').yellow('green').bold.to_s
+    message = "#{si1} #{si2}"
+    msgs = [{"message" => message}]
+    filtered = filter('', msgs)
+    assert_equal([{"message" => "`hello` `world`"}], filtered)
+  end
+
+  def test_invalid_byte_sequence
+    invalid_string = "\xff".force_encoding('UTF-8')
+    msgs = [{"message" => invalid_string}]
+    filtered = filter('', msgs)
+    assert_equal([{"message" => "?"}], filtered)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daioikachan
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: string-irc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ikachan compatible interface with multiple backends (IRC, Slack, etc)
 email: sonots@gmail.com
 executables:
@@ -156,8 +170,10 @@ files:
 - daioikachan.gemspec
 - examples/example.conf
 - examples/multi_slack.conf
+- lib/fluent/plugin/filter_string_irc_slack.rb
 - lib/fluent/plugin/in_daioikachan.rb
 - test/helper.rb
+- test/plugin/test_filter_string_irc_slack.rb
 - test/plugin/test_in_daioikachan.rb
 homepage: https://github.com/sonots/daioikachan
 licenses:
@@ -185,4 +201,5 @@ specification_version: 4
 summary: Ikachan compatible interface with multiple backends (IRC, Slack, etc)
 test_files:
 - test/helper.rb
+- test/plugin/test_filter_string_irc_slack.rb
 - test/plugin/test_in_daioikachan.rb