fluent-plugin-twitter 0.3.0 → 0.3.1

data/.travis.yml

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

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.3.0"
+  s.version     = "0.3.1"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-twitter"
@@ -14,10 +14,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
   s.add_development_dependency "rake"
   s.add_runtime_dependency "fluentd", [">= 0.10.46"]
-  s.add_runtime_dependency "em-twitter"
   s.add_runtime_dependency "twitter"
-  s.add_runtime_dependency "tweetstream"
+  s.add_runtime_dependency "tweetstream", [">= 2.6.1"]
 end

data/lib/fluent/plugin/in_twitter.rb

@@ -95,7 +95,7 @@ module Fluent
     def get_message(status)
       case @output_format
       when 'nest'
-        record = status.inject({}){|f,(k,v)| f[k.to_s] = v; f}
+        record = hash_key_to_s(status)
       when 'flat'
         record = hash_flatten(status)
       when 'simple'
@@ -123,5 +123,31 @@ module Fluent
         end
       end
     end
+
+    def hash_key_to_s(hash)
+      newhash = {}
+      hash.each do |k, v|
+        if v.instance_of?(Hash) then
+          newhash[k.to_s] = hash_key_to_s(v)
+        elsif v.instance_of?(Array) then
+          newhash[k.to_s] = array_key_to_s(v)
+        else
+          newhash[k.to_s] = v
+        end
+      end
+      newhash
+    end
+
+    def array_key_to_s(array)
+      array.map do |v|
+        if v.instance_of?(Hash) then
+          hash_key_to_s(v)
+        elsif v.instance_of?(Array) then
+          array_key_to_s(v)
+        else
+          v
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-twitter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.10.46
-- !ruby/object:Gem::Dependency
-  name: em-twitter
-  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'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.1
 description: 
 email:
 - y.ken.studio@gmail.com