RubyGems - mongo - Versions diffs - 2.4.0.rc0 → 2.4.0.rc1 - Mend

mongo 2.4.0.rc0 → 2.4.0.rc1

Files changed (93) hide show

checksums.yaml +4 -4
checksums.yaml.gz.sig +0 -0
data.tar.gz.sig +1 -2
data/lib/mongo/bulk_write/validatable.rb +3 -1
data/lib/mongo/client.rb +30 -3
data/lib/mongo/cluster/app_metadata.rb +7 -2
data/lib/mongo/collection.rb +3 -1
data/lib/mongo/collection/view.rb +3 -1
data/lib/mongo/collection/view/aggregation.rb +3 -1
data/lib/mongo/collection/view/builder/find_command.rb +20 -5
data/lib/mongo/collection/view/map_reduce.rb +3 -1
data/lib/mongo/collection/view/writable.rb +12 -2
data/lib/mongo/cursor/builder/get_more_command.rb +3 -2
data/lib/mongo/error/closed_stream.rb +1 -1
data/lib/mongo/error/invalid_server_preference.rb +1 -1
data/lib/mongo/index/view.rb +3 -1
data/lib/mongo/operation/write/bulk/mergable.rb +1 -1
data/lib/mongo/operation/write/create_index.rb +1 -1
data/lib/mongo/operation/write/delete.rb +1 -1
data/lib/mongo/operation/write/update.rb +1 -1
data/lib/mongo/protocol/delete.rb +4 -1
data/lib/mongo/protocol/get_more.rb +4 -1
data/lib/mongo/protocol/insert.rb +7 -3
data/lib/mongo/protocol/kill_cursors.rb +4 -1
data/lib/mongo/protocol/message.rb +5 -1
data/lib/mongo/protocol/query.rb +11 -4
data/lib/mongo/protocol/update.rb +4 -1
data/lib/mongo/server/connectable.rb +8 -2
data/lib/mongo/server/connection_pool.rb +3 -1
data/lib/mongo/server/monitor.rb +1 -0
data/lib/mongo/socket.rb +16 -8
data/lib/mongo/socket/ssl.rb +24 -9
data/lib/mongo/uri.rb +6 -6
data/lib/mongo/version.rb +1 -1
data/mongo.gemspec +1 -1
data/spec/mongo/bulk_write_spec.rb +117 -0
data/spec/mongo/collection/view/aggregation_spec.rb +26 -0
data/spec/mongo/collection/view/builder/find_command_spec.rb +244 -2
data/spec/mongo/collection/view/map_reduce_spec.rb +13 -0
data/spec/mongo/collection/view/readable_spec.rb +26 -0
data/spec/mongo/collection/view/writable_spec.rb +104 -0
data/spec/mongo/collection/view_spec.rb +13 -0
data/spec/mongo/collection_spec.rb +226 -7
data/spec/mongo/crud_spec.rb +5 -5
data/spec/mongo/index/view_spec.rb +53 -0
data/spec/mongo/server/connection_spec.rb +45 -26
data/spec/mongo/socket/ssl_spec.rb +358 -22
data/spec/spec_helper.rb +4 -0
data/spec/support/authorization.rb +3 -3
data/spec/support/certificates/client_cert.pem +21 -0
data/spec/support/certificates/client_key.pem +28 -0
data/spec/support/certificates/client_key_encrypted.pem +30 -0
data/spec/support/crud.rb +67 -22
data/spec/support/crud/read.rb +18 -36
data/spec/support/crud/write.rb +0 -44
data/spec/support/crud_tests/read/aggregate-collation.yml +17 -0
data/spec/support/crud_tests/read/aggregate-out.yml +28 -0
data/spec/support/crud_tests/read/aggregate.yml +1 -35
data/spec/support/crud_tests/read/count-collation.yml +15 -0
data/spec/support/crud_tests/read/count.yml +3 -15
data/spec/support/crud_tests/read/distinct-collation.yml +17 -0
data/spec/support/crud_tests/read/distinct.yml +1 -14
data/spec/support/crud_tests/read/find-collation.yml +15 -0
data/spec/support/crud_tests/read/find.yml +1 -12
data/spec/support/crud_tests/write/deleteMany-collation.yml +22 -0
data/spec/support/crud_tests/write/deleteMany.yml +1 -23
data/spec/support/crud_tests/write/deleteOne-collation.yml +22 -0
data/spec/support/crud_tests/write/deleteOne.yml +1 -21
data/spec/support/crud_tests/write/findOneAndDelete-collation.yml +23 -0
data/spec/support/crud_tests/write/findOneAndDelete.yml +2 -28
data/spec/support/crud_tests/write/findOneAndReplace-collation.yml +24 -0
data/spec/support/crud_tests/write/findOneAndReplace-upsert.yml +47 -0
data/spec/support/crud_tests/write/findOneAndReplace.yml +13 -53
data/spec/support/crud_tests/write/findOneAndUpdate-collation.yml +27 -0
data/spec/support/crud_tests/write/findOneAndUpdate.yml +8 -51
data/spec/support/crud_tests/write/insertMany.yml +1 -2
data/spec/support/crud_tests/write/insertOne.yml +1 -2
data/spec/support/crud_tests/write/replaceOne-collation.yml +23 -0
data/spec/support/crud_tests/write/replaceOne-upsert.yml +48 -0
data/spec/support/crud_tests/write/replaceOne.yml +11 -45
data/spec/support/crud_tests/write/updateMany-collation.yml +27 -0
data/spec/support/crud_tests/write/updateMany.yml +10 -42
data/spec/support/crud_tests/write/updateOne-collation.yml +24 -0
data/spec/support/crud_tests/write/updateOne.yml +7 -33
data/spec/support/sdam/rs/new_primary_new_setversion.yml +1 -1
data/spec/support/sdam/rs/null_election_id.yml +1 -0
data/spec/support/sdam/rs/primary_disconnect_electionid.yml +2 -3
data/spec/support/sdam/rs/primary_disconnect_setversion.yml +1 -2
data/spec/support/sdam/single/direct_connection_rsarbiter.yml +1 -1
data/spec/support/sdam/single/direct_connection_rsprimary.yml +1 -1
data/spec/support/sdam/single/direct_connection_rssecondary.yml +1 -1
metadata +40 -4
metadata.gz.sig +0 -0

