fluent-plugin-typetalk 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzFhNThjMWE0NjIzNmIyZDNhMDk4ODg1OTM0OGQ3ZTNjOGIwYjUzOQ==
+    YzY5YjQ5MTdhMmYxYzliZDRlMmQzYzUzZTEyNmM4ZDE5NTQwYTNmMw==
   data.tar.gz: !binary |-
-    YmE2Y2ZkM2ViZmNmNzg0MzRiMGFhYmI5MzU2N2IwODk0MTA4ZDdlOQ==
+    ZWQ1NjVkOGMwZWIwNDQzZjZmYTQxNzMzNzZmOTFiMjhhNzk0NmIwZA==
 SHA512:
   metadata.gz: !binary |-
-    ODQzZDBmMjc1Zjc4Njg1ZWY5NTczMjE3NDI5ODEzZTE0MzIyZDRlZGJiNzU2
-    NzhlNTljZmYyOWU3MDBjYjI5MmQwMGZiMmNiY2EyNjk3NWEwZGJhYmViNjM2
-    YmJlOGUzYjM1OWU0MzM4NTRjYTQ4NDA5YjVhMTY4ZDQ1ZDFhYWQ=
+    NWU4MGIxZTM2NjUyZWI5YTIzMDY3OGIwYzM5NTcwZTcyNGE1M2RjZGJkODZk
+    MDE2ZDFkMjNhODE2MjQwMDdjZDdhMGQ0NWUxYWE3YTg0OWNmM2Y0NTdhYmVh
+    ODJjZGI1YmMwNDQ4ZjU5OWRjMjg1ODVhN2VjMTA5MTQzNzk0NTg=
   data.tar.gz: !binary |-
-    NjBkMjgyODJjZDgzY2E3NjA1YTI1ODRiMGI4MDlmNTA0NzhhZmUxY2Q0MzIz
-    ZTZkNmQzODE2NWI5YmVmMzQ0YTcyZGFiMWQ2NWRiYzJhYjMzYjljNjQ4MTQ3
-    NzFjMTE4OTVkNDhlOTYxYjFhOWQ1YzNiZjFlOWRkZTdiZTFhZDA=
+    NWMxY2M4NGIyZmFhZmI0ZDQ5M2I2NTA0N2E3NDA3MTc2MjQ4N2M0M2E0NGM0
+    YTBhYjZlNDY1NTMxNjk3NWJmY2EzZWUwZDQzNzJjOTc1OWQxZWNjM2MxMzhi
+    ODU5MGRkNjk2ZDNmM2Q5ZDRiYWFjOTFkOWI1MGY3Y2RhNmIzM2E=

data/fluent-plugin-typetalk.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-typetalk"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["tksmd"]
   spec.email         = ["someda@isenshi.com"]
   spec.description   = %q{fluent plugin to send message to typetalk}
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rr", ">= 1.0.0"
   spec.add_runtime_dependency "fluentd"
+  spec.add_runtime_dependency "typetalk"
 
   spec.required_ruby_version = '>= 1.9.3'
 end

data/lib/fluent/plugin/out_typetalk.rb

@@ -23,13 +23,19 @@ module Fluent
 
     def initialize
       super
-      require 'erb'
       require 'socket'
+      require 'typetalk'
     end
 
     def configure(conf)
       super
-      @typetalk = Typetalk.new(conf['client_id'], conf['client_secret'])
+      Typetalk.configure do |c|
+        c.client_id = conf['client_id']
+        c.client_secret = conf['client_secret']
+        c.scope = 'topic.post'
+        c.user_agent = "fluent-plugin-typetalk Ruby/#{RUBY_VERSION}"
+      end
+      @typetalk = Typetalk::Api.new
       @hostname = Socket.gethostname
 
       @out_keys = @out_keys.split(',')
@@ -76,7 +82,19 @@ module Fluent
 
     def send_message(tag, time, record)
       message = evaluate_message(tag, time, record)
-      @typetalk.post(@topic_id, message)
+      begin
+        @typetalk.post_message(@topic_id, message)
+      rescue Typetalk::Unauthorized
+        raise TypetalkError, "invalid credentials used. check client_id and client_secret in your configuration."
+      rescue => e
+        msg = ''
+        res = JSON.parse(e.message) rescue {}
+        unless res['body'].nil?
+          body = JSON.parse(res['body']) rescue {}
+          msg = body['error']
+        end
+        raise TypetalkError, "failed to post, msg: #{msg}, code: #{res['status']}"
+      end
     end
 
     def evaluate_message(tag, time, record)
