mongo 2.2.7 → 2.3.0

data/spec/mongo/database_spec.rb

@@ -63,6 +63,25 @@ describe Mongo::Database do
         end.to raise_error(Mongo::Error::InvalidCollectionName)
       end
     end
+
+    context 'when the client has options' do
+
+      let(:client) do
+        Mongo::Client.new([default_address.host], read: { mode: :secondary })
+      end
+
+      let(:database) do
+        client.database
+      end
+
+      let(:collection) do
+        database[:with_read_pref]
+      end
+
+      it 'applies the options to the collection' do
+        expect(collection.read_preference).to eq(Mongo::ServerSelector.get(mode: :secondary))
+      end
+    end
   end
 
   describe '#collection_names' do
@@ -225,40 +244,87 @@ describe Mongo::Database do
       end
     end
 
-    context 'when an alternate read preference is specified' do
+    context 'when no read preference is provided', unless: sharded? do
+
+      let!(:primary_server) do
+        database.cluster.next_primary
+      end
 
       before do
-        allow(database.cluster).to receive(:single?).and_return(false)
+        expect(primary_server).to receive(:with_connection).at_least(:once).and_call_original
+      end
+
+      it 'uses read preference of primary' do
+        expect(database.command(ping: 1)).to be_successful
+      end
+    end
+
+    context 'when the client has a read preference set', unless: sharded? do
+
+      let!(:primary_server) do
+        database.cluster.next_primary
       end
 
-      let(:read) do
+      let(:read_preference) do
         { :mode => :secondary, :tag_sets => [{ 'non' => 'existent' }] }
       end
 
       let(:client) do
-        authorized_client.with(server_selection_timeout: 0.1)
+        authorized_client.with(read: read_preference)
       end
 
       let(:database) do
         described_class.new(client, TEST_DB, client.options)
       end
 
-      it 'uses that read preference', unless: sharded? do
-        expect do
-          database.command({ ping: 1 }, { read: read })
-        end.to raise_error(Mongo::Error::NoServerAvailable)
+      before do
+        expect(primary_server).to receive(:with_connection).at_least(:once).and_call_original
+      end
+
+      it 'does not use the client read preference 'do
+        expect(database.command(ping: 1)).to be_successful
       end
     end
 
-    context 'when there is a read preference set on the client' do
+    context 'when there is a read preference argument provided', unless: sharded? do
+
+      let(:read_preference) do
+        { :mode => :secondary, :tag_sets => [{ 'non' => 'existent' }] }
+      end
+
+      let(:client) do
+        authorized_client.with(server_selection_timeout: 0.2)
+      end
 
       let(:database) do
-        described_class.new(authorized_client.with(read: { mode: :secondary }), TEST_DB)
+        described_class.new(client, TEST_DB, client.options)
+      end
+
+      before do
+        allow(database.cluster).to receive(:single?).and_return(false)
       end
 
-      it 'does not use the read preference' do
-        expect(database.client.cluster).to receive(:next_primary).and_call_original
-        database.command(ping: 1)
+      it 'uses the read preference argument' do
+        expect {
+          database.command({ ping: 1 }, read: read_preference)
+        }.to raise_error(Mongo::Error::NoServerAvailable)
+      end
+    end
+
+    context 'when the client has a server_selection_timeout set', unless: sharded? do
+
+      let(:client) do
+        authorized_client.with(server_selection_timeout: 0)
+      end
+
+      let(:database) do
+        described_class.new(client, TEST_DB, client.options)
+      end
+
+      it 'uses the client server_selection_timeout' do
+        expect {
+          database.command(ping: 1)
+        }.to raise_error(Mongo::Error::NoServerAvailable)
       end
     end
   end

data/spec/mongo/grid/fs_bucket_spec.rb

@@ -51,7 +51,7 @@ describe Mongo::Grid::FSBucket do
       context 'when a read preference is set' do
 
         let(:options) do
-          { read: { mode: :secondary, server_selection_timeout: 0.1 } }
+          { read: { mode: :secondary } }
         end
 
         let(:read_pref) do
@@ -63,6 +63,21 @@ describe Mongo::Grid::FSBucket do
         end
       end
 
+      context 'when a read preference is not set' do
+
+        let(:database) do
+          authorized_client.with(read: { mode: :secondary }).database
+        end
+
+        let(:fs) do
+          described_class.new(database, options)
+        end
+
+        it 'uses the read preference of the database' do
+          expect(fs.read_preference).to be(database.read_preference)
+        end
+      end
+
       context 'when a write stream is opened' do
 
         let(:stream) do
