mongo 2.4.1 → 2.4.2

data/spec/mongo/client_spec.rb

@@ -218,6 +218,78 @@ describe Mongo::Client do
 
     context 'when providing options' do
 
+      context 'when ssl options are provided' do
+
+        let(:options) do
+          {
+              :ssl => true,
+              :ssl_ca_cert => CA_PEM,
+              :ssl_ca_cert_string => 'ca cert string',
+              :ssl_ca_cert_object => 'ca cert object',
+              :ssl_cert => CLIENT_CERT_PEM,
+              :ssl_cert_string => 'cert string',
+              :ssl_cert_object => 'cert object',
+              :ssl_key => CLIENT_KEY_PEM,
+              :ssl_key_string => 'key string',
+              :ssl_key_object => 'key object',
+              :ssl_key_pass_phrase => 'passphrase',
+              :ssl_verify => true
+          }
+        end
+
+        let(:client) do
+          described_class.new(['127.0.0.1:27017'], options)
+        end
+
+        it 'sets the ssl option' do
+          expect(client.options[:ssl]).to eq(options[:ssl])
+        end
+
+        it 'sets the ssl_ca_cert option' do
+          expect(client.options[:ssl_ca_cert]).to eq(options[:ssl_ca_cert])
+        end
+
+        it 'sets the ssl_ca_cert_string option' do
+          expect(client.options[:ssl_ca_cert_string]).to eq(options[:ssl_ca_cert_string])
+        end
+
+        it 'sets the ssl_ca_cert_object option' do
+          expect(client.options[:ssl_ca_cert_object]).to eq(options[:ssl_ca_cert_object])
+        end
+
+        it 'sets the ssl_cert option' do
+          expect(client.options[:ssl_cert]).to eq(options[:ssl_cert])
+        end
+
+        it 'sets the ssl_cert_string option' do
+          expect(client.options[:ssl_cert_string]).to eq(options[:ssl_cert_string])
+        end
+
+        it 'sets the ssl_cert_object option' do
+          expect(client.options[:ssl_cert_object]).to eq(options[:ssl_cert_object])
+        end
+
+        it 'sets the ssl_key option' do
+          expect(client.options[:ssl_key]).to eq(options[:ssl_key])
+        end
+
+        it 'sets the ssl_key_string option' do
+          expect(client.options[:ssl_key_string]).to eq(options[:ssl_key_string])
+        end
+
+        it 'sets the ssl_key_object option' do
+          expect(client.options[:ssl_key_object]).to eq(options[:ssl_key_object])
+        end
+
+        it 'sets the ssl_key_pass_phrase option' do
+          expect(client.options[:ssl_key_pass_phrase]).to eq(options[:ssl_key_pass_phrase])
+        end
+
+        it 'sets the ssl_verify option' do
+          expect(client.options[:ssl_verify]).to eq(options[:ssl_verify])
+        end
+      end
+
       context 'when no database is provided' do
 
         let(:client) do
@@ -272,6 +344,106 @@ describe Mongo::Client do
         end
       end
 
