net-dns 0.9.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dc42ad67563fd2c8dff75111f86d918da967e98b0beb1be2797b5a718081a65
-  data.tar.gz: 7dcdef18fe96bde06059de4953787a4f80f352dd49f4d75d1358e44c286477b5
+  metadata.gz: fec69b4a6e824defa6fb7a25a020a67d0dba5340f2f42b1c489e3b73027b6577
+  data.tar.gz: bd9fcd575cb009fa14ce0443ea3b415f0924a04c3a63be620b350c913b93fe39
 SHA512:
-  metadata.gz: 29ec0713726b0a5b8ff79e3bedc35dbb9ace5f6e98c4b77e5ceaaf814b1220028ef879e426468e5189364ffc028c2d938f2639420f398701656eb2a562f6cf7b
-  data.tar.gz: a515331bf54ce6c5d2d5971979d333043f02b569d4343f3883b99af92c162669eea0aa1287307573c1455a4f257d970a86bf6c0c717a068b8213879190a63460
+  metadata.gz: 3ba5ecc052ddd89bfc5bb264ce0a11edb2aa791b1d6285075f0f96245634b1b73bb69e29e883bd4656a85d6c82e6f331e11cfb66b55a10da27b90221ad61f8d6
+  data.tar.gz: 0ff1b210ef56b91a7dc3d914039bedb7e08803c8838a0eefe1233fef4c97a7e817b06387e45bc6b77354a3efe7f9fc885499efff0aabacb07ac24c3eb75aca15

data/CHANGELOG.md

@@ -1,33 +1,46 @@
 # Changelog
 
 
-## Release 0.9.0
+## Release 0.20.0
 
-- FIXED: Fixed CI run (GH-77).
+- CHANGED: Minimum Ruby version is now 2.7
+
+- CHANGED: Merged changes from gitlab-net-dns @stanhu
+
+- FIXED: Fixed undefined method 'size' errors (GH-46, GH-81) @stanhu
+
+- FIXED: uninitialized constant Net::DNS::Resolver::TimeoutError (GH-82, GH-83, GH-84)
+
+- ADDED: Added URI/SPF/CAA type code
 
-- FIXED: Fixed deprecated references to Fixnum.
+
+## Release 0.9.0
 
 - CHANGED: Major code cleanup.
 
 - CHANGED: Minimum Ruby version is now 2.1
 
+- FIXED: Fixed CI run (GH-77).
+
+- FIXED: Fixed deprecated references to Fixnum.
 
-## Release 0.8.0
 
-- FIXED: undefined local variable or method `source_address_inet6' (GH-40). [Thanks @simsicon]
+## Release 0.8.0
 
-- FIXED: Fixed bug on parsing multiple nameservers on different lines (GH-45). [Thanks @nicholasren]
+- FIXED: undefined local variable or method `source_address_inet6' (GH-40). @simsicon
 
-- CHANGED: Dropped duplicate query ID filter. Query ID is now randomically generated but it's not guaranteed to be unique (GH-39). [Thanks @ebroder]
+- FIXED: Fixed bug on parsing multiple nameservers on different lines (GH-45). @nicholasren
+  
+- CHANGED: Dropped duplicate query ID filter. Query ID is now randomically generated but it's not guaranteed to be unique (GH-39). @ebroder
 
-- CHANGED: require 'net/dns' is now the preferred way to load the library (GH-37). [Thanks @johnroa]
+- CHANGED: require 'net/dns' is now the preferred way to load the library (GH-37). @johnroa
 
 - CHANGED: Removed setup.rb installation script.
 
 
 ## Release 0.7.1
 
-- FIXED: Invalid file permissions on several files (GH-35) [Thanks @jamespharaoh]
+- FIXED: Invalid file permissions on several files (GH-35) @jamespharaoh
 
 
 ## Release 0.7.0
@@ -38,15 +51,15 @@
 
 - FIXED: Cleaned up require dependency and recursive require statements.
 
-- FIXED: Use RbConfig instead of obsolete and deprecated Config (GH-28, GH-33) [Thanks @shadowbq, @eik3]
+- FIXED: Use RbConfig instead of obsolete and deprecated Config (GH-28, GH-33) @shadowbq, @eik3
 
