mongo 2.1.0.beta → 2.1.0.rc0

data/spec/mongo/grid/stream_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Mongo::Grid::FSBucket::Stream do
+
+  let(:fs) do
+    authorized_client.database.fs
+  end
+
+  describe '.get' do
+
+    let(:stream) do
+      described_class.get(fs, mode)
+    end
+
+    context 'when mode is read' do
+
+      let(:mode) do
+        Mongo::Grid::FSBucket::Stream::READ_MODE
+      end
+
+      it 'returns a Stream::Read object' do
+        expect(stream).to be_a(Mongo::Grid::FSBucket::Stream::Read)
+      end
+    end
+
+    context 'when mode is write' do
+
+      let(:mode) do
+        Mongo::Grid::FSBucket::Stream::WRITE_MODE
+      end
+
+      it 'returns a Stream::Write object' do
+        expect(stream).to be_a(Mongo::Grid::FSBucket::Stream::Write)
+      end
+
+      context 'when options are provided' do
+
+        let(:stream) do
+          described_class.get(fs, mode, chunk_size: 100)
+        end
+
+        it 'sets the options on the stream object' do
+          expect(stream.options[:chunk_size]).to eq(100)
+        end
+      end
+    end
+  end
+end

data/spec/mongo/gridfs_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe 'GridFS' do
+  include Mongo::GridFS
+
+  GRIDFS_TESTS.each do |file|
+
+    spec = Mongo::GridFS::Spec.new(file)
+
+    context(spec.description) do
+
+      spec.tests.each do |test|
+
+        context(test.description) do
+
+          after do
+            fs.files_collection.delete_many
+            fs.chunks_collection.delete_many
+            test.expected_files_collection.delete_many
+            test.expected_chunks_collection.delete_many
+          end
+
+          let!(:result) do
+            test.run(fs)
+          end
+
+          let(:fs) do
+            authorized_collection.database.fs
+          end
+
+          it "raises the correct error", if: test.error? do
+            expect(result).to match_error(test.expected_error)
+          end
+
+          it 'completes successfully', unless: test.error? do
+            expect(result).to completes_successfully(test)
+          end
+
+          it 'has the correct documents in the files collection', if: test.assert_data? do
+            expect(fs.files_collection).to match_files_collection(test.expected_files_collection)
+          end
+
+          it 'has the correct documents in the chunks collection', if: test.assert_data? do
+            expect(fs.chunks_collection).to match_chunks_collection(test.expected_chunks_collection)
+          end
+        end
+      end
+    end 
+  end
+end

data/spec/mongo/logger_spec.rb

@@ -6,38 +6,6 @@ describe Mongo::Logger do
     described_class.logger
   end
 
-  describe '.debug' do
-
-    it 'logs a debug message' do
-      expect(logger).to receive(:debug).with("mongo.query | message | runtime: 10ms")
-      described_class.debug('mongo.query', 'message', '10ms')
-    end
-  end
-
-  describe '.error' do
-
-    it 'logs a error message' do
-      expect(logger).to receive(:error).with("mongo.query | message | runtime: 10ms")
-      described_class.error('mongo.query', 'message', '10ms')
-    end
-  end
-
-  describe '.fatal' do
-
-    it 'logs a fatal message' do
-      expect(logger).to receive(:fatal).with("mongo.query | message | runtime: 10ms")
-      described_class.fatal('mongo.query', 'message', '10ms')
-    end
-  end
-
-  describe '.info' do
-
-    it 'logs a info message' do
-      expect(logger).to receive(:info).with("mongo.query | message | runtime: 10ms")
-      described_class.info('mongo.query', 'message', '10ms')
-    end
-  end
-
   describe '.logger' do
 
     context 'when no logger has been set' do
@@ -86,12 +54,4 @@ describe Mongo::Logger do
       end
     end
   end
-
-  describe '.warn' do
-
-    it 'logs a warn message' do
-      expect(logger).to receive(:warn).with("mongo.query | message | runtime: 10ms")
-      described_class.warn('mongo.query', 'message', '10ms')
-    end
-  end
 end