+      context 'when min_pool_size is provided' do
+
+        let(:client) do
+          described_class.new(['127.0.0.1:27017'], options)
+        end
+
+        context 'when max_pool_size is provided' do
+
+          context 'when the min_pool_size is greater than the max_pool_size' do
+
+            let(:options) do
+              {
+                  :min_pool_size => 20,
+                  :max_pool_size => 10
+              }
+            end
+
+            it 'raises an Exception' do
+              expect {
+                client
+              }.to raise_exception(Mongo::Error::InvalidMinPoolSize)
+            end
+          end
+
+          context 'when the min_pool_size is less than the max_pool_size' do
+
+            let(:options) do
+              {
+                  :min_pool_size => 10,
+                  :max_pool_size => 20
+              }
+            end
+
+            it 'sets the option' do
+              expect(client.options[:min_pool_size]).to eq(options[:min_pool_size])
+              expect(client.options[:max_pool_size]).to eq(options[:max_pool_size])
+            end
+          end
+
+          context 'when the min_pool_size is equal to the max_pool_size' do
+
+            let(:options) do
+              {
+                  :min_pool_size => 10,
+                  :max_pool_size => 10
+              }
+            end
+
+            it 'sets the option' do
+              expect(client.options[:min_pool_size]).to eq(options[:min_pool_size])
+              expect(client.options[:max_pool_size]).to eq(options[:max_pool_size])
+            end
+          end
+        end
+
+        context 'when max_pool_size is not provided' do
+
+          context 'when the min_pool_size is greater than the default max_pool_size' do
+
+            let(:options) do
+              {
+                  :min_pool_size => 10
+              }
+            end
+
+            it 'raises an Exception' do
+              expect {
+                client
+              }.to raise_exception(Mongo::Error::InvalidMinPoolSize)
+            end
+          end
+
+          context 'when the min_pool_size is less than the default max_pool_size' do
+
+            let(:options) do
+              {
+                  :min_pool_size => 3
+              }
+            end
+
+            it 'sets the option' do
+              expect(client.options[:min_pool_size]).to eq(options[:min_pool_size])
+            end
+          end
+
+          context 'when the min_pool_size is equal to the max_pool_size' do
+
+            let(:options) do
+              {
+                :min_pool_size => Mongo::Server::ConnectionPool::Queue::MAX_SIZE
+              }
+            end
+
+            it 'sets the option' do
+              expect(client.options[:min_pool_size]).to eq(options[:min_pool_size])
+            end
+          end
+        end
+      end
+
       context 'when platform details are specified' do
 
         let(:app_metadata) do
@@ -360,6 +532,87 @@ describe Mongo::Client do
         it 'sets the options' do
           expect(client.options).to eq(expected_options)
         end
+
+        context 'when min_pool_size is provided' do
+
+          context 'when max_pool_size is provided' do
+
+            context 'when the min_pool_size is greater than the max_pool_size' do
+
+              let(:uri) do
+                'mongodb://127.0.0.1:27017/?minPoolSize=20&maxPoolSize=10'
+              end
+
+              it 'raises an Exception' do
+                expect {
+                  client
+                }.to raise_exception(Mongo::Error::InvalidMinPoolSize)
+              end
+            end
+
+            context 'when the min_pool_size is less than the max_pool_size' do
+
+              let(:uri) do
+                'mongodb://127.0.0.1:27017/?minPoolSize=10&maxPoolSize=20'
+              end
+
+              it 'sets the option' do
+                expect(client.options[:min_pool_size]).to eq(10)
+                expect(client.options[:max_pool_size]).to eq(20)
+              end
+            end
+
+            context 'when the min_pool_size is equal to the max_pool_size' do
+
+              let(:uri) do
+                'mongodb://127.0.0.1:27017/?minPoolSize=10&maxPoolSize=10'
+              end
+
+              it 'sets the option' do
+                expect(client.options[:min_pool_size]).to eq(10)
+                expect(client.options[:max_pool_size]).to eq(10)
+              end
+            end
+          end
+
+          context 'when max_pool_size is not provided' do
+
+            context 'when the min_pool_size is greater than the default max_pool_size' do
+
+              let(:uri) do
+                'mongodb://127.0.0.1:27017/?minPoolSize=10'
+              end
+
+              it 'raises an Exception' do
+                expect {
+                  client
+                }.to raise_exception(Mongo::Error::InvalidMinPoolSize)
+              end
+            end
+
+            context 'when the min_pool_size is less than the default max_pool_size' do
+
+              let(:uri) do
+                'mongodb://127.0.0.1:27017/?minPoolSize=3'
+              end
+
+              it 'sets the option' do
+                expect(client.options[:min_pool_size]).to eq(3)
+              end
+            end
+
+            context 'when the min_pool_size is equal to the max_pool_size' do
+
+              let(:uri) do
+                'mongodb://127.0.0.1:27017/?minPoolSize=5'
+              end
+
+              it 'sets the option' do
+                expect(client.options[:min_pool_size]).to eq(5)
+              end
+            end
+          end
+        end
       end
 
       context 'when options are provided not in the string' do