-- FIXED: SRV record not required by Net::DNS::RR (GH-27) [Thanks @sebastian]
+- FIXED: SRV record not required by Net::DNS::RR (GH-27) @sebastian
 
-- FIXED: Resolver now supports IPv6 (GH-32) [Thanks @jamesotron]
+- FIXED: Resolver now supports IPv6 (GH-32) @jamesotron
 
-- FIXED: Net::DNS::RR::PTR references an invalid parameter (GH-19) [Thanks @dd23]
+- FIXED: Net::DNS::RR::PTR references an invalid parameter (GH-19) @dd23
 
-- FIXED: Net::DNS::Question changes input arguments (GH-7) [Thanks @gfarfl]
+- FIXED: Net::DNS::Question changes input arguments (GH-7) @gfarfl
 
 - CHANGED: Refactoring unit test to follow most used Ruby conventions.
 
@@ -67,9 +80,9 @@
 
 - ADDED: Net::DNS::Packet#to_s method (alias of #inspect)
 
-- FIXED: typo in lib/net/dns/rr/ptr.rb [Thanks Chris Lundquist]
+- FIXED: typo in lib/net/dns/rr/ptr.rb. Thanks Chris Lundquist.
 
-- FIXED: warning: method redefined; discarding old inspect (GH-3) [Thanks Kevin Baker]
+- FIXED: warning: method redefined; discarding old inspect (GH-3). Thanks Kevin Baker.
 
 - FIXED: issue with rescue ArgumentError (GH-5) and with IPAddr handling (GH-6)
 

data/README.md

@@ -12,7 +12,7 @@ Net::DNS is a DNS library written in pure Ruby. It started as a port of Perl Net
 
 ## Requirements
 
-Ruby >= 2.1
+Ruby >= 2.6
 
 
 ## Installation

data/lib/net/dns/header.rb

@@ -128,16 +128,16 @@ module Net
                             "",
                             "",].freeze
 
-        attr_reader :code, :type, :explanation
+        attr_reader :code
+        attr_reader :type
+        attr_reader :explanation
 
         def initialize(code)
-          if (0..10).cover? code
-            @code         = code
-            @type         = RCodeType[code]
-            @explanation  = RCodeErrorString[code]
-          else
-            raise ArgumentError, "RCode `#{code}' out of range"
-          end
+          raise ArgumentError, "RCode `#{code}' out of range" unless (0..10).cover? code
+
+          @code         = code
+          @type         = RCodeType[code]
+          @explanation  = RCodeErrorString[code]
         end
 
         def to_s
@@ -205,11 +205,9 @@ module Net
       # See also each option for a detailed explanation of usage.
       #
       def initialize(arg = {})
-        if arg.is_a? Hash
-          new_from_hash(arg)
-        else
-          raise ArgumentError, "Wrong argument class `#{arg.class}'"
-        end
+        raise ArgumentError, "Wrong argument class `#{arg.class}'" unless arg.is_a? Hash
+
+        new_from_hash(arg)
       end
 
       # Creates a new Net::DNS::Header object from binary data, which is
@@ -225,13 +223,11 @@ module Net
       #     #=> "true" if it comes from authoritative name server
       #
       def self.parse(arg)
-        if arg.is_a? String
-          o = allocate
-          o.send(:new_from_binary, arg)
-          o
-        else
-          raise ArgumentError, "Wrong argument class `#{arg.class}'"
-        end
+        raise ArgumentError, "Wrong argument class `#{arg.class}'" unless arg.is_a? String
+
+        o = allocate
+        o.send(:new_from_binary, arg)
+        o
       end
 
       # Inspect method, prints out all the options and relative values.
@@ -251,18 +247,18 @@ module Net
               # do stuff
             else
               ";; qr = #{@qr}\t" \
-              "opCode: #{opCode_str}\t" \
-              "aa = #{@aa}\t" \
-              "tc = #{@tc}\t" \
-              "rd = #{@rd}\n" \
-              ";; ra = #{@ra}\t" \
-              "ad = #{@ad}\t" \
-              "cd = #{@cd}\t" \
-              "rcode = #{@rCode.type}\n" \
-              ";; qdCount = #{@qdCount}\t" \
-              "anCount = #{@anCount}\t" \
-              "nsCount = #{@nsCount}\t" \
-              "arCount = #{@arCount}\n"
+                "opCode: #{opCode_str}\t" \
+                "aa = #{@aa}\t" \
+                "tc = #{@tc}\t" \
+                "rd = #{@rd}\n" \
+                ";; ra = #{@ra}\t" \
+                "ad = #{@ad}\t" \
+                "cd = #{@cd}\t" \
+                "rcode = #{@rCode.type}\n" \
+                ";; qdCount = #{@qdCount}\t" \
+                "anCount = #{@anCount}\t" \
+                "nsCount = #{@nsCount}\t" \
+                "arCount = #{@arCount}\n"
             end
       end
 
