mongo 2.0.0.beta → 2.0.0.rc

data/spec/mongo/collection/view/aggregation_spec.rb

@@ -61,7 +61,7 @@ describe Mongo::Collection::View::Aggregation do
     end
 
     after do
-      authorized_collection.find.remove_many
+      authorized_collection.find.delete_many
     end
 
     context 'when a block is provided' do
@@ -108,6 +108,19 @@ describe Mongo::Collection::View::Aggregation do
         expect(aggregation.each).to be_a(Enumerator)
       end
     end
+
+    context 'when an invalid pipeline operator is provided' do
+
+      let(:pipeline) do
+        [{ '$invalid' => 'operator' }]
+      end
+
+      it 'raises an OperationFailure' do
+        expect {
+          aggregation.to_a
+        }.to raise_error(Mongo::Error::OperationFailure)
+      end
+    end
   end
 
   describe '#initialize' do

data/spec/mongo/collection/view/explainable_spec.rb

@@ -15,7 +15,7 @@ describe Mongo::Collection::View::Explainable do
   end
 
   after do
-    authorized_collection.find.remove_many
+    authorized_collection.find.delete_many
   end
 
   describe '#explain' do

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

@@ -48,7 +48,7 @@ describe Mongo::Collection::View::MapReduce do
   end
 
   after do
-    authorized_collection.find.remove_many
+    authorized_collection.find.delete_many
   end
 
   let(:map_reduce) do
@@ -82,7 +82,7 @@ describe Mongo::Collection::View::MapReduce do
     context 'when out is a collection' do
 
       after do
-        authorized_client['output_collection'].find.remove_many
+        authorized_client['output_collection'].find.delete_many
       end
 
       context 'when the option is to replace' do

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

@@ -15,7 +15,7 @@ describe Mongo::Collection::View::Readable do
   end
 
   after do
-    authorized_collection.find.remove_many
+    authorized_collection.find.delete_many
   end
 
   describe '#allow_partial_results' do
@@ -200,7 +200,7 @@ describe Mongo::Collection::View::Readable do
     end
 
     after do
-      authorized_collection.find.remove_many
+      authorized_collection.find.delete_many
     end
 
     context 'when a selector is provided' do

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

@@ -15,7 +15,7 @@ describe Mongo::Collection::View::Writable do
   end
 
   after do
-    authorized_collection.find.remove_many
+    authorized_collection.find.delete_many
   end
 
   describe '#find_one_and_delete' do
@@ -263,7 +263,7 @@ describe Mongo::Collection::View::Writable do
     end
   end
 
-  describe '#remove_many' do
+  describe '#delete_many' do
 
     context 'when a selector was provided' do
 
@@ -276,7 +276,7 @@ describe Mongo::Collection::View::Writable do
       end
 
       let(:response) do
-        view.remove_many
+        view.delete_many
       end
 
       it 'deletes the matching documents in the collection' do
@@ -291,7 +291,7 @@ describe Mongo::Collection::View::Writable do
       end
 
       let(:response) do
-        view.remove_many
+        view.delete_many
       end
 
       it 'deletes all the documents in the collection' do
@@ -300,7 +300,7 @@ describe Mongo::Collection::View::Writable do
     end
   end
 
-  describe '#remove_one' do
+  describe '#delete_one' do
 
     context 'when a selector was provided' do
 
@@ -317,7 +317,7 @@ describe Mongo::Collection::View::Writable do
       end
 
       let(:response) do
-        view.remove_one
+        view.delete_one
       end
 
       it 'deletes the first matching document in the collection' do
@@ -332,7 +332,7 @@ describe Mongo::Collection::View::Writable do
       end
 
       let(:response) do
-        view.remove_one
+        view.delete_one
       end
 
       it 'deletes the first document in the collection' do

data/spec/mongo/collection/view_spec.rb

@@ -15,7 +15,7 @@ describe Mongo::Collection::View do
   end
 
   after do
