mongo 2.11.4 → 2.12.3

data/spec/mongo/protocol/insert_spec.rb

@@ -1,18 +1,19 @@
-require 'spec_helper'
+require 'lite_spec_helper'
+require 'support/shared/protocol'
 
 describe Mongo::Protocol::Insert do
 
   let(:opcode) { 2002 }
   let(:db)     { SpecConfig.instance.test_db }
-  let(:coll)   { TEST_COLL }
-  let(:ns)     { "#{db}.#{coll}" }
+  let(:collection_name) { 'protocol-test' }
+  let(:ns)     { "#{db}.#{collection_name}" }
   let(:doc1)   { { :name => 'Tyler' } }
   let(:doc2)   { { :name => 'Brandon' } }
   let(:docs)   { [doc1, doc2] }
   let(:options)   { Hash.new }
 
   let(:message) do
-    described_class.new(db, coll, docs, options)
+    described_class.new(db, collection_name, docs, options)
   end
 
   describe '#initialize' do
@@ -43,7 +44,7 @@ describe Mongo::Protocol::Insert do
 
       context 'when the fields are equal' do
         let(:other) do
-          described_class.new(db, coll, docs, options)
+          described_class.new(db, collection_name, docs, options)
         end
 
         it 'returns true' do
@@ -53,7 +54,7 @@ describe Mongo::Protocol::Insert do
 
       context 'when the database is not equal' do
         let(:other) do
-          described_class.new('tyler', coll, docs, options)
+          described_class.new('tyler', collection_name, docs, options)
         end
 
         it 'returns false' do
@@ -73,7 +74,7 @@ describe Mongo::Protocol::Insert do
 
       context 'when the documents are not equal' do
         let(:other) do
-          described_class.new(db, coll, docs[1..1], options)
+          described_class.new(db, collection_name, docs[1..1], options)
         end
 
         it 'returns false' do
@@ -83,7 +84,7 @@ describe Mongo::Protocol::Insert do
 
       context 'when the options are not equal' do
         let(:other) do
-          described_class.new(db, coll, docs, :flags => [:continue_on_error])
+          described_class.new(db, collection_name, docs, :flags => [:continue_on_error])
         end
 
         it 'returns false' do

data/spec/mongo/protocol/kill_cursors_spec.rb

@@ -1,14 +1,15 @@
-require 'spec_helper'
+require 'lite_spec_helper'
+require 'support/shared/protocol'
 
 describe Mongo::Protocol::KillCursors do
 
   let(:opcode)     { 2007 }
   let(:cursor_ids) { [123, 456, 789] }
   let(:id_count)   { cursor_ids.size }
-  let(:collection) { TEST_COLL }
+  let(:collection_name) { 'protocol-test' }
   let(:database)   { SpecConfig.instance.test_db }
   let(:message) do
-    described_class.new(collection, database, cursor_ids)
+    described_class.new(collection_name, database, cursor_ids)
   end
 
   describe '#initialize' do
@@ -28,7 +29,7 @@ describe Mongo::Protocol::KillCursors do
 
       context 'when the cursor ids are equal' do
         let(:other) do
-          described_class.new(collection, database, cursor_ids)
+          described_class.new(collection_name, database, cursor_ids)
         end
 
         it 'returns true' do
@@ -38,7 +39,7 @@ describe Mongo::Protocol::KillCursors do
 
       context 'when the cursor ids are not equal' do
         let(:other) do
-          described_class.new(collection, database, [123, 456])
+          described_class.new(collection_name, database, [123, 456])
         end
 
         it 'returns false' do

data/spec/mongo/protocol/msg_spec.rb

@@ -6,11 +6,11 @@ describe Mongo::Protocol::Msg do
   let(:opcode) { 2013 }
   let(:flags)     { [] }
   let(:options)   { {} }
-  let(:global_args)     { { '$db' => SpecConfig.instance.test_db, ping: 1 } }
-  let(:sections)   { [ ] }
+  let(:main_document)     { { '$db' => SpecConfig.instance.test_db, ping: 1 } }
+  let(:sequences)   { [ ] }
 
   let(:message) do
