whois-parser 1.2.0 → 2.0.0

data/lib/whois/parsers/whois.za.net.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -45,13 +45,13 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /Record Created\s+:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :updated_on do
         if content_for_scanner =~ /Record Last Updated\s+:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -60,7 +60,7 @@ module Whois
 
       property_supported :nameservers do
         if content_for_scanner =~ /Domain Name Servers listed in order:\n\n((.+\n)+)\n/
-          $1.split("\n").reject { |value| value.strip.empty? }.map do |name|
+          ::Regexp.last_match(1).split("\n").reject { |value| value.strip.empty? }.map do |name|
             Parser::Nameserver.new(:name => name.strip)
           end
         end

data/lib/whois/parsers/whois.za.org.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -45,13 +45,13 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /Record Created\s+:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :updated_on do
         if content_for_scanner =~ /Record Last Updated\s+:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -60,7 +60,7 @@ module Whois
 
       property_supported :nameservers do
         if content_for_scanner =~ /Domain Name Servers listed in order:\n\n((.+\n)+)\n/
-          $1.split("\n").reject { |value| value.strip.empty? }.map do |name|
+          ::Regexp.last_match(1).split("\n").reject { |value| value.strip.empty? }.map do |name|
             Parser::Nameserver.new(:name => name.strip)
           end
         end

data/lib/whois/parsers/whois1.nic.bi.rb

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

data/lib/whois/parsers/za_central_registry.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -29,10 +29,11 @@ module Whois
 
       property_supported :registrar do
         return unless node("Sponsoring Registrar")
+
         Parser::Registrar.new(
             id:           node('Sponsoring Registrar IANA ID'),
             name:         node('Sponsoring Registrar'),
-            organization: node('Sponsoring Registrar'),
+            organization: node('Sponsoring Registrar')
         )
       end
 

data/lib/whois/safe_record.rb

@@ -28,6 +28,7 @@ module Whois
     # @api private
     def self.define_question_method(method)
       return if method.to_s.end_with?("?")
+
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{method}?
           !#{method}.nil?
@@ -54,7 +55,7 @@ module Whois
       @record = record
     end
 
-    alias_method :target, :record
+    alias target record
 
 
     # Checks if this class respond to given method.
@@ -166,4 +167,4 @@ module Whois
     end
 
   end
-end
+end

data/lib/whois/scanners/base.rb

@@ -37,7 +37,7 @@ module Whois
       end
 
       tokenizer :skip_blank_line do
-        @input.skip(/^[\s]*\n/)
+        @input.skip(/^\s*\n/)
       end
 
       tokenizer :skip_newline do
@@ -45,7 +45,7 @@ module Whois
       end
 
       # Scan a key/value pair and stores the result in the current target.
-      # target is the global @ast if no '_section' is set, else '_section' is used.
+      #  target is the global @ast if no '_section' is set, else '_section' is used.
       tokenizer :scan_keyvalue do
         if @input.scan(/(.+?):(.*?)(\n|\z)/)
           key, value = @input[1].strip, @input[2].strip
@@ -60,7 +60,7 @@ module Whois
         end
       end
 
-    protected
+      protected
 
       def _scan_lines_to_array(pattern)
         results = []
@@ -73,9 +73,7 @@ module Whois
 
       def _scan_lines_to_hash(pattern)
         results = {}
-        while @input.scan(pattern)
-          results.merge! @input[1].strip => @input[2].strip
-        end
+        results.merge! @input[1].strip => @input[2].strip while @input.scan(pattern)
         results
       end
 
@@ -113,4 +111,4 @@ module Whois
     end
 
   end
-end
+end

data/lib/whois/scanners/base_iisse.rb