-    authorized_collection.find.remove_many
+    authorized_collection.find.delete_many
   end
 
   describe '#==' do
@@ -116,7 +116,7 @@ describe Mongo::Collection::View do
     end
 
     after do
-      authorized_collection.find.remove_many
+      authorized_collection.find.delete_many
     end
 
     context 'when sending the initial query' do
@@ -401,9 +401,18 @@ describe Mongo::Collection::View do
       end
     end
 
-    pending 'when the cursor is created'
-    pending 'when a block is provided'
-    pending 'when a block is not provided'
+    context 'when a block is not provided' do
+
+      let(:enumerator) do
+        view.each
+      end
+
+      it 'returns an enumerator' do
+        enumerator.each do |doc|
+          expect(doc).to have_key('field')
+        end
+      end
+    end
   end
 
   describe '#hash' do

data/spec/mongo/collection_spec.rb

@@ -262,7 +262,7 @@ describe Mongo::Collection do
       end
 
       after do
-        authorized_collection.find.remove_many
+        authorized_collection.find.delete_many
       end
 
       let(:view) do
@@ -280,7 +280,7 @@ describe Mongo::Collection do
   describe '#insert_many' do
 
     after do
-      authorized_collection.find.remove_many
+      authorized_collection.find.delete_many
     end
 
     let(:result) do
@@ -299,7 +299,7 @@ describe Mongo::Collection do
   describe '#insert_one' do
 
     after do
-      authorized_collection.find.remove_many
+      authorized_collection.find.delete_many
     end
 
     let(:result) do
@@ -339,11 +339,11 @@ describe Mongo::Collection do
     end
 
     before do
-      authorized_collection.indexes.create(index_spec, unique: true)
+      authorized_collection.indexes.create_one(index_spec, unique: true)
     end
 
     after do
-      authorized_collection.indexes.drop(index_spec)
+      authorized_collection.indexes.drop_one('name_1')
     end
 
     it 'returns a list of indexes' do

data/spec/mongo/cursor_spec.rb

@@ -33,7 +33,7 @@ describe Mongo::Cursor do
         end
 
         after do
-          authorized_collection.find.remove_many
+          authorized_collection.find.delete_many
         end
 
         it 'returns the correct amount' do
@@ -58,7 +58,7 @@ describe Mongo::Cursor do
         end
 
         after do
-          authorized_collection.find.remove_many
+          authorized_collection.find.delete_many
         end
 
         it 'returns the correct amount' do
@@ -84,7 +84,7 @@ describe Mongo::Cursor do
       end
 
       after do
-        authorized_collection.find.remove_many
+        authorized_collection.find.delete_many
       end
 
       context 'when a limit is provided' do

data/spec/mongo/database_spec.rb

@@ -126,11 +126,9 @@ describe Mongo::Database do
         described_class.new(authorized_client, 'invalid_database')
       end
 
-      it 'returns an empty list', if: list_command_enabled? do
+      it 'returns an empty list', if: write_command_enabled? do
         expect(database.collections).to be_empty
       end
-
-      pending 'raises an exception' # 2.6
     end
 
     context 'when the user is not authorized', unless: sharded? do
@@ -139,13 +137,11 @@ describe Mongo::Database do
         described_class.new(unauthorized_client, TEST_DB)
       end
 
-      it 'raises an exception', if: list_command_enabled? do
+      it 'raises an exception' do
         expect {
           database.collections
         }.to raise_error(Mongo::Error::OperationFailure)
       end
-
-      pending 'raises an exception' # 2.6 not authorized
     end
   end
 
@@ -267,8 +263,8 @@ describe Mongo::Database do
         end
 
         after do
-          fs.files_collection.find.remove_many
-          fs.chunks_collection.find.remove_many
+          fs.files_collection.find.delete_many
+          fs.chunks_collection.find.delete_many
         end
 
         let(:from_db) do

data/spec/mongo/grid/fs_spec.rb

