mongo 2.1.0.rc0 → 2.1.0

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

@@ -4,7 +4,7 @@ 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::Bulk::Delete 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
@@ -89,7 +89,7 @@ describe Mongo::Operation::Write::Bulk::Delete 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
@@ -113,7 +113,7 @@ describe Mongo::Operation::Write::Bulk::Delete 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
@@ -127,10 +127,10 @@ describe Mongo::Operation::Write::Bulk::Delete 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,
@@ -139,7 +139,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
           :ordered       => true
         }
       end
-  
+
       let(:failing_delete) do
         described_class.new(spec)
       end
@@ -151,7 +151,7 @@ describe Mongo::Operation::Write::Bulk::Delete 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)
@@ -159,11 +159,11 @@ describe Mongo::Operation::Write::Bulk::Delete 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)
@@ -176,10 +176,10 @@ describe Mongo::Operation::Write::Bulk::Delete 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,
@@ -188,7 +188,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
           :ordered       => false
         }
       end
-  
+
       let(:failing_delete) do
         described_class.new(spec)
       end
@@ -200,7 +200,7 @@ describe Mongo::Operation::Write::Bulk::Delete 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)
@@ -208,11 +208,11 @@ describe Mongo::Operation::Write::Bulk::Delete 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/update_spec.rb

@@ -90,7 +90,7 @@ describe Mongo::Operation::Write::Bulk::Update 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
@@ -114,7 +114,7 @@ describe Mongo::Operation::Write::Bulk::Update 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
@@ -127,8 +127,8 @@ describe Mongo::Operation::Write::Bulk::Update 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
 
@@ -176,8 +176,8 @@ describe Mongo::Operation::Write::Bulk::Update 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,22 +56,6 @@ describe Mongo::Operation::Write::Command::Delete do
     end
   end
 
-  context '#merge' do
-    let(:other_op) { described_class.new(spec) }
-
-    it 'is not allowed' do
-      expect{ op.merge(other_op) }.to raise_exception
-    end
-  end
-
-  context '#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
 
     context 'server' do

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

@@ -56,22 +56,6 @@ describe Mongo::Operation::Write::Command::Insert do
     end
   end
 
-  context '#merge' do
-    let(:other_op) { described_class.new(spec) }
-
-    it 'is not allowed' do
-      expect{ op.merge(other_op) }.to raise_exception
-    end
-  end
-
-  context '#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
 
     context 'server' do

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

@@ -62,22 +62,6 @@ describe Mongo::Operation::Write::Command::Update do
     end
   end
 
-  context '#merge' do
-    let(:other_op) { described_class.new(spec) }
-
-    it 'is not allowed' do
-      expect{ op.merge(other_op) }.to raise_exception
-    end
-  end
-
-  context '#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
 
     context 'server' do

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/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

data/spec/mongo/options/redacted_spec.rb