@@ -99,84 +117,6 @@ module Fluent
 
   end
 
-  class Typetalk
-
-    USER_AGENT = "fluent-plugin-typetalk Ruby/#{RUBY_VERSION}"
-
-    def initialize(client_id, client_secret)
-      require 'net/http'
-      require 'uri'
-      require 'json'
-
-      @client_id = client_id
-      @client_secret = client_secret
-
-      @http = Net::HTTP.new('typetalk.in', 443)
-      @http.use_ssl = true
-    end
-
-    def post(topic_id, message)
-      check_token()
-      $log.debug("Typetalk access_token : #{@access_token}")
-
-      res = @http.post(
-        "/api/v1/topics/#{topic_id}",
-        "message=#{message}",
-        { 'Authorization' => "Bearer #{@access_token}", 'User-Agent' => USER_AGENT }
-      )
-
-      # todo: handling 429
-      unless res and res.is_a?(Net::HTTPSuccess)
-        msg = ""
-        unless res.body.nil?
-          json = JSON.parse(res.body)
-          msg = json.fetch('errors', [])[0].fetch('message',"")
-        end
-        raise TypetalkError, "failed to post, msg: #{msg}, code: #{res.code}"
-      end
-
-    end
-
-    def check_token
-
-      if @access_token.nil?
-        update_token()
-      elsif Time.now >= @expires
-        update_token(true)
-      end
-
-    end
-
-    def update_token(refresh = false)
-      params = "client_id=#{@client_id}&client_secret=#{@client_secret}"
-      unless refresh
-        params << "&grant_type=client_credentials&scope=topic.post"
-      else
-        params << "&grant_type=refresh_token&refresh_token=#{@refresh_token}"
-      end
-
-      res = @http.post(
-        "/oauth2/access_token",
-        params,
-        { 'User-Agent' => USER_AGENT }
-      )
-
-      if res.is_a?(Net::HTTPUnauthorized)
-        raise TypetalkError, "invalid credentials used. check client_id and client_secret in your configuration."
-      end
-
-      unless res.is_a?(Net::HTTPSuccess)
-        raise TypetalkError, "unexpected error occured in getting access_token, code: #{res && res.code}"
-      end
-
-      json = JSON.parse(res.body)
-      @expires = Time.now + json['expires_in'].to_i
-      @refresh_token = json['refresh_token']
-      @access_token = json['access_token']
-    end
-
-  end
-
   class TypetalkError < RuntimeError; end
 
 end

data/test/plugin/test_out_typetalk.rb

@@ -23,13 +23,13 @@ class TypetalkOutputTest < Test::Unit::TestCase
 
   def test_configure
     d = create_driver()
-    assert_equal d.instance.typetalk.instance_variable_get(:@client_id), '123456'
-    assert_equal d.instance.typetalk.instance_variable_get(:@client_secret), 'secret'
+    assert_equal '123456', Typetalk.config.client_id
+    assert_equal 'secret', Typetalk.config.client_secret
   end
 
   def test_write
     d = create_driver()
-    stub(d.instance.typetalk).post(1, 'notice : test1')
+    stub(d.instance.typetalk).post_message(1, 'notice : test1')
     d.emit({'message' => 'test1'})
     d.run()
   end
@@ -38,7 +38,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(1, "notice : test1 [1399910738]")
+    stub(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')
@@ -46,4 +46,46 @@ class TypetalkOutputTest < Test::Unit::TestCase
     d.run()
   end
 
-end
+  def test_post_message_unauthorized_error
+    d = create_driver()
+    stub(d.instance.typetalk).post_message(1, 'notice : test1') {
+      raise Typetalk::Unauthorized, {status:401, headers:{}, body:''}.to_json
+    }
+    stub(d.instance.log).error {|name, params|
+      assert_equal "out_typetalk:", name
+      assert_equal Fluent::TypetalkError, params[:error_class]
+      assert_equal "invalid credentials used. check client_id and client_secret in your configuration.", params[:error]
+    }
+    d.emit({'message' => 'test1'})
+    d.run()
+  end
+
+  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
+    }
+    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]
+    }
+    d.emit({'message' => 'test1'})
+    d.run()
+  end
+
+  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
+    }
+    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: , code: 404", params[:error]
+    }
+    d.emit({'message' => 'test1'})
+    d.run()
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-typetalk
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - tksmd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: typetalk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: fluent plugin to send message to typetalk
 email:
 - someda@isenshi.com