@@ -329,11 +325,9 @@ module Net
       # performing security tests.
       #
       def id=(val)
-        if (0..65_535).cover? val
-          @id = val
-        else
-          raise ArgumentError, "ID `#{val}' out of range"
-        end
+        raise ArgumentError, "ID `#{val}' out of range" unless (0..65_535).cover? val
+
+        @id = val
       end
 
       # Checks whether the header is a query (+qr+ bit set to 0)
@@ -392,11 +386,9 @@ module Net
       #   header.opCode = Header::STATUS
       #
       def opCode=(val)
-        if (0..2).cover? val
-          @opCode = val
-        else
-          raise WrongOpcodeError, "Wrong opCode value (#{val}), must be QUERY, IQUERY or STATUS"
-        end
+        raise WrongOpcodeError, "Wrong opCode value (#{val}), must be QUERY, IQUERY or STATUS" unless (0..2).cover? val
+
+        @opCode = val
       end
 
       # Checks whether the response is authoritative
@@ -620,41 +612,33 @@ module Net
       # Sets the number of entries in a question section
       #
       def qdCount=(val)
-        if (0..65_535).cover? val
-          @qdCount = val
-        else
-          raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535"
-        end
+        raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535" unless (0..65_535).cover? val
+
+        @qdCount = val
       end
 
       # Sets the number of RRs in an answer section
       #
       def anCount=(val)
-        if (0..65_535).cover? val
-          @anCount = val
-        else
-          raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535"
-        end
+        raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535" unless (0..65_535).cover? val
+
+        @anCount = val
       end
 
       # Sets the number of RRs in an authority section
       #
       def nsCount=(val)
-        if (0..65_535).cover? val
-          @nsCount = val
-        else
-          raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535"
-        end
+        raise WrongCountError, "Wrong number of count (#{val}), must be 0-65535" unless (0..65_535).cover? val
+
+        @nsCount = val
       end
 
       # Sets the number of RRs in an addictional section
       #
       def arCount=(val)
-        if (0..65_535).cover? val
-          @arCount = val
-        else
-          raise WrongCountError, "Wrong number of count: `#{val}' must be 0-65535"
-        end
+        raise WrongCountError, "Wrong number of count: `#{val}' must be 0-65535" unless (0..65_535).cover? val
+
+        @arCount = val
       end
 
       private
@@ -674,12 +658,12 @@ module Net
         end
 
         arr = str.unpack("n C2 n4")
-        @id          =  arr[0]
+        @id = arr[0]
         @qr          = (arr[1] >> 7) & 0x01
         @opCode      = (arr[1] >> 3) & 0x0F
         @aa          = (arr[1] >> 2) & 0x01
         @tc          = (arr[1] >> 1) & 0x01
-        @rd          =  arr[1] & 0x1
+        @rd = arr[1] & 0x1
         @ra          = (arr[2] >> 7) & 0x01
         @ad          = (arr[2] >> 5) & 0x01
         @cd          = (arr[2] >> 4) & 0x01

data/lib/net/dns/names.rb

@@ -12,7 +12,7 @@ module Net # :nodoc:
       INT16SZ = 2
 
       # Expand a compressed name in a DNS Packet object. Please
-      # see RFC1025 for an explanation of how the compression
+      # see RFC1035 for an explanation of how the compression
       # in DNS packets works, how may it be useful and how should
       # be handled.
       #
@@ -24,9 +24,9 @@ module Net # :nodoc:
         name = ""
         packetlen = packet.size
         loop do
-          raise ExpandError, "Offset is greater than packet lenght!" if packetlen < (offset + 1)
+          raise ExpandError, "Offset is greater than packet length!" if packetlen < (offset + 1)
 
