mongo 2.1.0.rc0 → 2.1.0

data/spec/mongo/collection_spec.rb

@@ -470,6 +470,50 @@ describe Mongo::Collection do
       end
     end
 
+    context 'when the user is not authorized' do
+
+      let(:view) do
+        unauthorized_collection.find
+      end
+
+      it 'iterates over the documents' do
+        expect {
+          view.each{ |document| document }
+        }.to raise_error(Mongo::Error::OperationFailure)
+      end
+    end
+
+    context 'when documents contain potential error message fields' do
+
+      [ Mongo::Error::ERRMSG, Mongo::Error::ERROR, Mongo::Operation::Result::OK ].each do |field|
+
+        context "when the document contains a '#{field}' field" do
+
+          let(:value) do
+            'testing'
+          end
+
+          let(:view) do
+            authorized_collection.find
+          end
+
+          before do
+            authorized_collection.insert_one({ field => value })
+          end
+
+          after do
+            authorized_collection.delete_many
+          end
+
+          it 'iterates over the documents' do
+            view.each do |document|
+              expect(document[field]).to eq(value)
+            end
+          end
+        end
+      end
+    end
+
     context 'when provided options' do
 
       let(:view) do

data/spec/mongo/connection_string_spec.rb

@@ -11,78 +11,56 @@ describe 'ConnectionString' do
 
       before(:all) do
 
-        class Mongo::Address
+        module Mongo
+          class Address
 
-          private
+            private
 
-          def initialize_resolver!(timeout, ssl_options)
-            family = (host == 'localhost') ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
-            info = ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM)
-            FAMILY_MAP[info.first[4]].new(info[3], port, host)
+            alias :original_initialize_resolver! :initialize_resolver!
+            def initialize_resolver!(timeout, ssl_options)
+              family = (host == 'localhost') ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
+              info = ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM)
+              FAMILY_MAP[info.first[4]].new(info[3], port, host)
+            end
           end
-        end
 
-        class Mongo::Server
+          class Server
+
+            # The constructor keeps the same API, but does not instantiate a
+            # monitor and run it.
+            alias :original_initialize :initialize
+            def initialize(address, cluster, monitoring, event_listeners, options = {})
+              @address = address
+              @cluster = cluster
+              @monitoring = monitoring
+              @options = options.freeze
+              @monitor = Monitor.new(address, event_listeners, options)
+            end
 
-          # The constructor keeps the same API, but does not instantiate a
-          # monitor and run it.
-          def initialize(address, cluster, monitoring, event_listeners, options = {})
-            @address = address
-            @cluster = cluster
-            @monitoring = monitoring
-            @options = options.freeze
-            @monitor = Monitor.new(address, event_listeners, options)
+            # Disconnect simply needs to return true since we have no monitor and
+            # no connection.
+            alias :original_disconnect! :disconnect!
+            def disconnect!; true; end
           end
-
-          # Disconnect simply needs to return true since we have no monitor and
-          # no connection.
-          def disconnect!; true; end
         end
       end
 
       after(:all) do
 
-        # Return the server implementation to its original for the other
-        # tests in the suite.
-        class Mongo::Server
-
-          # Returns the constructor to its original implementation.
-          def initialize(address, cluster, monitoring, event_listeners, options = {})
-            @address = address
-            @cluster = cluster
-            @monitoring = monitoring
-            @options = options.freeze
-            @monitor = Monitor.new(address, event_listeners, options)
-            @monitor.scan!
-            @monitor.run!
+        module Mongo
+          # Return the implementations to their originals for the other
+          # tests in the suite.
+          class Address
+            alias :initialize_resolver! :original_initialize_resolver!
+            remove_method(:original_initialize_resolver!)
           end
 
-          # Returns disconnect! to its original implementation.
-          def disconnect!
-            context.with_connection do |connection|
-              connection.disconnect!
-            end
-            @monitor.stop! and true
-          end
-        end
+          class Server
+            alias :initialize :original_initialize
+            remove_method(:original_initialize)
 
-        class Mongo::Address
-
-          private
-
-          def initialize_resolver!(timeout, ssl_options)
-            family = (host == 'localhost') ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
-            error = nil
-            ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM).each do |info|
-              begin
-                res = FAMILY_MAP[info[4]].new(info[3], port, host)
-                res.socket(timeout, ssl_options).connect!.close
-                return res
-              rescue IOError, SystemCallError, Error::SocketError => e
-                error = e
-              end
-            end
-            raise error
+            alias :disconnect! :original_disconnect!
+            remove_method(:original_disconnect!)
           end
         end
       end

data/spec/mongo/database_spec.rb

@@ -93,6 +93,26 @@ describe Mongo::Database do
         expect(database.collection_names(batch_size: 1).to_a).to include('users')
       end
     end
+
+    context 'when there are more collections than the initial batch size' do
+
+      before do
+        200.times do |i|
+          database["#{i}_dalmatians"].create
+        end
+      end
+
+      after do
+        200.times do |i|
+          database["#{i}_dalmatians"].drop
+        end
+      end
+
+      it 'returns all collections' do
+        expect(database.collection_names.select { |c| c =~ /dalmatians/}.size).to eq(200)
+      end
+
+    end
   end
 
   describe '#list_collections' do

