whois-parser 1.2.0 → 2.0.0

data/lib/whois/parsers/whois.sk-nic.sk.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>
 #++
 
 
@@ -33,7 +33,7 @@ module Whois
       #
       property_supported :status do
         if content_for_scanner =~ /^Domain-status\s+(.+)\n/
-          case $1.downcase
+          case ::Regexp.last_match(1).downcase
           # The domain is registered and paid.
           when  "dom_ok"
             :registered
@@ -58,7 +58,7 @@ module Whois
           when  "dom_held"
             :redemption
           else
-            Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
         else
           :available
@@ -78,13 +78,13 @@ module Whois
 
       property_supported :updated_on do
         if content_for_scanner =~ /^Last-update\s+(.+)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :expires_on do
         if content_for_scanner =~ /^Valid-date\s+(.+)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 

data/lib/whois/parsers/whois.smallregistry.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>
 #++
 
 
@@ -49,7 +49,7 @@ module Whois
           when "ACTIVE"
             :registered
           else
-            Whois::Parser.bug!(ParserError, "Unknown status `#{node("field:status")}'.")
+            Whois::Parser.bug!(ParserError, "Unknown status `#{node('field:status')}'.")
           end
         end
       end

data/lib/whois/parsers/whois.srs.net.nz.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/whois.sx.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>
 #++
 
 
@@ -113,7 +113,7 @@ module Whois
               :name         => node("#{element} Name"),
               :organization => node("#{element} Organization"),
               :address      => node("#{element} Street"),
-              :city        => node("#{element} City"),
+              :city => node("#{element} City"),
               :zip          => node("#{element} Postal Code"),
               :country      => node("#{element} Country"),
               :email        => node("#{element} Email")

data/lib/whois/parsers/whois.tcinet.ru.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>
 #++
 
 
@@ -26,7 +26,7 @@ module Whois
 
       property_supported :domain do
         if content_for_scanner =~ /domain:\s+(.+?)\n/
-          $1.downcase
+          ::Regexp.last_match(1).downcase
         end
       end
 
@@ -35,7 +35,7 @@ module Whois
 
       property_supported :status do
         if content_for_scanner =~ /state:\s+(.+?)\n/
-          $1.split(",").map(&:strip)
+          ::Regexp.last_match(1).split(",").map(&:strip)
         else
           []
         end
@@ -52,7 +52,7 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /created:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -60,7 +60,7 @@ module Whois
 
       property_supported :expires_on do
         if content_for_scanner =~ /paid-till:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -68,7 +68,7 @@ module Whois
       property_supported :registrar do
         if content_for_scanner =~ /registrar:\s+(.*)\n/
           Parser::Registrar.new(
-              :id           => $1
+              :id => ::Regexp.last_match(1)
           )
         end
       end
@@ -78,16 +78,16 @@ module Whois
         url   = content_for_scanner[/admin-contact:\s+(.+)\n/, 1]
         email = content_for_scanner[/e-mail:\s+(.+)\n/, 1]
         contact = if url or email
-          Parser::Contact.new(
-            :type         => Parser::Contact::TYPE_ADMINISTRATIVE,
-            :url          => url,
-            :email        => email,
-            :name         => content_for_scanner[/person:\s+(.+)\n/, 1],
-            :organization => content_for_scanner[/org:\s+(.+)\n/, 1],
-            :phone        => content_for_scanner[/phone:\s+(.+)\n/, 1],
-            :fax          => content_for_scanner[/fax-no:\s+(.+)\n/, 1]
-          )
-        end
+                    Parser::Contact.new(
+                      :type         => Parser::Contact::TYPE_ADMINISTRATIVE,
+                      :url          => url,
+                      :email        => email,
+                      :name         => content_for_scanner[/person:\s+(.+)\n/, 1],
+                      :organization => content_for_scanner[/org:\s+(.+)\n/, 1],
+                      :phone        => content_for_scanner[/phone:\s+(.+)\n/, 1],
+                      :fax          => content_for_scanner[/fax-no:\s+(.+)\n/, 1]
+                    )
+                  end
         Array.wrap(contact)
       end
 

data/lib/whois/parsers/whois.thnic.co.th.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>
 #++
 
 
@@ -28,11 +28,11 @@ module Whois
 
       property_supported :status do
         if content_for_scanner =~ /Status: (.+?)\n/
-          case $1.downcase
+          case ::Regexp.last_match(1).downcase
           when "active"
             :registered
           else
-            Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
         else
           :available