-    described_class.new(flags, options, global_args, *sections)
+    described_class.new(flags, options, main_document, *sequences)
   end
 
   let(:deserialized) do
@@ -19,8 +19,8 @@ describe Mongo::Protocol::Msg do
 
   describe '#initialize' do
 
-    it 'adds the global_args to the sections' do
-      expect(message.sections[0]).to eq(type: 0, payload: global_args)
+    it 'adds the main_document to the sections' do
+      expect(message.sections[0]).to eq(type: 0, payload: main_document)
     end
 
     context 'when flag bits are provided' do
@@ -59,13 +59,13 @@ describe Mongo::Protocol::Msg do
       end
     end
 
-    context 'with user-provided and driver-generated keys in global_args' do
-      let(:global_args) do
+    context 'with user-provided and driver-generated keys in main_document' do
+      let(:main_document) do
         { 'ping' => 1, 'lsid' => '__lsid__', 'a' => 'b', '$clusterTime' => '__ct__',
           'signature' => '__signature__', 'd' => 'f'}
       end
 
-      it 'reorders global_args for better logging' do
+      it 'reorders main_document for better logging' do
         expect(message.payload[:command].keys).to eq(%w(ping a d lsid $clusterTime signature))
       end
     end
@@ -78,7 +78,7 @@ describe Mongo::Protocol::Msg do
       context 'when the fields are equal' do
 
         let(:other) do
-          described_class.new(flags, options, global_args)
+          described_class.new(flags, options, main_document)
         end
 
         it 'returns true' do
@@ -89,7 +89,7 @@ describe Mongo::Protocol::Msg do
       context 'when the flags are not equal' do
 
         let(:other) do
-          described_class.new([:more_to_come], options, global_args)
+          described_class.new([:more_to_come], options, main_document)
         end
 
         it 'returns false' do
@@ -97,10 +97,14 @@ describe Mongo::Protocol::Msg do
         end
       end
 
-      context 'when the global_args are not equal' do
+      context 'when the main_document are not equal' do
+
+        let(:other_main_document) do
+          { '$db'=> SpecConfig.instance.test_db, ismaster: 1 }
+        end
 
         let(:other) do
-          described_class.new(flags, nil, { '$db'=> SpecConfig.instance.test_db, ismaster: 1 })
+          described_class.new(flags, nil, other_main_document)
         end
 
         it 'returns false' do
@@ -158,7 +162,7 @@ describe Mongo::Protocol::Msg do
     let(:flag_bytes) { bytes.to_s[16..19] }
     let(:payload_type) { bytes.to_s[20] }
     let(:payload_bytes) { bytes.to_s[21..-1] }
-    let(:global_args) { { ping: 1 } }
+    let(:main_document) { { ping: 1 } }
 
     include_examples 'message with a header'
 
@@ -205,13 +209,13 @@ describe Mongo::Protocol::Msg do
       end
 
       it 'serializes the global arguments' do
-        expect(payload_bytes).to be_bson(global_args)
+        expect(payload_bytes).to be_bson(main_document)
       end
     end
 
-    context 'when additional sections are provided' do
+    context 'when sequences are provided' do
 
-      let(:sections) do
+      let(:sequences) do
         [ section ]
       end
 
@@ -224,12 +228,13 @@ describe Mongo::Protocol::Msg do
         end
 
         it 'raises an exception' do
-          expect {
-            message.serialize
-          }.to raise_exception(Mongo::Error::UnknownPayloadType)
+          expect do
+            message
+          end.to raise_exception(ArgumentError, /All sequences must be Section1 instances/)
         end
       end
 
+=begin no longer supported
       context 'when a 0 payload type is specified' do
 
         let(:section) do
@@ -265,13 +270,12 @@ describe Mongo::Protocol::Msg do
           expect(section_bytes).to be_bson(section[:payload])
         end
       end
+=end
 
-      context 'when a 1 payload type is specified' do
+      context 'when a payload of type 1 is specified' do
 
         let(:section) do
-          { type: 1,
-            payload: { identifier: 'documents',
-                       sequence: [ { a: 1 } ] } }
+          Mongo::Protocol::Msg::Section1.new('documents', [ { a: 1 } ])
         end
 
         let(:section_payload_type) { bytes.to_s[36] }
