whois 5.0.2 → 5.1.1

data/lib/whois/errors.rb

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/record/part.rb

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -26,7 +26,7 @@ module Whois
       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

data/lib/whois/record.rb

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

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -40,11 +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)&.to_i,
           }
         end
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -30,9 +30,7 @@ module Whois
         # "192.in-addr.arpa" => "192.0.0.0"
         # "in-addr.arpa" => "0.0.0.0"
         def inaddr_to_ip(string)
-          unless string.match?(/^([0-9]{1,3}\.?){0,4}in-addr\.arpa$/)
-            raise ServerError, "Invalid .in-addr.arpa address"
-          end
+          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|

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/server/socket_handler.rb

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/whois/server.rb

@@ -5,13 +5,22 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
 require 'ipaddr'
 require 'json'
-require 'whois/server/adapters/base'
+require "whois/server/adapters/base"
+require "whois/server/adapters/arin"
+require "whois/server/adapters/arpa"
+require "whois/server/adapters/afilias"
+require "whois/server/adapters/formatted"
+require "whois/server/adapters/none"
+require "whois/server/adapters/not_implemented"
+require "whois/server/adapters/standard"
+require "whois/server/adapters/verisign"
+require "whois/server/adapters/web"
 
 
 module Whois
@@ -27,16 +36,6 @@ module Whois
     # WHOIS server adapters. Each adapter is a subclass of {Whois::Server::Adapters::Base},
     # customized to handle WHOIS queries for a type or a group of servers.
     module Adapters
-      autoload :Base,             "whois/server/adapters/base"
-      autoload :Arin,             "whois/server/adapters/arin"
-      autoload :Arpa,             "whois/server/adapters/arpa"
-      autoload :Afilias,          "whois/server/adapters/afilias"
-      autoload :Formatted,        "whois/server/adapters/formatted"
-      autoload :None,             "whois/server/adapters/none"
-      autoload :NotImplemented,   "whois/server/adapters/not_implemented"
-      autoload :Standard,         "whois/server/adapters/standard"
-      autoload :Verisign,         "whois/server/adapters/verisign"
-      autoload :Web,              "whois/server/adapters/web"
     end
 
     # @return [Array<Symbol>] the definition types
@@ -236,19 +235,13 @@ module Whois
       #         but the object type doesn't have any supported WHOIS adapter associated.
       def guess(string)
         # Top Level Domain match
-        if matches_tld?(string)
-          return factory(:tld, ".", "whois.iana.org")
-        end
+        return factory(:tld, ".", "whois.iana.org") if matches_tld?(string)
 
         # IP address (secure match)
-        if matches_ip?(string)
-          return find_for_ip(string)
-        end
+        return find_for_ip(string) if matches_ip?(string)
 
         # Email Address (secure match)
-        if matches_email?(string)
-          return find_for_email(string)
-        end
+        return find_for_email(string) if matches_email?(string)
 
         # Domain Name match
         if (server = find_for_domain(string))
@@ -256,9 +249,7 @@ module Whois
         end
 
         # ASN match
-        if matches_asn?(string)
-          return find_for_asn(string)
-        end
+        return find_for_asn(string) if matches_asn?(string)
 
         # Game Over
         raise ServerNotFound, "Unable to find a WHOIS server for `#{string}'"
@@ -278,9 +269,7 @@ module Whois
           ip = IPAddr.new(string)
           type = ip.ipv4? ? TYPE_IPV4 : TYPE_IPV6
           _definitions(type).each do |_, definition|
-            if IPAddr.new(definition.first).include?(ip)
-              return factory(type, *definition)
-            end
+            return factory(type, *definition) if IPAddr.new(definition.first).include?(ip)
           end
         rescue ArgumentError
           # continue

data/lib/whois/version.rb

@@ -5,11 +5,11 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
 module Whois
   # The current library version.
-  VERSION = "5.0.2"
+  VERSION = "5.1.1"
 end

data/lib/whois.rb

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -37,17 +37,17 @@ module Whois
       Client.new.lookup(object)
     end
 
-    alias_method :whois, :lookup
+    alias whois lookup
 
 
     # @deprecated
     def available?(object)
       unless defined? Whois::Parser
         warn("Whois.available? requires the gem `whois-parser`")
-        return
+        return false
       end
 
