whois 5.1.1 → 6.0.1

data/lib/whois/client.rb

@@ -5,11 +5,11 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
-require 'timeout'
+require "timeout"
 
 
 module Whois

data/lib/whois/errors.rb

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

data/lib/whois/record.rb

@@ -5,11 +5,11 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
-require 'whois/record/part'
+require "whois/record/part"
 
 
 module Whois

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

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

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -30,16 +30,14 @@ module Whois
         # "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$/)
+          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
-            if token <= 255 && token >= 0
-              token
-            else
-              raise ServerError, "Invalid .in-addr.arpa token `#{token}'"
-            end
+            raise ServerError, "Invalid .in-addr.arpa token `#{token}'" unless token <= 255 && token >= 0
+
+            token
           end.join(".")
         end
 

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

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

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 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-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -36,7 +36,7 @@ module Whois
         #
         # @raise  [Whois::NoInterfaceError] For every request.
         #
-        def request(string)
+        def request(_string)
           raise NoInterfaceError, "This `#{type}' has no whois server"
         end
 

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

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

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

@@ -5,7 +5,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 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-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 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-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -32,7 +32,7 @@ module Whois
         #
         # @raise  [Whois::WebInterfaceError] For every request.
         #
-        def request(string)
+        def request(_string)
           raise WebInterfaceError, options[:url]
         end
 

data/lib/whois/server/socket_handler.rb

@@ -5,12 +5,12 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
-require 'socket'
-require 'whois/errors'
+require "socket"
+require "whois/errors"
 
 
 module Whois
@@ -58,7 +58,7 @@ module Whois
         client.write("#{query}\r\n")    # I could use put(foo) and forget the \n
         client.read                     # but write/read is more symmetric than puts/read
       ensure                            # and I really want to use read instead of gets.
-        client.close if client          # If != client something went wrong.
+        client&.close # If != client something went wrong.
       end
     end
 

data/lib/whois/server.rb

@@ -5,12 +5,12 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
-require 'ipaddr'
-require 'json'
+require "ipaddr"
+require "json"
 require "whois/server/adapters/base"
 require "whois/server/adapters/arin"
 require "whois/server/adapters/arpa"
@@ -67,7 +67,7 @@ module Whois
       # @return [void]
       def load_definitions
         clear_definitions
-        Dir[File.expand_path('../../data/*.json', __dir__)].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.
@@ -86,7 +86,7 @@ module Whois
           options = if settings.empty?
                       EMPTY_HASH
                     else
-                      settings.map { |k, v| [k.to_sym, v.is_a?(String) ? intern_string(v) : v] }.to_h.freeze
+                      settings.to_h { |k, v| [k.to_sym, v.is_a?(String) ? intern_string(v) : v] }.freeze
                     end
           define(type, allocation, host, options)
         end
@@ -268,7 +268,7 @@ module Whois
         begin
           ip = IPAddr.new(string)
           type = ip.ipv4? ? TYPE_IPV4 : TYPE_IPV6
-          _definitions(type).each do |_, definition|
+          _definitions(type).each_value do |definition|
             return factory(type, *definition) if IPAddr.new(definition.first).include?(ip)
           end
         rescue ArgumentError
@@ -283,7 +283,7 @@ module Whois
       # @param  string [String]
       # @raise  [Whois::ServerNotSupported]
       #         emails are not supported.
-      def find_for_email(string)
+      def find_for_email(_string)
         raise ServerNotSupported, "No WHOIS server is known for email objects"
       end
 
@@ -303,7 +303,7 @@ module Whois
             index = token.index(".")
             break if index.nil?
 
-            token = token[(index + 1)..-1]
+            token = token[(index + 1)..]
           end
         end
 
@@ -321,7 +321,7 @@ module Whois
       def find_for_asn(string)
         asn = string[/\d+/].to_i
         asn_type = asn <= 65_535 ? TYPE_ASN16 : TYPE_ASN32
