RUBY-1096 Small typo fixes and spec cleanup

Author: estolfo

lib/mongo/cluster/topology/sharded.rb

@@ -68,7 +68,7 @@ def elect_primary(description, servers); self; end
         # @param [ ServerSelector ] server_selector The server
         #   selector.
         #
-        # @return [ true, false ] If a readable server is present.
+        # @return [ true ] A Sharded cluster always has a readable server.
         #
         # @since 2.4.0
         def has_readable_server?(cluster, server_selector = nil); true; end
@@ -81,7 +81,7 @@ def has_readable_server?(cluster, server_selector = nil); true; end
         #
         # @param [ Cluster ] cluster The cluster.
         #
-        # @return [ true, false ] If a writable server is present.
+        # @return [ true ] A Sharded cluster always has a writable server.
         #
         # @since 2.4.0
         def has_writable_server?(cluster); true; end

lib/mongo/cluster/topology/single.rb

@@ -71,7 +71,7 @@ def elect_primary(description, servers); self; end
         # @param [ ServerSelector ] server_selector The server
         #   selector.
         #
-        # @return [ true, false ] If a readable server is present.
+        # @return [ true ] A standalone always has a readable server.
         #
         # @since 2.4.0
         def has_readable_server?(cluster, server_selector = nil); true; end
@@ -84,7 +84,7 @@ def has_readable_server?(cluster, server_selector = nil); true; end
         #
         # @param [ Cluster ] cluster The cluster.
         #
-        # @return [ true, false ] If a writable server is present.
+        # @return [ true ] A standalone always has a writable server.
         #
         # @since 2.4.0
         def has_writable_server?(cluster); true; end

lib/mongo/cluster/topology/unknown.rb

@@ -77,7 +77,7 @@ def elect_primary(description, servers)
         # @param [ ServerSelector ] server_selector The server
         #   selector.
         #
-        # @return [ true, false ] If a readable server is present.
+        # @return [ false ] An Unknown topology will never have a readable server.
         #
         # @since 2.4.0
         def has_readable_server?(cluster, server_selector = nil); false; end
@@ -90,7 +90,7 @@ def has_readable_server?(cluster, server_selector = nil); false; end
         #
         # @param [ Cluster ] cluster The cluster.
         #
-        # @return [ true, false ] If a writable server is present.
+        # @return [ false ] An Unknown topology will never have a writable server.
         #
         # @since 2.4.0
         def has_writable_server?(cluster); false; end

lib/mongo/event/description_changed.rb

@@ -22,7 +22,7 @@ module Event
     class DescriptionChanged
       include Monitoring::Publishable
 
-      # @return [ Mongo::Cluster ] cluster The event publisher.
+      # @return [ Mongo::Cluster ] cluster The cluster.
       attr_reader :cluster
 
       # @return [ Hash ] options The options.

lib/mongo/event/member_discovered.rb

@@ -21,7 +21,7 @@ module Event
     class MemberDiscovered
       include Monitoring::Publishable
 
-      # @return [ Mongo::Cluster ] cluster The event publisher.
+      # @return [ Mongo::Cluster ] cluster The cluster.
       attr_reader :cluster
 
       # @return [ Hash ] options The options.
@@ -44,7 +44,7 @@ def initialize(cluster)
         @monitoring = cluster.monitoring
       end
 
-      # This event tells the cluster that a member of a known topology is discovered.
+      # This event tells the cluster that a member of a topology is discovered.
       #
       # @example Handle the event.
       #   member_discovered.handle(previous_description, description)

lib/mongo/event/primary_elected.rb

@@ -20,7 +20,7 @@ module Event
     # @since 2.0.0
     class PrimaryElected
 
-      # @return [ Mongo::Cluster ] cluster The event publisher.
+      # @return [ Mongo::Cluster ] cluster The cluster.
       attr_reader :cluster
 
       # Initialize the new primary elected event handler.

lib/mongo/event/standalone_discovered.rb

@@ -20,7 +20,7 @@ module Event
     # @since 2.0.6
     class StandaloneDiscovered
 
-      # @return [ Mongo::Cluster ] cluster The event publisher.
+      # @return [ Mongo::Cluster ] cluster The cluster.
       attr_reader :cluster
 
       # Initialize the new standalone discovered event handler.

lib/mongo/server/description.rb

@@ -519,7 +519,8 @@ def standalone?
       #
       # @since 2.0.0
       def unknown?
-        config.empty? || config[Operation::Result::OK] != 1
+        config.empty? || (config[Operation::Result::OK] &&
+                            config[Operation::Result::OK] != 1)
       end
 
       # A result from another server's ismaster command before this server has
@@ -610,14 +611,15 @@ def me_mismatch?
       # @since 2.0.6
       def ==(other)
         return false if self.class != other.class
+        return false if unknown? || other.unknown?
         compare_config(other)
       end
       alias_method :eql?, :==
 
       private
 
       def compare_config(other)
-        !config.keys.empty? && config.keys.all? do |k|
+        config.keys.all? do |k|
           config[k] == other.config[k] || EXCLUDE_FOR_COMPARISON.include?(k)
         end
       end

lib/mongo/server/description/inspector/description_changed.rb

@@ -46,7 +46,7 @@ def initialize(event_listeners)
           #
           # @since 2.0.0
           def run(description, updated)
-            unless (description.config.empty? && updated.config.empty?) || (description == updated)
+            unless (description.unknown? && updated.unknown?) || (description == updated)
               publish(Event::DESCRIPTION_CHANGED, description, updated)
             end
           end

spec/mongo/cluster_spec.rb

@@ -344,7 +344,6 @@
       let(:topology) do
         double('topology').tap do |t|
           allow(t).to receive(:add_hosts?).and_return(true)
-          allow(t).to receive(:changed!).and_return(true)
         end
       end
 
@@ -359,7 +358,6 @@
       let(:topology) do
         double('topology').tap do |t|
           allow(t).to receive(:add_hosts?).and_return(false)
-          allow(t).to receive(:changed!).and_return(true)
         end
       end
 
@@ -408,7 +406,6 @@
           double('topology').tap do |t|
             allow(t).to receive(:remove_hosts?).and_return(true)
             allow(t).to receive(:remove_server?).and_return(true)
-            allow(t).to receive(:changed!).and_return(true)
           end
         end
 
@@ -429,7 +426,6 @@
           double('topology').tap do |t|
             allow(t).to receive(:remove_hosts?).and_return(true)
             allow(t).to receive(:remove_server?).and_return(false)
-            allow(t).to receive(:changed!).and_return(true)
           end
         end
 
@@ -450,7 +446,6 @@
       let(:topology) do
         double('topology').tap do |t|
           allow(t).to receive(:remove_hosts?).and_return(false)
-          allow(t).to receive(:changed!).and_return(true)
         end
       end