fluent-plugin-slack 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63a07a1d2026c16d55cd088092f69953404b202e
-  data.tar.gz: 33f8b2de136067d8e0e7adfa69457bb676d97eaa
+  metadata.gz: 9728adc795ffb5913a6a95b430a9f32cfa6a348b
+  data.tar.gz: 2b4644f289d44272a7ce2b06a4d7fa9b523afa2b
 SHA512:
-  metadata.gz: 429287c6ea93b6a2af9371e7c50624142295be16a2e81e2ba27f3d293dc310eed431a0481f33b349c52384839db415401285f38ee7a4dbbcc778dc2f5017ad06
-  data.tar.gz: 50b5c8f83db6ef873cc448c85106b63e6dd7c6ff547f960701ec0634077d9539d09cbb5adfea347448c17982c538f87c5cfd37a44876eb5f90c2e91d43c3dfc6
+  metadata.gz: e133acd3966eca01bde5fe1a5dae574fd58761dd49066bac8a08ec46322e936cf20d7710c689bdbc135a6a438039e4d23c6bfcf3bff43ecae1be9091957038ef
+  data.tar.gz: e1c18bf9fe6fef99314522bfb94a8d092f430375ff69e3d2a2cb995185de5419f09dbaee50b3fd4528fbd329a427936578f6055c2133c4b3179b2d8b7b2cda87

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.6.1 (2015/05/17)
+
+Fixes:
+
+* Support ruby 1.9.3
+
 ## 0.6.0 (2015/04/02)
 
 This version has impcompatibility with previous versions in default option values

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/fluent/plugin/out_buffered_slack.rb

@@ -38,7 +38,7 @@ module Fluent
     end
 
     # for test
-    attr_reader :slack, :time_format, :localtime, :timef, :mrkdwn_in
+    attr_reader :slack, :time_format, :localtime, :timef, :mrkdwn_in, :post_message_opts
 
     def initialize
       super
@@ -117,7 +117,11 @@ module Fluent
         raise Fluent::ConfigError, "`parse` must be either of `none` or `full`"
       end
 
-      @post_message_opts = @auto_channels_create ? {auto_channels_create: true} : {}
+      @post_message_opts = {}
+      if @auto_channels_create
+        raise Fluent::ConfigError, "`token` parameter is required to use `auto_channels_create`" unless @token
+        @post_message_opts = {auto_channels_create: true}
+      end
     end
 
     def format(tag, time, record)
@@ -128,7 +132,7 @@ module Fluent
       begin
         payloads = build_payloads(chunk)
         payloads.each {|payload| @slack.post_message(payload, @post_message_opts) }
-      rescue Net::OpenTimeout, Net::ReadTimeout => e
+      rescue Timeout::Error => e
         log.warn "out_slack:", :error => e.to_s, :error_class => e.class.to_s
         raise e # let Fluentd retry
       rescue => e
@@ -172,6 +176,8 @@ module Fluent
     end
 
     Field = Struct.new("Field", :title, :value)
+    # ruby 1.9.x does not provide #to_h
+    Field.send(:define_method, :to_h) { {title: title, value: value} }
 
     def build_title_payloads(chunk)
       ch_fields = {}

data/lib/fluent/plugin/out_slack.rb

@@ -38,7 +38,7 @@ module Fluent
     end
 
     # for test
-    attr_reader :slack, :time_format, :localtime, :timef, :mrkdwn_in
+    attr_reader :slack, :time_format, :localtime, :timef, :mrkdwn_in, :post_message_opts
 
     def initialize
       super
@@ -117,7 +117,11 @@ module Fluent
         raise Fluent::ConfigError, "`parse` must be either of `none` or `full`"
       end
 
-      @post_message_opts = @auto_channels_create ? {auto_channels_create: true} : {}
+      @post_message_opts = {}
+      if @auto_channels_create
+        raise Fluent::ConfigError, "`token` parameter is required to use `auto_channels_create`" unless @token
+        @post_message_opts = {auto_channels_create: true}
+      end
     end
 
     def format(tag, time, record)
@@ -128,7 +132,7 @@ module Fluent
       begin
         payloads = build_payloads(chunk)
         payloads.each {|payload| @slack.post_message(payload, @post_message_opts) }
-      rescue Net::OpenTimeout, Net::ReadTimeout => e
+      rescue Timeout::Error => e
         log.warn "out_slack:", :error => e.to_s, :error_class => e.class.to_s
         raise e # let Fluentd retry
       rescue => e
@@ -172,6 +176,8 @@ module Fluent
     end
 
     Field = Struct.new("Field", :title, :value)
+    # ruby 1.9.x does not provide #to_h
+    Field.send(:define_method, :to_h) { {title: title, value: value} }
 
     def build_title_payloads(chunk)
       ch_fields = {}

data/lib/fluent/plugin/slack_client.rb

@@ -51,7 +51,7 @@ module Fluent
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         http.set_debug_output(debug_dev) if debug_dev
 
-        req = Net::HTTP::Post.new(endpoint)
+        req = Net::HTTP::Post.new(endpoint.request_uri)
         req['Host'] = endpoint.host
         req['Accept'] = 'application/json; charset=utf-8'
         req['User-Agent'] = 'fluent-plugin-slack'

data/test/plugin/test_out_slack.rb

@@ -246,6 +246,23 @@ class SlackOutputTest < Test::Unit::TestCase
     assert_not_equal Net::HTTP, d.instance.slack.proxy_class # Net::HTTP.Proxy
   end
 
+  def test_auto_channels_create_configure
+    # default
+    d = create_driver(CONFIG)
+    assert_equal false, d.instance.auto_channels_create
+    assert_equal({}, d.instance.post_message_opts)
+
+    # require `token`
+    assert_raise(Fluent::ConfigError) do
+      d = create_driver(CONFIG + %[auto_channels_create true])
+    end
+
+    # auto_channels_create
+    d = create_driver(CONFIG + %[auto_channels_create true\ntoken XXX-XX-XXX])
+    assert_equal true, d.instance.auto_channels_create
+    assert_equal({auto_channels_create: true}, d.instance.post_message_opts)
+  end
+
   def test_default_incoming_webhook
     d = create_driver(%[
       channel channel

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-slack
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Keisuke SOGAWA
@@ -9,118 +9,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.8
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: fluent Slack plugin
@@ -131,8 +131,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -157,17 +157,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: fluent Slack plugin