whois-parser 1.0.1 → 2.0.0

data/lib/whois/parsers/whois.nic.bj.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 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 section =~ /Domain Name:\s+(.+)\n/
-          $1
+          ::Regexp.last_match(1)
         end
       end
 
@@ -52,13 +52,13 @@ module Whois
 
       property_supported :created_on do
         if section =~ /Created:\s+(.+)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :updated_on do
         if section =~ /Updated:\s+(.+)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -72,7 +72,7 @@ module Whois
         if section =~ /Name:\s+(.+)\n/
           Parser::Contact.new(
               type:         Parser::Contact::TYPE_REGISTRANT,
-              name:         $1
+              name:         ::Regexp.last_match(1)
           )
         end
       end
@@ -84,7 +84,7 @@ module Whois
 
       property_supported :nameservers do
         (1..4).map do |i|
-          section =~ /Name Server #{i}:\s+(.+)\n/ ? Parser::Nameserver.new(name: $1) : nil
+          section =~ /Name Server #{i}:\s+(.+)\n/ ? Parser::Nameserver.new(name: ::Regexp.last_match(1)) : nil
         end.compact
       end
 
@@ -93,10 +93,10 @@ module Whois
 
       def build_contact(element, type)
         node("#{element} ID") do
-          address = ["", "2", "3"].
-              map { |i| node("#{element} Address#{i}") }.
-              delete_if(&:empty?).
-              join("\n")
+          address = ["", "2", "3"]
+                    .map { |i| node("#{element} Address#{i}") }
+                    .delete_if(&:empty?)
+                    .join("\n")
 
           Parser::Contact.new(
               :type         => type,
@@ -117,7 +117,8 @@ module Whois
 
       def section
         return @section if @section
-        @section = content_for_scanner =~ /((?:Domain:.+\n)(?:.+:.+\n)+)\n/ ? $1 : ""
+
+        @section = content_for_scanner =~ /((?:Domain:.+\n)(?:.+:.+\n)+)\n/ ? ::Regexp.last_match(1) : ""
       end
 
     end

data/lib/whois/parsers/whois.nic.bo.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 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 =~ /Dominio:(.*)\n/
-          $1.strip
+          ::Regexp.last_match(1).strip
         end
       end
 
@@ -52,7 +52,7 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /Fecha de registro:(.*)\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 =~ /Fecha de vencimiento:(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 

data/lib/whois/parsers/whois.nic.cd.rb

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

data/lib/whois/parsers/whois.nic.ch.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -59,7 +59,7 @@ module Whois
       #
       property_supported :registrant_contacts do
         if content_for_scanner =~ /Holder of domain name:\n(.+?)\n(.+?)\nContractual Language:.*\n\n/m
-          Parser::Contact.new({ :name => $1, :address => $2, :type => Parser::Contact::TYPE_REGISTRANT })
+          Parser::Contact.new({ :name => ::Regexp.last_match(1), :address => ::Regexp.last_match(2), :type => Parser::Contact::TYPE_REGISTRANT })
         end
       end
 
@@ -73,7 +73,7 @@ module Whois
       #
       property_supported :technical_contacts do
         if content_for_scanner =~ /Technical contact:\n(.+?)\n(.+?)\n\n/m
-          Parser::Contact.new({ :name => $1, :address => $2, :type => Parser::Contact::TYPE_TECHNICAL })
+          Parser::Contact.new({ :name => ::Regexp.last_match(1), :address => ::Regexp.last_match(2), :type => Parser::Contact::TYPE_TECHNICAL })
         end
       end
 
@@ -88,9 +88,9 @@ module Whois
         if content_for_scanner =~ /Name servers:\n((.+\n)+)(?:\n|\z)/
           list  = {}
           order = []
-          $1.split("\n").map do |line|
+          ::Regexp.last_match(1).split("\n").map do |line|
             if line =~ /(.+)\t\[(.+)\]/
-              name, ip = $1, $2
+              name, ip = ::Regexp.last_match(1), ::Regexp.last_match(2)
               order << name unless order.include?(name)
               list[name] ||= Parser::Nameserver.new(:name => name)
               list[name].ipv4 = ip if Whois::Server.send(:valid_ipv4?, ip)

data/lib/whois/parsers/whois.nic.ci.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 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: (.+?)\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 =~ /Expiration date: (.+?)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 

data/lib/whois/parsers/whois.nic.cl.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -35,7 +35,7 @@ module Whois
       end
 
       property_supported :available? do
-         !!(content_for_scanner =~ /^(.+?): no existe$/)
+        !!(content_for_scanner =~ /^(.+?): no existe$/)
       end
 
       property_supported :registered? do
@@ -57,10 +57,10 @@ module Whois
 
       property_supported :nameservers do
         if content_for_scanner =~ /Servidores de nombre \(Domain servers\):\n((.+\n)+)\n/
-          $1.split("\n").map do |line|
+          ::Regexp.last_match(1).split("\n").map do |line|
             line.strip!
             line =~ /(.+) \((.+)\)/
-            Parser::Nameserver.new(:name => $1, :ipv4 => $2)
+            Parser::Nameserver.new(:name => ::Regexp.last_match(1), :ipv4 => ::Regexp.last_match(2))
           end
         end
       end

data/lib/whois/parsers/whois.nic.co.rb

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

data/lib/whois/parsers/whois.nic.college.rb

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

data/lib/whois/parsers/whois.nic.coop.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -41,19 +41,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 updated:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
       property_supported :expires_on do
         if content_for_scanner =~ /Expiry Date:\s+(.*)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 

data/lib/whois/parsers/whois.nic.cx.rb

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

data/lib/whois/parsers/whois.nic.cz.rb

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

data/lib/whois/parsers/whois.nic.design.rb

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

data/lib/whois/parsers/whois.nic.dm.rb

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

data/lib/whois/parsers/whois.nic.dz.rb

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

data/lib/whois/parsers/whois.nic.ec.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -25,7 +25,7 @@ module Whois
           super()
         else
           registrar ? :registered : :available
-          # Whois.bug!(ParserError, "Unable to parse status.")
+          # Whois::Parser.bug!(ParserError, "Unable to parse status.")
         end
       end
     end

data/lib/whois/parsers/whois.nic.es.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 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.downcase
+          ::Regexp.last_match(1).downcase
         end
       end
 
@@ -48,7 +48,7 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /Creation Date:\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 =~ /Expiration Date:\s+(.+)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 
@@ -64,7 +64,7 @@ module Whois
       property_supported :registrar do
         Parser::Registrar.new(
             :name         => 'ES-NIC',
-            :organization => 'ES-NIC Delegated Internet Registry for Spain',
+            :organization => 'ES-NIC Delegated Internet Registry for Spain'
         )
       end
 
@@ -74,7 +74,7 @@ module Whois
           Parser::Contact.new(
               type:         Parser::Contact::TYPE_REGISTRANT,
               id:           nil,
-              name:         $1.to_s.strip,
+              name:         ::Regexp.last_match(1).to_s.strip,
               organization: nil,
               address:      nil,
               city:         nil,

data/lib/whois/parsers/whois.nic.fm.rb

@@ -0,0 +1,18 @@
+require_relative 'base_icann_compliant'
+
+module Whois
+  class Parsers
+
+    class WhoisNicFm < BaseIcannCompliant
+      self.scanner = Scanners::BaseIcannCompliant, {
+        pattern_available: /DOMAIN NOT FOUND\n/,
+      }
+
+      property_supported :expires_on do
+        node("Registry Expiry Date") do |value|
+          parse_time(value)
+        end
+      end
+    end
+  end
+end

data/lib/whois/parsers/whois.nic.fo.rb

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

data/lib/whois/parsers/whois.nic.fr.rb

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

data/lib/whois/parsers/whois.nic.gd.rb

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

data/lib/whois/parsers/whois.nic.gl.rb

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

data/lib/whois/parsers/whois.nic.gs.rb

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

data/lib/whois/parsers/whois.nic.hn.rb

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

data/lib/whois/parsers/whois.nic.ht.rb

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

data/lib/whois/parsers/whois.nic.hu.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -25,7 +25,7 @@ module Whois
 
       property_supported :domain do
         if content_for_scanner =~ /domain:\s+(.+)\n/
-          $1
+          ::Regexp.last_match(1)
         end
       end
 
@@ -41,7 +41,7 @@ module Whois
       end
 
       property_supported :available? do
-        !!(content_for_scanner =~ /\/ No match/)
+        !!(content_for_scanner =~ %r{/ No match})
       end
 
       property_supported :registered? do
@@ -51,7 +51,7 @@ module Whois
 
       property_supported :created_on do
         if content_for_scanner =~ /record created:\s+(.+)\n/
-          parse_time($1)
+          parse_time(::Regexp.last_match(1))
         end
       end
 

data/lib/whois/parsers/whois.nic.im.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -49,7 +49,7 @@ module Whois
 
       property_supported :expires_on do
         if content_for_scanner =~ /Expiry Date:\s+(.*?)\n/
-          parse_time($1.gsub("/", "-"))
+          parse_time(::Regexp.last_match(1).gsub("/", "-"))
         end
       end
 

data/lib/whois/parsers/whois.nic.io.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -39,7 +39,7 @@ module Whois
 
       # NEWPROPERTY
       def reserved?
-        !!content_for_scanner.match(/^Domain reserved\n/)
+        !!(content_for_scanner =~ /^Reserved by Registry\n/)
       end
 
     end

data/lib/whois/parsers/whois.nic.ir.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -47,7 +47,7 @@ module Whois
 
       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.nic.it.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -43,7 +43,7 @@ module Whois
           :registered
         when /^pendingtransfer/
           :registered
-        when /redemption\-/
+        when /redemption-/
           :redemption
         when "pending-delete"
           :redemption
@@ -59,7 +59,7 @@ module Whois
         when /^inactive/
           :inactive
         else
-          Whois.bug!(ParserError, "Unknown status `#{s}'.")
+          Whois::Parser.bug!(ParserError, "Unknown status `#{s}'.")
         end
       end
 

data/lib/whois/parsers/whois.nic.jobs.rb

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

data/lib/whois/parsers/whois.nic.ki.rb

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

data/lib/whois/parsers/whois.nic.kz.rb

@@ -3,7 +3,7 @@
 #
 # An intelligent pure Ruby WHOIS client and parser.
 #
-# Copyright (c) 2009-2015 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2022 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -25,7 +25,7 @@ module Whois
 
       property_supported :status do
         if content_for_scanner =~ /Domain status : ((.+\n)+)\s+\n/
-          $1.split("\n").map { |value| value.split("-").first.strip }
+          ::Regexp.last_match(1).split("\n").map { |value| value.split("-").first.strip }
         else
           nil
         end
@@ -42,12 +42,12 @@ 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 =~ /Last modified : (.+)\n/ && !(value = $1).empty?
+        if content_for_scanner =~ /Last modified : (.+)\n/ && !(value = ::Regexp.last_match(1)).empty?
           parse_time(value)
         end
       end

data/lib/whois/parsers/whois.nic.la.rb

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