mongo 2.0.6 → 2.1.0.beta

data/spec/mongo/client_spec.rb

@@ -448,6 +448,17 @@ describe Mongo::Client do
 
   describe '#with' do
 
+    let(:client) do
+      described_class.new(['127.0.0.1:27017'], :database => TEST_DB)
+    end
+
+    context 'when providing nil' do
+
+      it 'returns the cloned client' do
+        expect(client.with(nil)).to eq(client)
+      end
+    end
+
     context 'when the write concern is not changed' do
 
       let(:client) do
@@ -592,4 +603,35 @@ describe Mongo::Client do
         end).to include('admin')
     end
   end
+
+    describe '#close' do
+
+    let(:client) do
+      described_class.new(['127.0.0.1:27017'])
+    end
+
+    before do
+      expect(client.cluster).to receive(:disconnect!).and_call_original
+    end
+
+    it 'disconnects the cluster and returns true' do
+      expect(client.close).to be(true)
+    end
+  end
+
+  describe '#reconnect' do
+
+    let(:client) do
+      described_class.new(['127.0.0.1:27017'])
+    end
+
+    before do
+      expect(client.cluster).to receive(:reconnect!).and_call_original
+    end
+
+    it 'reconnects the cluster and returns true' do
+      expect(client.reconnect).to be(true)
+      sleep(2)
+    end
+  end
 end

data/spec/mongo/cluster/topology/replica_set_spec.rb

@@ -6,22 +6,30 @@ describe Mongo::Cluster::Topology::ReplicaSet do
     Mongo::Address.new('127.0.0.1:27017')
   end
 
+  let(:listeners) do
+    Mongo::Event::Listeners.new
+  end
+
+  let(:monitoring) do
+    Mongo::Monitoring.new
+  end
+
   describe '#servers' do
 
     let(:mongos) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:standalone) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:replica_set) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:replica_set_two) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:mongos_description) do
@@ -102,11 +110,11 @@ describe Mongo::Cluster::Topology::ReplicaSet do
   describe '#add_hosts?' do
 
     let(:primary) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:secondary) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:primary_description) do
@@ -183,7 +191,7 @@ describe Mongo::Cluster::Topology::ReplicaSet do
   describe '#remove_hosts?' do
 
     let(:primary) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:primary_description) do
@@ -262,7 +270,7 @@ describe Mongo::Cluster::Topology::ReplicaSet do
   describe '#remove_server?' do
 
     let(:secondary) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:secondary_description) do
@@ -346,6 +354,5 @@ describe Mongo::Cluster::Topology::ReplicaSet do
         expect(topology.remove_server?(description, secondary)).to eq(false)
       end
     end
-
   end
 end

data/spec/mongo/cluster/topology/sharded_spec.rb

@@ -10,17 +10,24 @@ describe Mongo::Cluster::Topology::Sharded do
     described_class.new({})
   end
 
+  let(:monitoring) do
+    Mongo::Monitoring.new
+  end
+
+  let(:listeners) do
+    Mongo::Event::Listeners.new
+  end
 
   let(:mongos) do
-    Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+    Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
   end
 
   let(:standalone) do
-    Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+    Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
   end
 
   let(:replica_set) do
-    Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+    Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
   end
 
   let(:mongos_description) do
@@ -99,6 +106,7 @@ describe Mongo::Cluster::Topology::Sharded do
       let(:description) do
         double('description').tap do |d|
           allow(d).to receive(:mongos?).and_return(false)
+          allow(d).to receive(:unknown?).and_return(false)
           allow(d).to receive(:is_server?).and_return(true)
         end
       end

data/spec/mongo/cluster/topology/single_spec.rb

@@ -10,22 +10,30 @@ describe Mongo::Cluster::Topology::Single do
     described_class.new({})
   end
 
+  let(:monitoring) do
+    Mongo::Monitoring.new
+  end
+
+  let(:listeners) do
+    Mongo::Event::Listeners.new
+  end
+
   describe '.servers' do
 
     let(:mongos) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:standalone) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:standalone_two) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:replica_set) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
     end
 
     let(:mongos_description) do

