whois 5.0.2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0135819e9f372668e91865f4dfffb8689adc4d8d3ea6e8d6317a78a911592d6
-  data.tar.gz: f4768ef62ed3d6321d044938c06ddcb66af3f2bb158078257ab6985c134f01a5
+  metadata.gz: 57e93e3592c7474005c2c875c60b9631830d522ef138ffee62a65125fb0cf2f6
+  data.tar.gz: 2138fc21071a0fec27d38d46d193f422c41b4b424c5abea7e0c85e72a76180c6
 SHA512:
-  metadata.gz: 81be2e41c2505d79bb93bc2df3b3875e97fa52941aebf06107b7bdbcdf91d301b629ddc68bff22b6d411cbf16024732d1e69742d8d1357f7f30a8ecfd37a0652
-  data.tar.gz: 48166f89adc8bdd8b780d6d22fcb00992d75ffcb37063f1a4c4c207e429d0cffebb814dbe72f615dee79988f1576f7aee9382bfdd7dcb10e87d44d2481d5db51
+  metadata.gz: 4296a63ef5057958e53dc08c654857956a7b46733d75264036fe29c621e484d04ef9555569a8add7f0a50db713a4d9a4a0b1b10b32ad87189068f871ca8c22b4
+  data.tar.gz: fc9f0066f3040855a0886acfa826cf4b76ecf83450b051b817c8d3b9925b29bef5aecc74ae10f4003f1e2b1bbd0ee4cabc15fabcadcd3ee6a8199eb5ae6f8f3c

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: bundler
+    directory: /
+    schedule:
+      interval: daily
+      time: "04:00"
+    open-pull-requests-limit: 10

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,64 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '39 4 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

data/.github/workflows/release.yml

@@ -0,0 +1,16 @@
+name: release
+
+on:
+  push:
+    tags:
+      - v*.*.*
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Release Gem
+        uses: cadwallion/publish-rubygems-action@8f9e0538302643309e4e43bf48cd34173ca48cfc
+        env:
+          RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+          RELEASE_COMMAND: rake release

data/.github/workflows/tests.yml

@@ -0,0 +1,29 @@
+name: Tests
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        ruby-version:
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+        platform: [ubuntu-latest]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake
+

data/.rubocop.yml

@@ -16,6 +16,7 @@ AllCops:
     # Exclude artifacts
     - 'pkg/**/*'
     # Other
+    - '.simplecov'
     - 'test/benchmarks/**/*'
     - 'test/profilers/**/*'
     - 'utils/**/*'

data/.rubocop_opinionated.yml

@@ -95,12 +95,6 @@ Layout/EmptyLinesAroundModuleBody:
 Layout/EmptyLineBetweenDefs:
   Enabled: false
 
-# I personally don't care about the format style.
-# In most cases I like to use %, but not at the point I want to enforce it
-# as a convention in the entire code.
-Style/FormatString:
-  Enabled: false
-
 # Annotated tokens (like %<foo>s) are a good thing, but in most cases we don't need them.
 # %s is a simpler and straightforward version that works in almost all cases. So don't complain.
 Style/FormatStringToken:
@@ -110,11 +104,6 @@ Style/FormatStringToken:
 Style/NegatedIf:
   Enabled: false
 
-# For years, %w() has been the de-facto standard. A lot of libraries are using ().
-# Switching to [] would be a nightmare.
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
 # There are cases were the inline rescue is ok. We can either downgrade the severity,
 # or rely on the developer judgement on a case-by-case basis.
 Style/RescueModifier:
@@ -123,17 +112,6 @@ Style/RescueModifier:
 Style/SymbolArray:
   EnforcedStyle: brackets
 
-# Sorry, but using trailing spaces helps readability.
-#
-#   %w( foo bar )
-#
-# looks better to me than
-#
-#   %w( foo bar )
-#
-Layout/SpaceInsidePercentLiteralDelimiters:
-  Enabled: false
-
 # Hate It or Love It, I prefer double quotes as this is more consistent
 # with several other programming languages and the output of puts and inspect.
 Style/StringLiterals:

data/.rubocop_todo.yml

@@ -45,13 +45,6 @@ RSpec/ExampleLength:
     - 'spec/whois/server/socket_handler_spec.rb'
     - 'spec/whois/server_spec.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: .
