mongo 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b0437cd0c5d8bb2f5500c239a8814d634c80499
-  data.tar.gz: bed04278506ef47a820421a872f5850ab8f01a7d
+  metadata.gz: e38363c98850f8cb9f7ef56552faf0b6bbaf88e6
+  data.tar.gz: 9bb3295506cf0fdd420a7232283982145824cb11
 SHA512:
-  metadata.gz: 9d790a1e9b2f1e97c2b354e22daf0ec5d6552c438f5d59c3d84e98ab57c42fec8f4cc4d81699569efde84840d3b41e5f9417c0aa536f0d51af1f39ce3c8368fa
-  data.tar.gz: d9417be0c394836c30d60a0bf4a1199003b56866a39f3630aea96e9647a3ef27040c9d1df9a7acc6c068718da4bee16bdb982c6feb3fae13ef7218280059e9e3
+  metadata.gz: 391cb75664da5c1d1f24a8b61b59703b2767c60c221c601342bf2597096af1a828b1eaec2402e91e5e512e251f64534a31dcc73103062cc111f6247137953edf
+  data.tar.gz: fe3b98b0be277225dbe52ca0a39a8bc3e31e80eff077041bf87d7327d9adfba697a8ed6b8333637dd5c6b887b7599b893b15ebfbf347af90cfdcae97582682c1

data/lib/mongo/address.rb

@@ -148,7 +148,7 @@ module Mongo
       error = nil
       ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM).detect do |info|
         begin
-          return FAMILY_MAP[info[4]].new(host, port).tap do |res|
+          return FAMILY_MAP[info[4]].new(info[3], port).tap do |res|
             res.socket(timeout, ssl_options).connect!
           end
         rescue IOError, SystemCallError => e

data/lib/mongo/error/parser.rb

@@ -48,7 +48,8 @@ module Mongo
         parse_single(@message, ERROR)
         parse_single(@message, ERRMSG)
         parse_multiple(@message, WRITE_ERRORS)
-        parse_multiple(@message, WRITE_CONCERN_ERROR)
+        parse_single(@message, ERRMSG,
+                     document[WRITE_CONCERN_ERROR]) if document[WRITE_CONCERN_ERROR]
       end
 
       def parse_single(message, key, doc = document)

data/lib/mongo/server/connection_pool.rb

@@ -98,7 +98,7 @@ module Mongo
           connection = checkout
           yield(connection)
         ensure
-          checkin(connection)
+          checkin(connection) if connection
         end
       end
 

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.0.4'.freeze
 end

data/spec/mongo/error/parser_spec.rb

@@ -84,35 +84,14 @@ describe Mongo::Error::Parser do
       end
     end
 
-    context 'when the document contains writeConcernErrors' do
+    context 'when the document contains a writeConcernError' do
 
-      context 'when a single error exists' do
-
-        let(:document) do
-          { 'writeConcernError' => [{ 'errmsg' => 'not authorized for query', 'code' => 13 }]}
-        end
-
-        it 'returns the message' do
-          expect(parser.message).to eq('not authorized for query (13)')
-        end
+      let(:document) do
+        { 'writeConcernError' => { 'code' => 100, 'errmsg' => 'Not enough data-bearing nodes' } }
       end
 
-      context 'when multiple errors exist' do
-
-        let(:document) do
-          {
-            'writeConcernError' => [
-              { 'code' => 9, 'errmsg' => 'Unknown modifier: $st' },
-              { 'code' => 9, 'errmsg' => 'Unknown modifier: $bl' }
-            ]
-          }
-        end
-
-        it 'returns the messages concatenated' do
-          expect(parser.message).to eq(
-            'Unknown modifier: $st (9), Unknown modifier: $bl (9)'
-          )
-        end
+      it 'returns the message' do
+        expect(parser.message).to eq('Not enough data-bearing nodes (100)')
       end
     end
   end

data/spec/mongo/server/connection_pool_spec.rb

@@ -117,4 +117,31 @@ describe Mongo::Server::ConnectionPool do
       expect(pool.inspect).to include(pool.__send__(:queue).inspect)
     end
   end
+
+  describe '#with_connection' do
+
+    let(:server) do
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
+    end
+
+    let(:pool) do
+      described_class.get(server)
+    end
+
+    context 'when a connection cannot be checked out' do
+
+      before do
+        allow(pool).to receive(:checkout).and_return(nil)
+        pool.with_connection { |c| c }
+      end
+
+      let(:queue) do
+        pool.send(:queue).queue
+      end
+
+      it 'does not add the connection to the pool' do
+        expect(queue.size).to eq(1)
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -75,7 +75,7 @@ CLIENT_PASSWORD_PEM = "#{SSL_CERTS_DIR}/password_protected.pem"
 CA_PEM = "#{SSL_CERTS_DIR}/ca.pem"
 CRL_PEM = "#{SSL_CERTS_DIR}/crl.pem"
 
-# Determine whether the test clients are connecting to a standlone.
+# Determine whether the test clients are connecting to a standalone.
 #
 # @since 2.0.0
 def standalone?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   o2UXDbWtz5PqoFd8EgNJAn3+BG1pwC9S9pVFG3WPucfAx/bE8iq/vvchHei5Y/Vo
   aAz5f/hY4zFeYWvGDBHYEXE1rTN2hhMSyJscPcFbmz0=
   -----END CERTIFICATE-----
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson