whois 2.5.1 → 2.6.0

data/lib/whois/record/parser/whois.nic.hu.rb

@@ -82,7 +82,7 @@ module Whois
 
           address, city, zip, country_code = decompose_address(node("address"))
 
-          Whois::Record::Contact.new(
+          Record::Contact.new(
               :type         => Whois::Record::Contact::TYPE_REGISTRANT,
               :name         => node("name"),
               :organization => node("org"),
@@ -106,7 +106,7 @@ module Whois
 
         property_supported :nameservers do
           Array.wrap(node("nameserver")).map do |name|
-            Record::Nameserver.new(name)
+            Record::Nameserver.new(:name => name)
           end
         end
 
@@ -140,7 +140,7 @@ module Whois
 
         def build_contact(element, type)
           node(node(element)) do |raw|
-            Whois::Record::Contact.new do |c|
+            Record::Contact.new do |c|
               c.type = type
               raw.each { |k,v| c[k.to_sym] = v }
             end

data/lib/whois/record/parser/whois.nic.im.rb

@@ -57,7 +57,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Name Server:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.chomp("."))
+            Record::Nameserver.new(:name => name.chomp("."))
           end
         end
 

data/lib/whois/record/parser/whois.nic.ir.rb

@@ -57,7 +57,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name)
+            Record::Nameserver.new(:name => name)
           end
         end
 

data/lib/whois/record/parser/whois.nic.it.rb

@@ -96,9 +96,9 @@ module Whois
         property_supported :registrar do
           node("Registrar") do |str|
             Record::Registrar.new(
-              :id           => str["Name"],
-              :name         => str["Name"],
-              :organization => str["Organization"]
+                :id           => str["Name"],
+                :name         => str["Name"],
+                :organization => str["Organization"]
             )
           end
         end
@@ -118,7 +118,7 @@ module Whois
 
         property_supported :nameservers do
           Array.wrap(node("Nameservers")).map do |name|
-            Record::Nameserver.new(name)
+            Record::Nameserver.new(:name => name)
           end
         end
 

data/lib/whois/record/parser/whois.nic.kz.rb

@@ -61,7 +61,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/^\w+ server\.+:\s(.*)\n/).flatten.map do |name|
-            Record::Nameserver.new(name)
+            Record::Nameserver.new(:name => name)
           end
         end
 

data/lib/whois/record/parser/whois.nic.li.rb

@@ -54,7 +54,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Name servers:\n((.+\n)+)(?:\n|\z)/
             $1.split("\n").map do |name|
-              Record::Nameserver.new(name)
+              Record::Nameserver.new(:name => name)
             end
           end
         end

data/lib/whois/record/parser/whois.nic.lv.rb

@@ -56,7 +56,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Nserver:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name)
+            Record::Nameserver.new(:name => name)
           end
         end
 

data/lib/whois/record/parser/whois.nic.ly.rb

@@ -66,7 +66,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Domain servers in listed order:\n((.+\n)+)\n/
             $1.split("\n").map do |name|
-              Record::Nameserver.new(name.strip)
+              Record::Nameserver.new(:name => name.strip)
             end
           end
         end

data/lib/whois/record/parser/whois.nic.md.rb

@@ -75,10 +75,9 @@ module Whois
 
         property_supported :registrant_contacts do
           if content_for_scanner =~ /Registrant:\s+(.+?)\n/
-            Whois::Record::Contact.new(
-              nil,
-              Whois::Record::Contact::TYPE_REGISTRANT,
-              $1
+            Record::Contact.new(
+                :type => Whois::Record::Contact::TYPE_REGISTRANT,
+                :name => $1
             )
           end
         end
@@ -90,7 +89,8 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Name server:\s(.+?)\n/).flatten.map do |line|
-             Record::Nameserver.new(*line.split(/\s+/))
+            name, ipv4 = line.split(/\s+/)
+            Record::Nameserver.new(:name => name, :ipv4 => ipv4)
           end
         end
 

data/lib/whois/record/parser/whois.nic.mg.rb

@@ -75,7 +75,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n/
             $1.split("\n").map do |name|
-              Record::Nameserver.new(name.strip)
+              Record::Nameserver.new(:name => name.strip)
             end
           end
         end

data/lib/whois/record/parser/whois.nic.mx.rb

@@ -69,7 +69,7 @@ module Whois
           if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n/
             $1.scan(/DNS:\s+(.+)\n/).flatten.map do |line|
               name, ipv4 = line.strip.split(/\s+/)
-              Record::Nameserver.new(name, ipv4)
+              Record::Nameserver.new(:name => name, :ipv4 => ipv4)
             end
           end
         end

data/lib/whois/record/parser/whois.nic.net.sa.rb

@@ -57,7 +57,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name)
+            Record::Nameserver.new(:name => name)
           end
         end
 

data/lib/whois/record/parser/whois.nic.nu.rb

@@ -84,7 +84,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Domain servers in listed order:(.*)Owner and Administrative Contact information for domains/m
             $1.split.map do |name|
-              Record::Nameserver.new(name)
+              Record::Nameserver.new(:name => name)
             end
           end
         end

data/lib/whois/record/parser/whois.nic.org.uy.rb

@@ -66,7 +66,7 @@ module Whois
         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|
-              Record::Nameserver.new(name)
+              Record::Nameserver.new(:name => name)
             end
           end
         end

data/lib/whois/record/parser/whois.nic.sl.rb

@@ -67,7 +67,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Name Server:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.downcase)
+            Record::Nameserver.new(:name => name.downcase)
           end
         end
 

data/lib/whois/record/parser/whois.nic.sm.rb

@@ -66,7 +66,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /DNS Servers:\n((.*\n)+)(?:\n|\z)/
             $1.split("\n").map do |name|
-              Record::Nameserver.new(name.strip)
+              Record::Nameserver.new(:name => name.strip)
             end
           end
         end

data/lib/whois/record/parser/whois.nic.sn.rb

@@ -69,7 +69,10 @@ module Whois
 
         property_supported :registrar do
           if content_for_scanner =~ /Registrar:\s+(.+)\n/
-            Whois::Record::Registrar.new(:id => $1, :name => $1)
+            Whois::Record::Registrar.new(
+                :id           => $1,
+                :name         => $1
+            )
           end
         end
 
@@ -95,7 +98,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Nameserver:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name)
+            Record::Nameserver.new(:name => name)
           end
         end
 
@@ -103,7 +106,7 @@ module Whois
       private
 
         def build_contact(string, type)
-          Whois::Record::Contact.new(
+          Record::Contact.new(
               :type => type,
               :id => string,
               :name => string

data/lib/whois/record/parser/whois.nic.so.rb

@@ -61,7 +61,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Name Server:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name)
+            Record::Nameserver.new(:name => name)
           end
         end
 

data/lib/whois/record/parser/whois.nic.st.rb

@@ -62,7 +62,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n?/
             $1.split("\n").map do |name|
-              Record::Nameserver.new(name.strip)
+              Record::Nameserver.new(:name => name.strip)
             end
           end
         end

data/lib/whois/record/parser/whois.nic.tel.rb

@@ -65,7 +65,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Name Server:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.downcase)
+            Record::Nameserver.new(:name => name.downcase)
           end
         end
 

data/lib/whois/record/parser/whois.nic.tr.rb

@@ -64,7 +64,8 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Domain Servers:\n((.+\n)+)\n/
             $1.split("\n").map do |line|
-              Record::Nameserver.new(*line.split(/\s+/))
+              name, ipv4 = line.split(/\s+/)
+              Record::Nameserver.new(:name => name, :ipv4 => ipv4)
             end
           end
         end

data/lib/whois/record/parser/whois.nic.travel.rb

@@ -61,7 +61,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Name Server:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.downcase)
+            Record::Nameserver.new(:name => name.downcase)
           end
         end
 

data/lib/whois/record/parser/whois.nic.tv.rb

@@ -76,7 +76,7 @@ module Whois
 
         property_supported :nameservers do
           Array.wrap(node("Name Server")).reject { |value| value =~ /no nameserver/i }.map do |name|
-            Nameserver.new(name.downcase)
+            Record::Nameserver.new(:name => name.downcase)
           end
         end
 

data/lib/whois/record/parser/whois.nic.uk.rb

@@ -37,8 +37,6 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /\s+Registration status:\s+(.+?)\n/
             case $1.downcase
