mongo 2.6.4 → 2.7.0.rc0

data/spec/mongo/error/parser_spec.rb

@@ -95,7 +95,7 @@ describe Mongo::Error::Parser do
       end
     end
   end
-  
+
   describe '#code' do
     let(:parser) do
       described_class.new(document)
@@ -105,7 +105,7 @@ describe Mongo::Error::Parser do
       let(:document) do
         { 'ok' => 0, 'errmsg' => 'not master', 'code' => 10107, 'codeName' => 'NotMaster' }
       end
-      
+
       it 'returns the code' do
         expect(parser.code).to eq(10107)
       end
@@ -115,7 +115,7 @@ describe Mongo::Error::Parser do
       let(:document) do
         { 'ok' => 0, 'errmsg' => 'not master' }
       end
-      
+
       it 'returns nil' do
         expect(parser.code).to eq(nil)
       end
@@ -143,7 +143,7 @@ describe Mongo::Error::Parser do
       end
     end
   end
-  
+
   describe '#code_name' do
     let(:parser) do
       described_class.new(document)
@@ -153,7 +153,7 @@ describe Mongo::Error::Parser do
       let(:document) do
         { 'ok' => 0, 'errmsg' => 'not master', 'code' => 10107, 'codeName' => 'NotMaster' }
       end
-      
+
       it 'returns the code name' do
         expect(parser.code_name).to eq('NotMaster')
       end
@@ -163,7 +163,7 @@ describe Mongo::Error::Parser do
       let(:document) do
         { 'ok' => 0, 'errmsg' => 'not master' }
       end
-      
+
       it 'returns nil' do
         expect(parser.code_name).to eq(nil)
       end
@@ -192,7 +192,7 @@ describe Mongo::Error::Parser do
       end
     end
   end
-  
+
   describe '#document' do
     let(:parser) do
       described_class.new(document)
@@ -201,12 +201,12 @@ describe Mongo::Error::Parser do
     let(:document) do
       { 'ok' => 0, 'errmsg' => 'not master', 'code' => 10107, 'codeName' => 'NotMaster' }
     end
-    
+
     it 'returns the document' do
       expect(parser.document).to eq(document)
     end
   end
-  
+
   describe '#replies' do
     let(:parser) do
       described_class.new(document)
@@ -216,10 +216,44 @@ describe Mongo::Error::Parser do
       let(:document) do
         { 'ok' => 0, 'errmsg' => 'not master', 'code' => 10107, 'codeName' => 'NotMaster' }
       end
-      
+
       it 'returns nil' do
         expect(parser.replies).to eq(nil)
       end
     end
   end
+
+  describe '#labels' do
+    let(:parser) do
+      described_class.new(document)
+    end
+
+    let(:document) do
+      {
+        'code' => 251,
+        'codeName' => 'NoSuchTransaction',
+        'errorLabels' => labels,
+      }
+    end
+
+    context 'when there are no labels' do
+      let(:labels) do
+        []
+      end
+
+      it 'has the correct labels' do
+        expect(parser.labels).to eq(labels)
+      end
+    end
+
+    context 'when there are labels' do
+      let(:labels) do
+        [ Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL ]
+      end
+
+      it 'has the correct labels' do
+        expect(parser.labels).to eq(labels)
+      end
+    end
+  end
 end

data/spec/mongo/grid/file/info_spec.rb

@@ -96,9 +96,9 @@ describe Mongo::Grid::File::Info do
       described_class.new(:filename => 'test.txt', :extra_field => 'extra')
     end
 
-    it 'does not include them in the document written to the database' do
-      expect(info.document['extra_field']).to be_nil
-      expect(info.document[:extra_field]).to be_nil
+    it 'includes them in the document written to the database' do
+      expect(info.document['extra_field']).to eq('extra')
+      expect(info.document[:extra_field]).to eq('extra')
     end
   end
 end

data/spec/mongo/grid/fs_bucket_spec.rb

@@ -6,6 +6,11 @@ describe Mongo::Grid::FSBucket do
     described_class.new(client.database, options)
   end
 
+  # A different instance so that fs creates indexes correctly
+  let(:support_fs) do
+    described_class.new(client.database, options)
+  end
+
   let(:client) do
     authorized_client
   end
@@ -22,6 +27,11 @@ describe Mongo::Grid::FSBucket do
     File.open(__FILE__)
   end
 
+  before do
+    support_fs.files_collection.drop rescue nil
+    support_fs.chunks_collection.drop rescue nil
+  end
+
   describe '#initialize' do
 
     it 'sets the files collection' do
@@ -155,11 +165,6 @@ describe Mongo::Grid::FSBucket do
         end
       end
 
-      after do
-        fs.files_collection.delete_many
-        fs.chunks_collection.delete_many
-      end
-
       it 'returns a collection view' do
         expect(fs.find).to be_a(Mongo::Collection::View)
       end