@@ -0,0 +1,350 @@
+require 'spec_helper'
+
+describe Mongo::Options::Redacted do
+
+  let(:options) do
+    described_class.new(original_opts)
+  end
+
+  describe '#to_s' do
+
+    context 'when the hash contains a sensitive key' do
+
+      let(:original_opts) do
+        { password: 'sensitive_data' }
+      end
+
+      it 'replaces the value with the redacted string' do
+        expect(options.to_s).not_to match(original_opts[:password])
+      end
+
+      it 'replaces the value with the redacted string' do
+        expect(options.to_s).to match(Mongo::Options::Redacted::STRING_REPLACEMENT)
+      end
+    end
+
+    context 'when the hash does not contain a sensitive key' do
+
+      let(:original_opts) do
+        { user: 'emily' }
+      end
+
+      it 'prints all the values' do
+        expect(options.to_s).to match(original_opts[:user])
+      end
+    end
+  end
+
+  describe '#inspect' do
+
+    context 'when the hash contains a sensitive key' do
+
+      let(:original_opts) do
+        { password: 'sensitive_data' }
+      end
+
+      it 'replaces the value with the redacted string' do
+        expect(options.inspect).not_to match(original_opts[:password])
+      end
+
+      it 'replaces the value with the redacted string' do
+        expect(options.inspect).to match(Mongo::Options::Redacted::STRING_REPLACEMENT)
+      end
+    end
+
+    context 'when the hash does not contain a sensitive key' do
+
+      let(:original_opts) do
+        { name: 'some_name' }
+      end
+
+      it 'does not replace the value with the redacted string' do
+        expect(options.inspect).to match(original_opts[:name])
+      end
+
+      it 'does not replace the value with the redacted string' do
+        expect(options.inspect).not_to match(Mongo::Options::Redacted::STRING_REPLACEMENT)
+      end
+    end
+  end
+
+  describe '#has_key?' do
+
+    context 'when the original key is a String' do
+
+      let(:original_opts) do
+        { 'name' => 'Emily' }
+      end
+
+      context 'when the method argument is a String' do
+
+        it 'returns true' do
+          expect(options.has_key?('name')).to be(true)
+        end
+      end
+
+      context 'when method argument is a Symbol' do
+
+        it 'returns true' do
+          expect(options.has_key?(:name)).to be(true)
+        end
+      end
+    end
+
+    context 'when the original key is a Symbol' do
+
+      let(:original_opts) do
+        { name: 'Emily' }
+      end
+
+      context 'when the method argument is a String' do
+
+        it 'returns true' do
+          expect(options.has_key?('name')).to be(true)
+        end
+      end
+
+      context 'when method argument is a Symbol' do
+
+        it 'returns true' do
+          expect(options.has_key?(:name)).to be(true)
+        end
+      end
+    end
+
+    context 'when the hash does not contain the key' do
+
+      let(:original_opts) do
+        { other: 'Emily' }
+      end
+
+      context 'when the method argument is a String' do
+
+        it 'returns false' do
+          expect(options.has_key?('name')).to be(false)
+        end
+      end
+
+      context 'when method argument is a Symbol' do
+
+        it 'returns false' do
+          expect(options.has_key?(:name)).to be(false)
+        end
+      end
+    end
+  end
+
+  describe '#reject' do
+
+    let(:options) do
+      described_class.new(a: 1, b: 2, c: 3)
+    end
+
+    context 'when no block is provided' do
+
+      it 'returns an enumerable' do
+        expect(options.reject).to be_a(Enumerator)
+      end
+    end
+
+    context 'when a block is provided' do
+
+      context 'when the block evaluates to true for some pairs' do
+
+        let(:result) do
+          options.reject { |k,v| k == 'a' }
+        end
+
+        it 'returns an object consisting of only the remaining pairs' do
+          expect(result).to eq(described_class.new(b: 2, c: 3))
+        end
+
+        it 'returns a new object' do
+          expect(result).not_to be(options)
+        end
+      end
+
+      context 'when the block does not evaluate to true for any pairs' do
+
+        let(:result) do
+          options.reject { |k,v| k == 'd' }
+        end
+
+        it 'returns an object with all pairs intact' do
+          expect(result).to eq(described_class.new(a: 1, b: 2, c: 3))
+        end
+
+        it 'returns a new object' do
+          expect(result).not_to be(options)
+        end
+      end
+    end
+  end
+
+  describe '#reject!' do
+
+    let(:options) do
+      described_class.new(a: 1, b: 2, c: 3)
+    end
+
+    context 'when no block is provided' do
+
+      it 'returns an enumerable' do
+        expect(options.reject).to be_a(Enumerator)
+      end
+    end
+
+    context 'when a block is provided' do
+
+      context 'when the block evaluates to true for some pairs' do
+
+        let(:result) do
+          options.reject! { |k,v| k == 'a' }
+        end
+
+        it 'returns an object consisting of only the remaining pairs' do
+          expect(result).to eq(described_class.new(b: 2, c: 3))
+        end
+
+        it 'returns the same object' do
+          expect(result).to be(options)
+        end
+      end
+
+      context 'when the block does not evaluate to true for any pairs' do
+
+        let(:result) do
+          options.reject! { |k,v| k == 'd' }
+        end
+
+        it 'returns nil' do
+          expect(result).to be(nil)
+        end
+      end
+    end
+  end
+
+  describe '#select' do
+
+    let(:options) do
+      described_class.new(a: 1, b: 2, c: 3)
+    end
+
+    context 'when no block is provided' do
+
+      it 'returns an enumerable' do
+        expect(options.reject).to be_a(Enumerator)
+      end
+    end
+
+    context 'when a block is provided' do
+
+      context 'when the block evaluates to true for some pairs' do
+
+        let(:result) do
+          options.select { |k,v| k == 'a' }
+        end
+
+        it 'returns an object consisting of those pairs' do
+          expect(result).to eq(described_class.new(a: 1))
+        end
+
+        it 'returns a new object' do
+          expect(result).not_to be(options)
+        end
+      end
+
+      context 'when the block does not evaluate to true for any pairs' do
+
+        let(:result) do
+          options.select { |k,v| k == 'd' }
+        end
+
+        it 'returns an object with no pairs' do
+          expect(result).to eq(described_class.new)
+        end
+
+        it 'returns a new object' do
+          expect(result).not_to be(options)
+        end
+      end
+
+      context 'when the object is unchanged' do
+
+        let(:options) do
+          described_class.new(a: 1, b: 2, c: 3)
+        end
+
+        let(:result) do
+          options.select { |k,v| ['a', 'b', 'c'].include?(k) }
+        end
+
+        it 'returns a new object' do
+          expect(result).to eq(described_class.new(a: 1, b: 2, c: 3))
+        end
+      end
+    end
+  end
+
+  describe '#select!' do
+
+    let(:options) do
+      described_class.new(a: 1, b: 2, c: 3)
+    end
+
+    context 'when no block is provided' do
+
+      it 'returns an enumerable' do
+        expect(options.reject).to be_a(Enumerator)
+      end
+    end
+
+    context 'when a block is provided' do
+
+      context 'when the block evaluates to true for some pairs' do
+
+        let(:result) do
+          options.select! { |k,v| k == 'a' }
+        end
+
+        it 'returns an object consisting of those pairs' do
+          expect(result).to eq(described_class.new(a: 1))
+        end
+
+        it 'returns the same object' do
+          expect(result).to be(options)
+        end
+      end
+
+      context 'when the block does not evaluate to true for any pairs' do
+
+        let(:result) do
+          options.select! { |k,v| k == 'd' }
+        end
+
+        it 'returns an object with no pairs' do
+          expect(result).to eq(described_class.new)
+        end
+
+        it 'returns the same object' do
+          expect(result).to be(options)
+        end
+      end
+
+      context 'when the object is unchanged' do
+
+        let(:options) do
+          described_class.new(a: 1, b: 2, c: 3)
+        end
+
+        let(:result) do
+          options.select! { |k,v| ['a', 'b', 'c'].include?(k) }
+        end
+
+        it 'returns nil' do
+          expect(result).to be(nil)
+        end
+      end
+    end
+  end
+end