Merge pull request #596 from estolfo/RUBY-891-standalone

estolfo · estolfo · commit 9de099e3beb5 · 2015-04-07T14:57:20.000+02:00
RUBY-891 Rename Standalone topology to Single and add tests
diff --git a/lib/mongo/cluster.rb b/lib/mongo/cluster.rb
@@ -34,7 +34,7 @@ class Cluster
     # @return [ Object ] The cluster topology.
     attr_reader :topology
 
-    def_delegators :topology, :replica_set?, :replica_set_name, :sharded?, :standalone?, :unknown?
+    def_delegators :topology, :replica_set?, :replica_set_name, :sharded?, :single?, :unknown?
 
     # Determine if this cluster of servers is equal to another object. Checks the
     # servers currently in the cluster, not what was configured.
diff --git a/lib/mongo/cluster/topology.rb b/lib/mongo/cluster/topology.rb
@@ -14,7 +14,7 @@
 
 require 'mongo/cluster/topology/replica_set'
 require 'mongo/cluster/topology/sharded'
-require 'mongo/cluster/topology/standalone'
+require 'mongo/cluster/topology/single'
 require 'mongo/cluster/topology/unknown'
 
 module Mongo
@@ -32,17 +32,18 @@ module Topology
       OPTIONS = {
         replica_set: ReplicaSet,
         sharded: Sharded,
-        direct: Standalone
+        direct: Single
       }
 
       # Get the initial cluster topology for the provided options.
       #
       # @example Get the initial cluster topology.
       #   Topology.initial(topology: :replica_set)
       #
+      # @param [ Array<String> ] seeds The addresses of the configured servers.
       # @param [ Hash ] options The cluster options.
       #
-      # @return [ ReplicaSet, Sharded, Standalone ] The topology.
+      # @return [ ReplicaSet, Sharded, Single ] The topology.
       #
       # @since 2.0.0
       def initial(seeds, options)
@@ -52,7 +53,7 @@ def initial(seeds, options)
         if options.has_key?(:replica_set)
           ReplicaSet.new(options)
         else
-          seeds.size > 1 ? Unknown.new(options) : Standalone.new(options)
+          seeds.size > 1 ? Unknown.new(options) : Single.new(options)
         end
       end
     end
diff --git a/lib/mongo/cluster/topology/replica_set.rb b/lib/mongo/cluster/topology/replica_set.rb
@@ -135,15 +135,15 @@ def servers(servers)
         # @since 2.0.0
         def sharded?; false; end
 
-        # A replica set topology is not standalone.
+        # A replica set topology is not single.
         #
-        # @example Is the topology standalone?
-        #   ReplicaSet.standalone?
+        # @example Is the topology single?
+        #   ReplicaSet.single?
         #
         # @return [ false ] Always false.
         #
         # @since 2.0.0
-        def standalone?; false; end
+        def single?; false; end
 
         # A replica set topology is not unknown.
         #
diff --git a/lib/mongo/cluster/topology/sharded.rb b/lib/mongo/cluster/topology/sharded.rb
@@ -107,15 +107,15 @@ def servers(servers)
         # @since 2.0.0
         def sharded?; true; end
 
-        # A sharded topology is not standalone.
+        # A sharded topology is not single.
         #
-        # @example Is the topology standalone?
-        #   Sharded.standalone?
+        # @example Is the topology single?
+        #   Sharded.single?
         #
         # @return [ false ] Always false.
         #
         # @since 2.0.0
-        def standalone?; false; end
+        def single?; false; end
 
         # A sharded topology is not unknown.
         #
diff --git a/lib/mongo/cluster/topology/single.rb b/lib/mongo/cluster/topology/single.rb
@@ -16,20 +16,20 @@ module Mongo
   class Cluster
     module Topology
 
-      # Defines behaviour for when a cluster is in standalone topology.
+      # Defines behaviour for when a cluster is in single topology.
       #
       # @since 2.0.0
-      class Standalone
+      class Single
 
         # The display name for the topology.
         #
         # @since 2.0.0
-        NAME = 'Standalone'.freeze
+        NAME = 'Single'.freeze
 
         # Get the display name.
         #
         # @example Get the display name.
-        #   Standalone.display_name
+        #   Single.display_name
         #
         # @return [ String ] The display name.
         #
@@ -48,13 +48,13 @@ def display_name
         # @param [ Array<Server> ] servers The list of known servers to the
         #   cluster.
         #
-        # @return [ Standalone ] The topology.
+        # @return [ Single ] The topology.
         def elect_primary(description, servers); self; end
 
         # Initialize the topology with the options.
         #
         # @example Initialize the topology.
-        #   Standalone.new(options)
+        #   Single.new(options)
         #
         # @param [ Hash ] options The options.
         #
