fluent-plugin-chatwork 1.0.1 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0b1215e734a23d143b14e4d47988ad4fde3d454
-  data.tar.gz: 7090e822f3e23aeab9eadbd8c70cba96ebdf3f18
+  metadata.gz: 19df334b710b279bba1f7d0116f51de3dd3c494e
+  data.tar.gz: 7ce33435ce3ea73cac806992a5696c4e5f5aa23b
 SHA512:
-  metadata.gz: 5be9c63dd379bc84bb0d2233113353ff9a87925086e06bc59aa8e24a57e9dae61b9a84e834f0b7a1ec0c76ad905debd1e170132a76affbd97c8c2c19ec3ae59e
-  data.tar.gz: 15b4d0738fa0c8fb9017b9344341b81597e9db9574d3df1eca85a07356774eb8c413df73d3e325d92ea51621deae2123ec0e22e72b098ef0e1a8dee2a36c2af4
+  metadata.gz: ccd4c7ab415214e3d2f63cfaa1b9691ec27890d93fc04e78344439db0ae2ed570dd4d89ea97249300829d84bbefec396680fe8c00d1cdc124f5646016dd6e888
+  data.tar.gz: 879297e60af8b5b3ea5d0c90f24a58a9a4f3ad39339766fa755c1122f936d6ff5c482ef67fab268e8c2bddcea8c9094b6208bb09a92d29326203badca9a90a34

data/fluent-plugin-chatwork.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-chatwork"
-  spec.version       = "1.0.1"
+  spec.version       = "2.0.0.beta1"
   spec.authors       = ["sue445"]
   spec.email         = ["sue445@sue445.net"]
   spec.summary       = %q{fluentd output plugin for post to chatwork}
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fluentd"
+  spec.add_dependency "fluentd", [">= 0.14.15", "< 2"]
   spec.add_dependency "chatwork", ">= 0.4.0"
 
   spec.add_development_dependency "bundler"

data/lib/fluent/plugin/out_chatwork.rb

@@ -1,15 +1,27 @@
 # -*- encoding: utf-8 -*-
 require "chatwork"
+require "fluent/plugin/output"
 
-module Fluent
-  class ChatworkOutput < Fluent::Output
+module Fluent::Plugin
+  class ChatworkOutput < Output
     # First, register the plugin. NAME is the name of this plugin
     # and identifies the plugin in the configuration file.
     Fluent::Plugin.register_output('chatwork', self)
 
+    helpers :compat_parameters
+
+    DEFAULT_BUFFER_TYPE = "memory"
+
     config_param :api_token, :string
     config_param :room_id  , :string
     config_param :message  , :string
+    # Switch non-buffered/buffered plugin
+    config_param :buffered, :bool, default: false
+
+    config_section :buffer do
+      config_set_default :@type, DEFAULT_BUFFER_TYPE
+      config_set_default :chunk_keys, ['tag']
+    end
 
     # This method is called before starting.
     def configure(conf)
@@ -26,18 +38,36 @@ module Fluent
       super
     end
 
+    def prefer_buffered_processing
+      @buffered
+    end
+
+    def formatted_to_msgpack_binary?
+      true
+    end
+
+    def format(tag, time, record)
+      [time, record].to_msgpack
+    end
+
     # This method is called when an event reaches Fluentd.
     # 'es' is a Fluent::EventStream object that includes multiple events.
     # You can use 'es.each {|time,record| ... }' to retrieve events.
     # 'chain' is an object that manages transactions. Call 'chain.next' at
     # appropriate points and rollback if it raises an exception.
-    def emit(tag, es, chain)
-      chain.next
+    def process(tag, es)
       es.each {|time,record|
         post_message(time: time, record: record, tag: tag)
       }
     end
 
+    def write(chunk)
+      tag = chunk.metadata.tag
+      chunk.msgpack_each {|time, record|
+        post_message(time: time, record: record, tag: tag)
+      }
+    end
+
     def post_message(args={})
       body = generate_message(args)
       ChatWork.api_key = @api_token

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

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 
-describe Fluent::ChatworkOutput do
+describe Fluent::Plugin::ChatworkOutput do
   before do
     Fluent::Test.setup
   end
 
-  let(:driver)   { Fluent::Test::OutputTestDriver.new(Fluent::ChatworkOutput, 'test.metrics').configure(config) }
+  let(:driver)   { Fluent::Test::Driver::Output.new(Fluent::Plugin::ChatworkOutput).configure(config) }
   let(:instance) { driver.instance }
 
   let(:config) do
@@ -28,6 +28,10 @@ describe Fluent::ChatworkOutput do
     it "should get message" do
       expect( instance.message ).to eq "some message"
     end
+
+    it "should get buffered" do
+      expect( instance.buffered ).to be_falsy
+    end
   end
 
   describe "#emit" do
@@ -38,8 +42,30 @@ describe Fluent::ChatworkOutput do
     end
 
     it "should be called" do
-      driver.emit(record)
-      expect(driver.run).not_to be_nil
+      driver.run(default_tag: "test.metrics") { driver.feed(record) }
+      expect(driver.events).not_to be_nil
+    end
+  end
+
+  describe "buffered #emit" do
+    let(:record){ {} }
+
+    let(:config) do
+      %[
+       api_token xxxxxxxxxxxxxxxxxxxx
+       room_id   1234567890
+       message   some message
+       buffered  true
+       ]
+    end
+
+    before do
+      allow(instance).to receive(:post_message)
+    end
+
+    it "should be called" do
+      driver.run(default_tag: "test.metrics") { driver.feed(record) }
+      expect(driver.events).not_to be_nil
     end
   end
 

data/spec/spec_helper.rb

@@ -26,6 +26,7 @@ end
 
 require 'fluent/load'
 require 'fluent/test'
+require 'fluent/test/driver/output'
 
 require 'fluent/plugin/out_chatwork'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-chatwork
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.15
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.15
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: chatwork
   requirement: !ruby/object:Gem::Requirement
@@ -172,12 +178,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: fluentd output plugin for post to chatwork