-      deprecate(%{Whois.available? is deprecated. Call Whois.whois("#{object}").available?})
+      deprecate(%{Whois.available? is deprecated. Call Whois.whois("#{object}").parser.available?})
 
       result = lookup(object).parser.available?
       if result.nil?
@@ -61,10 +61,10 @@ module Whois
     def registered?(object)
       unless defined? Whois::Parser
         warn("Whois.registered? requires the gem `whois-parser`")
-        return
+        return false
       end
 
-      deprecate(%{Whois.registered? is deprecated. Call Whois.whois("#{object}").available?})
+      deprecate(%{Whois.registered? is deprecated. Call Whois.whois("#{object}").parser.registered?})
 
       result = lookup(object).parser.registered?
       if result.nil?
@@ -90,8 +90,8 @@ module Whois
     # @private
     def bug!(error, message)
       raise error, message.dup <<
-                   " Please report the issue at" \
-                   " http://github.com/weppos/whois/issues"
+                   " Please report the issue at " \
+                   "http://github.com/weppos/whois/issues"
     end
 
 

data/spec/integration/whois_spec.rb

@@ -6,7 +6,7 @@ describe Whois do
   let(:response) { "Domain:             example.it\nStatus:             AVAILABLE\n" }
 
   describe "Basic WHOIS querying and parsing" do
-    it "works" do
+    it "queries and returns a record" do
       with_definitions do
         Whois::Server.define(:tld, "it", "whois.nic.it")
         expect(Whois::Server::Adapters::Standard.query_handler).to receive(:call)

data/spec/spec_helper.rb

@@ -3,9 +3,7 @@
 require 'rspec'
 require 'whois'
 
-unless defined?(SPEC_ROOT)
-  SPEC_ROOT = File.expand_path(__dir__)
-end
+SPEC_ROOT = File.expand_path(__dir__) unless defined?(SPEC_ROOT)
 
 # The fixtures are UTF-8 encoded.
 # Make sure Ruby uses the proper encoding.

data/spec/support/helpers/connectivity_helper.rb

@@ -2,9 +2,7 @@
 
 module RSpecSupportConnectivityHelpers
   def need_connectivity
-    if connectivity_available?
-      yield
-    end
+    yield if connectivity_available?
   end
 
   def connectivity_available?

data/spec/whois/client_spec.rb

@@ -135,8 +135,8 @@ describe Whois::Client do
     describe "#query" do
       it "sends a query for given domain" do
         record = described_class.new.lookup("weppos.it")
-        assert record.match?(/Domain:\s+weppos\.it/)
-        assert record.match?(/Created:/)
+        expect(record.match?(/Domain:\s+weppos\.it/)).to be(true)
+        expect(record.match?(/Created:/)).to be(true)
       end
     end
   end

data/spec/whois/record_spec.rb

@@ -138,8 +138,8 @@ describe Whois::Record do
 
   describe "#match?" do
     it "calls match and checks for match" do
-      expect(subject.match?(/record/)).to eq(true)
-      expect(subject.match?(/nomatch/)).to eq(false)
+      expect(subject.match?(/record/)).to be(true)
+      expect(subject.match?(/nomatch/)).to be(false)
     end
   end
 

data/spec/whois/server/adapters/afilias_spec.rb

@@ -39,7 +39,7 @@ describe Whois::Server::Adapters::Afilias do
         referral = File.read(fixture("referrals/afilias.bz.txt"))
         server.options[:referral] = false
         expect(server.query_handler).to receive(:call).with("example.test", "whois.afilias-grs.info", 43).and_return(referral)
-        expect(server.query_handler).to receive(:call).with("example.test", "whois.belizenic.bz", 43).never
+        expect(server.query_handler).not_to receive(:call).with("example.test", "whois.belizenic.bz", 43)
 
         record = server.lookup("example.test")
         expect(record.parts.size).to eq(1)

data/spec/whois/server/adapters/arin_spec.rb

@@ -52,7 +52,7 @@ describe Whois::Server::Adapters::Arin do
         referral = File.read(fixture("referrals/arin_referral_whois.txt"))
         server.options[:referral] = false
         expect(server.query_handler).to receive(:call).with("n + 0.0.0.0", "whois.arin.net", 43).and_return(referral)
