mongo 2.1.0.beta → 2.2.0

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/result_spec.rb

@@ -272,4 +272,23 @@ describe Mongo::Operation::Result do
       end
     end
   end
+
+  context 'when there is a top-level Result class defined' do
+
+    before do
+      class Result
+        def get_result
+          Mongo::Client.new([DEFAULT_ADDRESS], TEST_OPTIONS).database.command(:ping => 1)
+        end
+      end
+    end
+
+    let(:result) do
+      Result.new.get_result
+    end
+
+    it 'uses the Result class of the operation' do
+      expect(result).to be_a(Mongo::Operation::Result)
+    end
+  end
 end

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

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::BulkDelete do
+describe Mongo::Operation::Write::Bulk::Delete do
   include_context 'operation'
 
   let(:documents) do
-    [ { q: { foo: 1 }, limit: 1 } ]
+    [ { 'q' => { foo: 1 }, 'limit' => 1 } ]
   end
 
   let(:spec) do
@@ -42,7 +42,7 @@ describe Mongo::Operation::Write::BulkDelete do
 
       context 'when two ops have different specs' do
         let(:other_docs) do
-          [ { q: { bar: 1 }, limit: 1 } ]
+          [ { 'q' => { bar: 1 }, 'limit' => 1 } ]
         end
 
         let(:other_spec) 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
@@ -100,7 +89,7 @@ describe Mongo::Operation::Write::BulkDelete do
       context 'when the delete succeeds' do
 
         let(:documents) do
-          [{ q: { field: 'test' }, limit: 1 }]
+          [{ 'q' => { field: 'test' }, 'limit' => 1 }]
         end
 
         it 'deletes the document from the database' do
@@ -124,7 +113,7 @@ describe Mongo::Operation::Write::BulkDelete do
       context 'when the deletes succeed' do
 
         let(:documents) do
-          [{ q: { field: 'test' }, limit: 0 }]
+          [{ 'q' => { field: 'test' }, 'limit' => 0 }]
         end
 
         it 'deletes the documents from the database' do
@@ -138,10 +127,10 @@ describe Mongo::Operation::Write::BulkDelete do
 
       let(:documents) do
         [ failing_delete_doc,
-          { q: { field: 'test' }, limit: 1 }
+          { 'q' => { field: 'test' }, 'limit' => 1 }
         ]
       end
-  
+
       let(:spec) do
         { :deletes       => documents,
           :db_name       => TEST_DB,
@@ -150,7 +139,7 @@ describe Mongo::Operation::Write::BulkDelete do
           :ordered       => true
         }
       end
-  
+
       let(:failing_delete) do
         described_class.new(spec)
       end
@@ -162,7 +151,7 @@ describe Mongo::Operation::Write::BulkDelete do
           let(:write_concern) do
             Mongo::WriteConcern.get(w: 1)
           end
-        
+
           it 'aborts after first error' do
             failing_delete.execute(authorized_primary.context)
             expect(authorized_collection.find.count).to eq(2)
@@ -170,11 +159,11 @@ describe Mongo::Operation::Write::BulkDelete do
         end
 
         context 'when write concern is unacknowledged' do
-          
+
           let(:write_concern) do
             Mongo::WriteConcern.get(w: 0)
           end
-      
+
           it 'aborts after first error' do
             failing_delete.execute(authorized_primary.context)
             expect(authorized_collection.find.count).to eq(2)
@@ -187,10 +176,10 @@ describe Mongo::Operation::Write::BulkDelete do
 
       let(:documents) do
         [ failing_delete_doc,
-          { q: { field: 'test' }, limit: 1 }
+          { 'q' => { field: 'test' }, 'limit' => 1 }
         ]
       end
-  
+
       let(:spec) do
         { :deletes       => documents,
           :db_name       => TEST_DB,
@@ -199,7 +188,7 @@ describe Mongo::Operation::Write::BulkDelete do
           :ordered       => false
         }
       end