data/spec/mongo/monitoring/command_log_subscriber_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe Mongo::Monitoring::CommandLogSubscriber do
+
+  describe '#started' do
+
+    let(:filter) do
+      (1...100).reduce({}) do |hash, i|
+        hash[i] = i
+        hash
+      end
+    end
+
+    let(:command) do
+      { find: 'users', filter: filter }
+    end
+
+    let(:event) do
+      Mongo::Monitoring::Event::CommandStarted.new(
+        'find',
+        'users',
+        Mongo::Address.new('127.0.0.1:27017'),
+        12345,
+        67890,
+        command
+      )
+    end
+
+    before do
+      Mongo::Logger.level = Logger::DEBUG
+    end
+
+    after do
+      Mongo::Logger.level = Logger::INFO
+    end
+
+    context 'when truncating the logs' do
+
+      context 'when no option is provided' do
+
+        let(:subscriber) do
+          described_class.new
+        end
+
+        it 'truncates the logs at 250 characters' do
+          expect(subscriber).to receive(:truncate).with(command).and_call_original
+          subscriber.started(event)
+        end
+      end
+
+      context 'when true option is provided' do
+
+        let(:subscriber) do
+          described_class.new(truncate_logs: true)
+        end
+
+        it 'truncates the logs at 250 characters' do
+          expect(subscriber).to receive(:truncate).with(command).and_call_original
+          subscriber.started(event)
+        end
+      end
+    end
+
+    context 'when not truncating the logs' do
+
+      let(:subscriber) do
+        described_class.new(truncate_logs: false)
+      end
+
+      it 'does not truncate the logs' do
+        expect(subscriber).to_not receive(:truncate)
+        subscriber.started(event)
+      end
+    end
+  end
+end

data/spec/mongo/operation/{aggregate_spec.rb → commands/aggregate_spec.rb}

@@ -81,47 +81,5 @@ describe Mongo::Operation::Aggregate do
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end
-
-    context 'rerouting' do
-
-      before do
-        allow_any_instance_of(Mongo::Operation::Aggregate::Result).to receive(:validate!) do
-          true
-        end
-      end
-
-      context 'when out is specified and server is a secondary' do
-        let(:selector) do
-          { :aggregate => 'test_coll',
-            :pipeline => [{ '$out' => 'test_coll' }],
-          }
-        end
-
-        it 'raises an error' do
-          allow_any_instance_of(Mongo::ServerSelector::Primary).to receive(:server) do
-            primary_server
-          end
-          expect {
-            op.execute(secondary_context)
-          }.to raise_error(Mongo::Error::NeedPrimaryServer)
-        end
-      end
-
-      context 'when out is specified and server is a primary' do
-        let(:selector) do
-          { :aggregate => 'test_coll',
-            :pipeline => [{ '$out' => 'test_coll' }],
-          }
-        end
-
-        it 'sends the operation to the primary' do
-          allow_any_instance_of(Mongo::ServerSelector::Primary).to receive(:server) do
-            primary_server
-          end
-          expect(primary_context).to receive(:with_connection)
-          op.execute(primary_context)
-        end
-      end
-    end
   end
 end

data/spec/mongo/operation/{read → commands}/collections_info_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Read::CollectionsInfo do
+describe Mongo::Operation::CollectionsInfo do
 
   let(:spec) do
     { :db_name => TEST_DB }

data/spec/mongo/operation/{read → commands}/indexes_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Read::Indexes do
+describe Mongo::Operation::Indexes do
 
   describe '#execute' do
 

data/spec/mongo/operation/{map_reduce_spec.rb → commands/map_reduce_spec.rb}

@@ -77,24 +77,6 @@ describe Mongo::Operation::MapReduce do
     end
   end
 
-  describe '#merge' do
-
-    let(:other_op) { described_class.new(spec) }
-
-    it 'is not allowed' do
-      expect{ op.merge(other_op) }.to raise_exception
-    end
-  end
-
-  describe '#merge!' do
-
-    let(:other_op) { described_class.new(spec) }
-
-    it 'is not allowed' do
-      expect{ op.merge!(other_op) }.to raise_exception
-    end
-  end
-
   describe '#execute' do
 
     let(:documents) do

data/spec/mongo/operation/kill_cursors_spec.rb

@@ -48,7 +48,7 @@ describe Mongo::Operation::KillCursors do
     context 'message' do
 
       it 'creates a kill cursors wire protocol message with correct specs' do