-        expect(server.query_handler).to receive(:call).with("0.0.0.0", "whois.ripe.net", 43).never
+        expect(server.query_handler).not_to receive(:call).with("0.0.0.0", "whois.ripe.net", 43)
 
         record = server.lookup("0.0.0.0")
         expect(record.parts.size).to eq(1)
@@ -61,7 +61,7 @@ describe Whois::Server::Adapters::Arin do
       it "ignores referral (gracefully) if missing" do
         referral = File.read(fixture("referrals/arin_referral_missing.txt"))
         expect(server.query_handler).to receive(:call).with("n + 0.0.0.0", "whois.arin.net", 43).and_return(referral)
-        expect(server.query_handler).to receive(:call).never
+        expect(server.query_handler).not_to receive(:call)
 
         record = server.lookup("0.0.0.0")
         expect(record.parts.size).to eq(1)

data/spec/whois/server/adapters/formatted_spec.rb

@@ -21,7 +21,7 @@ describe Whois::Server::Adapters::Formatted do
     context "without format option" do
       it "raises an error" do
         server = described_class.new(:tld, ".de", "whois.denic.de", {})
-        expect(server.query_handler).to receive(:call).never
+        expect(server.query_handler).not_to receive(:call)
 
         expect {
           server.lookup("domain.de")

data/spec/whois/server/adapters/not_implemented_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Whois::Server::Adapters::NotImplemented do
-  before(:each) do
+  before do
     @definition = [:ipv6, "2001:0000::/32", "teredo", { adapter: Whois::Server::Adapters::NotImplemented }]
   end
 

data/spec/whois/server/adapters/verisign_spec.rb

@@ -39,7 +39,7 @@ describe Whois::Server::Adapters::Verisign do
         referral = File.read(fixture("referrals/crsnic.com.txt"))
         server.options[:referral] = false
         expect(server.query_handler).to receive(:call).with("=example.test", "whois.test", 43).and_return(referral)
-        expect(server.query_handler).to receive(:call).never
+        expect(server.query_handler).not_to receive(:call)
 
         record = server.lookup("example.test")
         expect(record.parts.size).to eq(1)
@@ -50,7 +50,7 @@ describe Whois::Server::Adapters::Verisign do
       it "ignores referral (gracefully) if missing" do
         referral = File.read(fixture("referrals/crsnic.com_referral_missing.txt"))
         expect(server.query_handler).to receive(:call).with("=example.test", "whois.test", 43).and_return(referral)
-        expect(server.query_handler).to receive(:call).never
+        expect(server.query_handler).not_to receive(:call)
 
         record = server.lookup("example.test")
         expect(record.parts.size).to eq(1)

data/spec/whois/server/adapters/web_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Whois::Server::Adapters::Web do
-  before(:each) do
+  before do
     @definition = [:tld, ".test", nil, { url: "http://whois.test" }]
   end
 

data/whois.gemspec

@@ -1,18 +1,18 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
-require 'whois/version'
+$:.push File.expand_path("../lib", __FILE__)
+require "whois/version"
 
 Gem::Specification.new do |s|
-  s.name        = 'whois'
+  s.name        = "whois"
   s.version     = Whois::VERSION
-  s.authors     = ['Simone Carletti']
-  s.email       = ['weppos@weppos.net']
-  s.homepage    = 'https://whoisrb.org/'
-  s.summary     = 'An intelligent pure Ruby WHOIS client and parser.'
-  s.description = 'Whois is an intelligent WHOIS client and parser written in pure Ruby. It can query registry data for IPv4, IPv6 and top level domains, and parse the responses into easy-to-use Ruby objects via the whois-parser library.'
-  s.license     = 'MIT'
+  s.authors     = ["Simone Carletti"]
+  s.email       = ["weppos@weppos.net"]
+  s.homepage    = "https://whoisrb.org/"
+  s.summary     = "An intelligent pure Ruby WHOIS client and parser."
+  s.description = "Whois is an intelligent WHOIS client and parser written in pure Ruby. It can query registry data for IPv4, IPv6 and top level domains, and parse the responses into easy-to-use Ruby objects via the whois-parser library."
+  s.license     = "MIT"
 
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = ">= 2.4"
 
   s.require_paths    = %w( lib )
   s.executables      =%w( whoisrb )