@@ -50,19 +50,19 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /^Created date: (.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :updated_on do
         if content_for_scanner =~ /^Updated date: (.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :expires_on do
         if content_for_scanner =~ /^Exp date: (.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 

data/lib/whois/parsers/whois.tld.ee.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>
 #++
 
 require_relative 'base'
@@ -29,8 +29,8 @@ module Whois
 
 
       property_supported :domain do
-        if (content_for_scanner =~ /^Domain:\nname:\s+(.+)\n/)
-          $1.to_s.strip.downcase
+        if content_for_scanner =~ /^Domain:\nname:\s+(.+)\n/
+          ::Regexp.last_match(1).to_s.strip.downcase
         end
       end
 
@@ -39,13 +39,13 @@ module Whois
 
       property_supported :status do
         if content_for_scanner =~ /status:\s+(.+?)\n/
-          case $1
+          case ::Regexp.last_match(1)
           when 'ok (paid and in zone)'
             :registered
           when 'expired'
             :expired
           else
-            $1
+            ::Regexp.last_match(1)
           end
         else
           :available
@@ -63,19 +63,19 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /registered:\s+(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :updated_on do
         if content_for_scanner =~ /changed:\s+(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :expires_on do
         if content_for_scanner =~ /expire:\s+(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 

data/lib/whois/parsers/whois.tld.sy.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/whois.tonic.to.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>
 #++
 
 
@@ -30,17 +30,15 @@ module Whois
       property_supported :status do
         if response_incomplete?
           :incomplete
+        elsif available?
+          :available
         else
-          if available?
-            :available
-          else
-            :registered
-          end
+          :registered
         end
       end
 
       property_supported :available? do
-         (!response_incomplete? && !!(content_for_scanner =~ /No match for/))
+        (!response_incomplete? && !!(content_for_scanner =~ /No match for/))
       end
 
       property_supported :registered? do

data/lib/whois/parsers/whois.tucows.com.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>
 #++
 
 
@@ -20,7 +20,7 @@ module Whois
     #
     class WhoisTucowsCom < BaseIcannCompliant
       self.scanner = Scanners::BaseIcannCompliant, {
-          pattern_available: /^ No match for/
+          pattern_available: /^ No match for/,
       }
     end
 

data/lib/whois/parsers/whois.twnic.net.tw.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,7 +45,7 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /Record created on ([^ ]+) .+\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -53,14 +53,14 @@ module Whois
 
       property_supported :expires_on do
         if content_for_scanner =~ /Record expires on ([^ ]+) .+\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
 
       property_supported :nameservers do
         if content_for_scanner =~ /Domain servers in listed order:\n((.+\n)+)\n/
-          $1.split("\n").map do |name|
+          ::Regexp.last_match(1).split("\n").map do |name|
             Parser::Nameserver.new(:name => name.strip)
           end
         end

data/lib/whois/parsers/whois.tznic.or.tz.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/whois.ua.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>
 #++
 
 
@@ -26,7 +26,7 @@ module Whois
 
         def status
           if content =~ /status:\s+(.+?)\n/
-            case (s = $1.downcase)
+            case (s = ::Regexp.last_match(1).downcase)
             when "ok", "clienthold", "autorenewgraceperiod", "clienttransferprohibited"
               :registered
             when "redemptionperiod", "pendingdelete"
@@ -41,19 +41,19 @@ module Whois
 
         def created_on
           if content =~ /created:\s+(.+)\n/
-            Base.parse_time($1)
+            Base.parse_time(::Regexp.last_match(1))
           end
         end
 
         def updated_on
           if content =~ /modified:\s+(.+)\n/
-            Base.parse_time($1)
+            Base.parse_time(::Regexp.last_match(1))
           end
         end
 
         def expires_on
           if content =~ /expires:\s+(.+)\n/
-            Base.parse_time($1)
+            Base.parse_time(::Regexp.last_match(1))
           end
         end
 
@@ -97,7 +97,7 @@ module Whois
 
         def status
           if content =~ /status:\s+(.+?)\n/
-            case (s = $1.downcase)
+            case (s = ::Regexp.last_match(1).downcase)
             when /^ok-until/
               :registered
             else
@@ -110,21 +110,21 @@ module Whois
 
         def created_on
           if content =~ /created:\s+(.+)\n/
-            time = $1.split(" ").last
+            time = ::Regexp.last_match(1).split(" ").last
             Base.parse_time(time)
           end
         end
 
         def updated_on
           if content =~ /changed:\s+(.+)\n/
-            time = $1.split(" ").last
+            time = ::Regexp.last_match(1).split(" ").last
             Base.parse_time(time)
           end
         end
 
         def expires_on
           if content =~ /status:\s+(.+)\n/
-            time = $1.split(" ").last
+            time = ::Regexp.last_match(1).split(" ").last
             Base.parse_time(time)
           end
         end
@@ -157,7 +157,7 @@ module Whois
               phone:        textblock.slice(/phone:\s+(.+)\n/, 1),
               fax:          textblock.slice(/fax-no:\s+(.+)\n/, 1),
               email:        textblock.slice(/e-mail:\s+(.+)\n/, 1),
-              updated_on:   (Base.parse_time($1.split(" ").last) if textblock =~ /changed:\s+(.+)\n/)
+              updated_on:   (Base.parse_time(::Regexp.last_match(1).split(" ").last) if textblock =~ /changed:\s+(.+)\n/)
             )
           end
         end
@@ -166,7 +166,7 @@ module Whois
 
       property_supported :domain do
         if content_for_scanner =~ /domain:\s+(.+)\n/
-          $1
+          ::Regexp.last_match(1)
         end
       end
 

data/lib/whois/parsers/whois.udag.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>
 #++
 
 
@@ -20,9 +20,9 @@ module Whois
     #
     class WhoisUdagNet < BaseIcannCompliant
       self.scanner = Scanners::BaseIcannCompliant, {
-          pattern_available: /^We could not find the requested domain on our system/
+          pattern_available: /^We could not find the requested domain on our system/,
       }
     end
 
   end
-end
+end

data/lib/whois/parsers/whois.uniregistry.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>
 #++
 
 
@@ -20,7 +20,7 @@ module Whois
     #
     class WhoisUniregistryNet < BaseIcannCompliant
       self.scanner = Scanners::BaseIcannCompliant, {
-          pattern_available: />>> Domain \".+\" is available/
+          pattern_available: />>> Domain ".+" is available/,
       }
 
 
@@ -38,6 +38,7 @@ module Whois
 
       property_supported :registrar do
         return unless node('Sponsoring Registrar')
+
         Parser::Registrar.new(
             id:           node('Sponsoring Registrar IANA ID'),
             name:         node('Sponsoring Registrar'),

data/lib/whois/parsers/whois.usp.ac.fj.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>
 #++
 
 
@@ -26,11 +26,11 @@ module Whois
 
       property_supported :status do
         if content_for_scanner =~ /Status:\s+(.+?)\n/
-          case $1.downcase
+          case ::Regexp.last_match(1).downcase
           when "active"
             :registered
           else
-            Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
         else
           :available
@@ -52,14 +52,14 @@ module Whois
 
       property_supported :expires_on do
         if content_for_scanner =~ /Expires:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
 
       property_supported :nameservers do
         if content_for_scanner =~ /Domain servers:\n\n((.+\n)+)\n/
-          $1.split("\n").map do |line|
+          ::Regexp.last_match(1).split("\n").map do |line|
             name, ipv4 = line.strip.split(/\s+/)
             Parser::Nameserver.new(name: name.downcase, ipv4: ipv4)
           end

data/lib/whois/parsers/whois.verisign-grs.com.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/whois.website.ws.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>
 #++
 
 
@@ -43,26 +43,26 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /\s+Domain Created:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :updated_on do
         if content_for_scanner =~ /\s+Domain Last Updated:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :expires_on do
         if content_for_scanner =~ /\s+Domain Currently Expires:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
 
       property_supported :nameservers do
         if content_for_scanner =~ /Current Nameservers:\n\n((.+\n)+)\n/
-          $1.split("\n").map do |name|
+          ::Regexp.last_match(1).split("\n").map do |name|
             Parser::Nameserver.new(name: name.strip.downcase)
           end
         end

data/lib/whois/parsers/whois.wildwestdomains.com.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>
 #++
 
 
@@ -21,7 +21,7 @@ module Whois
     class WhoisWildwestdomainsCom < BaseIcannCompliant
 
       self.scanner = Scanners::BaseIcannCompliant, {
-          pattern_available: /^Domain (.+) is not registered here.\n/
+          pattern_available: /^Domain (.+) is not registered here.\n/,
       }
 
 

data/lib/whois/parsers/whois.yoursrs.com.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>
 #++
 
 
@@ -67,7 +67,7 @@ module Whois
       property_supported :registrar do
         node("Sponsoring Registrar") do |value|
           Parser::Registrar.new(
-              name:         value
+              name: value
           )
         end
       end
@@ -97,10 +97,10 @@ module Whois
 
       def build_contact(element, type)
         node("#{element} ID") do
-          address = (1..3).
-              map { |i| node("#{element} Street#{i}") }.
-              delete_if { |i| i.nil? || i.empty? }.
-              join("\n")
+          address = (1..3)
+                    .map { |i| node("#{element} Street#{i}") }
+                    .delete_if { |i| i.nil? || i.empty? }
+                    .join("\n")
 
           Parser::Contact.new(
               type:         type,