fluent-plugin-twilio 0.0.3 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ab70ac89145baa0be76178e959a1528a6376f2d0
+  data.tar.gz: ee066533389d27be18d2a72ea98bfc09b077faac
+SHA512:
+  metadata.gz: 1b94d3ac7124a401b14d849337b76d97cacc167ff61bbe175dd79fc10ddf2c904d614fef30d4d60604adfad1ac6a065bc05c1951f83f819f900b3147a7ec6529
+  data.tar.gz: f2f726644ce54a5e7f709dc8e214c20dab16650d240126a4371d5e992a00b37f22e0761b27b146670030cab49c0b452fcb5b96f64ac43e90f88b4662fc636aeb

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+vendor/*

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 
 rvm:
+  - 2.4.1
+  - 2.3.4
   - 2.2
   - 2.1
-  - 2.0.0
-  - 1.9.3
-  
+

data/README.md

@@ -3,17 +3,27 @@ fluent-plugin-twilio
 
 ## Overview
 Fluentd Output plugin to make a call with twilio.
+Twilio free trial is available to signup at the official website.
+You can try call to your cellphone for free!
+
+## Requirements
+
+| fluent-plugin-twilio | fluentd     | ruby   |
+|----------------------|-------------|--------|
+| >= 0.1.0             | >= v0.14.15 | >= 2.1 |
+| < 0.1.0              | >= v0.12.0  | >= 1.9 |
+
 
 ## Installation
 
-install with gem or fluent-gem command as:
+install with gem or td-agent-gem command as:
 
 `````
-### system installed gem
-gem install fluent-plugin-twilio
+### for local fluentd
+$ gem install fluent-plugin-twilio
 
-### td-agent bundled gem
-/usr/lib64/fluent/ruby/bin/fluent-gem install fluent-plugin-twilio
+### for td-agent2 (standard)
+$ sudo td-agent-gem install fluent-plugin-twilio
 `````
 
 ## Configuration
@@ -29,12 +39,12 @@ fluent_logger.post('notify.call', {
 ### Sample
 `````
 <source>
-  type http
+  @type http
   port 8888
 </source>
 
 <match notify.call>
-  type twilio
+  @type twilio
 
   # Set account Sid and Token from twilio.com/user/account
   account_sid     TWILIO_ACCOUNT_SID           # Required
@@ -47,11 +57,36 @@ fluent_logger.post('notify.call', {
   # To call multiple phone at the same time, list them with comma like below.
   default_number  +819012345678,+818012345678  # Optional
 
-  # Set log level to prevent info error for Fluentd v0.10.43 or later.
-  log_level       warn
+  # Set log level to prevent info error
+  @log_level       warn
 </match>
 `````
 
+### Sample to customize messages
+
+You can customize message using [filter_record_transformer](http://docs.fluentd.org/v0.14/articles/filter_record_transformer).
+
+```
+<source>
+  @type http
+  port 8888
+  @label @NOTIFY
+</source>
+
+<label @NOTIFY>
+  <filter>
+    @type record_transformer
+    <record>
+      message Hi. ${record["name"]} has made a order of ${record["item"]} just now.
+    </record>
+  </filter>
+  <match>
+    @type twilio
+    # snip ...
+  </match>
+</label>
+```
+
 ### Quick Test
 `````
 # test call to +819012345678 and say "Help! System ABC has down." with woman voice.

data/fluent-plugin-twilio.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-twilio"
-  s.version     = "0.0.3"
+  s.version     = "0.1.0"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-twilio"
-  s.summary     = %q{Fluentd Output plugin to make a call with Twilio VoIP API. Twiml supports text-to-speech with many languages ref. https://www.twilio.com/docs/api/twiml/say}
+  s.summary     = %q{Fluentd Output plugin to make a phone call with Twilio VoIP API. Twiml supports text-to-speech with many languages ref. https://www.twilio.com/docs/api/twiml/say}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rake"
   s.add_development_dependency "test-unit", ">= 3.1.0"
-  s.add_runtime_dependency "fluentd"
+  s.add_runtime_dependency "fluentd", ">= 0.14.15", "< 2"
   s.add_runtime_dependency "twilio-ruby"
 end

data/lib/fluent/plugin/out_twilio.rb

@@ -1,44 +1,36 @@
-class Fluent::TwilioOutput < Fluent::Output
+require 'uri'
+require 'twilio-ruby'
+
+require 'fluent/plugin/output'
+
+class Fluent::Plugin::TwilioOutput < Fluent::Plugin::Output
   Fluent::Plugin.register_output('twilio', self)
 
   config_param :account_sid, :string
-  config_param :auth_token, :string, :secret => true
-  config_param :from_number, :string, :default => ''
-  config_param :default_number, :string, :default => ''
-  config_param :default_voice, :string, :default => 'woman'
-  config_param :language, :string, :default => 'ja-jp'
+  config_param :auth_token, :string, secret: true
+  config_param :from_number, :string, default: ''
+  config_param :default_number, :string, default: ''
+  config_param :default_voice, :string, default: 'woman'
+  config_param :language, :string, default: 'ja-jp'
 
   VOICE_MAP = ['man', 'woman']
 
-  # Define `log` method for v0.10.42 or earlier
-  unless method_defined?(:log)
-    define_method("log") { $log }
-  end
-
-  def initialize
-    super
-    require 'uri'
-    require 'twilio-ruby'
-  end
-
   def configure(conf)
     super
 
   end
 
-  def emit(tag, es, chain)
+  def process(tag, es)
     es.each do |time,record|
       number = record['number'].nil? ? @default_number : record['number']
       @voice = VOICE_MAP.include?(record['voice']) ? record['voice'] : @default_voice
       call(number, record['message'])
     end
-
-    chain.next
   end
 
   def call(number, message)
     response = Twilio::TwiML::Response.new do |r|
-      r.Say message, :voice => @voice, :language => @language
+      r.Say message, voice: @voice, language: @language
     end
     xml = response.text.sub(/<[^>]+?>/, '')
     url = "http://twimlets.com/echo?Twiml=#{URI.escape(xml)}"
@@ -48,7 +40,7 @@ class Fluent::TwilioOutput < Fluent::Output
     account = client.account
     number.gsub(' ', '').split(',').each do |to_number|
       begin
-        call = account.calls.create({:from => @from_number, :to => to_number, :url => url})
+        account.calls.create({from: @from_number, to: to_number, url: url})
       rescue => e
         log.error "twilio: Error: #{e.message}"
       end

data/test/helper.rb

@@ -1,28 +1,10 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+require 'bundler/setup'
 require 'test/unit'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(__dir__, '..', 'lib'))
+$LOAD_PATH.unshift(__dir__)
 require 'fluent/test'
-unless ENV.has_key?('VERBOSE')
-  nulllogger = Object.new
-  nulllogger.instance_eval {|obj|
-    def method_missing(method, *args)
-      # pass
-    end
-  }
-  $log = nulllogger
-end
+require 'fluent/test/driver/output'
 
 require 'fluent/plugin/out_twilio'
 
-class Test::Unit::TestCase
-end

data/test/plugin/test_out_twilio.rb

@@ -11,8 +11,8 @@ class TwilioOutputTest < Test::Unit::TestCase
     from_number  +8112345678
   ]
 
-  def create_driver(conf=CONFIG,tag='test')
-    Fluent::Test::OutputTestDriver.new(Fluent::TwilioOutput, tag).configure(conf)
+  def create_driver(conf=CONFIG)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::TwilioOutput).configure(conf)
   end
 
   def test_configure
@@ -44,12 +44,12 @@ class TwilioOutputTest < Test::Unit::TestCase
 
 
   def test_emit
-    d1 = create_driver(CONFIG, 'notify.call')
-    d1.run do
-      d1.emit({'message' => 'hello world.'})
+    d1 = create_driver(CONFIG)
+    d1.run(default_tag: 'notify.call') do
+      d1.feed({'message' => 'hello world.'})
     end
-    emits = d1.emits
-    assert_equal 0, emits.length
+    events = d1.events
+    assert_equal 0, events.length
   end
 end
 

metadata

@@ -1,78 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-twilio
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Kentaro Yoshida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     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
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.15
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: twilio-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -82,8 +79,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -94,28 +91,27 @@ files:
 - test/plugin/test_out_twilio.rb
 homepage: https://github.com/y-ken/fluent-plugin-twilio
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.5
 signing_key: 
-specification_version: 3
-summary: Fluentd Output plugin to make a call with Twilio VoIP API. Twiml supports
+specification_version: 4
+summary: Fluentd Output plugin to make a phone call with Twilio VoIP API. Twiml supports
   text-to-speech with many languages ref. https://www.twilio.com/docs/api/twiml/say
 test_files:
 - test/helper.rb