-# SupportedStyles: implicit, each, example
-RSpec/HookArgument:
-  EnforcedStyle: each
-
 # Offense count: 4
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
@@ -85,15 +78,6 @@ RSpec/PredicateMatcher:
     - 'spec/whois/record_spec.rb'
     - 'spec/whois/server/adapters/base_spec.rb'
 
-# Offense count: 6
-# Cop supports --auto-correct.
-RSpec/ReceiveNever:
-  Exclude:
-    - 'spec/whois/server/adapters/afilias_spec.rb'
-    - 'spec/whois/server/adapters/arin_spec.rb'
-    - 'spec/whois/server/adapters/formatted_spec.rb'
-    - 'spec/whois/server/adapters/verisign_spec.rb'
-
 # Offense count: 40
 RSpec/StubbedMock:
   Exclude:
@@ -114,16 +98,6 @@ RSpec/SubjectStub:
   Exclude:
     - 'spec/whois/server/socket_handler_spec.rb'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: prefer_alias, prefer_alias_method
-Style/Alias:
-  Exclude:
-    - 'lib/whois.rb'
-    - 'lib/whois/record.rb'
-    - 'lib/whois/server/adapters/base.rb'
-
 # Offense count: 31
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
@@ -169,24 +143,6 @@ Style/GuardClause:
     - 'lib/whois/server/adapters/verisign.rb'
     - 'spec/support/helpers/connectivity_helper.rb'
 
-# Offense count: 8
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/whois/server.rb'
-    - 'lib/whois/server/adapters/arpa.rb'
-    - 'spec/spec_helper.rb'
-    - 'spec/support/helpers/connectivity_helper.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IgnoredMethods.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/whois/record/part.rb'
-
 # Offense count: 13
 # Cop supports --auto-correct.
 Style/ParallelAssignment:
@@ -194,32 +150,6 @@ Style/ParallelAssignment:
     - 'spec/whois/record_spec.rb'
     - 'spec/whois/server/adapters/base_spec.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/PerlBackrefs:
-  Exclude:
-    - 'lib/whois/server/adapters/arin.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantParentheses:
-  Exclude:
-    - 'lib/whois/server/adapters/base.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-Style/RedundantSelf:
-  Exclude:
-    - 'lib/whois/server/adapters/base.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Exclude:
-    - 'lib/whois/server/adapters/arin.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
@@ -234,9 +164,3 @@ Style/SafeNavigation:
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/ZeroLengthPredicate:
-  Exclude:
-    - 'lib/whois/record/part.rb'

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.0
+ruby 3.0.3

data/CHANGELOG.md