-        _definitions(asn_type).each do |_, definition|
+        _definitions(asn_type).each_value do |definition|
           if (range = definition.first.split.map(&:to_i)) && asn >= range.first && asn <= range.last
             return factory(asn_type, *definition)
           end
@@ -363,7 +363,7 @@ module Whois
       end
 
       def matches_email?(string)
-        string.include?('@')
+        string.include?("@")
       end
 
       def matches_asn?(string)

data/lib/whois/version.rb

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

data/lib/whois.rb

@@ -5,15 +5,15 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2024 Simone Carletti <weppos@weppos.net>
 #++
 
 
-require 'whois/version'
-require 'whois/errors'
-require 'whois/client'
-require 'whois/server'
-require 'whois/record'
+require "whois/version"
+require "whois/errors"
+require "whois/client"
+require "whois/server"
+require "whois/record"
 
 
 module Whois
@@ -74,7 +74,7 @@ module Whois
       result
     end
 
-    def deprecate(message = nil, callstack = caller)
+    def deprecate(message = nil, _callstack = caller)
       # warn("DEPRECATION WARNING: #{message} #{deprecation_caller_message(callstack)}")
       warn("DEPRECATION WARNING: #{message}")
     end
@@ -99,24 +99,24 @@ module Whois
 
     def deprecation_caller_message(callstack)
       file, line, method = extract_callstack(callstack)
-      if file
-        if line && method
-          "(called from #{method} at #{file}:#{line})"
-        else
-          "(called from #{file}:#{line})"
-        end
+      return unless file
+
+      if line && method
+        "(called from #{method} at #{file}:#{line})"
+      else
+        "(called from #{file}:#{line})"
       end
     end
 
     def extract_callstack(callstack)
       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 `(.*?)')?/))
-          md.captures
-        else
-          offending_line
-        end
+      return unless offending_line
+
+      if (md = offending_line.match(/^(.+?):(\d+)(?::in `(.*?)')?/))
+        md.captures
+      else
+        offending_line
       end
     end
   end

data/spec/integration/whois_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Whois do
   let(:response) { "Domain:             example.it\nStatus:             AVAILABLE\n" }
@@ -13,7 +13,7 @@ describe Whois do
           .with("example.it", "whois.nic.it", 43)
           .and_return(response)
 
-        record = Whois.lookup("example.it")
+        record = described_class.lookup("example.it")
 
         expect(record).to be_a(Whois::Record)
         # expect(record.available?).to be_truthy

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'rspec'
-require 'whois'
+require "rspec"
+require "whois"
 
 SPEC_ROOT = File.expand_path(__dir__) unless defined?(SPEC_ROOT)
 