-          len = packet.unpack("@#{offset} C")[0]
+          len = packet.unpack1("@#{offset} C")
 
           if len == 0
             offset += 1
@@ -34,7 +34,7 @@ module Net # :nodoc:
           elsif (len & 0xC0) == 0xC0
             raise ExpandError, "Packet ended before offset expand" if packetlen < (offset + INT16SZ)
 
-            ptr = packet.unpack("@#{offset} n")[0]
+            ptr = packet.unpack1("@#{offset} n")
             ptr &= 0x3FFF
             name2 = dn_expand(packet, ptr)[0]
             raise ExpandError, "Packet is malformed!" if name2.nil?
@@ -98,7 +98,7 @@ module Net # :nodoc:
             offset += INT16SZ
             break
           else
-            len = entry.unpack("C")[0]
+            len = entry.unpack1("C")
             elem = entry[1..len]
             str += [len, elem].pack("Ca*")
             names.update(entry.to_s => offset)
@@ -109,11 +109,9 @@ module Net # :nodoc:
       end
 
       def valid?(name)
-        if name =~ /^([a-z0-9]([-a-z0-9]*[a-z0-9])?\.)+((a[cdefgilmnoqrstuwxz]|aero|arpa)|(b[abdefghijmnorstvwyz]|biz)|(c[acdfghiklmnorsuvxyz]|cat|com|coop)|d[ejkmoz]|(e[ceghrstu]|edu)|f[ijkmor]|(g[abdefghilmnpqrstuwy]|gov)|h[kmnrtu]|(i[delmnoqrst]|info|int)|(j[emop]|jobs)|k[eghimnprwyz]|l[abcikrstuvy]|(m[acdghklmnopqrstuvwxyz]|mil|mobi|museum)|(n[acefgilopruz]|name|net)|(om|org)|(p[aefghklmnrstwy]|pro)|qa|r[eouw]|s[abcdeghijklmnortvyz]|(t[cdfghjklmnoprtvwz]|travel)|u[agkmsyz]|v[aceginu]|w[fs]|y[etu]|z[amw])$/i
-          name
-        else
-          raise ArgumentError, "Invalid FQDN: #{name}"
-        end
+        raise ArgumentError, "Invalid FQDN: #{name}" unless name =~ /^([a-z0-9]([-a-z0-9]*[a-z0-9])?\.)+((a[cdefgilmnoqrstuwxz]|aero|arpa)|(b[abdefghijmnorstvwyz]|biz)|(c[acdfghiklmnorsuvxyz]|cat|com|coop)|d[ejkmoz]|(e[ceghrstu]|edu)|f[ijkmor]|(g[abdefghilmnpqrstuwy]|gov)|h[kmnrtu]|(i[delmnoqrst]|info|int)|(j[emop]|jobs)|k[eghimnprwyz]|l[abcikrstuvy]|(m[acdghklmnopqrstuvwxyz]|mil|mobi|museum)|(n[acefgilopruz]|name|net)|(om|org)|(p[aefghklmnrstwy]|pro)|qa|r[eouw]|s[abcdeghijklmnortvyz]|(t[cdfghjklmnoprtvwz]|travel)|u[agkmsyz]|v[aceginu]|w[fs]|y[etu]|z[amw])$/i
+
+        name
       end
     end
   end

data/lib/net/dns/packet.rb

@@ -90,8 +90,13 @@ module Net
       class PacketError < Error
       end
 
-      attr_reader :header, :question, :answer, :authority, :additional
-      attr_reader :answerfrom, :answersize
+      attr_reader :header
+      attr_reader :question
+      attr_reader :answer
+      attr_reader :authority
+      attr_reader :additional
+      attr_reader :answerfrom
+      attr_reader :answersize
 
       # Creates a new instance of <tt>Net::DNS::Packet</tt> class. Arguments are the
       # canonical name of the resource, an optional type field and an optional
@@ -261,11 +266,9 @@ module Net
       # Assigns a <tt>Net::DNS::Header</tt> <tt>object</tt>
       # to this <tt>Net::DNS::Packet</tt> instance.
       def header=(object)
-        if object.is_a? Net::DNS::Header
-          @header = object
-        else
-          raise ArgumentError, "Argument must be a Net::DNS::Header object"
-        end
+        raise ArgumentError, "Argument must be a Net::DNS::Header object" unless object.is_a? Net::DNS::Header
+
+        @header = object
       end
 
       # Assigns a <tt>Net::DNS::Question</tt> <tt>object</tt>