-  
+
       let(:failing_delete) do
         described_class.new(spec)
       end
@@ -211,7 +200,7 @@ describe Mongo::Operation::Write::BulkDelete do
           let(:write_concern) do
             Mongo::WriteConcern.get(w: 1)
           end
-        
+
           it 'does not abort after first error' do
             failing_delete.execute(authorized_primary.context)
             expect(authorized_collection.find.count).to eq(1)
@@ -219,11 +208,11 @@ describe Mongo::Operation::Write::BulkDelete do
         end
 
         context 'when write concern is unacknowledged' do
-          
+
           let(:write_concern) do
             Mongo::WriteConcern.get(w: 0)
           end
-      
+
           it 'does not abort after first error' do
             failing_delete.execute(authorized_primary.context)
             sleep(1)

data/spec/mongo/operation/write/bulk/{bulk_insert_spec.rb → insert_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::BulkInsert do
+describe Mongo::Operation::Write::Bulk::Insert do
   include_context 'operation'
 
   let(:documents) do
@@ -74,17 +74,6 @@ describe Mongo::Operation::Write::BulkInsert do
     end
   end
 
-  describe '#dup' do
-
-    context 'deep copy' do
-
-      it 'copies the list of documents' do
-        copy = op.dup
-        expect(copy.spec[:documents]).to_not be(op.spec[:documents])
-      end
-    end
-  end
-
   describe 'document ids' do
 
     context 'when documents do not contain an id' do

data/spec/mongo/operation/write/bulk/{bulk_update_spec.rb → update_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::BulkUpdate do
+describe Mongo::Operation::Write::Bulk::Update do
   include_context 'operation'
 
   let(:documents) do
@@ -72,17 +72,6 @@ describe Mongo::Operation::Write::BulkUpdate do
     end
   end
 
-  describe '#dup' do
-
-    context 'deep copy' do
-
-      it 'copies the list of updates' do
-        copy = op.dup
-        expect(copy.spec[:updates]).not_to be(op.spec[:updates])
-      end
-    end
-  end
-
   describe '#execute' do
 
     before do
@@ -101,7 +90,7 @@ describe Mongo::Operation::Write::BulkUpdate do
       context 'when the update passes' do
 
         let(:documents) do
-          [{ q: { other: 'test' }, u: { '$set' => { field: 'blah' }}, multi: false }]
+          [{ 'q' => { other: 'test' }, 'u' => { '$set' => { field: 'blah' }}, 'multi' => false }]
         end
 
         it 'updates the document' do
@@ -125,7 +114,7 @@ describe Mongo::Operation::Write::BulkUpdate do
       context 'when the updates succeed' do
 
         let(:documents) do
-          [{ q: { other: 'test' }, u: { '$set' => { field: 'blah' }}, multi: true }]
+          [{ 'q' => { other: 'test' }, 'u' => { '$set' => { field: 'blah' }}, 'multi' => true }]
         end
 
         it 'updates the documents' do
@@ -138,8 +127,8 @@ describe Mongo::Operation::Write::BulkUpdate do
     context 'when the updates are ordered' do
 
       let(:documents) do
-        [ { q: { name: 'test' }, u: { '$st' => { field: 'blah' }}, multi: true},
-          { q: { field: 'test' }, u: { '$set' => { other: 'blah' }}, multi: true }
+        [ { 'q' => { name: 'test' }, 'u' => { '$st' => { field: 'blah' }}, 'multi' => true},
+          { 'q' => { field: 'test' }, 'u' => { '$set' => { other: 'blah' }}, 'multi' => true }
         ]
       end
 
@@ -187,8 +176,8 @@ describe Mongo::Operation::Write::BulkUpdate do
     context 'when the updates are unordered' do
 
       let(:documents) do
-        [ { q: { name: 'test' }, u: { '$st' => { field: 'blah' }}, multi: true},
-          { q: { field: 'test' }, u: { '$set' => { other: 'blah' }}, multi: false }
+        [ { 'q' => { name: 'test' }, 'u' => { '$st' => { field: 'blah' }}, 'multi' => true},
+          { 'q' => { field: 'test' }, 'u' => { '$set' => { other: 'blah' }}, 'multi' => false }
         ]
       end
 

data/spec/mongo/operation/write/command/delete_spec.rb

@@ -56,19 +56,28 @@ describe Mongo::Operation::Write::Command::Delete do
     end
   end
 
-  context '#merge' do
-    let(:other_op) { described_class.new(spec) }
+  describe 'write concern' do
 
-    it 'is not allowed' do
-      expect{ op.merge(other_op) }.to raise_exception
+    context 'when write concern is not specified' do
+
+      let(:spec) do
+        { :deletes       => deletes,
+          :db_name       => db_name,
+          :coll_name     => coll_name,
+          :ordered       => true
+        }
+      end
+
+      it 'does not include write concern in the selector' do
+        expect(op.send(:selector)[:writeConcern]).to be_nil
+      end
     end
-  end
 
-  context '#merge!' do
-    let(:other_op) { described_class.new(spec) }
+    context 'when write concern is specified' do
 
-    it 'is not allowed' do
-      expect{ op.merge!(other_op) }.to raise_exception
+      it 'includes write concern in the selector' do
+        expect(op.send(:selector)[:writeConcern]).to eq(write_concern.options)
+      end
     end
   end
 

data/spec/mongo/operation/write/command/insert_spec.rb

@@ -56,19 +56,28 @@ describe Mongo::Operation::Write::Command::Insert do
     end
   end
 
-  context '#merge' do
-    let(:other_op) { described_class.new(spec) }
+  describe 'write concern' do
 
-    it 'is not allowed' do
-      expect{ op.merge(other_op) }.to raise_exception
+    context 'when write concern is not specified' do
+
+      let(:spec) do
+        { :documents     => documents,
+          :db_name       => db_name,
+          :coll_name     => coll_name,
+          :ordered       => true
+        }
+      end
+
+      it 'does not include write concern in the selector' do
+        expect(op.send(:selector)[:writeConcern]).to be_nil
+      end
     end
-  end
 
-  context '#merge!' do
-    let(:other_op) { described_class.new(spec) }
+    context 'when write concern is specified' do
 
-    it 'is not allowed' do
-      expect{ op.merge!(other_op) }.to raise_exception
+      it 'includes write concern in the selector' do
+        expect(op.send(:selector)[:writeConcern]).to eq(write_concern.options)
+      end
     end
   end
 

data/spec/mongo/operation/write/command/update_spec.rb

@@ -62,19 +62,28 @@ describe Mongo::Operation::Write::Command::Update do
     end
   end
 
-  context '#merge' do
-    let(:other_op) { described_class.new(spec) }
+  describe 'write concern' do
 
-    it 'is not allowed' do
-      expect{ op.merge(other_op) }.to raise_exception
+    context 'when write concern is not specified' do
+
+      let(:spec) do
+        { :updates       => updates,
+          :db_name       => db_name,
+          :coll_name     => coll_name,
+          :ordered       => true
+        }
+      end
+
+      it 'does not include write concern in the selector' do
+        expect(op.send(:selector)[:writeConcern]).to be_nil
+      end
     end
-  end
 
-  context '#merge!' do
-    let(:other_op) { described_class.new(spec) }
+    context 'when write concern is specified' do
 
-    it 'is not allowed' do
-      expect{ op.merge!(other_op) }.to raise_exception
+      it 'includes write concern in the selector' do
+        expect(op.send(:selector)[:writeConcern]).to eq(write_concern.options)
+      end
     end
   end
 

data/spec/mongo/operation/write/delete_spec.rb

@@ -89,7 +89,7 @@ describe Mongo::Operation::Write::Delete do
       context 'when the delete succeeds' do
 
         let(:document) do
-          { q: { field: 'test' }, limit: 1 }
+          { 'q' => { field: 'test' }, 'limit' => 1 }
         end
 
         let(:result) do
@@ -133,7 +133,7 @@ describe Mongo::Operation::Write::Delete do
       context 'when the deletes succeed' do
 
         let(:document) do
-          { q: { field: 'test' }, limit: 0 }
+          { 'q' => { field: 'test' }, 'limit' => 0 }
         end
 
         let(:result) do
@@ -172,7 +172,7 @@ describe Mongo::Operation::Write::Delete do
       context 'when a document exceeds max bson size' do
 
         let(:document) do
-          { q: { field: 't'*17000000 }, limit: 0 }
+          { 'q' => { field: 't'*17000000 }, 'limit' => 0 }
         end
 
         it 'raises an error' do

data/spec/mongo/operation/write/insert_spec.rb

@@ -73,17 +73,6 @@ describe Mongo::Operation::Write::Insert do
     end
   end
 
-  describe '#dup' do
-
-    context 'deep copy' do
-
-      it 'copies the list of documents' do
-        copy = insert.dup
-        expect(copy.spec[:documents]).to_not be(insert.spec[:documents])
-      end
-    end
-  end
-
   describe 'document ids' do
 
     context 'when documents do not contain an id' do

data/spec/mongo/operation/write/update_spec.rb

@@ -95,7 +95,7 @@ describe Mongo::Operation::Write::Update do
       context 'when the update succeeds' do
 
         let(:document) do
-          { q: { name: 'test' }, u: { '$set' => { field: 'blah' }}, limit: 1 }
+          { 'q' => { name: 'test' }, 'u' => { '$set' => { field: 'blah' }}, limit: 1 }
         end
 
         let(:result) do
@@ -122,7 +122,7 @@ describe Mongo::Operation::Write::Update do
       context 'when the update fails' do
 
         let(:document) do
-          { q: { name: 'test' }, u: { '$st' => { field: 'blah' } } }
+          { 'q' => { name: 'test' }, 'u' => { '$st' => { field: 'blah' } } }
         end
 
         it 'raises an exception' do
@@ -147,7 +147,7 @@ describe Mongo::Operation::Write::Update do
       context 'when the updates succeed' do
 
         let(:document) do
-          { q: { field: 'test' }, u: { '$set' => { other: 'blah' }}, multi: true }
+          { 'q' => { field: 'test' }, 'u' => { '$set' => { other: 'blah' }}, 'multi' => true }
         end
 
         let(:result) do
@@ -174,7 +174,7 @@ describe Mongo::Operation::Write::Update do
       context 'when an update fails' do
 
         let(:document) do
-          { q: { name: 'test' }, u: { '$st' => { field: 'blah' } }, multi: true }
+          { 'q' => { name: 'test' }, 'u' => { '$st' => { field: 'blah' } }, 'multi' => true }
         end
 
         it 'raises an exception' do
@@ -187,7 +187,7 @@ describe Mongo::Operation::Write::Update do
       context 'when a document exceeds max bson size' do
 
         let(:document) do
-          { q: { name: 't'*17000000}, u: { '$set' => { field: 'blah' } } }
+          { 'q' => { name: 't'*17000000}, 'u' => { '$set' => { field: 'blah' } } }
         end
 
         it 'raises an error' do
@@ -200,7 +200,7 @@ describe Mongo::Operation::Write::Update do
       context 'when upsert is true' do
 
         let(:document) do
-          { q: { field: 'non-existent' }, u: { '$set' => { other: 'blah' }}, upsert: true }
+          { 'q' => { field: 'non-existent' }, 'u' => { '$set' => { other: 'blah' }}, 'upsert' => true }
         end
 
         let(:result) do