data/spec/mongo/cluster/topology_spec.rb

@@ -17,6 +17,17 @@ describe Mongo::Cluster::Topology do
       it 'returns a replica set topology' do
         expect(topology).to be_a(Mongo::Cluster::Topology::ReplicaSet)
       end
+
+      context 'when the option is a String (due to YAML parsing)' do
+
+        let(:topology) do
+          described_class.initial([ 'a' ], monitoring, connect: 'replica_set')
+        end
+
+        it 'returns a replica set topology' do
+          expect(topology).to be_a(Mongo::Cluster::Topology::ReplicaSet)
+        end
+      end
     end
 
     context 'when provided a single option' do
@@ -32,6 +43,21 @@ describe Mongo::Cluster::Topology do
       it 'sets the seed on the topology' do
         expect(topology.seed).to eq('a')
       end
+
+      context 'when the option is a String (due to YAML parsing)' do
+
+        let(:topology) do
+          described_class.initial([ 'a' ], monitoring, connect: 'direct')
+        end
+
+        it 'returns a single topology' do
+          expect(topology).to be_a(Mongo::Cluster::Topology::Single)
+        end
+
+        it 'sets the seed on the topology' do
+          expect(topology.seed).to eq('a')
+        end
+      end
     end
 
     context 'when provided a sharded option' do
@@ -43,6 +69,17 @@ describe Mongo::Cluster::Topology do
       it 'returns a sharded topology' do
         expect(topology).to be_a(Mongo::Cluster::Topology::Sharded)
       end
+
+      context 'when the option is a String (due to YAML parsing)' do
+
+        let(:topology) do
+          described_class.initial([ 'a' ], monitoring, connect: 'sharded')
+        end
+
+        it 'returns a sharded topology' do
+          expect(topology).to be_a(Mongo::Cluster::Topology::Sharded)
+        end
+      end
     end
 
     context 'when provided no option' do

data/spec/mongo/cluster_spec.rb

@@ -113,7 +113,7 @@ describe Mongo::Cluster do
     context 'when the option is not provided' do
 
       let(:cluster) do
-        described_class.new([ '127.0.0.1:27017' ], monitoring, TEST_OPTIONS.dup.delete_if { |k| k == :replica_set })
+        described_class.new([ '127.0.0.1:27017' ], monitoring, TEST_OPTIONS.merge(connect: :direct).delete_if { |k| k == :replica_set })
       end
 
       it 'returns nil' do

data/spec/mongo/collection/view/aggregation_spec.rb

@@ -151,7 +151,7 @@ describe Mongo::Collection::View::Aggregation do
     context 'when the view has a write concern' do
 
       let(:collection) do
-        authorized_collection.with(write: { w: WRITE_CONCERN[:w]+1 })
+        authorized_collection.with(write: INVALID_WRITE_CONCERN)
       end
 
       let(:view) do
@@ -532,7 +532,7 @@ describe Mongo::Collection::View::Aggregation do
      context 'when the view has a write concern' do
 
        let(:collection) do
-         authorized_collection.with(write: { w: WRITE_CONCERN[:w]+1 })
+         authorized_collection.with(write: INVALID_WRITE_CONCERN)
        end
 
        let(:view) do

data/spec/mongo/collection/view/map_reduce_spec.rb

@@ -390,7 +390,7 @@ describe Mongo::Collection::View::MapReduce do
         context 'when the view has a write concern' do
 
           let(:collection) do
-            authorized_collection.with(write: { w: WRITE_CONCERN[:w]+1 })
+            authorized_collection.with(write: INVALID_WRITE_CONCERN)
           end
 
           let(:view) do

data/spec/mongo/collection_spec.rb

