whois 5.0.0 → 5.1.0

data/bin/whoisrb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-$:.unshift(File.expand_path("../../lib", __FILE__))
+$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
 
 require 'optparse'
 require 'whois'
@@ -8,7 +9,7 @@ require 'whois'
 
 options = {}
 OptionParser.new do |opts|
-  opts.banner     = "Whois: an intelligent pure Ruby WHOIS client"
+  opts.banner = "Whois: an intelligent pure Ruby WHOIS client"
   opts.define_head  "Usage: whoisrb [options] object"
   opts.separator    ""
   opts.separator    "Examples:"

data/data/ipv4.json

@@ -39,9 +39,7 @@
     "host": "whois.apnic.net"
   },
   "43.0.0.0/8": {
-    "host": "whois.nic.ad.jp",
-    "adapter": "formatted",
-    "format": "%s/e"
+    "host": "whois.apnic.net"
   },
   "46.0.0.0/8": {
     "host": "whois.ripe.net"

data/data/tld.json

@@ -1,7 +1,7 @@
 {
   "_": {
     "schema": "2",
-    "updated": "2019-09-19 11:00:00 UTC"
+    "updated": "2021-03-02 11:55:00 UTC"
   },
   "aaa": {
     "_type": "newgtld",
@@ -654,11 +654,6 @@
   "bn": {
     "host": "whois.bnnic.bn"
   },
-  "bnl": {
-    "_group": "afiliassrs",
-    "_type": "newgtld",
-    "host": "whois.nic.bnl"
-  },
   "bnpparibas": {
     "_group": "afiliassrs",
     "_type": "newgtld",
@@ -927,10 +922,6 @@
     "_type": "newgtld",
     "host": "whois.uniregistry.net"
   },
-  "cartier": {
-    "_type": "newgtld",
-    "adapter": "none"
-  },
   "casa": {
     "_group": "mmregistry",
     "_type": "newgtld",
@@ -1071,11 +1062,6 @@
     "_type": "newgtld",
     "host": "whois.nic.google"
   },
-  "chrysler": {
-    "_group": "afiliassrs",
-    "_type": "newgtld",
-    "host": "whois.afilias-srs.net"
-  },
   "church": {
     "_group": "donuts",
     "_type": "newgtld",
@@ -1694,11 +1680,6 @@
     "_type": "newgtld",
     "host": "whois.nic.doctor"
   },
-  "dodge": {
-    "_group": "afiliassrs",
-    "_type": "newgtld",
-    "host": "whois.afilias-srs.net"
-  },
   "dog": {
     "_group": "donuts",
     "_type": "newgtld",
@@ -1744,10 +1725,6 @@
     "_type": "newgtld",
     "host": "whois.nic.dunlop"
   },
-  "duns": {
-    "_type": "newgtld",
-    "adapter": "none"
-  },
   "dupont": {
     "_type": "newgtld",
     "adapter": "none"
@@ -1900,10 +1877,6 @@
     "_type": "newgtld",
     "host": "whois.nic.events"
   },
-  "everbank": {
-    "_type": "newgtld",
-    "host": "whois.nic.everbank"
-  },
   "exchange": {
     "_group": "donuts",
     "_type": "newgtld",
@@ -2953,10 +2926,6 @@
   "is": {
     "host": "whois.isnic.is"
   },
-  "iselect": {
-    "_type": "newgtld",
-    "host": "whois.nic.iselect"
-  },
   "ismaili": {
     "_group": "afiliassrs",
     "_type": "newgtld",
@@ -3226,10 +3195,6 @@
     "_type": "newgtld",
     "host": "whois.nic.lacaixa"
   },
-  "ladbrokes": {
-    "_type": "newgtld",
-    "host": "whois.nic.ladbrokes"
-  },
   "lamborghini": {
     "_group": "afiliassrs",
     "_type": "newgtld",
@@ -3250,10 +3215,6 @@
     "_type": "newgtld",
     "host": "whois.afilias-srs.net"
   },
-  "lancome": {
-    "_type": "newgtld",
-    "host": "whois.nic.lancome"
-  },
   "land": {
     "_group": "donuts",
     "_type": "newgtld",
@@ -3343,10 +3304,6 @@
   "li": {
     "host": "whois.nic.li"
   },
-  "liaison": {
-    "_type": "newgtld",
-    "host": "whois.nic.liaison"
-  },
   "lidl": {
     "_type": "newgtld",
     "host": "whois.nic.lidl"
@@ -3742,10 +3699,6 @@
     "_type": "newgtld",
     "host": "whois.nic.mobile"
   },
-  "mobily": {
-    "_type": "newgtld",
-    "adapter": "none"
-  },
   "moda": {
     "_group": "donuts",
     "_type": "newgtld",
@@ -3783,11 +3736,6 @@
     "_type": "newgtld",
     "adapter": "none"
   },
-  "mopar": {
-    "_group": "afiliassrs",
-    "_type": "newgtld",
-    "host": "whois.afilias-srs.net"
-  },
   "mormon": {
     "_group": "afiliassrs",
     "_type": "newgtld",
@@ -3821,11 +3769,6 @@
     "_type": "newgtld",
     "host": "whois.nic.movie"
   },
-  "movistar": {
-    "_group": "knipp",
-    "_type": "newgtld",
-    "host": "whois-fe.movistar.tango.knipp.de"
-  },
   "mp": {
     "adapter": "none"
   },
@@ -4383,10 +4326,6 @@
     "_type": "newgtld",
     "host": "whois.nic.physio"
   },
-  "piaget": {
-    "_type": "newgtld",
-    "adapter": "none"
-  },
   "pics": {
     "_group": "uniregistry",
     "_type": "newgtld",
@@ -5280,11 +5219,6 @@
     "_type": "newgtld",
     "host": "whois.afilias-srs.net"
   },
-  "srt": {
-    "_group": "afiliassrs",
-    "_type": "newgtld",
-    "host": "whois.afilias-srs.net"
-  },
   "ss": {
     "host": "whois.nic.ss"
   },
@@ -5305,10 +5239,6 @@
     "_type": "newgtld",
     "host": "whois.nic.star"
   },
-  "starhub": {
-    "_type": "newgtld",
-    "host": "whois.nic.starhub"
-  },
   "statebank": {
     "_group": "afiliassrs",
     "_type": "newgtld",
@@ -5344,7 +5274,7 @@
   },
   "stream": {
     "_type": "newgtld",
-    "adapter": "none"
+    "host": "whois.nic.stream"
   },
   "studio": {
     "_group": "donuts",
@@ -5512,11 +5442,6 @@
   "tel": {
     "host": "whois.nic.tel"
   },
-  "telefonica": {
-    "_group": "knipp",
-    "_type": "newgtld",
-    "host": "whois-fe.telefonica.tango.knipp.de"
-  },
   "temasek": {
     "_group": "afiliassrs",
     "_type": "newgtld",
@@ -5770,11 +5695,6 @@
     "_type": "newgtld",
     "host": "whois.nic.ubs"
   },
-  "uconnect": {
-    "_group": "afiliassrs",
-    "_type": "newgtld",
-    "host": "whois.afilias-srs.net"
-  },
   "ug": {
     "host": "whois.co.ug"
   },
@@ -5951,10 +5871,6 @@
     "_type": "newgtld",
     "host": "whois.nic.vision"
   },
-  "vistaprint": {
-    "_type": "newgtld",
-    "host": "whois.nic.vistaprint"
-  },
   "viva": {
     "_group": "centralnic",
     "_type": "newgtld",
@@ -6034,10 +5950,6 @@
     "_type": "newgtld",
     "host": "whois.nic.wanggou"
   },
-  "warman": {
-    "_type": "newgtld",
-    "host": "whois.nic.warman"
-  },
   "watch": {
     "_group": "donuts",
     "_type": "newgtld",
@@ -6398,11 +6310,6 @@
     "_type": "newgtld",
     "host": "whois.nic.xn--efvy88h"
   },
-  "xn--estv75g": {
-    "_group": "afiliassrs",
-    "_type": "newgtld",
-    "host": "whois.nic.xn--estv75g"
-  },
   "xn--fct429k": {
     "_group": "amazonregistry",
     "_type": "newgtld",
@@ -6577,10 +6484,6 @@
     "adapter": "web",
     "url": "http://idn.jo/whois_a.aspx"
   },
-  "xn--mgbb9fbpob": {
-    "_type": "newgtld",
-    "adapter": "none"
-  },
   "xn--mgbbh1a": {
     "_type": "newgtld",
     "host": "whois.registry.in"

data/lib/whois/client.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -88,7 +90,7 @@ 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)

data/lib/whois/errors.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -69,7 +71,7 @@ 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.

data/lib/whois/record/part.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -20,12 +22,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.size.zero?
           super
         else
           raise ArgumentError

data/lib/whois/record.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -65,7 +67,7 @@ module Whois
       end
     end
 
-    alias_method :eql?, :==
+    alias eql? ==
 
 
     # Invokes {#match} on record {#content}

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -40,6 +42,7 @@ 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

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -38,10 +40,11 @@ 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) ? Regexp.last_match(2).to_i : nil,
           }
         end
 

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -22,25 +24,24 @@ 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"
+        # "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?(/^([0-9]{1,3}\.?){0,4}in-addr\.arpa$/)
+
+          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
-             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
+          end.join(".")
+        end
 
       end
 

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -22,9 +24,7 @@ module Whois
             @query_handler ||= SocketHandler.new
           end
 
-          def query_handler=(handler)
-            @query_handler = handler
-          end
+          attr_writer :query_handler
         end
 
         # Default WHOIS request port.
@@ -48,15 +48,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 +61,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 +107,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 +134,7 @@ module Whois
         def buffer_start
           @buffer ||= []
           yield(@buffer)
+          @buffer.dup
         ensure
           @buffer.clear
         end
@@ -183,7 +169,7 @@ module Whois
           self.class.query_handler.call(query, *args)
         end
 
-        alias :query_the_socket :query
+        alias query_the_socket query
 
       end
 

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -47,7 +49,7 @@ 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
 

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++