@@ -63,20 +63,20 @@ def initialize(options)
           @options = options
         end
 
-        # A standalone topology is not a replica set.
+        # A single topology is not a replica set.
         #
         # @example Is the topology a replica set?
-        #   Sharded.replica_set?
+        #   Single.replica_set?
         #
         # @return [ false ] Always false.
         #
         # @since 2.0.0
         def replica_set?; false; end
 
-        # Standalone topologies have no replica set name.
+        # Single topologies have no replica set name.
         #
         # @example Get the replica set name.
-        #   standalone.replica_set_name
+        #   single.replica_set_name
         #
         # @return [ nil ] Always nil.
         #
@@ -86,41 +86,43 @@ def replica_set_name; nil; end
         # Select appropriate servers for this topology.
         #
         # @example Select the servers.
-        #   Standalone.servers(servers, 'test')
+        #   Single.servers(servers, 'test')
         #
         # @param [ Array<Server> ] servers The known servers.
         #
-        # @return [ Array<Server> ] The standalone servers.
+        # @return [ Array<Server> ] The single servers.
         #
         # @since 2.0.0
         def servers(servers, name = nil)
-          [ servers.detect{ |server| server.standalone? } ]
+          [ servers.detect do |server|
+              !server.unknown? && !server.arbiter? && !server.ghost?
+            end ]
         end
 
-        # A standalone topology is not sharded.
+        # A single topology is not sharded.
         #
         # @example Is the topology sharded?
-        #   Standalone.sharded?
+        #   Single.sharded?
         #
         # @return [ false ] Always false.
         #
         # @since 2.0.0
         def sharded?; false; end
 
-        # A standalone topology is standalone.
+        # A single topology is single.
         #
-        # @example Is the topology standalone?
-        #   Standalone.standalone?
+        # @example Is the topology single?
+        #   Single.single?
         #
         # @return [ true ] Always true.
         #
         # @since 2.0.0
-        def standalone?; true; end
+        def single?; true; end
 
-        # An standalone topology is not unknown.
+        # An single topology is not unknown.
         #
         # @example Is the topology unknown?
-        #   Standalone.unknown?
+        #   Single.unknown?
         #
         # @return [ false ] Always false.
         #
diff --git a/lib/mongo/cluster/topology/unknown.rb b/lib/mongo/cluster/topology/unknown.rb
@@ -118,15 +118,15 @@ def servers(servers)
         # @since 2.0.0
         def sharded?; false; end
 
-        # An unknown topology is not standalone.
+        # An unknown topology is not single.
         #
-        # @example Is the topology standalone?
-        #   Unknown.standalone?
+        # @example Is the topology single?
+        #   Unknown.single?
         #
         # @return [ true ] Always false.
         #
         # @since 2.0.0
-        def standalone?; false; end
+        def single?; false; end
 
         # An unknown topology is unknown.
         #
diff --git a/lib/mongo/server_selector/selectable.rb b/lib/mongo/server_selector/selectable.rb
@@ -86,7 +86,7 @@ def initialize(tag_sets = [], options = {})
       def select_server(cluster)
         deadline = Time.now + server_selection_timeout
         while (deadline - Time.now) > 0
-          if cluster.standalone?
+          if cluster.single?
             servers = cluster.servers
           elsif cluster.sharded?
             servers = near_servers(cluster.servers)
@@ -136,7 +136,7 @@ def local_threshold
       # @since 2.0.0
       def primary(candidates)
         candidates.select do |server|
-          server.primary? || server.standalone?
+          server.primary?
         end
       end
 
diff --git a/spec/mongo/cluster/topology/replica_set_spec.rb b/spec/mongo/cluster/topology/replica_set_spec.rb
@@ -92,10 +92,10 @@
     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
diff --git a/spec/mongo/cluster/topology/sharded_spec.rb b/spec/mongo/cluster/topology/sharded_spec.rb
@@ -65,10 +65,10 @@
     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
diff --git a/spec/mongo/cluster/topology/single_spec.rb b/spec/mongo/cluster/topology/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')
@@ -70,10 +70,10 @@
     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
diff --git a/spec/mongo/cluster/topology_spec.rb b/spec/mongo/cluster/topology_spec.rb
@@ -15,14 +15,14 @@
       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
     end
 
@@ -56,8 +56,30 @@
           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
diff --git a/spec/mongo/cluster_spec.rb b/spec/mongo/cluster_spec.rb
@@ -126,4 +126,28 @@
       expect(cluster.scan!).to be true
     end
   end
+
+  describe '#servers' do
+
+    context 'when topology is single', if: single_seed? do
+
+      let(:cluster) do
+        described_class.new(ADDRESSES)
+      end
+
+      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
+  end
 end
