whois-parser 1.2.0 → 2.0.0

data/lib/whois/parsers/whois.nic.ve.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 =~ /Estatus del dominio: (.+?)\n/
-          case $1.downcase
-            when "activo"
-              :registered
-            when "suspendido"
-              :inactive
-            else
-              Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+          case ::Regexp.last_match(1).downcase
+          when "activo"
+            :registered
+          when "suspendido"
+            :inactive
+          else
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
         else
           :available
@@ -52,25 +52,25 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /Fecha de Creacion: (.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :updated_on do
         if content_for_scanner =~ /Ultima Actualizacion: (.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :expires_on do
         if content_for_scanner =~ /Fecha de Vencimiento: (.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :nameservers do
         if content_for_scanner =~ /Servidor\(es\) de Nombres de Dominio:\n\n((.+\n)+)\n/
-          $1.scan(/-\s(.*?)\n/).flatten.map do |name|
+          ::Regexp.last_match(1).scan(/-\s(.*?)\n/).flatten.map do |name|
             Parser::Nameserver.new(:name => name)
           end
         end

data/lib/whois/parsers/whois.nic.wf.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.nic.xxx.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.nic.xyz.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.norid.no.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,13 +43,13 @@ 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 updated:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 

data/lib/whois/parsers/whois.pairnic.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,9 +20,9 @@ module Whois
     #
     class WhoisPairnicCom < BaseIcannCompliant
       self.scanner = Scanners::BaseIcannCompliant, {
-          pattern_available: /^No matching domain name found\.\n/
+          pattern_available: /^No matching domain name found\.\n/,
       }
     end
 
   end
-end
+end

data/lib/whois/parsers/whois.pandi.or.id.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.pir.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>
 #++
 
 
@@ -63,9 +63,9 @@ module Whois
       def build_contact(element, type)
         node("#{element} ID") do
           address = [node("#{element} Street")]
-          address = (address + (1..3).map { |i| node("#{element} Street#{i}") }).
-            delete_if { |i| i.nil? || i.empty? }.
-            join("\n")
+          address = (address + (1..3).map { |i| node("#{element} Street#{i}") })
+                    .delete_if { |i| i.nil? || i.empty? }
+                    .join("\n")
 
           Parser::Contact.new(
               :type         => type,

data/lib/whois/parsers/whois.pnina.ps.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.register.bg.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 =~ /registration status:\s+(.+?)\n/
-          case $1.downcase
+          case ::Regexp.last_match(1).downcase
           when "registered"
             :registered
           else
-            Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
         else
           :available
@@ -50,7 +50,7 @@ module Whois
         if content_for_scanner =~ /activated on:\s+(.*?)\n/
           # Time.parse("30/06/2003 00:00:00")
           # => ArgumentError: argument out of range
-          parse_time($1.gsub("/", "-"))
+          parse_time(::Regexp.last_match(1).gsub("/", "-"))
         end
       end
 
@@ -60,16 +60,16 @@ module Whois
         if content_for_scanner =~ /expires at:\s+(.*?)\n/
           # Time.parse("30/06/2003 00:00:00")
           # => ArgumentError: argument out of range
-          parse_time($1.gsub("/", "-"))
+          parse_time(::Regexp.last_match(1).gsub("/", "-"))
         end
       end
 
 
       property_supported :nameservers do
         if content_for_scanner =~ /NAME SERVER INFORMATION:\n((.+\n)+)\s+\n/
-          $1.split("\n").map do |line|
+          ::Regexp.last_match(1).split("\n").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.strip)
             end

data/lib/whois/parsers/whois.register.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.register.si.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/
-          statuses = $1.downcase.split(",").map(&:strip)
+          statuses = ::Regexp.last_match(1).downcase.split(",").map(&:strip)
           if statuses.include?("server_update_prohibited")
             :registered
           else
-            Whois::Parser.bug!(ParserError, "Unknown status `#{$1}'.")
+            Whois::Parser.bug!(ParserError, "Unknown status `#{::Regexp.last_match(1)}'.")
           end
         else
           :available
@@ -48,7 +48,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
 
@@ -56,7 +56,7 @@ module Whois
 
       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.registre.ma.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,13 +43,13 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /domain:Created:(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :updated_on do
         if content_for_scanner =~ /domain:Updated:(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 

data/lib/whois/parsers/whois.registro.br.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>
 #++
 
 
@@ -24,6 +24,15 @@ module Whois
     #
     class WhoisRegistroBr < Base
 
+      property_supported :domain do
+        if available?
+          content_for_scanner.match(/^% No match for \s*(.+)\n/)[1]
+        else
+          content_for_scanner.match(/^domain: \s*(.+)\n/)[1]
+        end
+      end
+
+
       property_supported :status do
         if available?
           :available
@@ -43,19 +52,19 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /created:\s+(.+?)(\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 =~ /expires:\s+(.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -86,13 +95,13 @@ module Whois
       def parse_contact(element, type)
         return unless content_for_scanner =~ /#{element}:\s+(.+)\n/
 
-        id = $1
+        id = ::Regexp.last_match(1)
         content_for_scanner.scan(/nic-hdl-br:\s+#{id}\n((.+\n)+)\n/).any? ||
             Whois.bug!(ParserError, "Unable to parse contact block for nic-hdl-br: #{id}")
-        values = build_hash($1.scan(/(.+?):\s+(.+?)\n/))
+        values = build_hash(::Regexp.last_match(1).scan(/(.+?):\s+(.+?)\n/))
 
-        created_on = values["created"] ? Time.utc(*values["created"][0..3],*values["created"][4..5],*values["created"][6..7]) : nil
-        updated_on = values["changed"] ? Time.utc(*values["changed"][0..3],*values["changed"][4..5],*values["changed"][6..7]) : nil
+        created_on = values["created"] ? Time.utc(*values["created"][0..3], *values["created"][4..5], *values["created"][6..7]) : nil
+        updated_on = values["changed"] ? Time.utc(*values["changed"][0..3], *values["changed"][4..5], *values["changed"][6..7]) : nil
 
         Parser::Contact.new({
           type:       type,
@@ -100,7 +109,7 @@ module Whois
           name:       values["person"],
           email:      values["e-mail"],
           created_on: created_on,
-          updated_on: updated_on
+          updated_on: updated_on,
         })
       end
 

data/lib/whois/parsers/whois.registry.gy.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.registry.hm.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
         if content_for_scanner =~ /Domain creation date: (.+?)\n/
           # Change dd/mm/yy to yyyy-mm-dd to prevent
           # argument out of range
-          parse_time($1.split("/").reverse.join("-"))
+          parse_time(::Regexp.last_match(1).split("/").reverse.join("-"))
         end
       end
 
@@ -55,7 +55,7 @@ module Whois
 
       property_supported :expires_on do
         if content_for_scanner =~ /Domain expiration date: (.+?)\n/
-          parse_time($1.split("/").reverse.join("-"))
+          parse_time(::Regexp.last_match(1).split("/").reverse.join("-"))
         end
       end
 

data/lib/whois/parsers/whois.registry.om.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 WhoisRegistryOm < BaseShared1
 
       self.scanner = Scanners::BaseShared1, {
-          pattern_reserved: /^Restricted\n/
+          pattern_reserved: /^Restricted\n/,
       }
 
 

data/lib/whois/parsers/whois.registry.qa.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.ripe.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.rnids.rs.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
         when 'expired'
           :expired
         else
-          Whois::Parser.bug!(ParserError, "Unknown status `#{node("Domain status")}'.")
+          Whois::Parser.bug!(ParserError, "Unknown status `#{node('Domain status')}'.")
         end
       end
 

data/lib/whois/parsers/whois.rotld.ro.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 =~ /Domain Status:\s(.+?)\n/
-          case $1.downcase
+          case ::Regexp.last_match(1).downcase
           when "ok", "updateprohibited"
             :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.rrpproxy.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 WhoisRrpproxyNet < BaseIcannCompliant
       self.scanner = Scanners::BaseIcannCompliant, {
-          pattern_available: /^No match for "[\w\.]+"\.\n/
+          pattern_available: /^No match for "[\w.]+"\.\n/,
       }
 
 

data/lib/whois/parsers/whois.safenames.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 WhoisSafenamesNet < BaseIcannCompliant
       self.scanner = Scanners::BaseIcannCompliant, {
-          pattern_available: /^No match for "[\w\.]+"\.\n/
+          pattern_available: /^No match for "[\w.]+"\.\n/,
       }
 
       property_supported :created_on do
@@ -37,9 +37,9 @@ module Whois
       end
 
       def contact_address_attribute(element)
-        address = (1..2).
-          map { |i| node("#{element} Address Line #{i}") }.
-          compact.join("\n").chomp
+        address = (1..2)
+                  .map { |i| node("#{element} Address Line #{i}") }
+                  .compact.join("\n").chomp
       end
 
     end

data/lib/whois/parsers/whois.schlund.info.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 WhoisSchlundInfo < BaseIcannCompliant
       self.scanner = Scanners::BaseIcannCompliant, {
-          pattern_available: /^Domain [\w\.]+ is not registered here\.\n/
+          pattern_available: /^Domain [\w.]+ is not registered here\.\n/,
       }
 
       property_supported :updated_on do

data/lib/whois/parsers/whois.sgnic.sg.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>
 #++
 
 
@@ -41,7 +41,7 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /^\s+Creation Date:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -49,31 +49,31 @@ module Whois
 
       property_supported :expires_on do
         if content_for_scanner =~ /^\s+Expiration Date:\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/
-          values = case value = $1.downcase
-          # schema-1
-          when /^(?:\s+([\w.-]+)\n){2,}/
-            value.scan(/\s+([\w.-]+)\n/).map do |match|
-              { :name => match[0] }
-            end
-          when /^(?:\s+([\w.-]+)\s+\((.+)\)\n){2,}/
-            value.scan(/\s+([\w.-]+)\s+\((.+)\)\n/).map do |match|
-              { :name => match[0], :ipv4 => match[1] }
-            end
-          # schema-2
-          when /^(?:\s+([\w.-]+)){2,}/
-            value.strip.split(/\s+/).map do |name|
-              { :name => name }
-            end
-          else
-            Whois::Parser.bug!(ParserError, "Unknown nameservers format `#{value}'")
-          end
+          values = case value = ::Regexp.last_match(1).downcase
+                   # schema-1
+                   when /^(?:\s+([\w.-]+)\n){2,}/
+                     value.scan(/\s+([\w.-]+)\n/).map do |match|
+                       { :name => match[0] }
+                     end
+                   when /^(?:\s+([\w.-]+)\s+\((.+)\)\n){2,}/
+                     value.scan(/\s+([\w.-]+)\s+\((.+)\)\n/).map do |match|
+                       { :name => match[0], :ipv4 => match[1] }
+                     end
+                   # schema-2
+                   when /^(?:\s+([\w.-]+)){2,}/
+                     value.strip.split(/\s+/).map do |name|
+                       { :name => name }
+                     end
+                   else
+                     Whois::Parser.bug!(ParserError, "Unknown nameservers format `#{value}'")
+                   end
 
           values.map do |params|
             Parser::Nameserver.new(params)