data/spec/mongo/grid/fs_bucket_spec.rb

@@ -55,7 +55,7 @@ describe Mongo::Grid::FSBucket do
         end
 
         let(:read_pref) do
-          Mongo::ServerSelector.get(options[:read].merge(authorized_client.options))
+          Mongo::ServerSelector.get(Mongo::Options::Redacted.new(options[:read].merge(authorized_client.options)))
         end
 
         it 'sets the read preference' do

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

@@ -87,14 +87,14 @@ describe Mongo::Grid::FSBucket::Stream::Write do
         context 'when chunks are inserted' do
 
           it 'uses that write concern' do
-            expect(stream.send(:chunks_collection).write_concern.options).to eq(expected)
+            expect(stream.send(:chunks_collection).write_concern.options[:w]).to eq(expected[:w])
           end
         end
 
         context 'when a files document is inserted' do
 
           it 'uses that write concern' do
-            expect(stream.send(:files_collection).write_concern.options).to eq(expected)
+            expect(stream.send(:files_collection).write_concern.options[:w]).to eq(expected[:w])
           end
         end
       end

data/spec/mongo/monitoring/event/command_started_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Mongo::Monitoring::Event::CommandStarted do
+
+  describe '#initialize' do
+
+    let(:address) do
+      Mongo::Address.new('127.0.0.1:27017')
+    end
+
+    let(:command) do
+      BSON::Document.new(test: 'value')
+    end
+
+    context 'when the command should be redacted' do
+
+      let(:event) do
+        described_class.new('copydb', 'admin', address, 1, 2, command)
+      end
+
+      it 'sets the command to an empty document' do
+        expect(event.command).to be_empty
+      end
+    end
+  end
+end

data/spec/mongo/monitoring/event/command_succeeded_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Mongo::Monitoring::Event::CommandSucceeded do
+
+  describe '#initialize' do
+
+    let(:address) do
+      Mongo::Address.new('127.0.0.1:27017')
+    end
+
+    let(:reply) do
+      BSON::Document.new(test: 'value')
+    end
+
+    context 'when the reply should be redacted' do
+
+      let(:event) do
+        described_class.new('copydb', 'admin', address, 1, 2, reply, 0.5)
+      end
+
+      it 'sets the reply to an empty document' do
+        expect(event.reply).to be_empty
+      end
+    end
+  end
+end

data/spec/mongo/monitoring/event/secure_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Mongo::Monitoring::Event::Secure do
+
+  let(:document) do
+    BSON::Document.new(test: 'value')
+  end
+
+  let(:klass) do
+    Class.new do
+      include Mongo::Monitoring::Event::Secure
+    end
+  end
+
+  describe '#redacted' do
+
+    let(:secure) do
+      klass.new
+    end
+
+    context 'when the command must be redacted' do
+
+      context 'when the command name is a string' do
+
+        let(:redacted) do
+          secure.redacted('saslStart', document)
+        end
+
+        it 'returns an empty document' do
+          expect(redacted).to be_empty
+        end
+      end
+
+      context 'when the command name is a symbol' do
+
+        let(:redacted) do
+          secure.redacted(:saslStart, document)
+        end
+
+        it 'returns an empty document' do
+          expect(redacted).to be_empty
+        end
+      end
+    end
+
+    context 'when the command is not in the redacted list' do
+
+      let(:redacted) do
+        secure.redacted(:find, document)
+      end
+
+      it 'returns the document' do
+        expect(redacted).to eq(document)
+      end
+    end
+  end
+end

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

@@ -49,22 +49,6 @@ describe Mongo::Operation::Aggregate 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 'when the aggregation fails' do

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

@@ -38,24 +38,6 @@ describe Mongo::Operation::Command do
     end
   end
 
-  context '#merge' do
-
-    let(:other_op) { described_class.new(spec) }
-
-    it 'raises an exception' do
-      expect{ op.merge(other_op) }.to raise_exception
-    end
-  end
-
-  context '#merge!' do
-
-    let(:other_op) { described_class.new(spec) }
-
-    it 'raises an exception' do
-      expect{ op.merge!(other_op) }.to raise_exception
-    end
-  end
-
   describe '#execute' do
 
     context 'when the command succeeds' do

data/spec/mongo/operation/kill_cursors_spec.rb

@@ -27,22 +27,6 @@ describe Mongo::Operation::KillCursors 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 'message' do

data/spec/mongo/operation/read/get_more_spec.rb

@@ -39,22 +39,6 @@ describe Mongo::Operation::Read::GetMore 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 'message' do

data/spec/mongo/operation/read/query_spec.rb

@@ -42,22 +42,6 @@ describe Mongo::Operation::Read::Query 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 '#message' do
 
     let(:query_options) do
@@ -98,6 +82,25 @@ describe Mongo::Operation::Read::Query do
         op.execute(primary_context)
       end
     end
+
+    context "when the document contains an 'ok' field" do
+
+      before do
+        authorized_collection.insert_one(ok: false)
+      end
+
+      after do
+        authorized_collection.delete_many
+      end
+
+      let(:context) do
+        authorized_client.cluster.next_primary.context
+      end
+
+      it 'does not raise an exception' do
+        expect(op.execute(context)).to be_a(Mongo::Operation::Read::Query::Result)
+      end
+    end
   end
 end