fluent-plugin-typetalk 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTMzMzhkY2NkYzFlMjQ4MTI3YzhjNTE2ODY0Y2UzY2MzMjlkMTlhNA==
+    ZTQ2N2Y1ZWM2MDU1YTAyY2E0MWM0NGI4MjVjOTdkZTUyYmVlOGZjMw==
   data.tar.gz: !binary |-
-    OTNmYjJiNzEwODFlYjM0N2U5YmZkMDVmZmVmYTI5MDA4MzJkY2I2MQ==
+    NDQ5NTY5ZTRkNTQyZjIxZmNmMzdlMTdjNWQ1MzYzOGZhZWIxMjg2Yw==
 SHA512:
   metadata.gz: !binary |-
-    MzIxNjFiZThhZDRkYTI5ODIxMzQ1Nzc2NDlhZGZhNjFmOWNmMjM5MGVlNzM5
-    NTRjY2FlMDI3MTg4NmMyNjRiYzcwYWViZjExYmZkYmExMDhkYmE5YjgzZTc3
-    OWYzY2UzMzAzZWM3MTYxMTJkOWQ0YmIwYTlkMWZhZjE4MmVhZmI=
+    YzNiNGMyYjkyNTg4MTY5NDlkNTI3ZmNjNGY2OGI2OTdiNzkxNDZhN2I0NTRm
+    NjEyYWJlNGY3OTZjZDk4NWVlNmVmM2M3NzkyZWU3OGFhMTRlMjQ0MmY3YmNi
+    MjM1YjcxNmE1ZjIyY2RjNmZiZTRjMTQ5NmUxZWI4NzM2MmMxMmI=
   data.tar.gz: !binary |-
-    ZDEwNDdjOTkwOGJjYjNkM2M1YzgzZDg5YjcxZjkzNGJjYTY1N2VjNzkxN2Fl
-    ZWUxMDJlYWZmZWMxNzNjMjk4M2QwZTExZjE3ODRjMDhiZTlhYzI3MzQ3YzY3
-    NmFkZDA1MjYwYWNkNjIyM2EzMmQwNGE3ZWI2MjY4NzI4NTEzMzk=
+    NDQyNGVhNDZhNWQ2ZmIzODIzMGQyY2EyZDc1Mzg3ZDU2NjhhOGNiODkxMDdi
+    NDljZTFhMWNkYmVhYjIzZTZkYjRkMmVjNzgxYmI0NTc5MzFlM2Y1ZjQ0NWI5
+    YTcyZTQyMzc1NWMyN2JjMDNjMWQxMGI1NDA3ZjAyNWNlMWQ1Zjk=

data/.travis.yml

@@ -1,3 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 1.9.3
+notifications:
+  webhooks:
+    urls:
+      - https://nulab-inc.com/hubot/travis?room=3741
+    on_success: change

data/README.md

@@ -1,4 +1,4 @@
-# fluent-plugin-typetalk [![Build Status](https://travis-ci.org/tksmd/fluent-plugin-typetalk.png?branch=master)](https://travis-ci.org/tksmd/fluent-plugin-typetalk)
+# fluent-plugin-typetalk [![Build Status](https://travis-ci.org/nulab/fluent-plugin-typetalk.svg?branch=master)](https://travis-ci.org/nulab/fluent-plugin-typetalk)
 
 ## Overview
 
@@ -61,9 +61,18 @@ By default, the number of notification you can send within a minute is limited t
   limit 10
 </match>
 ```
-
 In the example above, you can allow 10 notifications to be sent within 300 seconds. To remove the notification throttle, set both parameters to 0.
 
+Typetalk doesn't allow message which length is equal to or greater than 4096. Since 0.0.5, the message over 4096 characters will be truncated automatically. To turn off this behaviour, set truncate_message to false
+```
+<match ...>
+  type typetalk
+  :
+  truncate_message false
+</match>
+```
+If you set this value to false, the message over 4096 characters will not be sent to Typetalk.
+
 ## TODO
 
 Pull requests are very welcome!!
@@ -80,6 +89,16 @@ To run tests, do the following.
 $ VERBOSE=1 bundle exec rake test
 ```
 
