fluent-plugin-twitter 0.4.1 → 0.5.0

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 
 rvm:
+  - 2.2
   - 2.1
   - 2.0.0
   - 1.9.3

data/README.md

@@ -46,9 +46,10 @@ $ sudo td-agent-gem install fluent-plugin-twitter
   oauth_token         YOUR_OAUTH_TOKEN        # Required
   oauth_token_secret  YOUR_OAUTH_TOKEN_SECRET # Required
   tag                 input.twitter.sampling  # Required
-  timeline            tracking                # Required (tracking or sampling or userstream)
+  timeline            tracking                # Required (tracking or sampling or location or userstream)
   keyword             Ruby,Python             # Optional (keyword is priority than follow_ids)
   follow_ids          14252,53235             # Optional (integers, not screen names)
+  locations           31.110283, 129.431631, 45.619283, 145.510175  # Optional (bounding boxes; first pair specifies longitude/latitude of southwest corner)
   lang                ja,en                   # Optional
   output_format       nest                    # Optional (nest or flat or simple[default])
 </source>

data/fluent-plugin-twitter.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-twitter"
-  s.version     = "0.4.1"
+  s.version     = "0.5.0"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-twitter"
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rake"
+  s.add_development_dependency "test-unit", ">= 3.1.0"
   s.add_runtime_dependency "fluentd", ">= 0.10.46"
   s.add_runtime_dependency "twitter", ">= 5.0.0"
   s.add_runtime_dependency "tweetstream", ">= 2.6.1"

data/lib/fluent/plugin/in_twitter.rb

@@ -1,17 +1,23 @@
 module Fluent
   class TwitterInput < Fluent::Input
-    TIMELINE_TYPE = %w(userstream sampling tracking)
+    TIMELINE_TYPE = %w(userstream sampling location tracking)
     OUTPUT_FORMAT_TYPE = %w(nest flat simple)
     Plugin.register_input('twitter', self)
 
-    config_param :consumer_key, :string
-    config_param :consumer_secret, :string
-    config_param :oauth_token, :string
-    config_param :oauth_token_secret, :string
+    # To support Fluentd v0.10.57 or earlier
+    unless method_defined?(:router)
+      define_method("router") { Fluent::Engine }
+    end
+
+    config_param :consumer_key, :string, :secret => true
+    config_param :consumer_secret, :string, :secret => true
+    config_param :oauth_token, :string, :secret => true
+    config_param :oauth_token_secret, :string, :secret => true
     config_param :tag, :string
     config_param :timeline, :string
     config_param :keyword, :string, :default => nil
     config_param :follow_ids, :string, :default => nil
+    config_param :locations, :string, :default => nil
     config_param :lang, :string, :default => nil
     config_param :output_format, :string, :default => 'simple'
     config_param :flatten_separator, :string, :default => '_'
@@ -61,6 +67,8 @@ module Fluent
         client.track(@keyword)
       elsif @timeline == 'tracking' && @follow_ids
         client.follow(@follow_ids)
+      elsif @timeline == 'location' && @locations
+        client.locations(@locations)
       elsif @timeline == 'sampling' && @keyword.nil? && @follow_ids.nil?
         client.sample
       elsif @timeline == 'userstream'
@@ -113,7 +121,7 @@ module Fluent
         record.store('user_time_zone', status[:user][:time_zone])
         record.store('user_lang', status[:user][:lang])
       end
-      Engine.emit(@tag, Engine.now, record)
+      router.emit(@tag, Engine.now, record)
     end
 
     def hash_flatten(record, prefix = nil)

data/lib/fluent/plugin/out_twitter.rb

@@ -1,12 +1,12 @@
 class Fluent::TwitterOutput < Fluent::Output
   Fluent::Plugin.register_output('twitter', self)
 
-  config_param :consumer_key, :string
-  config_param :consumer_secret, :string
-  config_param :oauth_token, :string, :default => nil
-  config_param :oauth_token_secret, :string, :default => nil
-  config_param :access_token, :string, :default => nil
-  config_param :access_token_secret, :string, :default => nil
+  config_param :consumer_key, :string, :secret => true
+  config_param :consumer_secret, :string, :secret => true
+  config_param :oauth_token, :string, :default => nil, :secret => true
+  config_param :oauth_token_secret, :string, :default => nil, :secret => true
+  config_param :access_token, :string, :default => nil, :secret => true
+  config_param :access_token_secret, :string, :default => nil, :secret => true
 
   def initialize
     super

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-twitter
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !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