@@ -273,11 +276,10 @@ module Net
       def question=(object)
         case object
         when Array
-          if object.all? { |x| x.is_a? Net::DNS::Question }
-            @question = object
-          else
-            raise ArgumentError, "Some of the elements is not an Net::DNS::Question object"
-          end
+          raise ArgumentError, "Some of the elements is not an Net::DNS::Question object" unless object.all? { |x| x.is_a? Net::DNS::Question }
+
+          @question = object
+
         when Net::DNS::Question
           @question = [object]
         else
@@ -290,11 +292,10 @@ module Net
       def answer=(object)
         case object
         when Array
-          if object.all? { |x| x.is_a? Net::DNS::RR }
-            @answer = object
-          else
-            raise ArgumentError, "Some of the elements is not an Net::DNS::RR object"
-          end
+          raise ArgumentError, "Some of the elements is not an Net::DNS::RR object" unless object.all? { |x| x.is_a? Net::DNS::RR }
+
+          @answer = object
+
         when Net::DNS::RR
           @answer = [object]
         else
@@ -307,11 +308,10 @@ module Net
       def additional=(object)
         case object
         when Array
-          if object.all? { |x| x.is_a? Net::DNS::RR }
-            @additional = object
-          else
-            raise ArgumentError, "Some of the elements is not an Net::DNS::RR object"
-          end
+          raise ArgumentError, "Some of the elements is not an Net::DNS::RR object" unless object.all? { |x| x.is_a? Net::DNS::RR }
+
+          @additional = object
+
         when Net::DNS::RR
           @additional = [object]
         else
@@ -324,11 +324,10 @@ module Net
       def authority=(object)
         case object
         when Array
-          if object.all? { |x| x.is_a? Net::DNS::RR }
-            @authority = object
-          else
-            raise ArgumentError, "Some of the elements is not an Net::DNS::RR object"
-          end
+          raise ArgumentError, "Some of the elements is not an Net::DNS::RR object" unless object.all? { |x| x.is_a? Net::DNS::RR }
+
+          @authority = object
+
         when Net::DNS::RR
           @authority = [object]
         else
@@ -345,7 +344,7 @@ module Net
       #
       # As you can see in the documentation for the <tt>Net::DNS::RR::A</tt> class,
       # the address returned is an instance of <tt>IPAddr</tt> class.
-      def each_address(&block)
+      def each_address
         @answer.each do |elem|
           next unless elem.class == Net::DNS::RR::A
 
@@ -360,7 +359,7 @@ module Net
       #     puts "Nameserver found: #{ns}"
       #   end
       #
-      def each_nameserver(&block)
+      def each_nameserver
         @answer.each do |elem|
           next unless elem.class == Net::DNS::RR::NS
 
@@ -375,7 +374,7 @@ module Net
       #     puts "Mail exchange #{name} has preference #{pref}"
       #   end
       #
-      def each_mx(&block)
+      def each_mx
         @answer.each do |elem|
           next unless elem.class == Net::DNS::RR::MX
 
@@ -390,7 +389,7 @@ module Net
       #     puts "Canonical name: #{cname}"
       #   end
       #
-      def each_cname(&block)
+      def each_cname
         @answer.each do |elem|
           next unless elem.class == Net::DNS::RR::CNAME
 
@@ -405,7 +404,7 @@ module Net
       #     puts "Pointer for resource: #{ptr}"
       #   end
       #
-      def each_ptr(&block)
+      def each_ptr
         @answer.each do |elem|
           next unless elem.class == Net::DNS::RR::PTR
 
@@ -505,13 +504,11 @@ module Net
 
         @answer = []
         @header.anCount.times do
-          begin
-            rrobj, offset = Net::DNS::RR.parse_packet(data, offset)
-            @answer << rrobj
-            @logger.debug rrobj.inspect
-          rescue NameError => e
-            warn "Net::DNS unsupported record type: #{e.message}"
-          end
+          rrobj, offset = Net::DNS::RR.parse_packet(data, offset)
+          @answer << rrobj
+          @logger.debug rrobj.inspect
+        rescue NameError => e
+          warn "Net::DNS unsupported record type: #{e.message}"
         end
 
         #------------------------------------------------------------