diff --git a/spec/mongo/database_spec.rb b/spec/mongo/database_spec.rb
@@ -158,7 +158,7 @@
     context 'when an alternate read preference is specified' do
 
       before do
-        allow(database.cluster).to receive(:standalone?).and_return(false)
+        allow(database.cluster).to receive(:single?).and_return(false)
       end
 
       let(:read) do
diff --git a/spec/mongo/server_selection_spec.rb b/spec/mongo/server_selection_spec.rb
@@ -17,7 +17,7 @@
       let(:cluster) do
         double('cluster').tap do |c|
           allow(c).to receive(:topology).and_return(topology)
-          allow(c).to receive(:standalone?).and_return(topology.standalone?)
+          allow(c).to receive(:single?).and_return(topology.single?)
           allow(c).to receive(:sharded?).and_return(topology.sharded?)
           allow(c).to receive(:replica_set?).and_return(topology.replica_set?)
         end
diff --git a/spec/mongo/server_selector_spec.rb b/spec/mongo/server_selector_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
diff --git a/spec/support/server_discovery_and_monitoring.rb b/spec/support/server_discovery_and_monitoring.rb
diff --git a/spec/support/server_selection.rb b/spec/support/server_selection.rb

Original file line number	Diff line number	Diff line change
`@@ -135,15 +135,15 @@ def servers(servers)`
`135`	`135`	`# @since 2.0.0`
`136`	`136`	`def sharded?; false; end`
`137`	`137`
`138`		`- # A replica set topology is not standalone.`
	`138`	`+ # A replica set topology is not single.`
`139`	`139`	`#`
`140`		`- # @example Is the topology standalone?`
`141`		`- # ReplicaSet.standalone?`
	`140`	`+ # @example Is the topology single?`
	`141`	`+ # ReplicaSet.single?`
`142`	`142`	`#`
`143`	`143`	`# @return [ false ] Always false.`
`144`	`144`	`#`
`145`	`145`	`# @since 2.0.0`
`146`		`- def standalone?; false; end`
	`146`	`+ def single?; false; end`
`147`	`147`
`148`	`148`	`# A replica set topology is not unknown.`
`149`	`149`	`#`
Original file line number	Diff line number	Diff line change
`@@ -107,15 +107,15 @@ def servers(servers)`
`107`	`107`	`# @since 2.0.0`
`108`	`108`	`def sharded?; true; end`
`109`	`109`
`110`		`- # A sharded topology is not standalone.`
	`110`	`+ # A sharded topology is not single.`
`111`	`111`	`#`
`112`		`- # @example Is the topology standalone?`
`113`		`- # Sharded.standalone?`
	`112`	`+ # @example Is the topology single?`
	`113`	`+ # Sharded.single?`
`114`	`114`	`#`
`115`	`115`	`# @return [ false ] Always false.`
`116`	`116`	`#`
`117`	`117`	`# @since 2.0.0`
`118`		`- def standalone?; false; end`
	`118`	`+ def single?; false; end`
`119`	`119`
`120`	`120`	`# A sharded topology is not unknown.`
`121`	`121`	`#`
Original file line number	Diff line number	Diff line change
`@@ -16,20 +16,20 @@ module Mongo`
`16`	`16`	`class Cluster`
`17`	`17`	`module Topology`
`18`	`18`
`19`		`- # Defines behaviour for when a cluster is in standalone topology.`
	`19`	`+ # Defines behaviour for when a cluster is in single topology.`
`20`	`20`	`#`
`21`	`21`	`# @since 2.0.0`
`22`		`- class Standalone`
	`22`	`+ class Single`
`23`	`23`
`24`	`24`	`# The display name for the topology.`
`25`	`25`	`#`
`26`	`26`	`# @since 2.0.0`
`27`		`- NAME = 'Standalone'.freeze`
	`27`	`+ NAME = 'Single'.freeze`
`28`	`28`
`29`	`29`	`# Get the display name.`
`30`	`30`	`#`
`31`	`31`	`# @example Get the display name.`
`32`		`- # Standalone.display_name`
	`32`	`+ # Single.display_name`
`33`	`33`	`#`
`34`	`34`	`# @return [ String ] The display name.`
`35`	`35`	`#`
`@@ -48,13 +48,13 @@ def display_name`
`48`	`48`	`# @param [ Array<Server> ] servers The list of known servers to the`
`49`	`49`	`# cluster.`
`50`	`50`	`#`
`51`		`- # @return [ Standalone ] The topology.`
	`51`	`+ # @return [ Single ] The topology.`
`52`	`52`	`def elect_primary(description, servers); self; end`
`53`	`53`
`54`	`54`	`# Initialize the topology with the options.`
`55`	`55`	`#`
`56`	`56`	`# @example Initialize the topology.`
`57`		`- # Standalone.new(options)`
	`57`	`+ # Single.new(options)`