data/spec/mongo/collection/view/builder/find_command_spec.rb CHANGED

@@ -150,14 +150,256 @@ describe Mongo::Collection::View::Builder::FindCommand do
       end
     end
-    context 'when limit is negative' do
+    context 'when there is a limit' do
+      let(:filter) do
+        { 'name' => 'test' }
+      end
+      context 'when limit is 0' do
+        context 'when batch_size is also 0' do
+          let(:options) do
+            { limit: 0, batch_size: 0 }
+          end
+          it 'does not set the singleBatch' do
+            expect(selector['singleBatch']).to be nil
+          end
+          it 'does not set the limit' do
+            expect(selector['limit']).to be nil
+          end
+          it 'does not set the batch size' do
+            expect(selector['batchSize']).to be nil
+          end
+        end
+        context 'when batch_size is not set' do
+          let(:options) do
+            { limit: 0 }
+          end
+          it 'does not set the singleBatch' do
+            expect(selector['singleBatch']).to be nil
+          end
+          it 'does not set the limit' do
+            expect(selector['limit']).to be nil
+          end
+          it 'does not set the batch size' do
+            expect(selector['batchSize']).to be nil
+          end
+        end
+      end
+      context 'when the limit is negative' do
+        context 'when there is a batch_size' do
+          context 'when the batch_size is positive' do
+            let(:options) do
+              { limit: -1, batch_size: 3 }
+            end
+            it 'sets single batch to true' do
+              expect(selector['singleBatch']).to be true
+            end
+            it 'converts the limit to a positive value' do
+              expect(selector['limit']).to be(options[:limit].abs)
+            end
+            it 'sets the batch size' do
+              expect(selector['batchSize']).to be(options[:batch_size])
+            end
+          end
+          context 'when the batch_size is negative' do
+            let(:options) do
+              { limit: -1, batch_size: -3 }
+            end
+            it 'sets single batch to true' do
+              expect(selector['singleBatch']).to be true
+            end
+            it 'converts the limit to a positive value' do
+              expect(selector['limit']).to be(options[:limit].abs)
+            end
+            it 'sets the batch size to the limit' do
+              expect(selector['batchSize']).to be(options[:limit].abs)
+            end
+          end
+        end
+        context 'when there is not a batch_size' do
+          let(:options) do
+            { limit: -5 }
+          end
+          it 'sets single batch to true' do
+            expect(selector['singleBatch']).to be true
+          end
+          it 'converts the limit to a positive value' do
+            expect(selector['limit']).to be(options[:limit].abs)
+          end
+          it 'does not set the batch size' do
+            expect(selector['batchSize']).to be_nil
+          end
+        end
+      end
+      context 'when the limit is positive' do
+        context 'when there is a batch_size' do
+          context 'when the batch_size is positive' do
+            let(:options) do
+              { limit: 5, batch_size: 3 }
+            end
+            it 'does not set singleBatch' do
+              expect(selector['singleBatch']).to be nil
+            end
+            it 'sets the limit' do
+              expect(selector['limit']).to be(options[:limit])
+            end
+            it 'sets the batch size' do
+              expect(selector['batchSize']).to be(options[:batch_size])
+            end
+          end
+          context 'when the batch_size is negative' do
+            let(:options) do
+              { limit: 5, batch_size: -3 }
+            end
+            it 'sets the singleBatch' do
+              expect(selector['singleBatch']).to be true
+            end
+            it 'sets the limit' do
+              expect(selector['limit']).to be(options[:limit])
+            end
+            it 'sets the batch size to a positive value' do
+              expect(selector['batchSize']).to be(options[:batch_size].abs)
+            end
+          end
+        end
+        context 'when there is not a batch_size' do
+          let(:options) do
+            { limit: 5 }
+          end
+          it 'does not set the singleBatch' do
+            expect(selector['singleBatch']).to be nil
+          end
+          it 'sets the limit' do
+            expect(selector['limit']).to be(options[:limit])
+          end
+          it 'does not set the batch size' do
+            expect(selector['batchSize']).to be nil
+          end
+        end
+      end
+    end
+    context 'when there is a batch_size' do
+      let(:filter) do
+        { 'name' => 'test' }
+      end
+      context 'when there is no limit' do
+        context 'when the batch_size is positive' do
+          let(:options) do
+            { batch_size: 3 }
+          end
+          it 'does not set the singleBatch' do
+            expect(selector['singleBatch']).to be nil
+          end
+          it 'does not set the limit' do
+            expect(selector['limit']).to be nil
+          end
+          it 'sets the batch size' do
+            expect(selector['batchSize']).to be(options[:batch_size])
+          end
+        end
+        context 'when the batch_size is negative' do
+          let(:options) do
+            { batch_size: -3 }
+          end
+          it 'sets the singleBatch' do
+            expect(selector['singleBatch']).to be true
+          end
+          it 'does not set the limit' do
+            expect(selector['limit']).to be nil
+          end
+          it 'sets the batch size to a positive value' do
+            expect(selector['batchSize']).to be(options[:batch_size].abs)
+          end
+        end
+        context 'when batch_size is 0' do
+          let(:options) do
+            { batch_size: 0 }
+          end
+          it 'does not set the singleBatch' do
+            expect(selector['singleBatch']).to be nil
+          end
+          it 'does not set the limit' do
+            expect(selector['limit']).to be nil
+          end
+          it 'does not set the batch size' do
+            expect(selector['batchSize']).to be nil
+          end
+        end
+      end
+    end
+    context 'when limit and batch_size are negative' do
       let(:filter) do
         { 'name' => 'test' }
       end
       let(:options) do
