whois-parser 1.2.0 → 2.0.0

data/lib/whois/parsers/whois.educause.edu.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>
 #++
 
 
@@ -25,7 +25,7 @@ module Whois
 
       property_supported :disclaimer do
         if content_for_scanner =~ /\A((.*\n)+)\n--------------------------\n/
-          $1
+          ::Regexp.last_match(1)
         else
           Whois::Parser.bug!(ParserError, "Unable to parse disclaimer.")
         end
@@ -34,7 +34,7 @@ module Whois
 
       property_supported :domain do
         if content_for_scanner =~ /Domain Name:\s(.+?)\n/
-          $1.downcase
+          ::Regexp.last_match(1).downcase
         end
       end
 
@@ -60,19 +60,19 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /Domain record activated:\s+(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :updated_on do
         if content_for_scanner =~ /Domain record last updated:\s+(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :expires_on do
         if content_for_scanner =~ /Domain expires:\s+(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -94,7 +94,7 @@ module Whois
 
       property_supported :nameservers do
         if content_for_scanner =~ /Name Servers: \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
@@ -102,7 +102,7 @@ module Whois
       end
 
 
-    private
+      private
 
       # [NAME] | EMPTY
       # [ROLE]?
@@ -114,7 +114,7 @@ module Whois
       # [EMAIL]
       def build_contact(element, type)
         if content_for_scanner =~ /#{element}:\n+((.+\n)+)\n/
-          lines = $1.split("\n").map(&:strip)
+          lines = ::Regexp.last_match(1).split("\n").map(&:strip)
           items = lines.dup
 
           # Extract variables
@@ -129,13 +129,11 @@ module Whois
 
           v6 = items.delete_at(-1)
           if v6 =~ /([^\n,]+),\s([A-Z]{2})(?:\s(\d{5}(?:-\d{4})?))/
-            v6, v7, v8 = $1, $2, $3
+            v6, v7, v8 = ::Regexp.last_match(1), ::Regexp.last_match(2), ::Regexp.last_match(3)
           end
 
           v4 = []
-          until items[0] =~ /^\d+/ || items.empty?
-            v4 << items.shift
-          end
+          v4 << items.shift until items[0] =~ /^\d+/ || items.empty?
           v4 = v4.join("\n")
 
           v5 = items.empty? ? nil : items.join("\n")
@@ -163,7 +161,7 @@ module Whois
       # [COUNTRY]
       def build_contact_registrant(element, type)
         if content_for_scanner =~ /#{element}:\n((.+\n)+)\n/
-          lines = $1.split("\n").map(&:strip)
+          lines = ::Regexp.last_match(1).split("\n").map(&:strip)
           items = lines.dup
 
           # Extract variables
@@ -174,7 +172,7 @@ module Whois
 
           v6 = items.delete_at(-1)
           if v6 =~ /([^\n,]+),\s([A-Z]{2})(?:\s(\d{5}))/
-            v6, v7, v8 = $1, $2, $3
+            v6, v7, v8 = ::Regexp.last_match(1), ::Regexp.last_match(2), ::Regexp.last_match(3)
           end
 
           v5 = items.empty? ? nil : items.join("\n")

data/lib/whois/parsers/whois.eenet.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>
 #++
 
 
@@ -45,13 +45,13 @@ 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
 
       property_supported :updated_on do
         if content_for_scanner =~ /Record changed on (.*)\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 servers:\n((.+\n)+)\n/
-          $1.split("\n").map do |name|
+          ::Regexp.last_match(1).split("\n").map do |name|
             Parser::Nameserver.new(:name => name.strip.chomp("."))
           end
         end

data/lib/whois/parsers/whois.enom.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 WhoisEnomCom < BaseIcannCompliant
       self.scanner = Scanners::BaseIcannCompliant, {
-          pattern_available: /^Domain not found\.\n/
+          pattern_available: /^Domain not found\.\n/,
       }
 
       property_supported :updated_on do

data/lib/whois/parsers/whois.eu.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>
 #++
 
 

data/lib/whois/parsers/whois.eu.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>
 #++
 
 
@@ -19,7 +19,7 @@ module Whois
 
       property_supported :domain do
         if content_for_scanner =~ /Domain:\s+(.+)\n/
-          "#{$1.downcase}"
+          "#{::Regexp.last_match(1).downcase}"
         end
       end
 
@@ -52,7 +52,7 @@ module Whois
 
       property_supported :registrar do
         if content_for_scanner =~ /Registrar:\s((.+\n)+)\n/
-          lines = $1
+          lines = ::Regexp.last_match(1)
           Parser::Registrar.new(
               name:         lines.slice(/Name:\s+(.+)/, 1),
               url:          lines.slice(/Website:\s+(.+)/, 1)
@@ -76,7 +76,7 @@ module Whois
       #
       property_supported :technical_contacts do
         if content_for_scanner =~ /Technical:\s((.+\n)+)\n/
-          lines = $1
+          lines = ::Regexp.last_match(1)
           Parser::Contact.new(
             :type         => Parser::Contact::TYPE_TECHNICAL,
             :id           => nil,
@@ -102,9 +102,9 @@ module Whois
       #
       property_supported :nameservers do
         if content_for_scanner =~ /Name\sservers:\s((.+\n)+)\n/
-          $1.split("\n").map do |line|
+          ::Regexp.last_match(1).split("\n").map do |line|
             if line.strip =~ /(.+) \((.+)\)/
-              Parser::Nameserver.new(:name => $1, :ipv4 => $2)
+              Parser::Nameserver.new(:name => ::Regexp.last_match(1), :ipv4 => ::Regexp.last_match(2))
             else
               Parser::Nameserver.new(:name => line.strip)
             end

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

data/lib/whois/parsers/whois.gandi.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>
 #++
 
 

data/lib/whois/parsers/whois.gg.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.godaddy.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.gov.za.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,7 +43,7 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /Date : (.+)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 

data/lib/whois/parsers/whois.hkirc.hk.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,7 +43,7 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /Domain Name Commencement Date:\s(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -51,14 +51,14 @@ module Whois
 
       property_supported :expires_on do
         if content_for_scanner =~ /Expiry Date:\s(.+?)\n/
-          parse_time($1.strip)
+          parse_time(::Regexp.last_match(1).strip)
         end
       end
 
 
       property_supported :nameservers do
         if content_for_scanner =~ /Name Servers Information:\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.iana.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>
 #++
 
 

data/lib/whois/parsers/whois.iis.nu.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.iis.se.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.in.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,11 +26,11 @@ module Whois
 
       property_supported :status do
         if content_for_scanner =~ /status:\s+(.+?)\n/
-          case $1.split("-").first.downcase
+          case ::Regexp.last_match(1).split("-").first.downcase
           when "ok"
             :registered
           else
-            Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
         else
           :available
@@ -50,14 +50,14 @@ module Whois
 
       property_supported :updated_on do
         if content_for_scanner =~ /changed:\s+(.*)\n/
-          time = $1.split(" ").last
+          time = ::Regexp.last_match(1).split(" ").last
           Time.strptime(time, "%Y%m%d%H%M%S")
         end
       end
 
       property_supported :expires_on do
         if content_for_scanner =~ /status:\s+(.*)\n/
-          time = $1.split(" ").last
+          time = ::Regexp.last_match(1).split(" ").last
           Time.strptime(time, "%Y%m%d%H%M%S")
         end
       end

data/lib/whois/parsers/whois.inregistry.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>
 #++
 
 
@@ -18,7 +18,7 @@ module Whois
 
       self.scanner = Scanners::BaseAfilias, {
           # Disclaimer starts with "Access to" in .in servers
-          pattern_disclaimer: /^Access to/
+          pattern_disclaimer: /^Access to/,
       }
 
     end

data/lib/whois/parsers/whois.isnic.is.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 =~ /created:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -53,7 +53,7 @@ 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
 

data/lib/whois/parsers/whois.isoc.org.il.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,13 +28,13 @@ module Whois
 
       property_supported :status do
         if content_for_scanner =~ /status:\s+(.*?)\n/
-          case $1.downcase
+          case ::Regexp.last_match(1).downcase
           when "transfer locked"
             :registered
           when "transfer allowed"
             :registered
           else
-            Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
         else
           :available

data/lib/whois/parsers/whois.ja.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>
 #++
 
 
@@ -43,26 +43,26 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /^Entry created:\n\s+(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :updated_on do
         if content_for_scanner =~ /^Entry updated:\n\s+(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :expires_on do
         if content_for_scanner =~ /^Renewal date:\n\s+(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
 
       property_supported :nameservers do
         if content_for_scanner =~ /Servers:\n((.+\n)+)\n/
-          $1.split("\n").map do |line|
+          ::Regexp.last_match(1).split("\n").map do |line|
             name, ipv4 = line.strip.downcase.split("\t")
             Parser::Nameserver.new(:name => name, :ipv4 => ipv4)
           end

data/lib/whois/parsers/whois.je.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.jprs.jp.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 :status do
         if content_for_scanner =~ /\[Status\]\s+(.+)\n/
-          case $1.downcase
+          case ::Regexp.last_match(1).downcase
           when "active"
             :registered
           when "reserved"
@@ -36,10 +36,10 @@ module Whois
           when "suspended"
             :expired
           else
-            Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
         elsif content_for_scanner =~ /\[State\]\s+(.+)\n/
-          case $1.split(" ").first.downcase
+          case ::Regexp.last_match(1).split(" ").first.downcase
           when "connected", "registered"
             :registered
           when "deleted"
@@ -47,9 +47,9 @@ module Whois
           when "reserved"
             :reserved
           else
-            Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
-       else
+        else
           :available
         end
       end
@@ -66,21 +66,21 @@ module Whois
       # TODO: timezone ('Asia/Tokyo')
       property_supported :created_on do
         if content_for_scanner =~ /\[(?:Created on|Registered Date)\][ \t]+(.*)\n/
-          ($1.empty?) ? nil : parse_time($1)
+          ::Regexp.last_match(1).empty? ? nil : parse_time(::Regexp.last_match(1))
         end
       end
 
       # TODO: timezone ('Asia/Tokyo')
       property_supported :updated_on do
         if content_for_scanner =~ /\[Last Updated?\][ \t]+(.*)\n/
-          ($1.empty?) ? nil : parse_time($1)
+          ::Regexp.last_match(1).empty? ? nil : parse_time(::Regexp.last_match(1))
         end
       end
 
       # TODO: timezone ('Asia/Tokyo')
       property_supported :expires_on do
         if content_for_scanner =~ /\[(?:Expires on|State)\][ \t]+(.*)\n/
-          ($1.empty?) ? nil : parse_time($1)
+          ::Regexp.last_match(1).empty? ? nil : parse_time(::Regexp.last_match(1))
         end
       end
 

data/lib/whois/parsers/whois.kenic.or.ke.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 :status do
         if content_for_scanner =~ /Status:\s+(.+?)\n/
-          case $1.downcase
+          case ::Regexp.last_match(1).downcase
           when "active"
             :registered
           when "not registered"
@@ -34,7 +34,7 @@ module Whois
           when "this whois server does not have any records for that zone."
             :invalid
           else
-            Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
         else
           Whois::Parser.bug!(ParserError, "Unable to parse status.")
@@ -52,26 +52,26 @@ 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
 
       property_supported :updated_on do
         if content_for_scanner =~ /Modified:\s+(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       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 =~ /Name Servers:\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