-        expect(Mongo::Protocol::KillCursors).to receive(:new) do |ids|
+        expect(Mongo::Protocol::KillCursors).to receive(:new) do |collection, database, ids|
           expect(ids).to eq(spec[:cursor_ids])
         end
         op.execute(primary_context)

data/spec/mongo/operation/{read_preferrable_spec.rb → read_preference_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::ReadPreferrable do
+describe Mongo::Operation::ReadPreference do
 
   let(:selector) do
     { name: 'test' }
@@ -26,9 +26,9 @@ describe Mongo::Operation::ReadPreferrable do
     Mongo::ServerSelector.get
   end
 
-  let(:read_preferrable) do
+  let(:read_preference) do
     Class.new do
-      include Mongo::Operation::ReadPreferrable
+      include Mongo::Operation::ReadPreference
     end.new.tap do |rp|
       allow(rp).to receive(:read).and_return(read_pref)
       allow(rp).to receive(:selector).and_return(selector)
@@ -55,7 +55,7 @@ describe Mongo::Operation::ReadPreferrable do
     end
 
     it 'returns a special selector' do
-      expect(read_preferrable.send(:update_selector, context)).to eq(expected)
+      expect(read_preference.send(:update_selector, context)).to eq(expected)
     end
 
     context 'when the selector already has $query in it' do
@@ -70,7 +70,7 @@ describe Mongo::Operation::ReadPreferrable do
       end
 
       it 'returns an unaltered special selector' do
-        expect(read_preferrable.send(:update_selector, context)).to eq(expected)
+        expect(read_preference.send(:update_selector, context)).to eq(expected)
       end
     end
   end
@@ -82,7 +82,7 @@ describe Mongo::Operation::ReadPreferrable do
     end
 
     it 'returns a selector' do
-      expect(read_preferrable.send(:update_selector, context)).to eq(selector)
+      expect(read_preference.send(:update_selector, context)).to eq(selector)
     end
   end
 
@@ -168,7 +168,7 @@ describe Mongo::Operation::ReadPreferrable do
       end
 
       it 'does not set the slave_ok flag' do
-        expect(read_preferrable.send(:update_options, context)).to eq(expected)
+        expect(read_preference.send(:update_options, context)).to eq(expected)
       end
     end
 
@@ -183,7 +183,7 @@ describe Mongo::Operation::ReadPreferrable do
       end
 
       it 'sets the slave_ok flag' do
-        expect(read_preferrable.send(:update_options, context)).to eq(expected)
+        expect(read_preference.send(:update_options, context)).to eq(expected)
       end
     end
   end
@@ -205,7 +205,7 @@ describe Mongo::Operation::ReadPreferrable do
       end
 
       it 'does not set the slave_ok flag' do
-        expect(read_preferrable.send(:update_options, context)).to eq(expected)
+        expect(read_preference.send(:update_options, context)).to eq(expected)
       end
     end
 
@@ -222,7 +222,7 @@ describe Mongo::Operation::ReadPreferrable do
         end
 
         it 'sets the slave_ok flag' do
-          expect(read_preferrable.send(:update_options, context)).to eq(expected)
+          expect(read_preference.send(:update_options, context)).to eq(expected)
         end
       end
 
@@ -237,7 +237,7 @@ describe Mongo::Operation::ReadPreferrable do
         end
 
         it 'does not set the slave_ok flag' do
-          expect(read_preferrable.send(:update_options, context)).to eq(expected)
+          expect(read_preference.send(:update_options, context)).to eq(expected)
         end
       end
     end

data/spec/mongo/operation/write/bulk/{bulk_delete_spec.rb → delete_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::BulkDelete do
+describe Mongo::Operation::Write::Bulk::Delete do
   include_context 'operation'
 
   let(:documents) do
@@ -62,17 +62,6 @@ describe Mongo::Operation::Write::BulkDelete do
     end
   end
 
-  describe '#dup' do
-
-    context 'deep copy' do
-
-      it 'copies the list of deletes' do
-        copy = op.dup
-        expect(copy.spec[:deletes]).not_to be(op.spec[:deletes])
-      end
-    end
-  end
-
   describe '#execute' do
 
     before do