@@ -40,8 +40,8 @@ describe Mongo::Grid::FS do
     end
 
     after do
-      fs.files_collection.find.remove_many
-      fs.chunks_collection.find.remove_many
+      fs.files_collection.find.delete_many
+      fs.chunks_collection.find.delete_many
     end
 
     let(:from_db) do
@@ -70,8 +70,8 @@ describe Mongo::Grid::FS do
       end
 
       after do
-        fs.files_collection.find.remove_many
-        fs.chunks_collection.find.remove_many
+        fs.files_collection.find.delete_many
+        fs.chunks_collection.find.delete_many
       end
 
       let(:from_db) do
@@ -90,8 +90,8 @@ describe Mongo::Grid::FS do
     context 'when inserting the file more than once' do
 
       after do
-        fs.files_collection.find.remove_many
-        fs.chunks_collection.find.remove_many
+        fs.files_collection.find.delete_many
+        fs.chunks_collection.find.delete_many
       end
 
       it 'raises an error' do
@@ -103,7 +103,7 @@ describe Mongo::Grid::FS do
     end
   end
 
-  describe '#remove_one' do
+  describe '#delete_one' do
 
     let(:fs) do
       described_class.new(authorized_client.database)
@@ -115,7 +115,7 @@ describe Mongo::Grid::FS do
 
     before do
       fs.insert_one(file)
-      fs.remove_one(file)
+      fs.delete_one(file)
     end
 
     let(:from_db) do

data/spec/mongo/index/view_spec.rb

@@ -6,41 +6,33 @@ describe Mongo::Index::View do
     described_class.new(authorized_collection)
   end
 
-  describe '#drop' do
+  describe '#drop_one' do
 
     let(:spec) do
       { another: -1 }
     end
 
     before do
-      view.create(spec, unique: true)
+      view.create_one(spec, unique: true)
     end
 
-    context 'when providing an index spec' do
+    context 'when the index exists' do
 
-      context 'when the index exists' do
-
-        let(:result) do
-          view.drop(spec)
-        end
+      let(:result) do
+        view.drop_one('another_-1')
+      end
 
-        it 'drops the index' do
-          expect(result).to be_successful
-        end
+      it 'drops the index' do
+        expect(result).to be_successful
       end
     end
 
-    context 'when providing an index name' do
-
-      context 'when the index exists' do
-
-        let(:result) do
-          view.drop('another_-1')
-        end
+    context 'when passing a * as the name' do
 
-        it 'drops the index' do
-          expect(result).to be_successful
-        end
+      it 'raises an exception' do
+        expect {
+          view.drop_one('*')
+        }.to raise_error(Mongo::Error::MultiIndexDrop)
       end
     end
   end
@@ -52,7 +44,7 @@ describe Mongo::Index::View do
     end
 
     before do
-      view.create(spec, unique: true)
+      view.create_one(spec, unique: true)
     end
 
     context 'when indexes exists' do
@@ -67,7 +59,76 @@ describe Mongo::Index::View do
     end
   end
 
-  describe '#create' do
+  describe '#create_many' do
+
+    context 'when the indexes are created' do
+
+      context 'when passing multi-args' do
+
+        let(:result) do
+          view.create_many(
+            { key: { random: 1 }, unique: true },
+            { key: { testing: -1 }, unique: true }
+          )
+        end
+
+        after do
+          view.drop_one('random_1')
+          view.drop_one('testing_-1')
+        end
+
+        it 'returns ok' do
+          expect(result).to be_successful
+        end
+      end
+
+      context 'when passing an array' do
+
+        let(:result) do
+          view.create_many([
+            { key: { random: 1 }, unique: true },
+            { key: { testing: -1 }, unique: true }
+          ])
+        end
+
+        after do
+          view.drop_one('random_1')
+          view.drop_one('testing_-1')
+        end
+
+        it 'returns ok' do
+          expect(result).to be_successful
+        end
+      end
+
+      context 'when index creation fails' do
+
+        let(:spec) do
+          { name: 1 }
+        end
+
+        before do
+          view.create_one(spec, unique: true)
+        end
+
+        after do
+          view.drop_one('name_1')
+        end
+
+        it 'raises an exception', if: write_command_enabled? do
+          expect {
+            view.create_many([{ key: { name: 1 }, unique: false }])
+          }.to raise_error(Mongo::Error::OperationFailure)
+        end
+
+        it 'does not raise an exception', unless: write_command_enabled? do
+          expect(view.create_many([{ key: { name: 1 }, unique: false }])).to be_successful
+        end
+      end
+    end
+  end
+
+  describe '#create_one' do
 
     context 'when the index is created' do
 