@@ -259,11 +264,6 @@ describe Mongo::Grid::FSBucket do
       fs.insert_one(file)
     end
 
-    after do
-      fs.files_collection.delete_many
-      fs.chunks_collection.delete_many
-    end
-
     let(:from_db) do
       fs.find_one(:filename => 'test.txt')
     end
@@ -296,17 +296,16 @@ describe Mongo::Grid::FSBucket do
       Mongo::Grid::File.new('Hello!', :filename => 'test.txt')
     end
 
+    let(:support_file) do
+      Mongo::Grid::File.new('Hello!', :filename => 'support_test.txt')
+    end
+
     context 'when inserting the file once' do
 
       let!(:result) do
         fs.insert_one(file)
       end
 
-      after do
-        fs.files_collection.delete_many
-        fs.chunks_collection.delete_many
-      end
-
       let(:from_db) do
         fs.find_one(:filename => 'test.txt')
       end
@@ -325,20 +324,16 @@ describe Mongo::Grid::FSBucket do
     end
 
     context 'when the files collection is empty' do
+      before do
+        fs.database[fs.files_collection.name].indexes
+      end
 
       before do
-        fs.files_collection.delete_many
-        fs.chunks_collection.delete_many
         expect(fs.files_collection).to receive(:indexes).and_call_original
         expect(fs.chunks_collection).to receive(:indexes).and_call_original
         fs.insert_one(file)
       end
 
-      after do
-        fs.files_collection.delete_many
-        fs.chunks_collection.delete_many
-      end
-
       let(:chunks_index) do
         fs.database[fs.chunks_collection.name].indexes.get(:files_id => 1, :n => 1)
       end
@@ -374,16 +369,11 @@ describe Mongo::Grid::FSBucket do
     context 'when the index creation encounters an error' do
 
       before do
-        fs.chunks_collection.drop
         fs.chunks_collection.indexes.create_one(Mongo::Grid::FSBucket::CHUNKS_INDEX, :unique => false)
         expect(fs.chunks_collection).to receive(:indexes).and_call_original
         expect(fs.files_collection).not_to receive(:indexes)
       end
 
