fluent-plugin-mongo 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4c03c163ad52a2f48b8fa88d69370d4c1ed0810
-  data.tar.gz: cf0f26a570dcfaed4c24bde308446b36ba0c2cfd
+  metadata.gz: e0f06d14dcaa01affed6b682b47507f1316382b3
+  data.tar.gz: 45949ee4d712a3383a5d1d0950dbc4777023df67
 SHA512:
-  metadata.gz: 871f0d9f4880db300354aff08ba51f1a9f07718e01e9b3527ee22c5be107bda3f4ce9e96d7d5ed431a7ed704eb90fe421ba178a357216a1e9070630ff33847dd
-  data.tar.gz: 182460bff1536f1997c238537292cbb0a048af93ef74a2393e275b79b0ae969707336d4c3243cdfe50a8f717b3929ac8ab1cffd4b91a0e01c51499985dc035ee
+  metadata.gz: d46e3642f3e5ea270751f63d8f0e763d368e87a1d01c0bc87ef4b5e1f53c69dc866a7813129e3df0eda442c46850e57aa3e319397c96a77329347edf1828585f
+  data.tar.gz: 58520fb47980924087cd3daecc2e9913064dd8874e0ea1204be5af83132cf7bd66678a1b18dcf4e8c9f9786d74d8ec3232bf1bd8ce06d7f04ab84d5c1ead9440

data/.gitignore

@@ -3,3 +3,5 @@
 /coverage/
 /vendor/
 Gemfile.lock
+/test/plugin/data/
+/test/tools/data/

data/.travis.yml

@@ -1,8 +1,7 @@
 rvm:
- - 1.9.2
  - 1.9.3
  - 2.0.0
- - 2.1.0
+ - 2.1
  - rbx
 
 before_script:

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.7.4 - 2014/11/10
+
+	* Sanitize keys of each hash of an array
+	* Add config_set_default to mongo_replset
+
+
 Release 0.7.3 - 2014/03/09
 
 	* Add replace_dot_in_key_with and replace_dollar_in_key_with parameters to sanitize invalid key

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/lib/fluent/plugin/out_mongo.rb

@@ -253,18 +253,25 @@ module Fluent
       version
     end
 
-    def replace_key_of_hash(hash, pattern, replacement)
-      result = Hash.new
-      hash.each_pair do |k, v|
-        k = k.gsub(pattern, replacement)
-
-        if v.is_a?(Hash)
-          result[k] = replace_key_of_hash(v, pattern, replacement)
-        else
-          result[k] = (v.dup rescue v)
+    def replace_key_of_hash(hash_or_array, pattern, replacement)
+      case hash_or_array
+      when Array
+        hash_or_array.map do |elm|
+          replace_key_of_hash(elm, pattern, replacement)
+        end
+      when Hash
+        result = Hash.new
+        hash_or_array.each_pair do |k, v|
+          k = k.gsub(pattern, replacement)
+
+          if v.is_a?(Hash) || v.is_a?(Array)
+            result[k] = replace_key_of_hash(v, pattern, replacement)
+          else
+            result[k] = v
+          end
         end
+        result
       end
-      result
     end
   end
 end

data/lib/fluent/plugin/out_mongo_replset.rb

@@ -4,6 +4,9 @@ module Fluent
   class MongoOutputReplset < MongoOutput
     Plugin.register_output('mongo_replset', self)
 
+    config_set_default :include_tag_key, false
+    config_set_default :include_time_key, true
+
     config_param :nodes, :string
     config_param :name, :string, :default => nil
     config_param :read, :string, :default => nil

data/test/plugin/out_mongo.rb

@@ -25,6 +25,7 @@ class MongoOutputTest < Test::Unit::TestCase
       type mongo
       database #{MONGO_DB_DB}
       collection #{collection_name}
+      include_time_key true # TestDriver ignore config_set_default?
     ]
   end
 
@@ -136,15 +137,21 @@ class MongoOutputTest < Test::Unit::TestCase
 
     time = Time.parse("2011-01-02 13:14:15 UTC").to_i
     d.emit({
-      "foo.bar" => {
+      "foo.bar1" => {
         "$foo$bar" => "baz"
-      }
+      },
+      "foo.bar2" => [
+        {
+          "$foo$bar" => "baz"
+        }
+      ],
     }, time)
     d.run
 
     documents = get_documents
     assert_equal(1, documents.size)
-    assert_equal("baz", documents[0]["foo_dot_bar"]["_dollar_foo$bar"])
+    assert_equal("baz", documents[0]["foo_dot_bar1"]["_dollar_foo$bar"])
+    assert_equal("baz", documents[0]["foo_dot_bar2"][0]["_dollar_foo$bar"])
     assert_equal(0, documents.select { |e| e.has_key?(Fluent::MongoOutput::BROKEN_DATA_KEY)}.size)
   end
 
@@ -231,6 +238,7 @@ class MongoReplOutputTest < MongoOutputTest
       collection #{collection_name}
       nodes #{build_seeds(3).join(',')}
       num_retries 30
+      include_time_key true # TestDriver ignore config_set_default?
     ]
   end
 
@@ -260,3 +268,4 @@ class MongoReplOutputTest < MongoOutputTest
     assert_equal({:ssl => false}, d.instance.connection_options)
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: MongoDB plugin for Fluentd