-            when "registered until renewal date."
-              :registered
             when "registered until expiry date."
               :registered
             when "registration request being processed."
@@ -82,7 +80,7 @@ module Whois
         end
 
         property_supported :expires_on do
-          if content_for_scanner =~ /\s+Renewal date:\s+(.+)\n/
+          if content_for_scanner =~ /\s+Expiry date:\s+(.+)\n/
             Time.parse($1)
           end
         end
@@ -136,12 +134,21 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Name servers:\n((.+\n)+)\n/
             $1.split("\n").reject { |value| value =~ /No name servers listed/ }.map do |line|
-              Record::Nameserver.new(*line.strip.split(/\s+/))
+              name, ipv4, ipv6 = line.strip.split(/\s+/)
+              Record::Nameserver.new(:name => name, :ipv4 => ipv4, :ipv6 => ipv6)
             end
           end
         end
 
 
+        # Checks whether the response has been throttled.
+        #
+        # @return [Boolean]
+        #
+        # @example
+        #   The WHOIS query quota for 127.0.0.1 has been exceeded
+        #   and will be replenished in 50 seconds.
+        #
         def response_throttled?
           !!(content_for_scanner =~ /The WHOIS query quota for .+ has been exceeded/)
         end

data/lib/whois/record/parser/whois.nic.us.rb

@@ -61,7 +61,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Name Server:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.downcase)
+            Record::Nameserver.new(:name => name.downcase)
           end
         end
 

data/lib/whois/record/parser/whois.nic.ve.rb

@@ -30,8 +30,10 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /Estatus del dominio: (.+?)\n/
             case $1.downcase
-              when "activo"     then :registered
-              when "suspendido" then :inactive
+              when "activo"
+                :registered
+              when "suspendido"
+                :inactive
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
@@ -70,7 +72,7 @@ module Whois
         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|
-              Record::Nameserver.new(name)
+              Record::Nameserver.new(:name => name)
             end
           end
         end

data/lib/whois/record/parser/whois.pandi.or.id.rb

@@ -30,9 +30,10 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /domain-status:\s+(.+)\n/
             case $1.downcase
-              when "object is active" then :registered
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            when "object is active"
+              :registered
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             :available
@@ -69,7 +70,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name)
+            Record::Nameserver.new(:name => name)
           end
         end
 

data/lib/whois/record/parser/whois.pnina.ps.rb

@@ -29,13 +29,13 @@ module Whois
 
         property_supported :status do
           if content_for_scanner =~ /Status:\s+(.+?)\n/
-            case $1.downcase
-              when /^active/
-                :registered
-              when "not registered"
-                :available
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            case (s = $1.downcase)
+            when /^active/
+              :registered
+            when "not registered"
+              :available
+            else
+              Whois.bug!(ParserError, "Unknown status `#{s}'.")
             end
           else
             Whois.bug!(ParserError, "Unable to parse status.")
@@ -69,7 +69,7 @@ module Whois
         property_supported :nameservers do
           if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n/
             $1.split("\n").delete_if { |value| value =~ /nodns\.ns$/i  }.map do |name|
-              Record::Nameserver.new(name.strip)
+              Record::Nameserver.new(:name => name.strip)
             end
           end
         end

data/lib/whois/record/parser/whois.register.bg.rb

@@ -30,9 +30,10 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /registration status:\s+(.+?)\n/
             case $1.downcase
-              when "registered" then :registered
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            when "registered"
+              :registered
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             :available
@@ -71,9 +72,9 @@ module Whois
           if content_for_scanner =~ /NAME SERVER INFORMATION:\n((.+\n)+)\s+\n/
             $1.split("\n").map do |line|
               if line =~ /(.+) \((.+)\)/
-                Record::Nameserver.new($1, $2)
+                Record::Nameserver.new(:name => $1, :ipv4 => $2)
               else
-                Record::Nameserver.new(line.strip)
+                Record::Nameserver.new(:name => line.strip)
               end
             end
           end

data/lib/whois/record/parser/whois.registry.hm.rb

@@ -63,7 +63,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Name Server: ([^\s]+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.downcase)
+            Record::Nameserver.new(:name => name.downcase)
           end
         end