@@ -12,7 +12,7 @@ Encoding.default_internal = Encoding::UTF_8
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.join(SPEC_ROOT, "support/**/*.rb")].sort.each { |f| require f }
+Dir[File.join(SPEC_ROOT, "support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
   config.mock_with :rspec

data/spec/whois/client_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Whois::Client do
   describe "#initialize" do

data/spec/whois/record/part_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Whois::Record::Part do
   describe "#initialize" do

data/spec/whois/record_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Whois::Record do
   subject { described_class.new(server, parts) }
@@ -65,64 +65,72 @@ describe Whois::Record do
       one = two = described_class.new(server, parts)
 
       expect(one == two).to be_truthy
-      expect(one.eql?(two)).to be_truthy
+      expect(one).to eql(two)
     end
 
     it "returns true when other has same class and has the same parts" do
-      one, two = described_class.new(server, parts), described_class.new(server, parts)
+      one = described_class.new(server, parts)
+      two = described_class.new(server, parts)
 
       expect(one == two).to be_truthy
-      expect(one.eql?(two)).to be_truthy
+      expect(one).to eql(two)
     end
 
     it "returns true when other has descendant class and has the same parts" do
       subklass = Class.new(described_class)
-      one, two = described_class.new(server, parts), subklass.new(server, parts)
+      one = described_class.new(server, parts)
+      two = subklass.new(server, parts)
 
       expect(one == two).to be_truthy
-      expect(one.eql?(two)).to be_truthy
+      expect(one).to eql(two)
     end
 
     it "returns true when other has same class and has equal parts" do
-      one, two = described_class.new(server, parts), described_class.new(server, parts.dup)
+      one = described_class.new(server, parts)
+      two = described_class.new(server, parts.dup)
 
       expect(one == two).to be_truthy
-      expect(one.eql?(two)).to be_truthy
+      expect(one).to eql(two)
     end
 
     it "returns true when other has same class, different server and the same parts" do
-      one, two = described_class.new(server, parts), described_class.new(nil, parts)
+      one = described_class.new(server, parts)
+      two = described_class.new(nil, parts)
 
       expect(one == two).to be_truthy
-      expect(one.eql?(two)).to be_truthy
+      expect(one).to eql(two)
     end
 
     it "returns false when other has different class and has the same parts" do
-      one, two = described_class.new(server, parts), Struct.new(:server, :parts).new(server, parts)
+      one = described_class.new(server, parts)
+      two = Struct.new(:server, :parts).new(server, parts)
 
       expect(one == two).to be_falsey
-      expect(one.eql?(two)).to be_falsey
+      expect(one).not_to eql(two)
     end
 
     it "returns false when other has different parts" do
-      one, two = described_class.new(server, parts), described_class.new(server, [])
+      one = described_class.new(server, parts)
+      two = described_class.new(server, [])
 
       expect(one == two).to be_falsey
-      expect(one.eql?(two)).to be_falsey
+      expect(one).not_to eql(two)
     end
 
     it "returns false when other is string and has the same content" do
-      one, two = described_class.new(server, parts), described_class.new(server, parts).to_s
+      one = described_class.new(server, parts)
+      two = described_class.new(server, parts).to_s
 
       expect(one == two).to be_falsey
-      expect(one.eql?(two)).to be_falsey
+      expect(one).not_to eql(two)
     end
 
     it "returns false when other is string and has different content" do
-      one, two = described_class.new(server, parts), "different"
+      one = described_class.new(server, parts)
+      two = "different"
 
       expect(one == two).to be_falsey
-      expect(one.eql?(two)).to be_falsey
+      expect(one).not_to eql(two)
     end
   end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Whois::Server::Adapters::Afilias do
   let(:definition) { [:tld, ".test", "whois.afilias-grs.info", {}] }

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Whois::Server::Adapters::Arin do
   let(:definition) { [:ipv4, "0.0.0.0/1", "whois.arin.net"] }

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

@@ -1,20 +1,29 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-require 'whois/server/adapters/arin'
+require "spec_helper"
+require "whois/server/adapters/arin"
 
 describe Whois::Server::Adapters::Arpa do
   let(:definition) { [:tld, ".in-addr.arpa", nil, {}] }
 
   describe "#lookup" do
     it "returns the WHOIS record" do
-      response = "Whois Response"
       server = described_class.new(*definition)
-      expect(Whois::Server::Adapters::Arin.query_handler).to receive(:call).with("n + 229.128.in-addr.arpa", "whois.arin.net", 43).and_return(response)
+      expect(Whois::Server::Adapters::Arin.query_handler).to receive(:call)
+        .with("n + 229.128.in-addr.arpa", "whois.arin.net", 43)
+        .and_return(response = "Whois Response")
 
       record = server.lookup("229.128.in-addr.arpa")
       expect(record.to_s).to eq(response)
       expect(record.parts).to eq([Whois::Record::Part.new(body: response, host: "whois.arin.net")])
     end
+
+    it "discards newlines" do
+      server = described_class.new(*definition)
+
+      expect do
+        server.lookup("229.128.in-addr.arpa\nextra")
+      end.to raise_error(Whois::ServerError, "Invalid .in-addr.arpa address")
+    end
   end
 end