data/spec/mongo/cluster_spec.rb

@@ -2,8 +2,12 @@ require 'spec_helper'
 
 describe Mongo::Cluster do
 
+  let(:monitoring) do
+    Mongo::Monitoring.new
+  end
+
   let(:cluster) do
-    described_class.new(ADDRESSES, TEST_OPTIONS)
+    described_class.new(ADDRESSES, monitoring, TEST_OPTIONS)
   end
 
   describe '#==' do
@@ -15,7 +19,7 @@ describe Mongo::Cluster do
         context 'when the options are the same' do
 
           let(:other) do
-            described_class.new(ADDRESSES, TEST_OPTIONS)
+            described_class.new(ADDRESSES, monitoring, TEST_OPTIONS)
           end
 
           it 'returns true' do
@@ -26,7 +30,7 @@ describe Mongo::Cluster do
         context 'when the options are not the same' do
 
           let(:other) do
-            described_class.new([ '127.0.0.1:27017' ], TEST_OPTIONS.merge(:replica_set => 'test'))
+            described_class.new([ '127.0.0.1:27017' ], monitoring, TEST_OPTIONS.merge(:replica_set => 'test'))
           end
 
           it 'returns false' do
@@ -38,7 +42,7 @@ describe Mongo::Cluster do
       context 'when the addresses are not the same' do
 
         let(:other) do
-          described_class.new([ '127.0.0.1:27018' ], TEST_OPTIONS)
+          described_class.new([ '127.0.0.1:27018' ], monitoring, TEST_OPTIONS)
         end
 
         it 'returns false' do
@@ -76,8 +80,11 @@ describe Mongo::Cluster do
     context 'when the option is provided' do
 
       let(:cluster) do
-        described_class.new([ '127.0.0.1:27017' ], TEST_OPTIONS.merge(:connect => :replica_set,
-                                                                      :replica_set => 'testing'))
+        described_class.new(
+          [ '127.0.0.1:27017' ],
+          monitoring,
+          TEST_OPTIONS.merge(:connect => :replica_set, :replica_set => 'testing')
+        )
       end
 
       it 'returns the name' do
@@ -88,7 +95,7 @@ describe Mongo::Cluster do
     context 'when the option is not provided' do
 
       let(:cluster) do
-        described_class.new([ '127.0.0.1:27017' ], TEST_OPTIONS.dup.delete_if { |k| k == :replica_set })
+        described_class.new([ '127.0.0.1:27017' ], monitoring, TEST_OPTIONS.dup.delete_if { |k| k == :replica_set })
       end
 
       it 'returns nil' do
@@ -210,6 +217,36 @@ describe Mongo::Cluster do
     end
   end
 
+  describe '#disconnect!' do
+
+    let(:known_servers) do
+      cluster.instance_variable_get(:@servers)
+    end
+
+    before do
+      known_servers.each do |server|
+        expect(server).to receive(:disconnect!).and_call_original
+      end
+    end
+
+    it 'disconnects each server and returns true' do
+      expect(cluster.disconnect!).to be(true)
+    end
+  end
+
+  describe '#reconnect!' do
+
+    before do
+      cluster.servers.each do |server|
+        expect(server).to receive(:reconnect!).and_call_original
+      end
+    end
+
+    it 'reconnects each server and returns true' do
+      expect(cluster.reconnect!).to be(true)
+    end
+  end
+
   describe '#remove' do
 
     let(:address_a) do
@@ -220,12 +257,16 @@ describe Mongo::Cluster do
       Mongo::Address.new('127.0.0.1:27018')
     end
 
+    let(:monitoring) do
+      Mongo::Monitoring.new
+    end
+
     let(:server_a) do
-      Mongo::Server.new(address_a, cluster, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address_a, cluster, monitoring, Mongo::Event::Listeners.new)
     end
 
     let(:server_b) do
-      Mongo::Server.new(address_b, cluster, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address_b, cluster, monitoring, Mongo::Event::Listeners.new)
     end
 
     let(:servers) do
@@ -309,8 +350,12 @@ describe Mongo::Cluster do
       Mongo::Address.new('127.0.0.1:27017')
     end
 