@@ -76,11 +137,11 @@ describe Mongo::Index::View do
       end
 
       let(:result) do
-        view.create(spec, unique: true)
+        view.create_one(spec, unique: true)
       end
 
       after do
-        view.drop(spec)
+        view.drop_one('random_1')
       end
 
       it 'returns ok' do
@@ -95,21 +156,21 @@ describe Mongo::Index::View do
       end
 
       before do
-        view.create(spec, unique: true)
+        view.create_one(spec, unique: true)
       end
 
       after do
-        view.drop(spec)
+        view.drop_one('name_1')
       end
 
       it 'raises an exception', if: write_command_enabled? do
         expect {
-          view.create(spec, unique: false)
+          view.create_one(spec, unique: false)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
 
       it 'does not raise an exception', unless: write_command_enabled? do
-        expect(view.create(spec, unique: false)).to be_successful
+        expect(view.create_one(spec, unique: false)).to be_successful
       end
     end
 
@@ -120,11 +181,11 @@ describe Mongo::Index::View do
       end
 
       let!(:result) do
-        view.create(spec, unique: true, name: 'random_name')
+        view.create_one(spec, unique: true, name: 'random_name')
       end
 
       after do
-        view.drop('random_name')
+        view.drop_one('random_name')
       end
 
       it 'returns ok' do
@@ -144,11 +205,11 @@ describe Mongo::Index::View do
     end
 
     let!(:result) do
-      view.create(spec, unique: true, name: 'random_name')
+      view.create_one(spec, unique: true, name: 'random_name')
     end
 
     after do
-      view.drop('random_name')
+      view.drop_one('random_name')
     end
 
     context 'when providing a name' do
@@ -190,11 +251,11 @@ describe Mongo::Index::View do
       end
 
       before do
-        view.create(spec, unique: true)
+        view.create_one(spec, unique: true)
       end
 
       after do
-        view.drop(spec)
+        view.drop_one('name_1')
       end
 
       let(:indexes) do
@@ -223,4 +284,47 @@ describe Mongo::Index::View do
       end
     end
   end
+
+  describe '#normalize_models' do
+
+    context 'when providing options' do
+
+      let(:options) do
+        {
+          :key => { :name => 1 },
+          :bucket_size => 5,
+          :default_language => 'deutsch',
+          :expire_after => 10,
+          :language_override => 'language',
+          :sphere_version => 1,
+          :storage_engine => 'wiredtiger',
+          :text_version => 2,
+          :version => 1
+        }
+      end
+
+      let(:models) do
+        view.send(:normalize_models, [ options ])
+      end
+
+      let(:expected) do
+        {
+          :key => { :name => 1 },
+          :name => 'name_1',
+          :bucketSize => 5,
+          :default_language => 'deutsch',
+          :expireAfterSeconds => 10,
+          :language_override => 'language',
+          :'2dsphereIndexVersion' => 1,
+          :storageEngine => 'wiredtiger',
+          :textIndexVersion => 2,
+          :v => 1
+        }
+      end
+
+      it 'maps the ruby options to the server options' do
+        expect(models).to eq([ expected ])
+      end
+    end
+  end
 end