fluent-plugin-out_chatwork 0.0.2 → 0.0.3

data/README.md

@@ -4,6 +4,7 @@ fluentd output plugin for post to [ChatWork](http://www.chatwork.com/)
 
 [![Gem Version](https://badge.fury.io/rb/fluent-plugin-out_chatwork.svg)](http://badge.fury.io/rb/fluent-plugin-out_chatwork)
 [![Build Status](https://travis-ci.org/sue445/fluent-plugin-out_chatwork.svg)](https://travis-ci.org/sue445/fluent-plugin-out_chatwork)
+[![Dependency Status](https://gemnasium.com/sue445/fluent-plugin-out_chatwork.svg)](https://gemnasium.com/sue445/fluent-plugin-out_chatwork)
 
 ## Installation
 
@@ -26,7 +27,7 @@ Or install it yourself as:
   type         chatwork
   api_token    YOUR_SECRET_TOKEN
   room_id      0000000000
-  message      Hello ChatWork! <%= record["value"] %>
+  message      Hello ChatWork!\n<%= record["value"] %>
 </match>
 ```
 
@@ -37,12 +38,18 @@ Or install it yourself as:
 * message
   * message content
   * support erb format
+  * support newline character (\n)
   
 ## Changelog
+### master
+[full changelog](http://github.com/sue445/fluent-plugin-out_chatwork/compare/v0.0.2...master)
+
+* Support newline character in message
+
 ### 0.0.2
 [full changelog](http://github.com/sue445/fluent-plugin-out_chatwork/compare/v0.0.1...v0.0.2)
 
-* Support erb at message
+* Support erb in message
 
 ### 0.0.1
 * Initial commit

data/fluent-plugin-out_chatwork.gemspec

@@ -4,12 +4,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-out_chatwork"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["sue445"]
   spec.email         = ["sue445@sue445.net"]
   spec.summary       = %q{fluentd output plugin for post to chatwork}
   spec.description   = %q{fluentd output plugin for post to chatwork}
-  spec.homepage      = "https://github.com/sue445/fluent-plugin-out_chatwor"
+  spec.homepage      = "https://github.com/sue445/fluent-plugin-out_chatwork"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/fluent/plugin/out_chatwork.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require "chatwork"
 
 module Fluent
@@ -37,16 +38,18 @@ module Fluent
       }
     end
 
-    private
     def post_message(args={})
+      body = generate_message(args)
+      ChatWork.api_key = @api_token
+      ChatWork::Message.create(room_id: @room_id, body: body)
+    end
+
+    def generate_message(args={})
       time   = args[:time]
       record = args[:record]
       tag    = args[:tag]
 
-      erb = ERB.new(@message)
-      body = erb.result(binding)
-      ChatWork.api_key = @api_token
-      ChatWork::Message.create(room_id: @room_id, body: body)
+      ERB.new(@message).result(binding).gsub("\\n", "\n")
     end
   end
 end

data/spec/lib/fluent/plugin/out_chatwork_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 describe Fluent::ChatworkOutput do
   let(:driver)   { Fluent::Test::OutputTestDriver.new(Fluent::ChatworkOutput, 'test.metrics').configure(config) }
   let(:instance) { driver.instance }
@@ -22,10 +24,6 @@ describe Fluent::ChatworkOutput do
     it "should get message" do
       expect( instance.message ).to eq "some message"
     end
-
-    context "When contain erb" do
-
-    end
   end
 
   describe "#emit" do
@@ -40,4 +38,42 @@ describe Fluent::ChatworkOutput do
       expect(driver.run).not_to be_nil
     end
   end
+
+  describe "#generate_message" do
+    subject{ instance.generate_message(record: record, time: time, tag: tag) }
+
+    let(:record){ {} }
+    let(:time)  { Time.now }
+    let(:tag)   { "debug.foo" }
+
+    context "When contain erb format" do
+      let(:config) do
+        %[
+          api_token xxxxxxxxxxxxxxxxxxxx
+          room_id   1234567890
+          message   <%= record["greeting"] %> ChatWork!
+        ]
+      end
+
+      let(:record) do
+        {
+            "greeting" => "Hello"
+        }
+      end
+
+      it{ should eq "Hello ChatWork!" }
+    end
+
+    context "When contain newline character" do
+      let(:config) do
+        %[
+          api_token xxxxxxxxxxxxxxxxxxxx
+          room_id   1234567890
+          message   1st line\\n2nd line
+        ]
+      end
+
+      it{ should eq "1st line\n2nd line" }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-out_chatwork
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -109,7 +109,7 @@ files:
 - lib/fluent/plugin/out_chatwork.rb
 - spec/lib/fluent/plugin/out_chatwork_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/sue445/fluent-plugin-out_chatwor
+homepage: https://github.com/sue445/fluent-plugin-out_chatwork
 licenses:
 - MIT
 post_install_message: 
@@ -124,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 872810270354693595
+      hash: 2466610615714716893
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 872810270354693595
+      hash: 2466610615714716893
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23