@@ -3,6 +3,14 @@
 This project uses [Semantic Versioning 2.0.0](http://semver.org/).
 
 
+## Release 5.1.0
+
+### Changed
+
+- SERVER: Deleted .VISTAPRINT, .XN--ESTV75G
+- CHANGED: Eager load all adapters (GH-644). Thanks @casperisfine @byroot
+
+
 ## Release 5.0.2
 
 ### Changed

data/CONTRIBUTING.md

@@ -4,39 +4,39 @@
 
 Fork, then clone the repo:
 
-~~~
+```
 git clone git@github.com:your-username/whois.git
-~~~
+```
 
 Set up your machine:
 
-~~~
+```
 bundle
-~~~
+```
 
 Make sure the tests pass:
 
-~~~
+```
 bundle exec rake
-~~~
+```
 
 To propose a change/feature/patch, create your feature branch:
 
-~~~
+```
 git checkout -b my-new-feature
-~~~
+```
 
 Make your change. Add tests for your change. Make the tests pass:
 
-~~~
+```
 bundle exec rake
-~~~
+```
 
 Commit your changes:
 
-~~~
+```
 git commit -am 'Add some feature'
-~~~
+```
 
 Push to your fork and [submit a pull request](https://github.com/weppos/whois/compare/).
 

data/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "rubocop", "1.11.0", require: false
+gem "rubocop", "1.12.1", require: false
 gem 'rubocop-rspec', require: false

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2021 Simone Carletti
+Copyright (c) 2009-2022 Simone Carletti
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -4,7 +4,7 @@
 
 This library was extracted from [RoboWhois](https://robowhois.com/) and [RoboDomain](https://robodomain.com/), and it's now in use at [DNSimple](https://dnsimple.com/). It has been performing queries in production since July 2009.
 
-[![Build Status](https://travis-ci.org/weppos/whois.svg?branch=master)](https://travis-ci.org/weppos/whois)
+[![Build Status](https://github.com/weppos/whois/actions/workflows/tests.yml/badge.svg)](https://github.com/weppos/whois/actions/workflows/tests.yml)
 
 
 ## Donate a coffee
@@ -42,25 +42,25 @@ For older versions of Ruby, see the [CHANGELOG](CHANGELOG.md).
 
 You can install the gem manually:
 
-~~~shell
+```shell
 gem install whois
-~~~
+```
 
 Or use [Bundler](http://bundler.io/) and define it as a dependency in your `Gemfile`:
 
-~~~ruby
+```ruby
 gem 'whois'
-~~~
+```
 
 To use the WHOIS parser component you need to install the `whois-parser` gem:
 
-~~~shell
+```shell
 gem install whois-parser
-~~~
+```
 
-~~~ruby
+```ruby
 gem 'whois-parser'
-~~~
+```
 
 The `whois-parser` gem already depends on the `whois` gem. If you install `whois-parser`, `whois` will be installed as well and it will also be automatically required when you `require 'whois-parser'`.
 
@@ -77,7 +77,7 @@ This section covers only the essentials for getting started with the Whois libra
 
 Check out the following examples:
 
-~~~ruby
+```ruby
 # Domain WHOIS
 whois = Whois::Client.new
 whois.lookup("google.com")
@@ -97,29 +97,29 @@ whois.lookup("74.125.67.100")
 whois = Whois::Client.new
 whois.lookup("2001:db8::1428:57ab")
 # => #<Whois::Record>
-~~~
+```
 
 The query method is stateless. For this reason, you can safely re-use the same client instance for multiple queries.
 
-~~~ruby
+```ruby
 whois = Whois::Client.new
 whois.lookup("google.com")
 whois.lookup(".com")
 whois.lookup("74.125.67.100")
 whois.lookup("2001:db8::1428:57ab")
 whois.lookup("google.it")
-~~~
+```
 
 If you just need a WHOIS response and you don't care about a full control of the WHOIS client, the `Whois` module provides an all-in-one method called `Whois.whois`. This is the simplest way to send a WHOIS request.
 
-~~~ruby
+```ruby
 Whois.whois("google.com")
 # => #<Whois::Record>
-~~~
+```
 
 Did I mention you can even use blocks?
 
-~~~ruby
+```ruby
 Whois::Client.new do |w|
   w.lookup("google.com")
   w.lookup(".com")
@@ -127,7 +127,7 @@ Whois::Client.new do |w|
   w.lookup("2001:db8::1428:57ab")
   w.lookup("google.it")
 end
-~~~
+```
 
 ### Consuming the Record
 
@@ -135,7 +135,7 @@ Any WHOIS query returns a `Whois::Record`. This object looks like a String, but
 
 `Whois::Record` encapsulates a WHOIS record and provides the ability to parse the WHOIS response programmatically, when the `whois-parser` gem is installed and loaded.
 
-~~~ruby
+```ruby
 require 'whois-parser'
 
 record = Whois.whois("google.it")
@@ -162,7 +162,7 @@ tech.name
 parser.nameservers.each do |nameserver|
   puts nameserver
 end
-~~~
+```
 
 This feature is made possible by the <tt>Whois</tt> record parsers. Unfortunately, due to the lack of a global standard, each WHOIS server requires a specific parser. For this reason, the library doesn't support all existing WHOIS servers.
 
@@ -174,14 +174,14 @@ By default, each query run though the client has a timeout value of 5 seconds. I
 
 Of course, you can customize the timeout value setting a different value. If timeout is `nil`, the client will wait until the response is sent back from the server or the process is killed. Don't disable the timeout unless you really know what you are doing!
 
-~~~ruby
+```ruby
 whois = Whois::Client.new(:timeout => 10)
 whois.timeout # => 10
 whois.timeout = 5
 whois.timeout # => 5
 
 whois.lookup("google.com")
-~~~
+```
 
 
 ## Credits
@@ -213,4 +213,4 @@ Report issues or feature requests to [GitHub Issues](https://github.com/weppos/w
 
 ## License
 
-Copyright (c) 2009-2021 [Simone Carletti](https://simonecarletti.com/). This is Free Software distributed under the MIT license.
+Copyright (c) 2009-2022 [Simone Carletti](https://simonecarletti.com/). This is Free Software distributed under the MIT license.

data/data/tld.json

@@ -1,7 +1,7 @@
 {
   "_": {
     "schema": "2",
-    "updated": "2021-03-02 11:02:00 UTC"
+    "updated": "2021-03-02 11:55:00 UTC"
   },
   "aaa": {
     "_type": "newgtld",
@@ -5871,10 +5871,6 @@
     "_type": "newgtld",
     "host": "whois.nic.vision"
   },
-  "vistaprint": {
-    "_type": "newgtld",
-    "host": "whois.nic.vistaprint"
-  },
   "viva": {
     "_group": "centralnic",
     "_type": "newgtld",
@@ -6314,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",

data/lib/whois/client.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/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.size.zero?
           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) ? Regexp.last_match(2).to_i : nil,
           }
         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.0"
 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,7 +37,7 @@ module Whois
       Client.new.lookup(object)
     end
 
-    alias_method :whois, :lookup
+    alias whois lookup
 
 
     # @deprecated
@@ -47,7 +47,7 @@ module Whois
         return
       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?
@@ -64,7 +64,7 @@ module Whois
         return
       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?

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/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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whois
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.0
 platform: ruby
 authors:
 - Simone Carletti
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -65,6 +65,10 @@ extra_rdoc_files:
 - ".yardopts"
 files:
 - ".github/FUNDING.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/codeql-analysis.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -72,7 +76,6 @@ files:
 - ".rubocop_todo.yml"
 - ".simplecov"
 - ".tool-versions"
-- ".travis.yml"
 - ".yardopts"
 - 4.0-Upgrade.md
 - CHANGELOG.md
@@ -82,7 +85,6 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/setup
 - bin/whoisrb
 - data/asn16.json
 - data/asn32.json
@@ -149,7 +151,7 @@ homepage: https://whoisrb.org/
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -164,39 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: An intelligent pure Ruby WHOIS client and parser.
-test_files:
-- spec/fixtures/referrals/afilias.bz.txt
-- spec/fixtures/referrals/arin_referral_apnic.txt
-- spec/fixtures/referrals/arin_referral_missing.txt
-- spec/fixtures/referrals/arin_referral_ripe.txt
-- spec/fixtures/referrals/arin_referral_rwhois.txt
-- spec/fixtures/referrals/arin_referral_servernap.txt
-- spec/fixtures/referrals/arin_referral_whois.txt
-- spec/fixtures/referrals/crsnic.com.txt
-- spec/fixtures/referrals/crsnic.com_referral.txt
-- spec/fixtures/referrals/crsnic.com_referral_missing.txt
-- spec/integration/whois_spec.rb
-- spec/spec_helper.rb
-- spec/support/helpers/connectivity_helper.rb
-- spec/support/helpers/spec_helper.rb
-- spec/whois/client_spec.rb
-- spec/whois/record/part_spec.rb
-- spec/whois/record_spec.rb
-- spec/whois/server/adapters/afilias_spec.rb
-- spec/whois/server/adapters/arin_spec.rb
-- spec/whois/server/adapters/arpa_spec.rb
-- spec/whois/server/adapters/base_spec.rb
-- spec/whois/server/adapters/formatted_spec.rb
-- spec/whois/server/adapters/none_spec.rb
-- spec/whois/server/adapters/not_implemented_spec.rb
-- spec/whois/server/adapters/standard_spec.rb
-- spec/whois/server/adapters/verisign_spec.rb
-- spec/whois/server/adapters/web_spec.rb
-- spec/whois/server/socket_handler_spec.rb
-- spec/whois/server_spec.rb
-- spec/whois/web_interface_error_spec.rb
-- spec/whois/whois_spec.rb
+test_files: []

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-
-rvm:
-  - "2.4"
-  - "2.5"
-  - "2.6"
-  - "2.7"
-  - ruby-head
-
-cache:
-  - bundler
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-
-before_install:
-  - gem install bundler

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here