`58`	`58`	`#`
`59`	`59`	`# @param [ Hash ] options The options.`
`60`	`60`	`#`
`@@ -63,20 +63,20 @@ def initialize(options)`
`63`	`63`	`@options = options`
`64`	`64`	`end`
`65`	`65`
`66`		`- # A standalone topology is not a replica set.`
	`66`	`+ # A single topology is not a replica set.`
`67`	`67`	`#`
`68`	`68`	`# @example Is the topology a replica set?`
`69`		`- # Sharded.replica_set?`
	`69`	`+ # Single.replica_set?`
`70`	`70`	`#`
`71`	`71`	`# @return [ false ] Always false.`
`72`	`72`	`#`
`73`	`73`	`# @since 2.0.0`
`74`	`74`	`def replica_set?; false; end`
`75`	`75`
`76`		`- # Standalone topologies have no replica set name.`
	`76`	`+ # Single topologies have no replica set name.`
`77`	`77`	`#`
`78`	`78`	`# @example Get the replica set name.`
`79`		`- # standalone.replica_set_name`
	`79`	`+ # single.replica_set_name`
`80`	`80`	`#`
`81`	`81`	`# @return [ nil ] Always nil.`
`82`	`82`	`#`
`@@ -86,41 +86,43 @@ def replica_set_name; nil; end`
`86`	`86`	`# Select appropriate servers for this topology.`
`87`	`87`	`#`
`88`	`88`	`# @example Select the servers.`
`89`		`- # Standalone.servers(servers, 'test')`
	`89`	`+ # Single.servers(servers, 'test')`
`90`	`90`	`#`
`91`	`91`	`# @param [ Array<Server> ] servers The known servers.`
`92`	`92`	`#`
`93`		`- # @return [ Array<Server> ] The standalone servers.`
	`93`	`+ # @return [ Array<Server> ] The single servers.`
`94`	`94`	`#`
`95`	`95`	`# @since 2.0.0`
`96`	`96`	`def servers(servers, name = nil)`
`97`		`- [ servers.detect{ \|server\| server.standalone? } ]`
	`97`	`+ [ servers.detect do \|server\|`
	`98`	`+ !server.unknown? && !server.arbiter? && !server.ghost?`
	`99`	`+ end ]`
`98`	`100`	`end`
`99`	`101`
`100`		`- # A standalone topology is not sharded.`
	`102`	`+ # A single topology is not sharded.`
`101`	`103`	`#`
`102`	`104`	`# @example Is the topology sharded?`
`103`		`- # Standalone.sharded?`
	`105`	`+ # Single.sharded?`
`104`	`106`	`#`
`105`	`107`	`# @return [ false ] Always false.`
`106`	`108`	`#`
`107`	`109`	`# @since 2.0.0`
`108`	`110`	`def sharded?; false; end`
`109`	`111`
`110`		`- # A standalone topology is standalone.`
	`112`	`+ # A single topology is single.`
`111`	`113`	`#`
`112`		`- # @example Is the topology standalone?`
`113`		`- # Standalone.standalone?`
	`114`	`+ # @example Is the topology single?`
	`115`	`+ # Single.single?`
`114`	`116`	`#`
`115`	`117`	`# @return [ true ] Always true.`
`116`	`118`	`#`
`117`	`119`	`# @since 2.0.0`
`118`		`- def standalone?; true; end`
	`120`	`+ def single?; true; end`
`119`	`121`
`120`		`- # An standalone topology is not unknown.`
	`122`	`+ # An single topology is not unknown.`
`121`	`123`	`#`
`122`	`124`	`# @example Is the topology unknown?`
`123`		`- # Standalone.unknown?`
	`125`	`+ # Single.unknown?`
`124`	`126`	`#`
`125`	`127`	`# @return [ false ] Always false.`
`126`	`128`	`#`
Original file line number	Diff line number	Diff line change
`@@ -118,15 +118,15 @@ def servers(servers)`
`118`	`118`	`# @since 2.0.0`
`119`	`119`	`def sharded?; false; end`
`120`	`120`
`121`		`- # An unknown topology is not standalone.`
	`121`	`+ # An unknown topology is not single.`
`122`	`122`	`#`
`123`		`- # @example Is the topology standalone?`
`124`		`- # Unknown.standalone?`
	`123`	`+ # @example Is the topology single?`
	`124`	`+ # Unknown.single?`
`125`	`125`	`#`
`126`	`126`	`# @return [ true ] Always false.`
`127`	`127`	`#`
`128`	`128`	`# @since 2.0.0`
`129`		`- def standalone?; false; end`
	`129`	`+ def single?; false; end`
`130`	`130`
`131`	`131`	`# An unknown topology is unknown.`
`132`	`132`	`#`