fluent-plugin-ikachan 0.2.0 → 0.2.1

data/fluent-plugin-ikachan.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-ikachan"
-  gem.version       = "0.2.0"
+  gem.version       = "0.2.1"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.summary       = %q{output plugin for IRC-HTTP gateway 'ikachan'}

data/lib/fluent/plugin/out_ikachan.rb

@@ -83,7 +83,9 @@ class Fluent::IkachanOutput < Fluent::Output
 
     messages.each do |msg|
       begin
-        res = Net::HTTP.post_form(@notice_uri, {'channel' => @channel, 'message' => msg})
+        msg.split("\n").each do |m|
+          res = Net::HTTP.post_form(@notice_uri, {'channel' => @channel, 'message' => m})
+        end
       rescue
         $log.warn "out_ikachan: failed to send notice to #{@host}:#{@port}, #{@channel}, message: #{msg}"
       end
@@ -91,7 +93,9 @@ class Fluent::IkachanOutput < Fluent::Output
 
     privmsg_messages.each do |msg|
       begin
-        res = Net::HTTP.post_form(@privmsg_uri, {'channel' => @channel, 'message' => msg})
+        msg.split("\n").each do |m|
+          res = Net::HTTP.post_form(@privmsg_uri, {'channel' => @channel, 'message' => m})
+        end
       rescue
         $log.warn "out_ikachan: failed to send privmsg to #{@host}:#{@port}, #{@channel}, message: #{msg}"
       end
@@ -117,7 +121,7 @@ class Fluent::IkachanOutput < Fluent::Output
       end
     end
 
-    message % values
+    (message % values).gsub(/\\n/, "\n")
   end
 
 end

data/test/plugin/test_out_ikachan.rb

@@ -36,6 +36,19 @@ class IkachanOutputTest < Test::Unit::TestCase
     tag_key tag
   ]
 
+  # Please notice that the line feed is "\n" in fluentd config file, not "\\n" as belows:
+  CONFIG_LINE_FEED = %[
+    host localhost
+    channel morischan
+    message out_ikachan: %s [%s] %s\\nRETURN
+    out_keys tag,time,msg
+    privmsg_message out_ikachan: %s [%s] %s\\nRETURN
+    privmsg_out_keys tag,time,msg
+    time_key time
+    time_format %Y/%m/%d %H:%M:%S
+    tag_key tag
+  ]
+
   def create_driver(conf=CONFIG,tag='test')
     Fluent::Test::OutputTestDriver.new(Fluent::IkachanOutput, tag).configure(conf)
   end
@@ -47,6 +60,8 @@ class IkachanOutputTest < Test::Unit::TestCase
     assert_equal '#morischan', d.instance.channel
     d = create_driver(CONFIG_PRIVMSG_ONLY)
     assert_equal '#morischan', d.instance.channel
+    d = create_driver(CONFIG_LINE_FEED)
+    assert_equal '#morischan', d.instance.channel
   end
 
   # CONFIG = %[
@@ -148,6 +163,59 @@ class IkachanOutputTest < Test::Unit::TestCase
     assert_equal "out_ikachan: test [#{ts}] privmsg message from fluentd out_ikachan: testing second line", @posted[1][:message]
   end
 
+  # CONFIG = %[
+  #   host localhost
+  #   channel morischan
+  #   message out_ikachan: %s [%s] %s\nRETURN
+  #   out_keys tag,time,msg
+  #   privmsg_message out_ikachan: %s [%s] %s\nRETURN
+  #   privmsg_out_keys tag,time,msg
+  #   time_key time
+  #   time_format %Y/%m/%d %H:%M:%S
+  #   tag_key tag
+  # ]
+  def test_line_feed
+    d = create_driver(CONFIG_LINE_FEED)
+    t = Time.now
+    time = t.to_i
+    ts = t.strftime(d.instance.time_format)
+    d.run do
+      d.emit({'msg' => "both notice and privmsg message from fluentd out_ikachan: testing now\ntesting second line"}, time)
+    end
+
+    assert_equal 6, @posted.length
+
+    i = 0
+    assert_equal 'notice', @posted[i][:method]
+    assert_equal '#morischan', @posted[i][:channel]
+    assert_equal "out_ikachan: test [#{ts}] both notice and privmsg message from fluentd out_ikachan: testing now", @posted[i][:message]
+
+    i += 1
+    assert_equal 'notice', @posted[i][:method]
+    assert_equal '#morischan', @posted[i][:channel]
+    assert_equal "testing second line", @posted[i][:message]
+
+    i += 1
+    assert_equal 'notice', @posted[i][:method]
+    assert_equal '#morischan', @posted[i][:channel]
+    assert_equal "RETURN", @posted[i][:message]
+
+    i += 1
+    assert_equal 'privmsg', @posted[i][:method]
+    assert_equal '#morischan', @posted[i][:channel]
+    assert_equal "out_ikachan: test [#{ts}] both notice and privmsg message from fluentd out_ikachan: testing now", @posted[i][:message]
+
+    i += 1
+    assert_equal 'privmsg', @posted[i][:method]
+    assert_equal '#morischan', @posted[i][:channel]
+    assert_equal "testing second line", @posted[i][:message]
+
+    i += 1
+    assert_equal 'privmsg', @posted[i][:method]
+    assert_equal '#morischan', @posted[i][:channel]
+    assert_equal "RETURN", @posted[i][:message]
+  end
+
   # setup / teardown for servers
   def setup
     Fluent::Test.setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ikachan
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd