whois-parser 1.2.0 → 2.0.0

data/lib/whois/parsers/whois.dk-hostmaster.dk.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,15 +29,15 @@ module Whois
 
       property_supported :status do
         if content_for_scanner =~ /Status:\s+(.+?)\n/
-          case $1.downcase
-            when "active"
-              :registered
-            when "deactivated"
-              :expired
-            when "reserved"
-              :reserved
-            else
-              Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+          case ::Regexp.last_match(1).downcase
+          when "active"
+            :registered
+          when "deactivated"
+            :expired
+          when "reserved"
+            :reserved
+          else
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
         else
           :available
@@ -55,7 +55,7 @@ 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
 
@@ -63,7 +63,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.dns.be.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>
 #++
 
 
@@ -31,7 +31,7 @@ module Whois
 
       property_supported :status do
         if content_for_scanner =~ /Status:\s+(.+?)\n/
-          case $1.downcase
+          case ::Regexp.last_match(1).downcase
           when "available"
             :available
           when "not available"
@@ -43,7 +43,7 @@ module Whois
           when "not allowed"
             :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.")
@@ -61,7 +61,7 @@ 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
 
@@ -80,9 +80,9 @@ module Whois
 
       property_supported :nameservers do
         if content_for_scanner =~ /Nameservers:\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.dns.hr.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.dns.lu.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 =~ /domaintype:\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
@@ -49,7 +49,7 @@ module Whois
       property_supported :created_on do
         if content_for_scanner =~ /registered:\s+(.*)\n/
           # Force the parser to use the dd/mm/yyyy format.
-          Time.utc(*$1.split("/").reverse)
+          Time.utc(*::Regexp.last_match(1).split("/").reverse)
         end
       end
 
@@ -62,7 +62,7 @@ module Whois
         if name = value_for_key('registrar-name')
           Parser::Registrar.new(
               name:         name,
-              url:          value_for_key('registrar-url'),
+              url:          value_for_key('registrar-url')
           )
         end
       end
@@ -83,7 +83,7 @@ module Whois
       property_supported :nameservers do
         values_for_key('nserver').map do |line|
           if line =~ /(.+) \[(.+)\]/
-            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)
           end
@@ -94,18 +94,18 @@ module Whois
       private
 
       def build_contact(element, type)
-        if name = value_for_key('%s-name' % element)
-          Parser::Contact.new(
-              type:         type,
-              id:           nil,
-              name:         name,
-              address:      value_for_key('%s-address' % element),
-              city:         value_for_key('%s-city' % element),
-              zip:          value_for_key('%s-zipcode' % element),
-              country_code: value_for_key('%s-country' % element),
-              email:        value_for_key('%s-email' % element)
-          )
-        end
+        return unless (name = value_for_key(format("%s-name", element)))
+
+        Parser::Contact.new(
+            type:         type,
+            id:           nil,
+            name:         name,
+            address:      value_for_key(format("%s-address", element)),
+            city:         value_for_key(format("%s-city", element)),
+            zip:          value_for_key(format("%s-zipcode", element)),
+            country_code: value_for_key(format("%s-country", element)),
+            email:        value_for_key(format("%s-email", element))
+        )
       end
 
       def value_for_key(key)
@@ -123,4 +123,4 @@ module Whois
 
     end
   end
-end
+end

data/lib/whois/parsers/whois.dns.pl.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>
 #++
 
 
@@ -22,7 +22,7 @@ module Whois
 
       property_supported :domain do
         if content_for_scanner =~ /DOMAIN NAME:\s+(.+)\n/
-          $1
+          ::Regexp.last_match(1)
         end
       end
 