@@ -297,23 +301,23 @@ describe Mongo::Protocol::Msg do
 
         context 'when two sections are specified' do
 
-          let(:sections) do
+          let(:sequences) do
             [ section1, section2 ]
           end
 
           let(:section1) do
-            { type: 1,
-              payload: { identifier: 'documents',
-                         sequence: [ { a: 1 } ] } }
+            Mongo::Protocol::Msg::Section1.new('documents', [ { a: 1 } ])
           end
 
           let(:section2) do
-            { type: 1,
-              payload: { identifier: 'updates',
-                         sequence: [ {:q => { :bar => 1 },
-                                      :u => { :$set => { :bar => 2 } },
-                                      :multi => true,
-                                      :upsert => false } ] } }
+            Mongo::Protocol::Msg::Section1.new('updates', [
+              {
+                :q => { :bar => 1 },
+                :u => { :$set => { :bar => 2 } },
+                :multi => true,
+                :upsert => false,
+              }
+            ])
           end
 
           let(:section1_payload_type) { bytes.to_s[36] }
@@ -355,16 +359,16 @@ describe Mongo::Protocol::Msg do
           end
 
           it 'serializes the second section bytes' do
-            expect(section2_bytes).to be_bson(section2[:payload][:sequence][0])
+            expect(section2_bytes).to be_bson(section2.documents[0])
           end
         end
       end
 
+=begin no longer supported
       context 'when the sections are mixed types and payload type 1 comes before type 0' do
 
         let(:section1) do
-          { type: 1,
-            payload: { identifier: 'documents', sequence: [ { 'a' => 1 }]}}
+          Mongo::Protocol::Msg::Section1.new('documents', [ { a: 1 } ])
         end
 
         let(:section2) do
@@ -376,19 +380,20 @@ describe Mongo::Protocol::Msg do
         end
 
         it 'serializes all sections' do
-          expect(deserialized.documents).to eq([ BSON::Document.new(global_args), { 'a' => 1 }, { 'b' => 2 }])
+          expect(deserialized.documents).to eq([ BSON::Document.new(main_document), { 'a' => 1 }, { 'b' => 2 }])
         end
       end
+=end
     end
 
     context 'when the validating_keys option is true with payload 1' do
 
-      let(:sections) do
+      let(:sequences) do
         [ section ]
       end
 
       let(:section) do
-        { type: 1, payload: { identifier: 'documents', sequence: [ { '$b' => 2 } ] } }
+        Mongo::Protocol::Msg::Section1.new('documents', [ { '$b' => 2 } ])
       end
 
       let(:options) do
@@ -404,12 +409,12 @@ describe Mongo::Protocol::Msg do
 
     context 'when the validating_keys option is false with payload 1' do
 
-      let(:sections) do
+      let(:sequences) do
         [ section ]
       end
 
       let(:section) do
-        { type: 1, payload: { identifier: 'documents', sequence: [ { '$b' => 2 } ] } }
+        Mongo::Protocol::Msg::Section1.new('documents', [ { '$b' => 2 } ])
       end
 
       let(:options) do
@@ -427,7 +432,7 @@ describe Mongo::Protocol::Msg do
     context 'when the payload type is valid' do
 
       it 'deserializes the message' do
-        expect(deserialized.documents).to eq([ BSON::Document.new(global_args) ])
+        expect(deserialized.documents).to eq([ BSON::Document.new(main_document) ])
       end
     end
 
@@ -440,9 +445,9 @@ describe Mongo::Protocol::Msg do
       end
 
       it 'raises an exception' do
-        expect {
+        expect do
           Mongo::Protocol::Message.deserialize(StringIO.new(invalid_payload_message))
-        }.to raise_exception(Mongo::Error::UnknownPayloadType)
+        end.to raise_exception(Mongo::Error::UnknownPayloadType)
       end
     end
   end
@@ -454,7 +459,7 @@ describe Mongo::Protocol::Msg do
       it 'creates a payload with the command' do
         expect(message.payload[:command_name]).to eq('ping')
         expect(message.payload[:database_name]).to eq(SpecConfig.instance.test_db)