@@ -522,13 +519,11 @@ module Net
 
         @authority = []
         @header.nsCount.times do
-          begin
-            rrobj, offset = Net::DNS::RR.parse_packet(data, offset)
-            @authority << rrobj
-            @logger.debug rrobj.inspect
-          rescue NameError => e
-            warn "Net::DNS unsupported record type: #{e.message}"
-          end
+          rrobj, offset = Net::DNS::RR.parse_packet(data, offset)
+          @authority << rrobj
+          @logger.debug rrobj.inspect
+        rescue NameError => e
+          warn "Net::DNS unsupported record type: #{e.message}"
         end
 
         #------------------------------------------------------------
@@ -538,13 +533,11 @@ module Net
 
         @additional = []
         @header.arCount.times do
-          begin
-            rrobj, offset = Net::DNS::RR.parse_packet(data, offset)
-            @additional << rrobj
-            @logger.debug rrobj.inspect
-          rescue NameError => e
-            warn "Net::DNS unsupported record type: #{e.message}"
-          end
+          rrobj, offset = Net::DNS::RR.parse_packet(data, offset)
+          @additional << rrobj
+          @logger.debug rrobj.inspect
+        rescue NameError => e
+          warn "Net::DNS unsupported record type: #{e.message}"
         end
       end
 

data/lib/net/dns/question.rb

@@ -152,7 +152,7 @@ module Net
         result = ""
         offset = 0
         loop do
-          len = str.unpack("@#{offset} C")[0]
+          len = str.unpack1("@#{offset} C")
           break if len == 0
 
           offset += 1
@@ -165,7 +165,7 @@ module Net
 
       def check_name(input)
         name = input.to_s.strip
-        if name =~ /[^\w\.\-_]/
+        if name =~ /[^\w\.\-_\*]/
           raise NameInvalid, "Invalid Question Name `#{name}'"
         end
 
@@ -173,11 +173,13 @@ module Net
       end
 
       def new_from_binary(data)
+        raise NameInvalid if data.size <= 4
+
         str, type, cls = data.unpack("a#{data.size - 4}nn")
         @qName = build_qName(str)
         @qType = Net::DNS::RR::Types.new type
         @qClass = Net::DNS::RR::Classes.new cls
-      rescue StandardError => e
+      rescue StandardError
         raise ArgumentError, "Invalid data: #{data.inspect}"
       end
     end

data/lib/net/dns/resolver/socks.rb

@@ -50,7 +50,7 @@ class RawSocket # :nodoc:
       [@protocol, 'C'],                   # protocol
       [0, 'n'],                           # checksum
       [@src_addr.to_i, 'N'],              # source
-      [@dest_addr.to_i, 'N'],             # destination
+      [@dest_addr.to_i, 'N'], # destination
     ])
     packet << make_transport_header(payload.size)
     packet << [payload].pack("a*")
@@ -71,11 +71,9 @@ class RawSocket # :nodoc:
   end
 
   def check_port(port)
-    if (1..65_535).cover?(port) && port.is_a?(Integer)
-      port
-    else
-      raise ArgumentError, "Port #{port} not valid"
-    end
+    raise ArgumentError, "Port #{port} not valid" unless (1..65_535).cover?(port) && port.is_a?(Integer)
+
+    port
   end
 
   def genID
@@ -142,7 +140,7 @@ class UdpRawSocket < RawSocket # :nodoc:
       [@src_port, 'n'], # source port
       [@dest_port, 'n'],       # destination port
       [8 + pay_size, 'n'],     # len
-      [0, 'n']                 # checksum (mandatory)
+      [0, 'n'], # checksum (mandatory)
     ])
   end
 end

data/lib/net/dns/resolver/timeouts.rb

@@ -7,11 +7,9 @@ module Net # :nodoc:
         attr_reader :seconds
 
         def initialize(seconds)
-          if seconds.is_a?(Numeric) && seconds >= 0
-            @seconds = seconds
-          else
-            raise ArgumentError, "Invalid value for tcp timeout"
-          end
+          raise ArgumentError, "Invalid value for tcp timeout" unless seconds.is_a?(Numeric) && seconds >= 0
+
+          @seconds = seconds
         end
 
         # Returns a string representation of the timeout corresponding