-      after do
-        fs.database[fs.chunks_collection.name].indexes.drop_one('files_id_1_n_1')
-      end
-
       it 'raises the error to the user' do
         expect {
           fs.insert_one(file)
@@ -394,17 +384,12 @@ describe Mongo::Grid::FSBucket do
     context 'when the files collection is not empty' do
 
       before do
-        fs.files_collection.insert_one(a: 1)
+        support_fs.insert_one(support_file)
         expect(fs.files_collection).not_to receive(:indexes)
         expect(fs.chunks_collection).not_to receive(:indexes)
         fs.insert_one(file)
       end
 
-      after do
-        fs.files_collection.delete_many
-        fs.chunks_collection.delete_many
-      end
-
       let(:files_index) do
         fs.database[fs.files_collection.name].indexes.get(:filename => 1, :uploadDate => 1)
       end
@@ -416,11 +401,6 @@ describe Mongo::Grid::FSBucket do
 
     context 'when inserting the file more than once' do
 
-      after do
-        fs.files_collection.delete_many
-        fs.chunks_collection.delete_many
-      end
-
       it 'raises an error' do
         expect {
           fs.insert_one(file)
@@ -444,11 +424,6 @@ describe Mongo::Grid::FSBucket do
         fs.insert_one(file)
       end
 
-      after do
-        fs.files_collection.delete_many
-        fs.chunks_collection.delete_many
-      end
-
       it 'successfully inserts the file' do
         expect(
           fs.find_one(:filename => 'large-file.txt').chunks
@@ -525,11 +500,6 @@ describe Mongo::Grid::FSBucket do
       StringIO.new
     end
 
-    after do
-      fs.files_collection.delete_many
-      fs.chunks_collection.delete_many
-    end
-
     describe '#open_download_stream' do
 
       let!(:file_id) do
@@ -1022,11 +992,6 @@ describe Mongo::Grid::FSBucket do
       fs.open_upload_stream(filename)
     end
 
-    after do
-      fs.files_collection.delete_many
-      fs.chunks_collection.delete_many
-    end
-
     describe '#open_upload_stream' do
 
       context 'when a block is not provided' do

data/spec/mongo/grid/stream/read_spec.rb

@@ -2,6 +2,15 @@ require 'spec_helper'
 
 describe Mongo::Grid::FSBucket::Stream::Read do
 
+  let(:support_fs) do
+    authorized_client.database.fs(fs_options)
+  end
+
+  before do
+    support_fs.files_collection.drop rescue nil
+    support_fs.chunks_collection.drop rescue nil
+  end
+
   let(:fs_options) do
     { }
   end
@@ -22,11 +31,6 @@ describe Mongo::Grid::FSBucket::Stream::Read do
     fs.upload_from_stream(filename, File.open(__FILE__))
   end
 
-  after do
-    fs.files_collection.delete_many
-    fs.chunks_collection.delete_many
-  end
-
   let(:stream) do
     described_class.new(fs, options)
   end
@@ -95,11 +99,6 @@ describe Mongo::Grid::FSBucket::Stream::Read do
       fs.upload_from_stream(filename, File.open(__FILE__))
     end
 
-    after do
-      fs.files_collection.delete_many
-      fs.chunks_collection.delete_many
-    end
-
     let(:fs_options) do
       { chunk_size: 5 }
     end
@@ -195,11 +194,6 @@ describe Mongo::Grid::FSBucket::Stream::Read do
       fs.upload_from_stream(filename, file)
     end
 
-    after do
-      fs.files_collection.delete_many
-      fs.chunks_collection.delete_many
-    end
-
     it 'returns a string of all data' do
       expect(stream.read.size).to eq(file.size)
     end

data/spec/mongo/grid/stream/write_spec.rb

@@ -2,6 +2,15 @@ require 'spec_helper'
 
 describe Mongo::Grid::FSBucket::Stream::Write do
 
+  let(:support_fs) do
+    authorized_client.database.fs(fs_options)
+  end
+
+  before do
+    support_fs.files_collection.drop rescue nil
+    support_fs.chunks_collection.drop rescue nil
+  end
+
   let(:file) do
     File.open(__FILE__)
   end
@@ -30,11 +39,6 @@ describe Mongo::Grid::FSBucket::Stream::Write do
     { filename: filename }.merge(extra_options).merge(fs.options)
   end
 
-  after do
-    fs.files_collection.delete_many
-    fs.chunks_collection.delete_many
-  end
-
   let(:stream) do
     described_class.new(fs, options)
   end
@@ -231,11 +235,6 @@ describe Mongo::Grid::FSBucket::Stream::Write do
 
   describe '#write' do
 
-    after do
-      fs.files_collection.delete_many
-      fs.chunks_collection.delete_many
-    end
-
     let(:file_from_db) do
       fs.find_one(filename: filename)
     end
@@ -256,8 +255,6 @@ describe Mongo::Grid::FSBucket::Stream::Write do
       context 'when the files collection is empty' do
 
         before do
-          fs.files_collection.delete_many
-          fs.chunks_collection.delete_many
           expect(fs.files_collection).to receive(:indexes).and_call_original
           expect(fs.chunks_collection).to receive(:indexes).and_call_original
           stream.write(file)
@@ -294,17 +291,13 @@ describe Mongo::Grid::FSBucket::Stream::Write do
       context 'when the files collection is not empty' do
 
         before do
-          fs.files_collection.insert_one(a: 1)
+          support_fs.send(:ensure_indexes!)
+          support_fs.files_collection.insert_one(a: 1)
           expect(fs.files_collection).not_to receive(:indexes)
           expect(fs.chunks_collection).not_to receive(:indexes)
           stream.write(file)
         end
 
-        after do
-          fs.files_collection.delete_many
-          fs.chunks_collection.delete_many
-        end
-
         let(:files_index) do
           fs.database[fs.files_collection.name].indexes.get(:filename => 1, :uploadDate => 1)
         end
@@ -317,16 +310,11 @@ describe Mongo::Grid::FSBucket::Stream::Write do
       context 'when the index creation encounters an error' do
 
         before do
-          fs.chunks_collection.drop
           fs.chunks_collection.indexes.create_one(Mongo::Grid::FSBucket::CHUNKS_INDEX, :unique => false)
           expect(fs.chunks_collection).to receive(:indexes).and_call_original
           expect(fs.files_collection).not_to receive(:indexes)
         end
 
-        after do
-          fs.database[fs.chunks_collection.name].indexes.drop_one('files_id_1_n_1')
-        end
-
         it 'raises the error to the user' do
           expect {
             stream.write(file)

data/spec/mongo/id_spec.rb

@@ -0,0 +1,35 @@
+require 'lite_spec_helper'
+
+describe Mongo::Id do
+  it 'starts with ID 1' do
+    class IdA
+      include Mongo::Id
+    end
+
+    expect(IdA.next_id).to eq(1)
+  end
+
+  it 'increases each subsequent ID' do
+    class IdB
+      include Mongo::Id
+    end
+
+    expect(IdB.next_id).to eq(1)
+    expect(IdB.next_id).to eq(2)
+  end
+
+  it 'correctly generates independent IDs for separate classes' do
+    class IdC
+      include Mongo::Id
+    end
+
+    class IdD
+      include Mongo::Id
+    end
+
+    expect(IdC.next_id).to eq(1)
+    expect(IdD.next_id).to eq(1)
+    expect(IdC.next_id).to eq(2)
+    expect(IdD.next_id).to eq(2)
+  end
+end