@@ -23,8 +23,8 @@ module Whois
       tokenizer :scan_disclaimer do
         if @input.match?(/# Copyright/)
           lines = []
-          while @input.scan(/#(.*)\n\n?/)
-            lines << @input[1].strip unless @input[1].strip == ""
+          while @input.scan(/#(.*)\n\n?/) # rubocop:disable Style/WhileUntilModifier
+            lines << @input[1].strip if @input[1].strip != ""
           end
           @ast["field:disclaimer"] = lines.join(" ")
         end

data/lib/whois/scanners/iana.rb

@@ -13,8 +13,8 @@ module Whois
 
 
       tokenizer :scan_disclaimer do
-        if @input.match?(/^\%(.*?)\n/)
-          @ast["Disclaimer"] = _scan_lines_to_array(/\%(.*?)\n/).select { |line| line =~ /\w+/ }.join(" ")
+        if @input.match?(/^%(.*?)\n/)
+          @ast["Disclaimer"] = _scan_lines_to_array(/%(.*?)\n/).select { |line| line =~ /\w+/ }.join(" ")
         end
       end
 
@@ -23,15 +23,15 @@ module Whois
 
           # Adapt the section's name depending on the first line
           section = case @input[1].strip
-          when 'contact'
-            @input[2].strip # use the contact type name as identifier
-          when 'created', 'changed'
-            'dates'
-          when 'nserver'
-            'nameservers'
-          else
-            @input[1].strip # Default name is the first label found
-          end
+                    when 'contact'
+                      @input[2].strip # use the contact type name as identifier
+                    when 'created', 'changed'
+                      'dates'
+                    when 'nserver'
+                      'nameservers'
+                    else
+                      @input[1].strip # Default name is the first label found
+                    end
 
           content = parse_section_pairs
           @input.match?(/\n+/) || error("Unexpected end of section")
@@ -40,12 +40,12 @@ module Whois
       end
 
 
-    private
+      private
 
       def parse_section_pairs
         # Sets by default the firsts values found in the section parsing bellow
         section_name, section_value = @input[1].strip, @input[2].strip
-        #contents = {section_name =>  section_value}
+        # contents = {section_name =>  section_value}
 
         contents = {}
 
@@ -53,37 +53,37 @@ module Whois
           contents.merge!(content)
         end
 
-        if contents.has_key? section_name
+        if contents.key? section_name
           contents[section_name].insert(0, "#{section_value}\n")
         else
           contents[section_name] = section_value
         end
 
-        if !contents.empty?
-          contents
-        else
+        if contents.empty?
           false
+        else
+          contents
         end
       end
 
-        def parse_section_pair
-          if @input.scan(/^(.+):\s*(.+)\n/)
-            key     =  @input[1].strip
-            values  = [@input[2].strip]
+      def parse_section_pair
+        if @input.scan(/^(.+):\s*(.+)\n/)
+          key     =  @input[1].strip
+          values  = [@input[2].strip]
 
-            while value = parse_section_pair_newlinevalue(key)
-              values << value
-            end
-            { key => values.join("\n") }
+          while value = parse_section_pair_newlinevalue(key)
+            values << value
           end
+          { key => values.join("\n") }
         end
+      end
 
-          def parse_section_pair_newlinevalue(key)
-            if @input.scan(/^#{key}:\s*(.+)\n/)
-              @input[1].strip
-            end
-          end
+      def parse_section_pair_newlinevalue(key)
+        if @input.scan(/^#{key}:\s*(.+)\n/)
+          @input[1].strip
+        end
+      end
 
     end
   end
-end
+end

data/lib/whois/scanners/verisign.rb

@@ -21,12 +21,12 @@ module Whois
       tokenizer :scan_response_unavailable do
         # Check if the string starts with /*
         # If it does, match until the end of all /* lines
-        # or the end of the file and check for the content.
+        #  or the end of the file and check for the content.
         #
         # Flag the block as visited to force the scanner to ignore this tokenizer
-        # if already used and the content didn't match the unavailable message.
+        #  if already used and the content didn't match the unavailable message.
         if @input.match?(/^\*\n/) && !visited?
-          p = /^[^\*]|\z/
+          p = /^[^*]|\z/
           y = @input.check_until(p) =~ /^\* Sorry, the Whois database is currently down/
 
           if y

data/lib/whois/scanners/whois.cira.ca.rb

@@ -35,13 +35,13 @@ module Whois
 
           # This is a nested key
           target = if start.index(" ") == 0
-            error!("Expected group.") if @tmp["group"].nil?
-            @ast[@tmp["group"]] ||= {}
-            @ast[@tmp["group"]]
-          else
-            @tmp.delete("group")
-            @ast
-          end
+                     error!("Expected group.") if @tmp["group"].nil?
+                     @ast[@tmp["group"]] ||= {}
+                     @ast[@tmp["group"]]
+                   else
+                     @tmp.delete("group")
+                     @ast
+                   end
 
           more  = _scan_lines_to_array(/^\s{#{start.size}}(.+)\n/)
           value = more.unshift(value).join("\n") unless more.empty?

data/lib/whois/scanners/whois.denic.de.rb

@@ -34,7 +34,7 @@ module Whois
         if @input.match?(/% Copyright \(c\) *\d{4} by DENIC\n/)
           @input.scan_until(/% Terms and Conditions of Use\n/)
           lines = []
-          while @input.match?(/%/) && @input.scan(/%(.*)\n/)
+          while @input.match?(/%/) && @input.scan(/%(.*)\n/) # rubocop:disable Style/WhileUntilModifier
             lines << @input[1].strip unless @input[1].strip == ""
           end
           @ast["Disclaimer"] = lines.join(" ")
@@ -65,7 +65,7 @@ module Whois
             "fax" => contact['Fax'],
             "email" => contact['Email'],
             "created_on" => nil,
-            "updated_on" => contact['Changed']
+            "updated_on" => contact['Changed'],
           }
         end
       end
@@ -78,7 +78,7 @@ module Whois
       private
 
       def parse_pair(store)
-        if @input.scan(/([^  \[]*):(.*)\n/)
+        if @input.scan(/([^ \[]*):(.*)\n/)
           key, value = @input[1].strip, @input[2].strip
           if store[key].nil?
             store[key] = value

data/lib/whois/scanners/whois.fi.rb

@@ -11,7 +11,7 @@ module Whois
           :scan_available,
           :scan_disclaimer,
           :scan_keyvalue,
-          :scan_reserved
+          :scan_reserved,
       ]
 
 

data/lib/whois/scanners/whois.nic.it.rb

@@ -61,10 +61,10 @@ module Whois
         while content = parse_section_pair
           contents.merge!(content)
         end
-        if !contents.empty?
-          contents
-        else
+        if contents.empty?
           false
+        else
+          contents
         end
       end
 

data/lib/whois/scanners/whois.smallregistry.net.rb

@@ -40,8 +40,8 @@ module Whois
 
       tokenizer :scan_body do
         str = @input.rest
-        str.gsub!(/ (![\w]+) \n/, " \n") # remove custom types
-        @ast.merge! YAML.load(str)
+        str.gsub!(/ (!\w+) \n/, " \n") # remove custom types
+        @ast.merge! YAML.safe_load(str)
         @input.terminate
       end
 

data/lib/whois/scanners/whois.tld.ee.rb

@@ -11,7 +11,7 @@ module Whois
           :skip_head,
           :scan_section,
           :skip_empty_line,
-          :scan_disclaimer
+          :scan_disclaimer,
       ]
 
 
@@ -35,7 +35,7 @@ module Whois
       end
 
       tokenizer :skip_end do
-        @input.skip(/^More information at http:\/\/internet.ee\n?/)
+        @input.skip(%r{^More information at http://internet.ee\n?})
       end
 
       tokenizer :scan_disclaimer do

data/lib/whois/scanners/whois.yoursrs.com.rb

@@ -13,7 +13,7 @@ module Whois
 
 
       tokenizer :scan_available do
-        if @input.scan(/^No match for [\w\.]+/)
+        if @input.scan(/^No match for [\w.]+/)
           @ast["status:available"] = true
         end
       end

data/lib/whois-parser.rb

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

data/spec/fixtures/responses/whois.registro.br/br/status_available.expected

@@ -1,3 +1,7 @@
+#domain
+  %s == "u34jedzcq.br"
+
+
 #status
   %s == :available
 

data/spec/fixtures/responses/whois.registro.br/br/status_registered.expected

@@ -1,3 +1,7 @@
+#domain
+  %s == "google.com.br"
+
+
 #status
   %s == :registered
 

data/spec/integration/whois_spec.rb

@@ -2,15 +2,15 @@ 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
       with_definitions do
         Whois::Server.define(:tld, "it", "whois.nic.it")
         expect(Whois::Server::Adapters::Standard.query_handler).to receive(:call)
-            .with("example.it", "whois.nic.it", 43)
-            .and_return(response)
+          .with("example.it", "whois.nic.it", 43)
+          .and_return(response)
 
         record = Whois.lookup("example.it")
 
@@ -29,8 +29,8 @@ describe Whois do
       with_definitions do
         Whois::Server.define(:tld, "it", "whois.nic.it")
         expect(Whois::Server::Adapters::Standard.query_handler).to receive(:call)
-            .with("example.it", "whois.nic.it", 43, "192.168.1.1", 3000)
-            .and_return(response)
+          .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.lookup("example.it")
@@ -43,8 +43,8 @@ describe Whois do
       with_definitions do
         Whois::Server.define(:tld, "it", "whois.nic.it")
         expect(Whois::Server::Adapters::Standard.query_handler).to receive(:call)
-            .with("example.it", "whois.nic.it", 43, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, 3000)
-            .and_return(response)
+          .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.lookup("example.it")
@@ -57,8 +57,8 @@ describe Whois do
       with_definitions do
         Whois::Server.define(:tld, "it", "whois.nic.it")
         expect(Whois::Server::Adapters::Standard.query_handler).to receive(:call)
-            .with("example.it", "whois.example.com", 43)
-            .and_return(response)
+          .with("example.it", "whois.example.com", 43)
+          .and_return(response)
 
         client = Whois::Client.new(:host => "whois.example.com")
         record = client.lookup("example.it")

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'whois'
 require 'whois/parser'
 
 unless defined?(SPEC_ROOT)
-  SPEC_ROOT = File.expand_path("../", __FILE__)
+  SPEC_ROOT = File.expand_path(__dir__)
 end
 
 # The fixtures are UTF-8 encoded.

data/spec/support/example/parser_example_group.rb

@@ -30,10 +30,10 @@ RSpec::Matchers.define :cache_property do |property|
   end
 end
 
-RSpec::configure do |c|
+RSpec.configure do |c|
   def c.escaped_path(*parts)
     /#{parts.join('\/')}/
   end
 
-  c.include ParserExampleGroup, file_path: c.escaped_path(%w( spec whois parsers ))
+  c.include ParserExampleGroup, file_path: c.escaped_path(%w[spec whois parsers])
 end

data/spec/whois/parser/contact_spec.rb

@@ -14,14 +14,14 @@ describe Whois::Parser::Contact do
       expect {
         instance = described_class.new
         expect(instance.id).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.id).to be_nil
-      }.to_not raise_error
+      }.not_to raise_error
     end
 
     it "initializes a new instance from given hash" do
@@ -48,4 +48,3 @@ describe Whois::Parser::Contact do
   end
 
 end
-

data/spec/whois/parser/nameserver_spec.rb

@@ -14,14 +14,14 @@ describe Whois::Parser::Nameserver do
       expect {
         instance = described_class.new
         expect(instance.name).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.name).to be_nil
-      }.to_not raise_error
+      }.not_to raise_error
     end
 
     it "initializes a new instance from given hash" do

data/spec/whois/parser/registrar_spec.rb

@@ -14,14 +14,14 @@ describe Whois::Parser::Registrar do
       expect {
         instance = described_class.new
         expect(instance.id).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.id).to be_nil
-      }.to_not raise_error
+      }.not_to raise_error
     end
 
     it "initializes a new instance from given hash" do

data/spec/whois/parser_extensions/parser_spec.rb

@@ -7,10 +7,12 @@ describe Whois::Record do
   let(:server) {
     Whois::Server.factory(:tld, ".foo", "whois.example.test")
   }
-  let(:parts) {[
-    Whois::Record::Part.new(body: "This is a record from foo.", host: "foo.example.test"),
-    Whois::Record::Part.new(body: "This is a record from bar.", host: "bar.example.test")
-  ]}
+  let(:parts) {
+    [
+   Whois::Record::Part.new(body: "This is a record from foo.", host: "foo.example.test"),
+   Whois::Record::Part.new(body: "This is a record from bar.", host: "bar.example.test"),
+ ]
+  }
 
   describe "#parser" do
     it "returns a Parser" do

data/spec/whois/parser_extensions/record_spec.rb

@@ -8,10 +8,12 @@ describe Whois::Record do
   let(:server) {
     Whois::Server.factory(:tld, ".foo", "whois.example.test")
   }
-  let(:parts) {[
-    Whois::Record::Part.new(body: "This is a record from foo.", host: "foo.example.test"),
-    Whois::Record::Part.new(body: "This is a record from bar.", host: "bar.example.test")
-  ]}
+  let(:parts) {
+    [
+   Whois::Record::Part.new(body: "This is a record from foo.", host: "foo.example.test"),
+   Whois::Record::Part.new(body: "This is a record from bar.", host: "bar.example.test"),
+ ]
+  }
 
 
   describe "#respond_to?" do
@@ -195,7 +197,7 @@ describe Whois::Record do
 
       expect {
         described_class.new(nil, []).changed?(described_class.new(nil, []))
-      }.to_not raise_error
+      }.not_to raise_error
     end
   end
 
@@ -207,7 +209,7 @@ describe Whois::Record do
 
       expect {
         described_class.new(nil, []).unchanged?(described_class.new(nil, []))
-      }.to_not raise_error
+      }.not_to raise_error
     end
 
     it "returns true if self and other references the same object" do
@@ -278,13 +280,15 @@ describe Whois::Record do
     context "when a simple method" do
       it "passes the request to super" do
         Object.class_eval do
-          def happy; "yes"; end
+          def happy
+            "yes"
+          end
         end
 
         record = described_class.new(nil, [])
         expect {
           expect(record.happy).to eq("yes")
-        }.to_not raise_error
+        }.not_to raise_error
         expect {
           record.sad
         }.to raise_error(NoMethodError)