mongo 2.0.2 → 2.0.3

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.3'.freeze
 end

data/spec/mongo/address/ipv4_spec.rb

@@ -2,12 +2,33 @@ require 'spec_helper'
 
 describe Mongo::Address::IPv4 do
 
+  let(:resolver) do
+    described_class.new(*described_class.parse(address))
+  end
+
+  describe 'self.parse' do
+
+    context 'when a port is provided' do
+
+      it 'returns the host and port' do
+        expect(described_class.parse('127.0.0.1:27017')).to eq(['127.0.0.1', 27017])
+      end
+    end
+
+    context 'when no port is provided' do
+
+      it 'returns the host and port' do
+        expect(described_class.parse('127.0.0.1')).to eq(['127.0.0.1', 27017])
+      end
+    end
+  end
+
   describe '#initialize' do
 
     context 'when a port is provided' do
 
-      let(:resolver) do
-        described_class.new('127.0.0.1:27017')
+      let(:address) do
+        '127.0.0.1:27017'
       end
 
       it 'sets the port' do
@@ -21,8 +42,8 @@ describe Mongo::Address::IPv4 do
 
     context 'when no port is provided' do
 
-      let(:resolver) do
-        described_class.new('127.0.0.1')
+      let(:address) do
+        '127.0.0.1'
       end
 
       it 'sets the port to 27017' do
@@ -37,8 +58,8 @@ describe Mongo::Address::IPv4 do
 
   describe '#socket' do
 
-    let(:resolver) do
-      described_class.new('127.0.0.1')
+    let(:address) do
+      '127.0.0.1'
     end
 
     context 'when ssl options are provided' do

data/spec/mongo/address/ipv6_spec.rb

@@ -2,12 +2,33 @@ require 'spec_helper'
 
 describe Mongo::Address::IPv6 do
 
+  let(:resolver) do
+    described_class.new(*described_class.parse(address))
+  end
+
+  describe 'self.parse' do
+
+    context 'when a port is provided' do
+
+      it 'returns the host and port' do
+        expect(described_class.parse('[::1]:27017')).to eq(['::1', 27017])
+      end
+    end
+
+    context 'when no port is provided' do
+
+      it 'returns the host and port' do
+        expect(described_class.parse('[::1]')).to eq(['::1', 27017])
+      end
+    end
+  end
+
   describe '#initialize' do
 
     context 'when a port is provided' do
 
-      let(:resolver) do
-        described_class.new('[::1]:27017')
+      let(:address) do
+        '[::1]:27017'
       end
 
       it 'sets the port' do
@@ -21,8 +42,8 @@ describe Mongo::Address::IPv6 do
 
     context 'when no port is provided' do
 
-      let(:resolver) do
-        described_class.new('[::1]')
+      let(:address) do
+        '[::1]'
       end
 
       it 'sets the port to 27017' do
@@ -37,8 +58,8 @@ describe Mongo::Address::IPv6 do
 
   describe '#socket' do
 
-    let(:resolver) do
-      described_class.new('[::1]')
+    let(:address) do
+      '[::1]'
     end
 
     context 'when ssl options are provided' do

data/spec/mongo/address/unix_spec.rb

@@ -2,10 +2,21 @@ require 'spec_helper'
 
 describe Mongo::Address::Unix do
 
+  let(:resolver) do
+    described_class.new(*described_class.parse(address))
+  end
+
+  describe 'self.parse' do
+
+    it 'returns the host and no port' do
+      expect(described_class.parse('/path/to/socket.sock')).to eq(['/path/to/socket.sock'])
+    end
+  end
+
   describe '#initialize' do
 
-    let(:resolver) do
-      described_class.new('/path/to/socket.sock')
+    let(:address) do
+      '/path/to/socket.sock'
     end
 
     it 'sets the host' do
@@ -15,8 +26,8 @@ describe Mongo::Address::Unix do
 
   describe '#socket' do
 
-    let(:resolver) do
-      described_class.new('/path/to/socket.sock')
+    let(:address) do
+      '/path/to/socket.sock'
     end
 
     let(:socket) do

data/spec/mongo/auth/cr_spec.rb

@@ -7,11 +7,11 @@ describe Mongo::Auth::CR do
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new)
+    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
   end
 
   let(:connection) do
-    Mongo::Server::Connection.new(server)
+    Mongo::Server::Connection.new(server, TEST_OPTIONS)
   end
 
   describe '#login' do

data/spec/mongo/auth/ldap_spec.rb

@@ -7,11 +7,11 @@ describe Mongo::Auth::LDAP do
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new)
+    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
   end
 
   let(:connection) do
-    Mongo::Server::Connection.new(server)
+    Mongo::Server::Connection.new(server, TEST_OPTIONS)
   end
 
   let(:user) do