@@ -7,7 +7,7 @@ describe Mongo::Collection do
   end
 
   let(:collection_invalid_write_concern) do
-    authorized_collection.client.with(write: { w: (WRITE_CONCERN[:w] + 1) })[authorized_collection.name]
+    authorized_collection.client.with(write: INVALID_WRITE_CONCERN)[authorized_collection.name]
   end
 
   let(:collection_with_validator) do
@@ -97,7 +97,7 @@ describe Mongo::Collection do
   describe '#with' do
 
     let(:client) do
-      Mongo::Client.new(ADDRESSES)
+      Mongo::Client.new(ADDRESSES, TEST_OPTIONS)
     end
 
     let(:database) do
@@ -129,7 +129,7 @@ describe Mongo::Collection do
       context 'when the client has a server selection timeout setting' do
 
         let(:client) do
-          Mongo::Client.new(ADDRESSES, server_selection_timeout: 2)
+          Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(server_selection_timeout: 2))
         end
 
         it 'passes the the server_selection_timeout to the cluster' do
@@ -140,7 +140,7 @@ describe Mongo::Collection do
       context 'when the client has a read preference set' do
 
         let(:client) do
-          Mongo::Client.new(ADDRESSES, read: { mode: :primary_preferred })
+          Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(read: { mode: :primary_preferred }))
         end
 
         it 'sets the new read options on the new collection' do
@@ -152,7 +152,7 @@ describe Mongo::Collection do
       context 'when the client has a read preference and server selection timeout set' do
 
         let(:client) do
-          Mongo::Client.new(ADDRESSES, read: { mode: :primary_preferred }, server_selection_timeout: 2)
+          Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(read: { mode: :primary_preferred }, server_selection_timeout: 2))
         end
 
         it 'sets the new read options on the new collection' do
@@ -182,7 +182,7 @@ describe Mongo::Collection do
       context 'when the client has a write concern set' do
 
         let(:client) do
-          Mongo::Client.new(ADDRESSES, write: { w: 10 })
+          Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(write: { w: 10 }))
         end
 
         it 'sets the new write options on the new collection' do
@@ -215,7 +215,7 @@ describe Mongo::Collection do
       context 'when the client has a server selection timeout setting' do
 
         let(:client) do
-          Mongo::Client.new(ADDRESSES, server_selection_timeout: 2)
+          Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(server_selection_timeout: 2))
         end
 
         it 'passes the server_selection_timeout setting to the cluster' do
@@ -226,7 +226,7 @@ describe Mongo::Collection do
       context 'when the client has a read preference set' do
 
         let(:client) do
-          Mongo::Client.new(ADDRESSES, read: { mode: :primary_preferred })
+          Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(read: { mode: :primary_preferred }))
         end
 
         it 'sets the new read options on the new collection' do
@@ -422,7 +422,7 @@ describe Mongo::Collection do
 
         let(:options) do
           {
-            write: { w: WRITE_CONCERN[:w] + 1}
+            write: INVALID_WRITE_CONCERN
           }
         end
 
@@ -569,7 +569,7 @@ describe Mongo::Collection do
 
         let(:write_options) do
           {
-            write: { w: WRITE_CONCERN[:w] + 1}
+            write: INVALID_WRITE_CONCERN
           }
         end
 
@@ -1819,10 +1819,14 @@ describe Mongo::Collection do
         authorized_collection.find(field: 'testing').first
       end
 
-      it 'updates the first matching document in the collection' do
+      it 'updates the first matching document in the collection', if: write_command_enabled? do
         expect(response.modified_count).to eq(1)
       end
 
+      it 'does not return modified count', unless: write_command_enabled? do
+        expect(response.modified_count).to eq(nil)
+      end
+
       it 'updates the documents in the collection' do
         expect(updated[:field]).to eq('testing')
       end
@@ -1838,10 +1842,14 @@ describe Mongo::Collection do
         authorized_collection.find(field: 'test1').to_a
       end
 
