responding to comments - rewriting tests and moving logic

Author: kyleburgess2025

lib/mongo/srv/result.rb

@@ -118,11 +118,10 @@ def normalize_hostname(host)
       # @raise [ Mongo::Error::MismatchedDomain ] If the record's domain name doesn't match that of
       #   the hostname.
       def validate_same_origin!(record_host)
-        srv_is_less_than_three_parts = query_hostname.split('.').length < 3
-        srv_host_domain = if srv_is_less_than_three_parts
-          query_hostname.split('.')
-        else
-          query_hostname.split('.')[1..-1]
+        srv_host_domain = query_hostname.split('.')
+        srv_is_less_than_three_parts = srv_host_domain.length < 3
+        unless srv_is_less_than_three_parts
+          srv_host_domain = srv_host_domain[1..-1]
         end
         record_host_parts = record_host.split('.')
 

lib/mongo/uri/srv_protocol.rb

@@ -184,7 +184,7 @@ def validate_srv_hostname(hostname)
         if parts.any?(&:empty?)
           raise_invalid_error!("Hostname cannot have consecutive dots: #{hostname}")
         end
-        if parts.length == 0
+        if parts.length < 1
           raise_invalid_error!("Hostname cannot be empty: #{hostname}")
         end
       end

spec/mongo/srv/result_spec.rb

@@ -42,27 +42,30 @@
         let(:host_name) { example_host_names[i] }
         let(:mismatched_host_name) { example_host_names_that_do_not_match_parent[i] }
         context 'when address does not match parent domain' do
-          it 'raises MismatchedDomain error' do
-            record = double('record').tap do |record|
+          let(:record) do
+            double('record').tap do |record|
               allow(record).to receive(:target).and_return(mismatched_host_name)
               allow(record).to receive(:port).and_return(42)
               allow(record).to receive(:ttl).and_return(1)
             end
-
+          end
+          it 'raises MismatchedDomain error' do
             expect {
               result = described_class.new(srv_name)
               result.add_record(record)
             }.to raise_error(Mongo::Error::MismatchedDomain)
           end
         end
+
         context 'when address matches parent domain' do
-          it 'adds the record' do
-            record = double('record').tap do |record|
+          let(:record) do
+            double('record').tap do |record|
               allow(record).to receive(:target).and_return(host_name)
               allow(record).to receive(:port).and_return(42)
               allow(record).to receive(:ttl).and_return(1)
             end
-
+          end
+          it 'adds the record' do
             result = described_class.new(srv_name)
             result.add_record(record)
 
@@ -72,13 +75,14 @@
 
         if i < 2
           context 'when the address is less than 3 parts' do
-            it 'does not accept address if it does not contain an extra domain level' do
-              record = double('record').tap do |record|
+            let(:record) do
+              double('record').tap do |record|
                 allow(record).to receive(:target).and_return(srv_name)
                 allow(record).to receive(:port).and_return(42)
                 allow(record).to receive(:ttl).and_return(1)
               end
-
+            end
+            it 'does not accept address if it does not contain an extra domain level' do
               expect {
                 result = described_class.new(srv_name)
                 result.add_record(record)