whois 1.3.10 → 1.3.11

data/CHANGELOG.rdoc

@@ -1,5 +1,53 @@
 = Changelog
 
+== Release 1.3.11
+
+* CHANGED: Standardized #status property for the following parsers (#5)
+  * whois.aero
+  * whois.aeda.net.ae
+  * whois.audns.net.au
+  * whois.cat
+  * whois.cctld.uz
+  * whois.co.ug
+  * whois.denic.de
+  * whois.dk-hostmaster.dk
+  * whois.dns.be
+  * whois.dns.lu
+  * whois.dns.pt
+  * whois.domainregistry.ie
+  * whois.in.ua
+  * whois.jprs.jp
+  * whois.net.ua
+  * whois.nic-se.se
+  * whois.nic.am
+  * whois.nic.asia
+  * whois.nic.at
+  * whois.nic.coop
+  * whois.nic.fr
+  * whois.nic.ht
+  * whois.nic.kz
+  * whois.nic.la
+  * whois.nic.mu
+  * whois.nic.nu
+  * whois.nic.org.uy
+  * whois.nic.travel
+  * whois.nic.uk
+  * whois.nic.ve
+  * whois.norid.no
+  * whois.register.bg
+  * whois.registry.in
+  * whois.rotld.ro
+  * whois.srs.net.nz
+
+* FIXED: Property cache is missing for some parsers (#18)
+
+* FIXED: In some circumstances the whois.jprs.js parser may raise 
+  an Argument out of range error trying to parse the #updated_on property.
+
+* FIXED: The whois.nic.uk parser fails to parse #nameservers when
+  the domain is suspended.
+
+
 == Release 1.3.10
 
 * SERVER: Removed the .fed.us TLD definition.

data/lib/whois/answer/parser/base.rb

@@ -233,6 +233,8 @@ module Whois
           contacts.compact
         end
 
+        # NEWPROPERTY
+        #
         # Checks whether this is a throttle response.
         # The default implementation always returns false.
         #

data/lib/whois/answer/parser/jobswhois.verisign-grs.com.rb

@@ -58,11 +58,11 @@ module Whois
         end
 
         property_supported :available? do
-          node("Registrar").nil?
+          @available  ||= node("Registrar").nil?
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.adamsnames.tc.rb

@@ -43,11 +43,11 @@ module Whois
         end
 
         property_supported :available? do
-          @available ||= !!(content_for_scanner =~ /is not registered/)
+          @available  ||= !!(content_for_scanner =~ /is not registered/)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.aeda.net.ae.rb

@@ -35,15 +35,23 @@ module Whois
       class WhoisAedaNetAe < Base
 
         property_supported :status do
-          @status ||= content_for_scanner.scan(/Status:\s+(.*?)\n/).flatten
+          @status ||= if content_for_scanner =~ /Status:\s+(.+?)\n/
+            case $1.downcase
+              when "ok" then :registered
+              else
+                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            :available
+          end
         end
 
         property_supported :available? do
-          @available ||= content_for_scanner.strip == "No Data Found"
+          @available  ||= content_for_scanner.strip == "No Data Found"
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.aero.rb

@@ -35,34 +35,40 @@ module Whois
       class WhoisAero < Base
 
         property_supported :status do
-          @status ||= if content_for_scanner =~ /Domain Status:(.*?)\n/
-            $1
+          @status ||= if content_for_scanner =~ /Domain Status:(.+?)\n/
+            case $1.downcase
+              when "ok" then :registered
+              else
+                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            :available
           end
         end
 
         property_supported :available? do
-          @available ||= (content_for_scanner.strip == "NOT FOUND")
+          @available  ||= (content_for_scanner.strip == "NOT FOUND")
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 
         property_supported :created_on do
-          @created_on ||= if content_for_scanner =~ /Created On:(.*?)\n/
+          @created_on ||= if content_for_scanner =~ /Created On:(.+?)\n/
             Time.parse($1)
           end
         end
 
         property_supported :updated_on do
-          @updated_on ||= if content_for_scanner =~ /Updated On:(.*?)\n/
+          @updated_on ||= if content_for_scanner =~ /Updated On:(.+?)\n/
             Time.parse($1)
           end
         end
 
         property_supported :expires_on do
-          @expires_on ||= if content_for_scanner =~ /Expires On:(.*?)\n/
+          @expires_on ||= if content_for_scanner =~ /Expires On:(.+?)\n/
             Time.parse($1)
           end
         end

data/lib/whois/answer/parser/whois.afilias-grs.info.rb

@@ -39,11 +39,11 @@ module Whois
         end
 
         property_supported :available? do
-          @available ||= (content_for_scanner.strip == "NOT FOUND")
+          @available  ||= (content_for_scanner.strip == "NOT FOUND")
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.afilias.info.rb

@@ -35,15 +35,15 @@ module Whois
       class WhoisAfiliasInfo < Base
 
         property_supported :status do
-          @status ||= content_for_scanner.scan(/Status:(.*?)\n/).flatten
+          @status ||= content_for_scanner.scan(/Status:(.+?)\n/).flatten
         end
 
         property_supported :available? do
-          @available ||= (content_for_scanner.strip == "NOT FOUND")
+          @available  ||= (content_for_scanner.strip == "NOT FOUND")
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.ai.rb

@@ -35,7 +35,7 @@ module Whois
       class WhoisAi < Base
 
         property_supported :status do
-          if available?
+          @status ||= if available?
             :available
           else
             :registered
@@ -43,11 +43,11 @@ module Whois
         end
 
         property_supported :available? do
-          @available ||= !!(content_for_scanner =~ /Domain (.+?) not registred/)
+          @available  ||= !!(content_for_scanner =~ /Domain (.+?) not registred/)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.audns.net.au.rb

@@ -35,17 +35,23 @@ module Whois
       class WhoisAudnsNetAu < Base
 
         property_supported :status do
-          @status ||= if content_for_scanner =~ /Status:\s+(.*)\n/
-            $1
+          @status ||= if content_for_scanner =~ /Status:\s+(.+?)\n/
+            case $1.downcase
+              when "ok" then :registered
+              else
+                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            :available
           end
         end
 
         property_supported :available? do
-          @available ||= (content_for_scanner.strip == "No Data Found")
+          @available  ||= (content_for_scanner.strip == "No Data Found")
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.biz.rb

@@ -39,11 +39,11 @@ module Whois
         end
 
         property_supported :available? do
-          @available ||= !!(content_for_scanner =~ /Not found:/)
+          @available  ||= !!(content_for_scanner =~ /Not found:/)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.cat.rb

@@ -35,8 +35,14 @@ module Whois
       class WhoisCat < Base
 
         property_supported :status do
-          @status ||= if content_for_scanner =~ /Status:\s+(.*)\n/
-            $1.downcase.to_sym
+          @status ||= if content_for_scanner =~ /Status:\s+(.+?)\n/
+            case $1.downcase
+              when "ok" then :registered
+              else
+                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            :available
           end
         end
 

data/lib/whois/answer/parser/whois.cctld.uz.rb

@@ -35,8 +35,14 @@ module Whois
       class WhoisCctldUz < Base
 
         property_supported :status do
-          @status ||= if content_for_scanner =~ /^Status: (.*)\n/
-            $1
+          @status ||= if content_for_scanner =~ /^Status: (.+?)\n/
+            case $1.downcase
+              when "active" then :registered
+              else
+                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            :available
           end
         end
 

data/lib/whois/answer/parser/whois.cnnic.cn.rb

@@ -39,11 +39,11 @@ module Whois
         end
 
         property_supported :available? do
-          @available ||= (content_for_scanner.strip == "no matching record")
+          @available  ||= (content_for_scanner.strip == "no matching record")
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.co.ug.rb

@@ -35,7 +35,15 @@ module Whois
       class WhoisCoUg < Base
 
         property_supported :status do
-          @status ||= content_for_scanner[/^Status:\s+(.+)$/, 1]
+          @status ||= if content_for_scanner =~ /^Status:\s+(.+?)\n/
+            case $1.downcase
+              when "active" then :registered
+              else
+                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            :available
+          end
         end
 
         property_supported :available? do

data/lib/whois/answer/parser/whois.crsnic.net.rb

@@ -55,15 +55,15 @@ module Whois
 
 
         property_supported :status do
-          node("Status")
+          @status ||= node("Status")
         end
 
         property_supported :available? do
-          node("Registrar").nil?
+          @available  ||= node("Registrar").nil?
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.denic.de.rb

@@ -42,7 +42,21 @@ module Whois
 
 
         property_supported :status do
-          @status ||= node("Status")
+          @status ||= if node("Status")
+            case node("Status")
+              when "connect"    then :registered
+              when "free"       then :available
+              when "invalid"    then :invalid
+              else
+                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            if version < "2.0"
+              :available
+            else
+              Whois.bug!(ParserError, "Unable to parse status.")
+            end
+          end
         end
 
         property_supported :available? do

data/lib/whois/answer/parser/whois.dk-hostmaster.dk.rb

@@ -35,17 +35,23 @@ module Whois
       class WhoisDkHostmasterDk < Base
 
         property_supported :status do
-          @status ||= if content_for_scanner =~ /Status:\s+(.*)\n/
-            $1.downcase.to_sym
+          @status ||= if content_for_scanner =~ /Status:\s+(.+?)\n/
+            case $1.downcase
+              when "active" then :registered
+              else
+                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            :available
           end
         end
 
         property_supported :available? do
-          @available ||= !!(content_for_scanner =~ /No entries found for the selected source/)
+          @available  ||= !!(content_for_scanner =~ /No entries found for the selected source/)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.dns.be.rb

@@ -35,13 +35,20 @@ module Whois
       class WhoisDnsBe < Base
 
         property_supported :status do
-          @status ||= if content_for_scanner =~ /Status:\s+(.+)\n/
-            $1
+          @status ||= if content_for_scanner =~ /Status:\s+(.+?)\n/
+            case $1.downcase
+              when "registered" then :registered
+              when "free"       then :available
+              else
+                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            Whois.bug!(ParserError, "Unable to parse status.")
           end
         end
 
         property_supported :available? do
-          @available  ||= (status == "FREE")
+          @available  ||= (status == :available)
         end
 
         property_supported :registered? do

data/lib/whois/answer/parser/whois.dns.lu.rb

@@ -35,8 +35,14 @@ module Whois
       class WhoisDnsLu < Base
 
         property_supported :status do
-          @status ||= if content_for_scanner =~ /domaintype:\s+(.*)\n/
-            $1
+          @status ||= if content_for_scanner =~ /domaintype:\s+(.+)\n/
+            case $1.downcase
+              when "active" then :registered
+              else
+                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            :available
           end
         end