whois 5.0.1 → 5.0.2

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "whois"

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:02: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"
   },
@@ -6034,10 +5954,6 @@
     "_type": "newgtld",
     "host": "whois.nic.wanggou"
   },
-  "warman": {
-    "_type": "newgtld",
-    "host": "whois.nic.warman"
-  },
   "watch": {
     "_group": "donuts",
     "_type": "newgtld",
@@ -6577,10 +6493,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.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -45,11 +47,11 @@ module Whois
         return
       end
 
-      deprecate(%Q{Whois.available? is deprecated. Call Whois.whois("#{object}").available?})
+      deprecate(%{Whois.available? is deprecated. Call Whois.whois("#{object}").available?})
 
       result = lookup(object).parser.available?
       if result.nil?
-        warn  "This method is not supported for this kind of object.\n" +
+        warn  "This method is not supported for this kind of object.\n" \
               "Use Whois.lookup('#{object}') instead."
       end
       result
@@ -62,11 +64,11 @@ module Whois
         return
       end
 
-      deprecate(%Q{Whois.registered? is deprecated. Call Whois.whois("#{object}").available?})
+      deprecate(%{Whois.registered? is deprecated. Call Whois.whois("#{object}").available?})
 
       result = lookup(object).parser.registered?
       if result.nil?
-        warn  "This method is not supported for this kind of object.\n" +
+        warn  "This method is not supported for this kind of object.\n" \
               "Use Whois.lookup('#{object}') instead."
       end
       result
@@ -87,9 +89,9 @@ module Whois
     # @api private
     # @private
     def bug!(error, message)
-      raise error, message.dup        <<
-        " Please report the issue at" <<
-        " http://github.com/weppos/whois/issues"
+      raise error, message.dup <<
+                   " Please report the issue at" \
+                   " http://github.com/weppos/whois/issues"
     end
 
 
@@ -107,10 +109,10 @@ module Whois
     end
 
     def extract_callstack(callstack)
-      gem_root = File.expand_path("../../../", __FILE__) + "/"
+      gem_root = "#{File.expand_path('../..', __dir__)}/"
       offending_line = callstack.find { |line| !line.start_with?(gem_root) } || callstack.first
       if offending_line
-        if md = offending_line.match(/^(.+?):(\d+)(?::in `(.*?)')?/)
+        if (md = offending_line.match(/^(.+?):(\d+)(?::in `(.*?)')?/))
           md.captures
         else
           offending_line

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-2020 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2021 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-2020 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2021 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.rb

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

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-2020 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -20,8 +22,7 @@ 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)

data/lib/whois/server.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -40,11 +41,11 @@ module Whois
 
     # @return [Array<Symbol>] the definition types
     TYPES = [
-        TYPE_TLD   = :tld,
-        TYPE_IPV4  = :ipv4,
-        TYPE_IPV6  = :ipv6,
-        TYPE_ASN16 = :asn16,
-        TYPE_ASN32 = :asn32,
+      TYPE_TLD = :tld,
+      TYPE_IPV4  = :ipv4,
+      TYPE_IPV6  = :ipv6,
+      TYPE_ASN16 = :asn16,
+      TYPE_ASN32 = :asn32,
     ].freeze
 
     # Empty hash constant used to save allocation for definitions with empty settings.
@@ -67,7 +68,7 @@ module Whois
       # @return [void]
       def load_definitions
         clear_definitions
-        Dir[File.expand_path("../../../data/*.json", __FILE__)].each { |f| load_json(f) }
+        Dir[File.expand_path('../../data/*.json', __dir__)].each { |f| load_json(f) }
       end
 
       # Loads the definitions from a JSON file.
@@ -77,16 +78,17 @@ module Whois
       # @return [void]
       def load_json(file)
         type = File.basename(file, File.extname(file)).to_sym
-        JSON.load(File.read(file)).each do |allocation, settings|
+        JSON.parse(File.read(file)).each do |allocation, settings|
           next if allocation == "_"
+
           settings.reject! { |k, _| k.start_with?("_") }
           host = settings.delete("host")
           host = intern_string(host) if host
           options = if settings.empty?
-            EMPTY_HASH
-          else
-            Hash[settings.map { |k,v| [k.to_sym, v.is_a?(String) ? intern_string(v) : v] }].freeze
-          end
+                      EMPTY_HASH
+                    else
+                      settings.map { |k, v| [k.to_sym, v.is_a?(String) ? intern_string(v) : v] }.to_h.freeze
+                    end
           define(type, allocation, host, options)
         end
       end
@@ -112,7 +114,7 @@ module Whois
       #
       def definitions(type)
         TYPES.include?(type) or
-            raise(ArgumentError, "`#{type}` is not a valid definition type")
+          raise(ArgumentError, "`#{type}` is not a valid definition type")
 
         _definitions(type).values
       end
@@ -156,7 +158,7 @@ module Whois
       #
       def define(type, allocation, host, options = EMPTY_HASH)
         TYPES.include?(type) or
-            raise(ArgumentError, "`#{type}` is not a valid definition type")
+          raise(ArgumentError, "`#{type}` is not a valid definition type")
 
         _definitions(type)[allocation] = [allocation, host, options.freeze]
       end
@@ -282,6 +284,7 @@ module Whois
           end
         rescue ArgumentError
           # continue
+          nil
         end
         raise AllocationUnknown, "IP Allocation for `#{string}' unknown"
       end
@@ -304,7 +307,7 @@ module Whois
         token = string
         defs  = _definitions(TYPE_TLD)
 
-        while token != "" do
+        while token != ""
           if (found = defs[token])
             return factory(:tld, *found)
           else
@@ -328,7 +331,7 @@ module Whois
       #         that matches one of the existing server definitions.
       def find_for_asn(string)
         asn = string[/\d+/].to_i
-        asn_type = asn <= 65535 ? TYPE_ASN16 : TYPE_ASN32
+        asn_type = asn <= 65_535 ? TYPE_ASN16 : TYPE_ASN32
         _definitions(asn_type).each do |_, definition|
           if (range = definition.first.split.map(&:to_i)) && asn >= range.first && asn <= range.last
             return factory(asn_type, *definition)
@@ -379,9 +382,10 @@ module Whois
       end
 
       def valid_ipv4?(addr)
-        if /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/ =~ addr
-          return $~.captures.all? {|i| i.to_i < 256}
+        if (m = /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/.match(addr))
+          return m.captures.all? { |i| i.to_i < 256 }
         end
+
         false
       end
 
@@ -391,9 +395,10 @@ module Whois
         return true if addr.match?(/\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/)
         return true if addr.match?(/\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/)
         # IPv6 (IPv4 compat)
-        return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:/ =~ addr && valid_ipv4?($')
-        return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_ipv4?($')
-        return true if /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_ipv4?($')
+        return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:/ =~ addr && valid_ipv4?(Regexp.last_match.post_match)
+        return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_ipv4?(Regexp.last_match.post_match)
+        return true if /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_ipv4?(Regexp.last_match.post_match)
+
         false
       end