whois 5.0.1 → 5.0.2

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -40,6 +42,7 @@ module Whois
 
         def extract_referral(response)
           return unless (match = response.match(/Registrar WHOIS Server:(.+?)$/))
+
           server = match[match.size - 1].strip
           server.empty? ? nil : server
         end

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -39,9 +41,10 @@ module Whois
 
         def extract_referral(response)
           return unless response =~ /ReferralServer:\s*r?whois:\/\/([\w.-]+)(?::(\d+))?/
+
           {
             host: $1,
-            port: $2 ? $2.to_i : nil
+            port: $2 ? $2.to_i : nil,
           }
         end
 

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -22,26 +24,27 @@ module Whois
 
         private
 
-          # "127.1.168.192.in-addr.arpa" => "192.168.1.127"
-          # "1.168.192.in-addr.arpa" => "192.168.1.0"
-          # "168.192.in-addr.arpa" => "192.168.0.0"
-          # "192.in-addr.arpa" => "192.0.0.0"
-          # "in-addr.arpa" => "0.0.0.0"
-          def inaddr_to_ip(string)
-            unless string.match?(/^([0-9]{1,3}\.?){0,4}in-addr\.arpa$/)
-              raise ServerError, "Invalid .in-addr.arpa address"
-            end
-             a, b, c, d = string.scan(/[0-9]{1,3}\./).reverse
-            [a, b, c, d].map do |token|
-              token = (token ||= 0).to_i
-              if token <= 255 && token >= 0
-                token
-              else
-                raise ServerError, "Invalid .in-addr.arpa token `#{token}'"
-              end
-            end.join(".")
+        # "127.1.168.192.in-addr.arpa" => "192.168.1.127"
+        # "1.168.192.in-addr.arpa" => "192.168.1.0"
+        # "168.192.in-addr.arpa" => "192.168.0.0"
+        # "192.in-addr.arpa" => "192.0.0.0"
+        # "in-addr.arpa" => "0.0.0.0"
+        def inaddr_to_ip(string)
+          unless string.match?(/^([0-9]{1,3}\.?){0,4}in-addr\.arpa$/)
+            raise ServerError, "Invalid .in-addr.arpa address"
           end
 
+          a, b, c, d = string.scan(/[0-9]{1,3}\./).reverse
+          [a, b, c, d].map do |token|
+            token = (token || 0).to_i
+            if token <= 255 && token >= 0
+              token
+            else
+              raise ServerError, "Invalid .in-addr.arpa token `#{token}'"
+            end
+          end.join(".")
+        end
+
       end
 
     end

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -22,9 +24,7 @@ module Whois
             @query_handler ||= SocketHandler.new
           end
 
-          def query_handler=(handler)
-            @query_handler = handler
-          end
+          attr_writer :query_handler
         end
 
         # Default WHOIS request port.

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 #--
 # Ruby Whois
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2021 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -47,7 +49,7 @@ module Whois
         #
         def request(string)
           options[:format] || raise(ServerError, "Missing mandatory :format option for adapter `Formatted'")
-          response = query_the_socket(sprintf(options[:format], string), host)
+          response = query_the_socket(format(options[:format], string), host)
           buffer_append response, host
         end
 

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

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

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

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

data/lib/whois/server/adapters/standard.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>
 #++
 
 
@@ -56,4 +58,4 @@ module Whois
 
     end
   end
-end
+end

data/lib/whois/server/adapters/verisign.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>
 #++
 
 
@@ -40,6 +42,7 @@ module Whois
 
         def extract_referral(response)
           return unless (match = response.match(/Registrar WHOIS Server:(.+?)$/))
+
           server = match[match.size - 1].strip
           server.empty? ? nil : server
         end

data/lib/whois/server/adapters/web.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/server/socket_handler.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>
 #++
 
 
@@ -22,9 +24,9 @@ module Whois
       # Array of connection errors to rescue
       # and wrap into a {Whois::ConnectionError}
       RESCUABLE_CONNECTION_ERRORS = [
-          SystemCallError,
-          SocketError,
-      ]
+        SystemCallError,
+        SocketError,
+      ].freeze
 
       # Performs the Socket request.
       #
@@ -36,8 +38,8 @@ module Whois
       #
       def call(query, *args)
         execute(query, *args)