-      it 'reports that no documents were written' do
+      it 'reports that no documents were written', if: write_command_enabled?  do
         expect(response.modified_count).to eq(0)
       end
 
+      it 'does not return modified count', unless: write_command_enabled? do
+        expect(response.modified_count).to eq(nil)
+      end
+
       it 'does not insert the document' do
         expect(updated).to be_empty
       end
@@ -1876,10 +1884,14 @@ describe Mongo::Collection do
         authorized_collection.find(field: 'test1').to_a
       end
 
-      it 'reports that no documents were written' do
+      it 'reports that no documents were written', if: write_command_enabled? do
         expect(response.modified_count).to eq(0)
       end
 
+      it 'does not return modified count', unless: write_command_enabled? do
+        expect(response.modified_count).to eq(nil)
+      end
+
       it 'does not insert the document' do
         expect(updated).to be_empty
       end
@@ -2073,10 +2085,14 @@ describe Mongo::Collection do
         authorized_collection.find(field: 'testing').to_a.last
       end
 
-      it 'returns the number updated' do
+      it 'returns the number updated', if: write_command_enabled? do
         expect(response.modified_count).to eq(2)
       end
 
+      it 'does not return modified count', unless: write_command_enabled? do
+        expect(response.modified_count).to eq(nil)
+      end
+
       it 'updates the documents in the collection' do
         expect(updated[:field]).to eq('testing')
       end
@@ -2093,10 +2109,14 @@ describe Mongo::Collection do
         authorized_collection.find.to_a
       end
 
-      it 'reports that no documents were updated' do
+      it 'reports that no documents were updated', if: write_command_enabled? do
         expect(response.modified_count).to eq(0)
       end
 
+      it 'does not return modified count', unless: write_command_enabled? do
+        expect(response.modified_count).to eq(nil)
+      end
+
       it 'updates no documents in the collection' do
         expect(updated).to be_empty
       end
@@ -2132,10 +2152,14 @@ describe Mongo::Collection do
         authorized_collection.find.to_a
       end
 
-      it 'reports that no documents were updated' do
+      it 'reports that no documents were updated', if: write_command_enabled? do
         expect(response.modified_count).to eq(0)
       end
 
+      it 'does not return modified count', unless: write_command_enabled? do
+        expect(response.modified_count).to eq(nil)
+      end
+
       it 'updates no documents in the collection' do
         expect(updated).to be_empty
       end
@@ -2333,10 +2357,14 @@ describe Mongo::Collection do
         authorized_collection.find(field: 'testing').first
       end
 
-      it 'updates the first matching document in the collection' do
+      it 'updates the first matching document in the collection', if: write_command_enabled? do
         expect(response.modified_count).to eq(1)
       end
 
+      it 'does not return modified count', unless: write_command_enabled? do
+        expect(response.modified_count).to eq(nil)
+      end
+
       it 'updates the documents in the collection' do
         expect(updated[:field]).to eq('testing')
       end
@@ -2353,10 +2381,14 @@ describe Mongo::Collection do
         authorized_collection.find.to_a
       end
 
-      it 'reports that no documents were updated' do
+      it 'reports that no documents were updated', if: write_command_enabled? do
         expect(response.modified_count).to eq(0)
       end
 
+      it 'does not return modified count', unless: write_command_enabled? do
+        expect(response.modified_count).to eq(nil)
+      end
+
       it 'updates no documents in the collection' do
         expect(updated).to be_empty
       end
@@ -2392,10 +2424,14 @@ describe Mongo::Collection do
         authorized_collection.find.to_a
       end
 
-      it 'reports that no documents were updated' do
+      it 'reports that no documents were updated', if: write_command_enabled? do
         expect(response.modified_count).to eq(0)
       end
 
+      it 'does not return modified count', unless: write_command_enabled? do
+        expect(response.modified_count).to eq(nil)
+      end
+
       it 'updates no documents in the collection' do
         expect(updated).to be_empty
       end