whois 4.0.6 → 6.0.3

data/lib/whois/client.rb

@@ -1,19 +1,19 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
-require 'timeout'
+require "timeout"
 
 
 module Whois
-
   class Client
-
     # The maximum time to run a WHOIS query, expressed in seconds.
     #
     # @return [Fixnum] Timeout value in seconds.
@@ -88,13 +88,11 @@ module Whois
     #
     def lookup(object)
       string = object.to_s.downcase
-      Timeout::timeout(timeout) do
+      Timeout.timeout(timeout) do
         @server = Server.guess(string)
         @server.configure(settings)
         @server.lookup(string)
       end
     end
-
   end
-
 end

data/lib/whois/errors.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
-
   # The base error class for all <tt>Whois</tt> error classes.
   class Error < StandardError
   end
@@ -69,9 +70,8 @@ module Whois
 
   # Raised when the class has found a server but it doesn't support the
   # standard WHOIS interface via port 43. This is the case of some
-  # specific domains that only provide a web–based WHOIS interface. (\x01)
+  # specific domains that only provide a web-based WHOIS interface. (\x01)
   class WebInterfaceError < InterfaceNotSupported
-
     # @return [String] The URL of the web-based WHOIS interface.
     attr_reader :url
 
@@ -82,9 +82,7 @@ module Whois
       @url = url
       super("This TLD has no WHOIS server, but you can access the WHOIS database at `#{@url}'")
     end
-
   end
 
   # @!endgroup
-
 end

data/lib/whois/record/part.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
   class Record
-
     # A single {Whois::Record} fragment. For instance,
     # in case of *thin server*, a {Whois::Record} can be composed by
     # one or more parts corresponding to all responses
@@ -20,12 +21,11 @@ module Whois
     # @attr [String] body The body containing the WHOIS output.
     # @attr [String] host The host which returned the body.
     #
-    class Part < Struct.new(:body, :host)
-
+    Part = Struct.new(:body, :host) do
       def initialize(*args)
         if args.first.is_a? Hash
           initialize_with_hash(args.first)
-        elsif args.size == 0
+        elsif args.empty?
           super
         else
           raise ArgumentError
@@ -41,6 +41,5 @@ module Whois
         end
       end
     end
-
   end
 end

data/lib/whois/record.rb

@@ -1,20 +1,19 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
-require 'whois/record/part'
+require "whois/record/part"
 
 
 module Whois
-
   class Record
-
-
     # @return [Whois::Server] The server that originated this record.
     attr_reader :server
 
@@ -65,7 +64,7 @@ module Whois
       end
     end
 
-    alias_method :eql?, :==
+    alias eql? ==
 
 
     # Invokes {#match} on record {#content}
@@ -111,7 +110,5 @@ module Whois
     def content
       @content ||= parts.map(&:body).join("\n")
     end
-
   end
-
 end

data/lib/whois/server/adapters/afilias.rb

@@ -1,23 +1,23 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
   class Server
     module Adapters
-
       #
       # = Afilias Adapter
       #
       # Provides ability to query Afilias WHOIS interfaces.
       #
       class Afilias < Base
-
         # Executes a WHOIS query to the Afilias WHOIS interface,
         # resolving any intermediate referral,
         # and appends the response to the client buffer.
@@ -40,12 +40,11 @@ module Whois
 
         def extract_referral(response)
           return unless (match = response.match(/Registrar WHOIS Server:(.+?)$/))
+
           server = match[match.size - 1].strip
           server.empty? ? nil : server
         end
-
       end
-
     end
   end
 end

data/lib/whois/server/adapters/arin.rb

@@ -1,23 +1,23 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
   class Server
     module Adapters
-
       #
       # = Arin Adapter
       #
       # Provides ability to query Arin WHOIS interfaces.
       #
       class Arin < Base
-
         # Executes a WHOIS query to the Arin WHOIS interface,
         # resolving any intermediate referral,
         # and appends the response to the client buffer.
@@ -38,15 +38,14 @@ module Whois
         private
 
         def extract_referral(response)