+    let(:monitoring) do
+      Mongo::Monitoring.new
+    end
+
     let(:server) do
-      Mongo::Server.new(address, cluster, listeners)
+      Mongo::Server.new(address, cluster, monitoring, listeners)
     end
 
     let(:servers) do

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

@@ -61,7 +61,7 @@ describe Mongo::Collection::View::Aggregation do
     end
 
     after do
-      authorized_collection.find.delete_many
+      authorized_collection.delete_many
     end
 
     context 'when a block is provided' do
@@ -176,6 +176,128 @@ describe Mongo::Collection::View::Aggregation do
       it 'includes the option in the spec' do
         expect(aggregation.send(:aggregate_spec)[:selector][:allowDiskUse]).to eq(true)
       end
+
+      context 'when allow_disk_use is specified as an option' do
+
+        let(:options) do
+          { :allow_disk_use => true }
+        end
+
+        let(:aggregation) do
+          described_class.new(view, pipeline, options)
+        end
+
+        it 'includes the option in the spec' do
+          expect(aggregation.send(:aggregate_spec)[:selector][:allowDiskUse]).to eq(true)
+        end
+
+        context 'when #allow_disk_use is also called' do
+
+          let(:options) do
+            { :allow_disk_use => true }
+          end
+
+          let(:aggregation) do
+            described_class.new(view, pipeline, options).allow_disk_use(false)
+          end
+
+          it 'overrides the first option with the second' do
+            expect(aggregation.send(:aggregate_spec)[:selector][:allowDiskUse]).to eq(false)
+          end
+        end
+      end
+    end
+
+    context 'when max_time_ms is an option' do
+
+      let(:options) do
+        { :max_time_ms => 100 }
+      end
+
+      it 'includes the option in the spec' do
+        expect(aggregation.send(:aggregate_spec)[:selector][:maxTimeMS]).to eq(options[:max_time_ms])
+      end
+    end
+
+    context 'when batch_size is set' do
+
+      context 'when batch_size is set on the view' do
+
+        let(:view_options) do
+          { :batch_size => 10 }
+        end
+
+        it 'uses the batch_size on the view' do
+          expect(aggregation.send(:aggregate_spec)[:selector][:cursor][:batchSize]).to eq(view_options[:batch_size])
+        end
+      end
+
+      context 'when batch_size is provided in the options' do
+
+        let(:options) do
+          { :batch_size => 20 }
+        end
+
+        it 'includes the option in the spec' do
+          expect(aggregation.send(:aggregate_spec)[:selector][:cursor][:batchSize]).to eq(options[:batch_size])
+        end
+
+        context 'when  batch_size is also set on the view' do
+
+          let(:view_options) do
+            { :batch_size => 10 }
+          end
+
+          it 'overrides the view batch_size with the option batch_size' do
+            expect(aggregation.send(:aggregate_spec)[:selector][:cursor][:batchSize]).to eq(options[:batch_size])
+          end
+        end
+      end
+    end
+
+    context 'when use_cursor is set' do
+
+      context 'when use_cursor is true' do
+
+        context 'when batch_size is set' do
+
+          let(:options) do
+            { :use_cursor => true,
+              :batch_size => 10
+            }
+          end
+
+          it 'sets a batch size document in the spec' do
+            expect(aggregation.send(:aggregate_spec)[:selector][:cursor][:batchSize]).to eq(options[:batch_size])
+          end
+        end
+
+        context 'when batch_size is not set' do
+
+          let(:options) do
+            { :use_cursor => true }
+          end
+
+          it 'sets an empty document in the spec' do
+            expect(aggregation.send(:aggregate_spec)[:selector][:cursor]).to eq({})
+          end
+        end
+
+      end
+
+      context 'when use_cursor is false' do
+
+        let(:options) do
+          { :use_cursor => false }
+        end
+
+        context 'when batch_size is set' do
+
+          it 'does not set the cursor option in the spec' do
+            expect(aggregation.send(:aggregate_spec)[:selector][:cursor]).to be_nil
+          end
+        end
+      end
     end
   end
 end