-      rescue *RESCUABLE_CONNECTION_ERRORS => error
-        raise ConnectionError, "#{error.class}: #{error.message}"
+      rescue *RESCUABLE_CONNECTION_ERRORS => e
+        raise ConnectionError, "#{e.class}: #{e.message}"
       end
 
       # Executes the low-level Socket connection.

data/lib/whois/version.rb

@@ -1,13 +1,15 @@
+# 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>
 #++
 
 
 module Whois
   # The current library version.
-  VERSION = "5.0.1".freeze
+  VERSION = "5.0.2"
 end

data/spec/integration/whois_spec.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Whois do
-
-  let(:response)    { "Domain:             example.it\nStatus:             AVAILABLE\n" }
+  let(:response) { "Domain:             example.it\nStatus:             AVAILABLE\n" }
 
   describe "Basic WHOIS querying and parsing" do
     it "works" do
@@ -32,7 +33,7 @@ describe Whois do
           .with("example.it", "whois.nic.it", 43, "192.168.1.1", 3000)
           .and_return(response)
 
-        client = Whois::Client.new(:bind_host => "192.168.1.1", :bind_port => 3000)
+        client = Whois::Client.new(bind_host: "192.168.1.1", bind_port: 3000)
         client.lookup("example.it")
       end
     end
@@ -46,7 +47,7 @@ describe Whois do
           .with("example.it", "whois.nic.it", 43, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, 3000)
           .and_return(response)
 
-        client = Whois::Client.new(:bind_port => 3000)
+        client = Whois::Client.new(bind_port: 3000)
         client.lookup("example.it")
       end
     end
@@ -60,7 +61,7 @@ describe Whois do
           .with("example.it", "whois.example.com", 43)
           .and_return(response)
 
-        client = Whois::Client.new(:host => "whois.example.com")
+        client = Whois::Client.new(host: "whois.example.com")
         record = client.lookup("example.it")
 
         expect(record.parts.size).to eq(1)
@@ -69,5 +70,4 @@ describe Whois do
       end
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'rspec'
 require 'whois'
 
 unless defined?(SPEC_ROOT)
-  SPEC_ROOT = File.expand_path("../", __FILE__)
+  SPEC_ROOT = File.expand_path(__dir__)
 end
 
 # The fixtures are UTF-8 encoded.
@@ -12,7 +14,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")].each { |f| require f }
+Dir[File.join(SPEC_ROOT, "support/**/*.rb")].sort.each { |f| require f }
 
 RSpec.configure do |config|
   config.mock_with :rspec

data/spec/support/helpers/connectivity_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RSpecSupportConnectivityHelpers
   def need_connectivity
     if connectivity_available?

data/spec/support/helpers/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RSpecSupportSpecHelpers
 
   def fixture(*names)

data/spec/whois/client_spec.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Whois::Client do
-
   describe "#initialize" do
     it "accepts a zero parameters" do
-      expect { described_class.new }.to_not raise_error
+      expect { described_class.new }.not_to raise_error
     end
 
     it "accepts a settings parameter" do
-      expect { described_class.new({ foo: "bar" }) }.to_not raise_error
+      expect { described_class.new({ foo: "bar" }) }.not_to raise_error
     end
 
 
@@ -111,7 +112,7 @@ describe Whois::Client do
       client = described_class.new(timeout: 5)
       expect {
         client.lookup("example.test")
-      }.to_not raise_error
+      }.not_to raise_error
     end
 
     it "supports unlimited timeout" do
@@ -125,9 +126,8 @@ describe Whois::Client do
       client = described_class.new.tap { |c| c.timeout = nil }
       expect {
         client.lookup("example.test")
-      }.to_not raise_error
+      }.not_to raise_error
     end
-
   end
 
   # FIXME: use RSpec metadata
@@ -140,5 +140,4 @@ describe Whois::Client do
       end
     end
   end
-
 end

data/spec/whois/record/part_spec.rb

@@ -1,20 +1,21 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Whois::Record::Part do
-
   describe "#initialize" do
     it "accepts an empty value" do
       expect {
         instance = described_class.new
         expect(instance.body).to be_nil
-      }.to_not raise_error
+      }.not_to raise_error
     end
 
     it "accepts an empty hash" do
       expect {
         instance = described_class.new({})
         expect(instance.body).to be_nil
-      }.to_not raise_error
+      }.not_to raise_error
     end
 
     it "initializes a new instance from given hash" do
@@ -34,5 +35,4 @@ describe Whois::Record::Part do
       expect(instance.host).to eq("whois.example.test")
     end
   end
-
 end