data/spec/mongo/auth/scram_spec.rb

@@ -7,11 +7,11 @@ describe Mongo::Auth::SCRAM do
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new)
+    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
   end
 
   let(:connection) do
-    Mongo::Server::Connection.new(server)
+    Mongo::Server::Connection.new(server, TEST_OPTIONS)
   end
 
   describe '#login' do

data/spec/mongo/auth/x509_spec.rb

@@ -7,11 +7,11 @@ describe Mongo::Auth::X509 do
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new)
+    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
   end
 
   let(:connection) do
-    Mongo::Server::Connection.new(server)
+    Mongo::Server::Connection.new(server, TEST_OPTIONS)
   end
 
   let(:user) do

data/spec/mongo/client_spec.rb

@@ -2,6 +2,14 @@ require 'spec_helper'
 
 describe Mongo::Client do
 
+  before do
+    if running_ssl?
+      allow_any_instance_of(Mongo::Server::Monitor).to receive(:ismaster) do
+        [{}, 1]
+      end
+    end
+  end
+
   describe '#==' do
 
     let(:client) do

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

@@ -9,19 +9,19 @@ describe Mongo::Cluster::Topology::ReplicaSet do
   describe '#servers' do
 
     let(:mongos) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:standalone) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:replica_set) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:replica_set_two) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:mongos_description) do
@@ -92,10 +92,10 @@ describe Mongo::Cluster::Topology::ReplicaSet do
     end
   end
 
-  describe '.standalone?' do
+  describe '.single?' do
 
     it 'returns false' do
-      expect(described_class.new({})).to_not be_standalone
+      expect(described_class.new({})).to_not be_single
     end
   end
 end

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

@@ -13,15 +13,15 @@ describe Mongo::Cluster::Topology::Sharded do
   describe '.servers' do
 
     let(:mongos) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:standalone) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:replica_set) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:mongos_description) do
@@ -65,10 +65,10 @@ describe Mongo::Cluster::Topology::Sharded do
     end
   end
 
-  describe '.standalone?' do
+  describe '.single?' do
 
     it 'returns false' do
-      expect(topology).to_not be_standalone
+      expect(topology).to_not be_single
     end
   end
 end

data/spec/mongo/cluster/topology/{standalone_spec.rb → single_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Cluster::Topology::Standalone do
+describe Mongo::Cluster::Topology::Single do
 
   let(:address) do
     Mongo::Address.new('127.0.0.1:27017')
@@ -13,19 +13,19 @@ describe Mongo::Cluster::Topology::Standalone do
   describe '.servers' do
 
     let(:mongos) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:standalone) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:standalone_two) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:replica_set) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:mongos_description) do
@@ -70,10 +70,10 @@ describe Mongo::Cluster::Topology::Standalone do
     end
   end
 
-  describe '.standalone?' do
+  describe '.single?' do
 
     it 'returns true' do
-      expect(topology).to be_standalone
+      expect(topology).to be_single
     end
   end
 end

data/spec/mongo/cluster/topology_spec.rb

@@ -15,14 +15,18 @@ describe Mongo::Cluster::Topology do
       end
     end
 
-    context 'when provided a standalone option' do
+    context 'when provided a single option' do
 
       let(:topology) do
         described_class.initial([ 'a' ], connect: :direct)
       end
 
-      it 'returns a standalone topology' do
-        expect(topology).to be_a(Mongo::Cluster::Topology::Standalone)
+      it 'returns a single topology' do
+        expect(topology).to be_a(Mongo::Cluster::Topology::Single)
+      end
+
+      it 'sets the seed on the topology' do
+        expect(topology.seed).to eq('a')
       end
     end
 
@@ -56,8 +60,30 @@ describe Mongo::Cluster::Topology do
           described_class.initial([], {})
         end
 
-        it 'returns a standalone topology' do
-          expect(topology).to be_a(Mongo::Cluster::Topology::Standalone)
+        it 'returns a single topology' do
+          expect(topology).to be_a(Mongo::Cluster::Topology::Single)
+        end
+      end
+
+      context 'when provided a single mongos', if: single_mongos? do
+
+        let(:topology) do
+          described_class.initial(ADDRESSES, {})
+        end
+
+        it 'returns a single topology' do
+          expect(topology).to be_a(Mongo::Cluster::Topology::Single)
+        end
+      end
+
+      context 'when provided a single replica set member', if: single_rs_member? do
+
+        let(:topology) do
+          described_class.initial(ADDRESSES, {})
+        end
+
+        it 'returns a single topology' do
+          expect(topology).to be_a(Mongo::Cluster::Topology::Single)
         end
       end
     end

data/spec/mongo/cluster_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe Mongo::Cluster do
 
-  describe '#==' do
+  let(:cluster) do
+    described_class.new(ADDRESSES, TEST_OPTIONS)
+  end
 