-        expect(message.payload[:command]).to eq('ping' => 1)
+        expect(message.payload[:command]).to eq('ping' => 1, '$db' => SpecConfig.instance.test_db)
         expect(message.payload[:request_id]).to eq(message.request_id)
       end
     end
@@ -462,27 +467,26 @@ describe Mongo::Protocol::Msg do
     context 'when the contains a payload type 1' do
 
       let(:section) do
-        { type: 1,
-          payload: { identifier: 'documents',
-                     sequence: [ { a: 1 } ] } }
+        Mongo::Protocol::Msg::Section1.new('documents', [ { a: 1 } ])
       end
 
-      let(:global_args) do
+      let(:main_document) do
         { '$db' => SpecConfig.instance.test_db,
           'insert' => 'foo',
           'ordered' => true
         }
       end
 
-      let(:sections) do
+      let(:sequences) do
         [ section ]
       end
 
       let(:expected_command_doc) do
         {
-            'insert' => 'foo',
-            'documents' => [{ 'a' => 1 }],
-            'ordered' => true
+          'insert' => 'foo',
+          'documents' => [{ 'a' => 1 }],
+          'ordered' => true,
+          '$db' => SpecConfig.instance.test_db,
         }
       end
 

data/spec/mongo/protocol/query_spec.rb

@@ -1,17 +1,17 @@
-# encoding: UTF-8
-require 'spec_helper'
+require 'lite_spec_helper'
+require 'support/shared/protocol'
 
 describe Mongo::Protocol::Query do
 
   let(:opcode)   { 2004 }
   let(:db)       { SpecConfig.instance.test_db }
-  let(:coll)     { TEST_COLL }
-  let(:ns)       { "#{db}.#{coll}" }
+  let(:collection_name) { 'protocol-test' }
+  let(:ns)       { "#{db}.#{collection_name}" }
   let(:selector) { { :name => 'Tyler' } }
   let(:options)     { Hash.new }
 
   let(:message) do
-    described_class.new(db, coll, selector, options)
+    described_class.new(db, collection_name, selector, options)
   end
 
   describe '#initialize' do
@@ -66,7 +66,7 @@ describe Mongo::Protocol::Query do
 
       context 'when the fields are equal' do
         let(:other) do
-          described_class.new(db, coll, selector, options)
+          described_class.new(db, collection_name, selector, options)
         end
 
         it 'returns true' do
@@ -76,7 +76,7 @@ describe Mongo::Protocol::Query do
 
       context 'when the database is not equal' do
         let(:other) do
-          described_class.new('tyler', coll, selector, options)
+          described_class.new('tyler', collection_name, selector, options)
         end
 
         it 'returns false' do
@@ -96,7 +96,7 @@ describe Mongo::Protocol::Query do
 
       context 'when the selector is not equal' do
         let(:other) do
-          described_class.new(db, coll, { :a => 1 }, options)
+          described_class.new(db, collection_name, { :a => 1 }, options)
         end
 
         it 'returns false' do
@@ -106,7 +106,7 @@ describe Mongo::Protocol::Query do
 
       context 'when the options are not equal' do
         let(:other) do
-          described_class.new(db, coll, selector, :skip => 2)
+          described_class.new(db, collection_name, selector, :skip => 2)
         end
 
         it 'returns false' do
@@ -225,7 +225,7 @@ describe Mongo::Protocol::Query do
       context 'when the namespace contains unicode characters' do
         let(:field) { bytes.to_s[20..40] }
 
-        let(:coll) do
+        let(:collection_name) do
           'områder'
         end
 
@@ -320,7 +320,7 @@ describe Mongo::Protocol::Query do
       end
 
       it 'returns a compressed message' do
-        expect(message.compress!('zlib')).to be_a(Mongo::Protocol::Compressed)
+        expect(message.maybe_compress('zlib')).to be_a(Mongo::Protocol::Compressed)
       end
     end
 
@@ -335,7 +335,7 @@ describe Mongo::Protocol::Query do
         context "when the command is #{command}" do
 
           it 'does not allow compression for the command' do
-            expect(message.compress!('zlib')).to be(message)
+            expect(message.maybe_compress('zlib')).to be(message)
           end
         end
       end