@@ -48,19 +48,19 @@ 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 =~ /last modified:\s+(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :expires_on do
-        if content_for_scanner =~ /renewal date:\s+(.+?)\n/ && $1 != "not defined"
-          parse_time($1)
+        if content_for_scanner =~ /renewal date:\s+(.+?)\n/ && ::Regexp.last_match(1) != "not defined"
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -71,7 +71,7 @@ module Whois
 
         lines = match.split("\n")
         Parser::Registrar.new(
-          :name         => lines[0]
+          :name => lines[0]
         )
       end
 
@@ -88,7 +88,7 @@ module Whois
         content_for_scanner.scan(/nameservers:\s+(.+)\n(.+)\n/).flatten.map do |line|
           line.strip!
           if line =~ /(.+) \[(.+)\]/
-            Parser::Nameserver.new(:name => $1.chomp("."), :ipv4 => $2)
+            Parser::Nameserver.new(:name => ::Regexp.last_match(1).chomp("."), :ipv4 => ::Regexp.last_match(2))
           else
             Parser::Nameserver.new(:name => line.chomp("."))
           end
@@ -137,7 +137,7 @@ module Whois
         hash = {}
         lines.each do |line|
           if line =~ /(.+):(.+)/
-            hash[key = $1] = $2.strip
+            hash[key = ::Regexp.last_match(1)] = ::Regexp.last_match(2).strip
           else
             hash[key] += "\n#{line.strip}"
           end

data/lib/whois/parsers/whois.dns.pt.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,8 +25,8 @@ module Whois
     class WhoisDnsPt < Base
 
       property_supported :status do
-        if content_for_scanner =~ /^Estado \/ Status:\s+(.+)\n/
-          case $1.downcase
+        if content_for_scanner =~ %r{^Estado / Status:\s+(.+)\n}
+          case ::Regexp.last_match(1).downcase
           when "active"
             :registered
           when "reserved"
@@ -34,7 +34,7 @@ module Whois
           when "tech-pro"
             :inactive
           else
-            Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
         else
           :available
@@ -52,7 +52,7 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ / Creation Date .+?:\s+(.+)\n/
-          Time.utc(*$1.split("/").reverse)
+          Time.utc(*::Regexp.last_match(1).split("/").reverse)
         end
       end
 
@@ -60,7 +60,7 @@ module Whois
 
       property_supported :expires_on do
         if content_for_scanner =~ / Expiration Date .+?:\s+(.+)\n/
-          Time.utc(*$1.split("/").reverse)
+          Time.utc(*::Regexp.last_match(1).split("/").reverse)
         end
       end
 

data/lib/whois/parsers/whois.domain-registry.nl.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>
 #++
 
 
@@ -39,7 +39,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 "in quarantine"
@@ -47,7 +47,7 @@ module Whois
           when "inactive"
             :inactive
           else
-            Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
         else
           :available
@@ -65,13 +65,13 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /Date registered:\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+(.+)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -80,7 +80,7 @@ module Whois
 
       property_supported :nameservers do
         if content_for_scanner =~ /Domain nameservers:\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, :ipv4 => ipv4)
           end

data/lib/whois/parsers/whois.domainregistry.ie.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>
 #++
 
 
@@ -48,7 +48,7 @@ module Whois
             :available
           end
         else
-          Whois::Parser.bug!(ParserError, "Unknown status `#{node("status")}'.")
+          Whois::Parser.bug!(ParserError, "Unknown status `#{node('status')}'.")
         end
       end
 
@@ -107,6 +107,7 @@ module Whois
       def build_contact(element, type)
         Array.wrap(node(element)).map do |id|
           next unless (contact = node("field:#{id}"))
+
           Parser::Contact.new(
             :type         => type,
             :id           => id,

data/lib/whois/parsers/whois.domreg.lt.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,7 +28,7 @@ module Whois
 
       property_supported :status do
         if content_for_scanner =~ /Status:\s+(.*)\n/
-          $1.to_sym
+          ::Regexp.last_match(1).to_sym
         end
       end
 
@@ -43,7 +43,7 @@ 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
 
@@ -55,7 +55,7 @@ module Whois
       property_supported :nameservers do
         content_for_scanner.scan(/Nameserver:\s+(.+)\n/).flatten.map do |line|
           if line =~ /(.+)\t\[(.+)\]/
-            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.donuts.co.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 WhoisDonutsCo < BaseIcannCompliant
 
       self.scanner = Scanners::BaseIcannCompliant, {
-          pattern_available: /^Domain not found\./
+          pattern_available: /^Domain not found\./,
       }
 
 
@@ -34,6 +34,7 @@ module Whois
 
       property_supported :registrar do
         return unless node("Registrar")
+
         Parser::Registrar.new({
             id:           node("Registrar IANA ID"),
             name:         node("Registrar"),
@@ -43,7 +44,7 @@ module Whois
       end
 
 
-      private
+
       #
       # def build_contact(element, type)
       #   if (contact = super)

data/lib/whois/parsers/whois.dot.cf.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 registered:\s(.+)\n/
-          Time.strptime($1, "%m/%d/%Y")
+          Time.strptime(::Regexp.last_match(1), "%m/%d/%Y")
         end
       end
 
@@ -51,7 +51,7 @@ module Whois
 
       property_supported :expires_on do
         if content_for_scanner =~ /Record will expire on:\s(.+)\n/
-          value = $1.strip
+          value = ::Regexp.last_match(1).strip
           Time.strptime(value, "%m/%d/%Y") if value.present?
         end
       end
@@ -59,7 +59,7 @@ module Whois
 
       property_supported :nameservers do
         if content_for_scanner =~ /Domain Nameservers:\n((.+\n)+)\s+\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.dot.tk.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 registered:\s(.+)\n/
-          Time.strptime($1, "%m/%d/%Y")
+          Time.strptime(::Regexp.last_match(1), "%m/%d/%Y")
         end
       end
 
@@ -51,14 +51,14 @@ module Whois
 
       property_supported :expires_on do
         if content_for_scanner =~ /Record will expire on:\s(.+)\n/
-          Time.strptime($1, "%m/%d/%Y")
+          Time.strptime(::Regexp.last_match(1), "%m/%d/%Y")
         end
       end
 
 
       property_supported :nameservers do
         if content_for_scanner =~ /Domain Nameservers:\n((.+\n)+)\s+\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.dotgov.gov.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

data/lib/whois/parsers/whois.dotmobiregistry.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.dotpostregistry.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.dreamhost.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>
 #++
 
 require_relative 'base_icann_compliant'