@@ -221,9 +236,22 @@ describe Mongo::Grid::FSBucket do
       fs.find_one(:filename => 'test.txt')
     end
 
+    let(:from_db_upload_date) do
+      from_db.info.upload_date.strftime("%Y-%m-%d %H:%M:%S")
+    end
+
+    let(:file_info_upload_date) do
+      file.info.upload_date.strftime("%Y-%m-%d %H:%M:%S")
+    end
+
     it 'returns the assembled file from the db' do
       expect(from_db.filename).to eq(file.info.filename)
     end
+
+    it 'maps the file info correctly' do
+      expect(from_db.info.length).to eq(file.info.length)
+      expect(from_db_upload_date).to eq(file_info_upload_date)
+    end
   end
 
   describe '#insert_one' do
@@ -434,6 +462,25 @@ describe Mongo::Grid::FSBucket do
     it 'removes the file from the db' do
       expect(from_db).to be_nil
     end
+
+    context 'when a custom file id is used' do
+
+      let(:custom_file_id) do
+        fs.upload_from_stream(filename, file, file_id: 'Custom ID')
+      end
+
+      before do
+        fs.delete(custom_file_id)
+      end
+
+      let(:from_db) do
+        fs.find_one(:filename => filename)
+      end
+
+      it 'removes the file from the db' do
+        expect(from_db).to be_nil
+      end
+    end
   end
 
   context 'when a read stream is opened' do
@@ -498,6 +545,51 @@ describe Mongo::Grid::FSBucket do
           expect(io.size).to eq(0)
         end
       end
+
+      context 'when a custom file id is provided' do
+
+        let(:file) do
+          File.open(__FILE__)
+        end
+
+        let!(:file_id) do
+          fs.open_upload_stream(filename, file_id: 'Custom ID') do |stream|
+            stream.write(file)
+          end.file_id
+        end
+
+        context 'when a block is provided' do
+
+          let!(:stream) do
+            fs.open_download_stream(file_id) do |stream|
+              io.write(stream.read)
+            end
+          end
+
+          it 'yields the stream to the block' do
+            expect(io.size).to eq(file.size)
+          end
+        end
+
+        context 'when a block is not provided' do
+
+          let!(:stream) do
+            fs.open_download_stream(file_id)
+          end
+
+          it 'returns a Stream::Read object' do
+            expect(stream).to be_a(Mongo::Grid::FSBucket::Stream::Read)
+          end
+
+          it 'does not close the stream' do
+            expect(stream.closed?).to be(false)
+          end
+
+          it 'does not yield the stream to the block' do
+            expect(io.size).to eq(0)
+          end
+        end
+      end
     end
 
     describe '#download_to_stream' do
@@ -830,6 +922,21 @@ describe Mongo::Grid::FSBucket do
         it 'creates an ObjectId for the file' do
           expect(stream.file_id).to be_a(BSON::ObjectId)
         end
+
+        context 'when a custom file ID is provided' do
+
+          let(:stream) do
+            fs.open_upload_stream(filename, file_id: 'Custom ID')
+          end
+
+          it 'returns a Stream::Write object' do
+            expect(stream).to be_a(Mongo::Grid::FSBucket::Stream::Write)
+          end
+
+          it 'creates an ObjectId for the file' do
+            expect(stream.file_id).to eq('Custom ID')
+          end
+        end
       end
 
       context 'when a block is provided' do
@@ -930,6 +1037,17 @@ describe Mongo::Grid::FSBucket do
         fs.open_upload_stream(filename, stream_options)
       end
 
+      context 'when a custom file id is provided' do
+
+        let(:stream_options) do
+          { file_id: 'Custom ID' }
+        end
+
+        it 'sets the file id on the stream' do
+          expect(stream.file_id).to eq('Custom ID')
+        end
+      end
+
       context 'when a write option is specified' do
 
         let(:stream_options) do

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

@@ -83,7 +83,7 @@ describe Mongo::Grid::FSBucket::Stream::Write do
 
         let(:extra_options) do
           {
-              write: { w: (WRITE_CONCERN[:w] + 1) }
+            write: { w: (WRITE_CONCERN[:w] + 1) }
           }
         end
 