-    let(:cluster) do
-      described_class.new([ '127.0.0.1:27017' ])
-    end
+  describe '#==' do
 
     context 'when the other is a cluster' do
 
@@ -15,7 +15,7 @@ describe Mongo::Cluster do
         context 'when the options are the same' do
 
           let(:other) do
-            described_class.new([ '127.0.0.1:27017' ])
+            described_class.new(ADDRESSES, TEST_OPTIONS)
           end
 
           it 'returns true' do
@@ -26,7 +26,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' ], :replica_set => 'test')
+            described_class.new([ '127.0.0.1:27017' ], TEST_OPTIONS.merge(:replica_set => 'test'))
           end
 
           it 'returns false' do
@@ -38,7 +38,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' ])
+          described_class.new([ '127.0.0.1:27018' ], TEST_OPTIONS)
         end
 
         it 'returns false' do
@@ -61,10 +61,6 @@ describe Mongo::Cluster do
       Mongo::ServerSelector.get
     end
 
-    let(:cluster) do
-      described_class.new([ '127.0.0.1:27017' ])
-    end
-
     it 'displays the cluster seeds and topology' do
       expect(cluster.inspect).to include('topology')
       expect(cluster.inspect).to include('servers')
@@ -77,14 +73,10 @@ describe Mongo::Cluster do
       Mongo::ServerSelector.get
     end
 
-    let(:cluster) do
-      described_class.new([ '127.0.0.1:27017' ], :replica_set => 'testing')
-    end
-
     context 'when the option is provided' do
 
       let(:cluster) do
-        described_class.new([ '127.0.0.1:27017' ], :replica_set => 'testing')
+        described_class.new([ '127.0.0.1:27017' ], TEST_OPTIONS.merge(:replica_set => 'testing'))
       end
 
       it 'returns the name' do
@@ -95,7 +87,7 @@ describe Mongo::Cluster do
     context 'when the option is not provided' do
 
       let(:cluster) do
-        described_class.new([ '127.0.0.1:27017' ])
+        described_class.new([ '127.0.0.1:27017' ], TEST_OPTIONS)
       end
 
       it 'returns nil' do
@@ -110,10 +102,6 @@ describe Mongo::Cluster do
       Mongo::ServerSelector.get
     end
 
-    let(:cluster) do
-      described_class.new([ '127.0.0.1:27017' ])
-    end
-
     let(:known_servers) do
       cluster.instance_variable_get(:@servers)
     end
@@ -126,4 +114,98 @@ describe Mongo::Cluster do
       expect(cluster.scan!).to be true
     end
   end
+
+  describe '#servers' do
+
+    context 'when topology is single', if: single_seed? do
+
+      context 'when the server is a mongos', if: single_mongos?  do
+
+        it 'returns the mongos' do
+          expect(cluster.servers.size).to eq(1)
+        end
+      end
+
+      context 'when the server is a replica set member', if: single_rs_member? do
+
+        it 'returns the replica set member' do
+          expect(cluster.servers.size).to eq(1)
+        end
+      end
+    end
+
+    context 'when the cluster has no servers' do
+
+      let(:servers) do
+        [nil]
+      end
+
+      before do
+        cluster.instance_variable_set(:@servers, servers)
+        cluster.instance_variable_set(:@topology, topology)
+      end
+
+      context 'when topology is Single' do
+
+        let(:topology) do
+          Mongo::Cluster::Topology::Single.new({})
+        end
+
+        it 'returns an empty array' do
+          expect(cluster.servers).to eq([])
+        end
+      end
+
+      context 'when topology is ReplicaSet' do
+
+        let(:topology) do
+          Mongo::Cluster::Topology::ReplicaSet.new({})
+        end
+
+        it 'returns an empty array' do
+          expect(cluster.servers).to eq([])
+        end
+      end
+
+      context 'when topology is Sharded' do
+
+        let(:topology) do
+          Mongo::Cluster::Topology::Sharded.new({})
+        end
+
+        it 'returns an empty array' do
+          expect(cluster.servers).to eq([])
+        end
+      end
+
+      context 'when topology is Unknown' do
+
+        let(:topology) do
+          Mongo::Cluster::Topology::Unknown.new({})
+        end
+
+        it 'returns an empty array' do
+          expect(cluster.servers).to eq([])
+        end
+      end
+    end
+  end
+
+  describe '#add' do
+
+    context 'when topology is Single' do
+
+      let(:topology) do
+        Mongo::Cluster::Topology::Single.new({})
+      end
+
+      before do
+        cluster.add('a')
+      end
+
+      it 'does not add discovered servers to the cluster' do
+        expect(cluster.servers[0].address.seed).to_not eq('a')
+      end
+    end
+  end
 end