-          return unless response =~ /ReferralServer:\s*r?whois:\/\/([\w.-]+)(?::(\d+))?/
+          return unless response =~ %r{ReferralServer:\s*r?whois://([\w.-]+)(?::(\d+))?}
+
           {
-            host: $1,
-            port: $2 ? $2.to_i : nil
+            host: Regexp.last_match(1),
+            port: Regexp.last_match(2)&.to_i,
           }
         end
-
       end
-
     end
   end
 end

data/lib/whois/server/adapters/arpa.rb

@@ -1,18 +1,18 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
   class Server
     module Adapters
-
       class Arpa < Base
-
         def request(string)
           record = Server.guess(inaddr_to_ip(string)).lookup(string)
           part   = record.parts.first
@@ -22,28 +22,23 @@ module Whois
 
         private
 
-          # "127.1.168.192.in-addr.arpa" => "192.168.1.127"
-          # "1.168.192.in-addr.arpa" => "192.168.1.0"
-          # "168.192.in-addr.arpa" => "192.168.0.0"
-          # "192.in-addr.arpa" => "192.0.0.0"
-          # "in-addr.arpa" => "0.0.0.0"
-          def inaddr_to_ip(string)
-            unless /^([0-9]{1,3}\.?){0,4}in-addr\.arpa$/ =~ string
-              raise ServerError, "Invalid .in-addr.arpa address"
-            end
-             a, b, c, d = string.scan(/[0-9]{1,3}\./).reverse
-            [a, b, c, d].map do |token|
-              token = (token ||= 0).to_i
-              if token <= 255 && token >= 0
-                token
-              else
-                raise ServerError, "Invalid .in-addr.arpa token `#{token}'"
-              end
-            end.join(".")
-          end
-
+        # "127.1.168.192.in-addr.arpa" => "192.168.1.127"
+        # "1.168.192.in-addr.arpa" => "192.168.1.0"
+        # "168.192.in-addr.arpa" => "192.168.0.0"
+        # "192.in-addr.arpa" => "192.0.0.0"
+        # "in-addr.arpa" => "0.0.0.0"
+        def inaddr_to_ip(string)
+          raise ServerError, "Invalid .in-addr.arpa address" unless string.match?(/\A([0-9]{1,3}\.?){0,4}in-addr\.arpa\z/)
+
+          a, b, c, d = string.scan(/[0-9]{1,3}\./).reverse
+          [a, b, c, d].map do |token|
+            token = (token || 0).to_i
+            raise ServerError, "Invalid .in-addr.arpa token `#{token}'" unless token.between?(0, 255)
+
+            token
+          end.join(".")
+        end
       end
-
     end
   end
 end

data/lib/whois/server/adapters/base.rb

@@ -1,30 +1,29 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
-require 'whois/record/part'
-require 'whois/record'
-require 'whois/server/socket_handler'
+require "whois/record/part"
+require "whois/record"
+require "whois/server/socket_handler"
 
 
 module Whois
   class Server
     module Adapters
-
       class Base
         class << self
           def query_handler
             @query_handler ||= SocketHandler.new
           end
 
-          def query_handler=(handler)
-            @query_handler = handler
-          end
+          attr_writer :query_handler
         end
 
         # Default WHOIS request port.
@@ -48,15 +47,10 @@ module Whois
         attr_reader :buffer
 
 
-        # @param  [Symbol] type
-        #         The type of WHOIS adapter to define.
-        #         Known values are :tld, :ipv4, :ipv6.
-        # @param  [String] allocation
-        #         The allocation, range or hostname, this server is responsible for.
-        # @param  [String, nil] host
-        #         The server hostname. Use nil if unknown or not available.
-        # @param  [Hash] options Optional adapter properties.
-        #
+        # @param  type [Symbol] the type of WHOIS adapter to define. Known values are :tld, :ipv4, :ipv6,
+        # @param  allocation [String] the allocation, range or hostname, this server is responsible for.
+        # @param  host [String, nil] the server hostname. Use nil if unknown or not available.
+        # @param  options [Hash] optional adapter properties
         def initialize(type, allocation, host, options = {})
           @type       = type
           @allocation = allocation
@@ -66,53 +60,44 @@ module Whois
 
         # Checks self and other for equality.
         #
-        # @param  [The Whois::Server::Adapters::Base] other
-        # @return [Boolean] Returns true if the other is the same object,
+        # @param  other [The Whois::Server::Adapters::Base]
+        # @return [Boolean] true if the other is the same object,
         #         or <tt>other</tt> attributes matches this object attributes.
-        #
         def ==(other)
-          (
-            self.equal?(other)
-          ) || (
+          equal?(other) || (
             other.is_a?(self.class) &&
-            self.type == other.type &&
-            self.allocation == other.allocation &&
-            self.host == other.host &&
-            self.options == other.options
+            type == other.type &&
+            allocation == other.allocation &&
+            host == other.host &&
+            options == other.options
           )
         end
 
-        alias_method :eql?, :==
+        alias eql? ==
 
 
         # Merges given +settings+ into current {#options}.
         #
-        # @param  [Hash] settings
-        # @return [Hash] The updated options for this object.
-        #
+        # @param  settings [Hash]
+        # @return [Hash] the updated options for this object
         def configure(settings)
           @host = settings[:host] if settings[:host]
           options.merge!(settings)
         end
 
 
-        # Performs a Whois lookup for <tt>string</tt>
-        # using the current server adapter.
+        # Performs a Whois lookup for <tt>string</tt> using the current server adapter.
         #
-        # Internally, this method calls {#request}
-        # using the Template Method design pattern.
+        # Internally, this method calls {#request} using the Template Method design pattern.
         #
         #   server.lookup("google.com")
         #   # => Whois::Record
         #
-        # @param  [String] string The string to be sent as query parameter.
+        # @param  string [String] the string to query
         # @return [Whois::Record]
-        #
         def lookup(string)
-          buffer_start do |buffer|
-            request(string)
-            Whois::Record.new(self, buffer.dup)
-          end
+          parts = buffer_start { request(string) }
+          Whois::Record.new(self, parts)
         end
 
         # Performs the real WHOIS request.
@@ -121,11 +106,10 @@ module Whois
         # it is intended to be overwritten in the concrete subclasses.
         # This is the heart of the Template Method design pattern.
         #
-        # @param  [String] string The string to be sent as query parameter.
+        # @param  string [String] the string to query
         # @return [void]
         # @raise  [NotImplementedError]
         # @abstract
-        #
         def request(string)
           raise NotImplementedError
         end
@@ -149,6 +133,7 @@ module Whois
         def buffer_start
           @buffer ||= []
           yield(@buffer)
+          @buffer.dup
         ensure
           @buffer.clear
         end
@@ -183,10 +168,8 @@ module Whois
           self.class.query_handler.call(query, *args)
         end
 
-        alias :query_the_socket :query
-
+        alias query_the_socket query
       end
-
     end
   end
 end

data/lib/whois/server/adapters/formatted.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
   class Server
     module Adapters
-
       #
       # = Formatted Adapter
       #
@@ -32,7 +33,6 @@ module Whois
       # @see Whois::Server::Adapters::Standard
       #
       class Formatted < Base
-
         # Executes a WHOIS query to the WHOIS interface
         # listening at +host+ and appends the response
         # to the client buffer.
@@ -47,12 +47,10 @@ module Whois
         #
         def request(string)
           options[:format] || raise(ServerError, "Missing mandatory :format option for adapter `Formatted'")
-          response = query_the_socket(sprintf(options[:format], string), host)
+          response = query_the_socket(format(options[:format], string), host)
           buffer_append response, host
         end
-
       end
-
     end
   end
 end

data/lib/whois/server/adapters/none.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
   class Server
     module Adapters
-
       #
       # = None Adapter
       #
@@ -26,7 +27,6 @@ module Whois
       # adapter raises a {Whois::NoInterfaceError} exception.
       #
       class None < Base
-
         # Always raises a {Whois::NoInterfaceError} exception.
         #
         # @param  [String] string
@@ -34,12 +34,10 @@ module Whois
         #
         # @raise  [Whois::NoInterfaceError] For every request.
         #
-        def request(string)
+        def request(_string)
           raise NoInterfaceError, "This `#{type}' has no whois server"
         end
-
       end
-
     end
   end
 end

data/lib/whois/server/adapters/not_implemented.rb

@@ -1,18 +1,18 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
   class Server
     module Adapters
-
       class NotImplemented < Base
-
         # Always raises a {Whois::ServerNotImplemented} exception.
         #
         # @param  [String] string
@@ -20,12 +20,10 @@ module Whois
         #
         # @raise  [Whois::ServerNotImplemented] For every request.
         #
-        def request(string)
+        def request(_string)
           raise ServerNotImplemented, "The `#{host}' feature has not been implemented yet."
         end
-
       end
-
     end
   end
 end

data/lib/whois/server/adapters/standard.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
   class Server
     module Adapters
-
       #
       # = Standard Adapter
       #
@@ -36,7 +37,6 @@ module Whois
       # * +:port+ - Specifies a port number different than 43
       #
       class Standard < Base
-
         # Executes a WHOIS query to the WHOIS interface
         # listening at +host+ and appends the response
         # to the client buffer.
@@ -51,9 +51,7 @@ module Whois
           response = query_the_socket(string, host)
           buffer_append response, host
         end
-
       end
-
     end
   end
-end
+end

data/lib/whois/server/adapters/verisign.rb

@@ -1,23 +1,23 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
   class Server
     module Adapters
-
       #
       # = Verisign Adapter
       #
       # Provides ability to query Verisign WHOIS interfaces.
       #
       class Verisign < Base
-
         # Executes a WHOIS query to the Verisign WHOIS interface,
         # resolving any intermediate referral,
         # and appends the response to the client buffer.
@@ -40,12 +40,11 @@ module Whois
 
         def extract_referral(response)
           return unless (match = response.match(/Registrar WHOIS Server:(.+?)$/))
+
           server = match[match.size - 1].strip
           server.empty? ? nil : server
         end
-
       end
-
     end
   end
 end