-        { limit: -1 }
+        { limit: -1, batch_size: -3 }
       end
       it 'sets single batch to true' do

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

@@ -528,6 +528,19 @@ describe Mongo::Collection::View::MapReduce do
           map_reduce.to_a
         }.to raise_exception(Mongo::Error::UnsupportedCollation)
       end
+      context 'when a String key is used' do
+        let(:options) do
+          { 'collation' => { locale: 'en_US', strength: 2 } }
+        end
+        it 'raises an exception' do
+          expect {
+            map_reduce.to_a
+          }.to raise_exception(Mongo::Error::UnsupportedCollation)
+        end
+      end
     end
   end
 end

data/spec/mongo/collection/view/readable_spec.rb CHANGED

@@ -438,6 +438,19 @@ describe Mongo::Collection::View::Readable do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+        context 'when a String key is used' do
+          let(:count_options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
   end
@@ -713,6 +726,19 @@ describe Mongo::Collection::View::Readable do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+        context 'when a String key is used' do
+          let(:distinct_options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end

data/spec/mongo/collection/view/writable_spec.rb CHANGED

@@ -108,6 +108,19 @@ describe Mongo::Collection::View::Writable do
               result
             }.to raise_exception(Mongo::Error::UnsupportedCollation)
           end
+          context 'when a String key is used' do
+            let(:options) do
+              { 'collation' => { locale: 'en_US', strength: 2 } }
+            end
+            it 'raises an exception' do
+              expect {
+                result
+              }.to raise_exception(Mongo::Error::UnsupportedCollation)
+            end
+          end
         end
       end
@@ -241,6 +254,19 @@ describe Mongo::Collection::View::Writable do
               result
             }.to raise_exception(Mongo::Error::UnsupportedCollation)
           end
+          context 'when a String key is used' do
+            let(:options) do
+              { 'collation' => { locale: 'en_US', strength: 2 } }
+            end
+            it 'raises an exception' do
+              expect {
+                result
+              }.to raise_exception(Mongo::Error::UnsupportedCollation)
+            end
+          end
         end
       end
@@ -389,6 +415,19 @@ describe Mongo::Collection::View::Writable do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+        context 'when a String key is used' do
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
@@ -497,6 +536,19 @@ describe Mongo::Collection::View::Writable do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+        context 'when a String key is used' do
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
@@ -595,6 +647,19 @@ describe Mongo::Collection::View::Writable do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+        context 'when a String key is used' do
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
@@ -761,6 +826,19 @@ describe Mongo::Collection::View::Writable do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+        context 'when a String key is used' do
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
@@ -932,6 +1010,19 @@ describe Mongo::Collection::View::Writable do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+        context 'when a String key is used' do
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end
@@ -1100,6 +1191,19 @@ describe Mongo::Collection::View::Writable do
             result
           }.to raise_exception(Mongo::Error::UnsupportedCollation)
         end
+        context 'when a String key is used' do
+          let(:options) do
+            { 'collation' => { locale: 'en_US', strength: 2 } }
+          end
+          it 'raises an exception' do
+            expect {
+              result
+            }.to raise_exception(Mongo::Error::UnsupportedCollation)
+          end
+        end
       end
     end