+If you want to run a certain file, run rake like this
+```
+$ VERBOSE=1 bundle exec rake test TEST=test/plugin/test_out_typetalk.rb
+```
+
+In addition, you can run specific method like this.
+```
+$ VERBOSE=1 bundle exec rake test TEST=test/plugin/test_out_typetalk.rb TESTOPTS="--name=test_post_message_invalid_request_error"
+```
+
 When releasing, call rake release as follows.
 ```
 $ bundle exec rake release

data/fluent-plugin-typetalk.gemspec

@@ -4,12 +4,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-typetalk"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["tksmd","umakoz"]
   spec.email         = ["someda@isenshi.com"]
   spec.description   = %q{fluent plugin to send message to typetalk}
   spec.summary       = spec.description
-  spec.homepage      = "https://github.com/tksmd/fluent-plugin-typetalk"
+  spec.homepage      = "https://github.com/nulab/fluent-plugin-typetalk"
   spec.license       = "Apache-2.0"
 
   spec.files         = `git ls-files`.split($/)

data/lib/fluent/plugin/out_typetalk.rb

@@ -15,6 +15,8 @@ module Fluent
     config_param :interval, :time, :default => 60
     config_param :limit, :integer, :default => 10
 
+    config_param :truncate_message, :bool, :default => true
+
     attr_reader :typetalk
 
     # Define `log` method for v0.10.42 or earlier
@@ -113,7 +115,9 @@ module Fluent
         res = JSON.parse(e.message) rescue {}
         unless res['body'].nil?
           body = JSON.parse(res['body']) rescue {}
-          msg = body['error']
+          msg = body['errors'].map{|f|
+            f['field'] + ' : ' + f['message']
+          }.join(',')
         end
         raise TypetalkError, "failed to post, msg: #{msg}, code: #{res['status']}"
       end
@@ -134,7 +138,11 @@ module Fluent
         end
       end
 
-      (message % values).gsub(/\\n/, "\n")
+      truncate (@message % values).gsub(/\\n/, "\n")
+    end
+
+    def truncate(str, limit=4096)
+      @truncate_message && str.size >= limit ? str[0,limit-5] + ' ...' : str
     end
 
   end

data/test/plugin/test_out_typetalk.rb

@@ -39,6 +39,17 @@ class TypetalkOutputTest < Test::Unit::TestCase
     limit 0
   ]
 
+  CONFIG_TRUNCATE = %[
+    type typetalk
+    client_id 123456
+    client_secret secret
+    topic_id 1
+    message %s
+    out_keys message
+    truncate_message true
+  ]
+
+
   def create_driver(conf = CONFIG, tag = 'test')
     Fluent::Test::OutputTestDriver.new(Fluent::TypetalkOutput, tag).configure(conf)
   end
@@ -59,7 +70,7 @@ class TypetalkOutputTest < Test::Unit::TestCase
 
   def test_write
     d = create_driver()
-    stub(d.instance.typetalk).post_message(1, 'notice : test1')
+    mock(d.instance.typetalk).post_message(1, 'notice : test1')
     d.emit({'message' => 'test1'})
     d.run()
   end
@@ -68,7 +79,7 @@ class TypetalkOutputTest < Test::Unit::TestCase
     d = create_driver(CONFIG, 'warn')
     d.instance.message = "notice : %s [%s]"
     d.instance.out_keys = ["message", "time"]
-    stub(d.instance.typetalk).post_message(1, "notice : test1 [1399910738]")
+    mock(d.instance.typetalk).post_message(1, "notice : test1 [1399910738]")
 
     ENV["TZ"]="Asia/Tokyo"
     t = Time.strptime('2014-05-13 01:05:38', '%Y-%m-%d %T')
@@ -93,12 +104,12 @@ class TypetalkOutputTest < Test::Unit::TestCase
   def test_post_message_invalid_request_error
     d = create_driver()
     stub(d.instance.typetalk).post_message(1, 'notice : test1') {
-      raise Typetalk::InvalidRequest, {status:400, headers:{}, body:'{"error":"invalid_client","error_description":""}'}.to_json
+      raise Typetalk::InvalidRequest, {status:400, headers:{}, body:'{"errors":[{"field":"message", "name":"error.maxLength", "message":"Maximum length is 4,096 characters."}]}'}.to_json
     }
     stub(d.instance.log).error {|name, params|
       assert_equal "out_typetalk:", name
       assert_equal Fluent::TypetalkError, params[:error_class]
-      assert_equal "failed to post, msg: invalid_client, code: 400", params[:error]
+      assert_equal "failed to post, msg: message : Maximum length is 4,096 characters., code: 400", params[:error]
     }
     d.emit({'message' => 'test1'})
     d.run()
@@ -107,7 +118,7 @@ class TypetalkOutputTest < Test::Unit::TestCase
   def test_post_message_notfound_error
     d = create_driver()
     stub(d.instance.typetalk).post_message(1, 'notice : test1') {
-      raise Typetalk::NotFound, {status:404, headers:{}, body:''}.to_json
+      raise Typetalk::NotFound, {status:404, headers:{}, body:'{"errors":[]}'}.to_json
     }
     stub(d.instance.log).error {|name, params|
       assert_equal "out_typetalk:", name
@@ -120,8 +131,8 @@ class TypetalkOutputTest < Test::Unit::TestCase
 
   def test_throttle
     d = create_driver(CONFIG_THROTTLE)
-    stub(d.instance.typetalk).post_message(1, 'notice : test1')
-    stub(d.instance.typetalk).post_message(1, 'notice : test3')
+    mock(d.instance.typetalk).post_message(1, 'notice : test1')
+    mock(d.instance.typetalk).post_message(1, 'notice : test3')
     stub(d.instance.log).error {|name, params|
       assert_equal "out_typetalk:", name
       assert_equal "number of posting message within 5.0(sec) reaches to the limit 1", params[:error]
@@ -133,4 +144,15 @@ class TypetalkOutputTest < Test::Unit::TestCase
     d.run()
   end
 
+  def test_truncate
+    d = create_driver(CONFIG_TRUNCATE)
+    mock(d.instance.typetalk).post_message(1, '1')
+    mock(d.instance.typetalk).post_message(1, '1'*4095)
+    mock(d.instance.typetalk).post_message(1, '1'*4091 + ' ...')
+    d.emit({'message' => '1'})
+    d.emit({'message' => '1'*4095}) # not truncated
+    d.emit({'message' => '1'*4096}) # should be truncated
+    d.run()
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-typetalk
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - tksmd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,7 @@ files:
 - lib/fluent/plugin/out_typetalk.rb
 - test/helper.rb
 - test/plugin/test_out_typetalk.rb
-homepage: https://github.com/tksmd/fluent-plugin-typetalk
+homepage: https://github.com/nulab/fluent-plugin-typetalk
 licenses:
 - Apache-2.0
 metadata: {}