fluent-plugin-mongo 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 892fbaf245b427435db3ebb4edaa6e4681d5fd07
-  data.tar.gz: de0b7e9b1b054e02819f5242888361bb4ebbf8a5
+  metadata.gz: eedc0d2a61f67e0ef0e8e4b36066e1e0491d263d
+  data.tar.gz: d4bec2e33837adc3dda2a54cfe270ac82f6ad805
 SHA512:
-  metadata.gz: 9193319af1591a3b21b5ceeb1c98155434f41cb01ad5125fe6bb3dfaea30bd40d4fbea868421f38f85fccb30f8eea1480f912c84ddeea3f2415b3b2f6520e45a
-  data.tar.gz: c486200f457c322e6c0350dfba0191776dac3909b85cf5e46547c705680ccae5c9b19be2857e7076c00f195e7d93528698bebd8aa7e76d81f1fa27d78ef536ca
+  metadata.gz: f1b9d8b626bd916c3837465430535bb598487cf3742bb52da05b28ca13198d0b98591a1c399923426e59c15f35cb4b47c5a53e23630555c532854b827dbbb6e1
+  data.tar.gz: '085554829eaa6becd079dafa4bbc61ad6f9122f93aba4c39e9f2eb0d8f186e37e0a2ae775cb32c71af4351ac24166eb5b4eec4ed764202fa8858e1183176cd05'

data/.travis.yml

@@ -13,7 +13,8 @@ services:
   - mongodb
 
 before_install:
-  - gem update --system
+  - gem update --system=2.7.8
+
 before_script:
   - git submodule update -i
 

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 1.2.2 - 2019/04/01
+
+	* out_mongo: Don't handle database placholders when specifying connection_string parameter
+
 Release 1.2.1 - 2018/12/18
 
 	* out_mongo_replset: Fix internal signature mismatch

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/fluent-plugin-mongo.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency "fluentd", [">= 0.14.12", "< 2"]
+  gem.add_dependency "fluentd", [">= 0.14.22", "< 2"]
   gem.add_runtime_dependency "mongo", "~> 2.6.0"
   gem.add_development_dependency "rake", ">= 0.9.2"
   gem.add_development_dependency "simplecov", ">= 0.5.4"

data/lib/fluent/plugin/out_mongo.rb

@@ -172,8 +172,9 @@ module Fluent::Plugin
     end
 
     def write(chunk)
-      collection_name = extract_placeholders(@collection, chunk.metadata)
-      database_name = extract_placeholders(@database, chunk.metadata)
+      collection_name = extract_placeholders(@collection, chunk)
+      # In connection_string case, we shouldn't handle extract_placeholers for @database.
+      database_name = extract_placeholders(@database, chunk) unless @connection_string
       operate(database_name, format_collection_name(collection_name), collect_records(chunk))
     end
 

data/test/plugin/test_out_mongo.rb

@@ -183,6 +183,27 @@ class MongoOutputTest < ::Test::Unit::TestCase
     assert_equal(expected, actual_documents)
   end
 
+  def test_write_with_connection_string
+    d = create_driver(%[
+      @type mongo
+      connection_string mongodb://localhost:#{port}/#{database_name}
+      collection #{collection_name}
+      capped
+      capped_size 100
+    ])
+    assert_equal("mongodb://localhost:#{port}/#{database_name}", d.instance.connection_string)
+    assert_nil d.instance.database
+
+    d.run(default_tag: 'test') do
+      emit_documents(d)
+    end
+    actual_documents = get_documents
+    time = event_time("2011-01-02 13:14:15 UTC")
+    expected = [{'a' => 1, d.instance.inject_config.time_key => Time.at(time).localtime},
+                {'a' => 2, d.instance.inject_config.time_key => Time.at(time).localtime}]
+    assert_equal(expected, actual_documents)
+  end
+
   class WriteWithCollectionPlaceholder < self
     def setup
       @tag = 'custom'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.12
+        version: 0.14.22
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.12
+        version: 0.14.22
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'