@@ -174,6 +174,19 @@ describe Mongo::Grid::FSBucket::Stream::Write do
           expect(stream.send(:file_info).document[:aliases]).to eq(options[:aliases])
         end
       end
+
+      context 'when provided a file_id option' do
+
+        let(:options) do
+          {
+            file_id: 'Custom ID'
+          }
+        end
+
+        it 'assigns the stream the file id' do
+          expect(stream.file_id).to eq(options[:file_id])
+        end
+      end
     end
   end
 
@@ -285,25 +298,63 @@ describe Mongo::Grid::FSBucket::Stream::Write do
 
     context 'when provided an io stream' do
 
-      before do
-        stream.write(file)
-        stream.close
-      end
+      context 'when no file id is specified' do
 
-      it 'writes the contents of the stream' do
-        expect(file_from_db.data.size).to eq(file.size)
-      end
+        before do
+          stream.write(file)
+          stream.close
+        end
 
-      it 'updates the length written' do
-        expect(stream.send(:file_info).document['length']).to eq(file.size)
+        it 'writes the contents of the stream' do
+          expect(file_from_db.data.size).to eq(file.size)
+        end
+
+        it 'updates the length written' do
+          expect(stream.send(:file_info).document['length']).to eq(file.size)
+        end
+
+        it 'updates the position (n)' do
+          expect(stream.instance_variable_get(:@n)).to eq(1)
+        end
       end
 
-      it 'updates the position (n)' do
-        expect(stream.instance_variable_get(:@n)).to eq(1)
+      context 'when a custom file id is provided' do
+
+        let(:extra_options) do
+          {
+            file_id: 'Custom ID'
+          }
+        end
+
+        let!(:id) do
+          stream.write(file)
+          stream.close
+        end
+
+        it 'writes the contents of the stream' do
+          expect(file_from_db.data.size).to eq(file.size)
+        end
+
+        it 'updates the length written' do
+          expect(stream.send(:file_info).document['length']).to eq(file.size)
+        end
+
+        it 'updates the position (n)' do
+          expect(stream.instance_variable_get(:@n)).to eq(1)
+        end
+
+        it 'uses the custom file id' do
+          expect(id).to eq(options[:file_id])
+        end
       end
 
       context 'when the user file contains no data' do
 
+        before do
+          stream.write(file)
+          stream.close
+        end
+
         let(:file) do
           StringIO.new('')
         end

data/spec/mongo/index/view_spec.rb

@@ -366,6 +366,25 @@ describe Mongo::Index::View do
       it 'maps the ruby options to the server options' do
         expect(models).to eq([ expected ])
       end
+
+      context 'when using alternate names' do
+
+        let(:extended_options) do
+          options.merge!(expire_after_seconds: 5)
+        end
+
+        let(:extended_expected) do
+          expected.tap { |exp| exp[:expireAfterSeconds] = 5 }
+        end
+
+        let(:models) do
+          view.send(:normalize_models, [ extended_options ])
+        end
+
+        it 'maps the ruby options to the server options' do
+          expect(models).to eq([ extended_expected ])
+        end
+      end
     end
   end
 end

data/spec/mongo/operation/commands/aggregate_spec.rb

@@ -1,17 +1,20 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Commands::Aggregate do
-  include_context 'operation'
+
+  let(:options) do
+    {}
+  end
 
   let(:selector) do
-    { :aggregate => coll_name,
+    { :aggregate => TEST_COLL,
       :pipeline => [],
     }
   end
   let(:spec) do
     { :selector => selector,
-      :options => {},
-      :db_name => db_name
+      :options => options,
+      :db_name => TEST_DB
     }
   end
   let(:op) { described_class.new(spec) }
@@ -38,7 +41,7 @@ describe Mongo::Operation::Commands::Aggregate do
       let(:other_spec) do
         { :selector => other_selector,
           :options => options,
-          :db_name => db_name,
+          :db_name => TEST_DB,
         }
       end
       let(:other) { described_class.new(other_spec) }
@@ -54,14 +57,14 @@ describe Mongo::Operation::Commands::Aggregate do
     context 'when the aggregation fails' do
 
       let(:selector) do
-        { :aggregate => coll_name,
+        { :aggregate => TEST_COLL,
           :pipeline => [{ '$invalid' => 'operator' }],
         }
       end
 
       it 'raises an exception' do
         expect {
-          op.execute(authorized_primary.context)
+          op.execute(authorized_primary)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end