whois 1.3.10 → 1.3.11

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

@@ -35,8 +35,14 @@ module Whois
       class WhoisDnsPt < 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 "active" then :registered
+              else
+                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            :available
           end
         end
 

data/lib/whois/answer/parser/whois.domainregistry.ie.rb

@@ -35,8 +35,12 @@ module Whois
       class WhoisDomainregistryIe < 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

data/lib/whois/answer/parser/whois.dot.tk.rb

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

data/lib/whois/answer/parser/whois.dotmobiregistry.net.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.educause.edu.rb

@@ -35,7 +35,7 @@ module Whois
       class WhoisEducauseEdu < 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 =~ /No Match/)
+          @available  ||= !!(content_for_scanner =~ /No Match/)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.eu.org.rb

@@ -35,7 +35,7 @@ module Whois
       class WhoisEuOrg < 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 =~ /Key not found/)
+          @available  ||= !!(content_for_scanner =~ /Key not found/)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

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

@@ -35,7 +35,7 @@ module Whois
       class WhoisEu < 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 =~ /Status:\s+AVAILABLE/)
+          @available  ||= !!(content_for_scanner =~ /Status:\s+AVAILABLE/)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.ficora.fi.rb

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

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

@@ -37,8 +37,8 @@ module Whois
         property_supported :status do
           @status ||= if content_for_scanner =~ /status:(.+?)\n/
             case $1.downcase
-              when "0"              then :available
-              when "1"              then :registered
+              when "0" then :available
+              when "1" then :registered
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end

data/lib/whois/answer/parser/whois.hkirc.hk.rb

@@ -43,11 +43,11 @@ module Whois
         end
 
         property_supported :available? do
-          @available ||= (content_for_scanner.strip == "Domain Not Found")
+          @available  ||= (content_for_scanner.strip == "Domain Not Found")
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.in.ua.rb

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

data/lib/whois/answer/parser/whois.isnic.is.rb

@@ -35,7 +35,7 @@ module Whois
       class WhoisIsnicIs < 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 =~ /No entries found for query/)
+          @available  ||= !!(content_for_scanner =~ /No entries found for query/)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

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

@@ -37,8 +37,8 @@ module Whois
         property_supported :status do
           @status ||= if content_for_scanner =~ /status:(.+?)\n/
             case $1.downcase
-              when "0"              then :available
-              when "1"              then :registered
+              when "0" then :available
+              when "1" then :registered
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end

data/lib/whois/answer/parser/whois.jprs.jp.rb

@@ -36,16 +36,23 @@ module Whois
 
         property_supported :status do
           @status ||= if content_for_scanner =~ /\[Stat(?:us|e)\]\s+(.*)\n/
-            $1
+            case $1.split(" ").first.downcase
+              when "active" then :registered
+              when "connected" then :registered
+              else
+                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            end
+          else
+            :available
           end
         end
 
         property_supported :available? do
-          @available ||= !!(content_for_scanner =~ /No match!!/)
+          @available  ||= !!(content_for_scanner =~ /No match!!/)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 
@@ -58,7 +65,7 @@ module Whois
 
         # TODO: timezone ('Asia/Tokyo')
         property_supported :updated_on do
-          @updated_on ||= if content_for_scanner =~ /\[Last Updated?\]\s+(.*)\n/m
+          @updated_on ||= if content_for_scanner =~ /\[Last Updated?\]\s+(.*)\n/
             Time.parse($1)
           end
         end

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

@@ -43,11 +43,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.net.ua.rb

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

data/lib/whois/answer/parser/whois.nic-se.se.rb

@@ -35,17 +35,23 @@ module Whois
       class WhoisNicSeSe < Base
 
         property_supported :status do
-          @status ||= if content_for_scanner =~ /state:\s+(.*)\n/
-            $1.downcase.to_sym
+          @status ||= if content_for_scanner =~ /state:\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 =~ /" not found./)
+          @available  ||= !!(content_for_scanner =~ /" not found./)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 
@@ -82,4 +88,4 @@ module Whois
 
     end
   end
-end
+end

data/lib/whois/answer/parser/whois.nic.ac.rb

@@ -49,11 +49,11 @@ module Whois
         end
 
         property_supported :available? do
-          @available ||= !(content_for_scanner =~ /Not available/)
+          @available  ||= !(content_for_scanner =~ /Not available/)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 
@@ -83,10 +83,12 @@ module Whois
         property_not_supported :nameservers
 
 
+        # NEWPROPERTY
         property_supported :changed? do |other|
           !unchanged?(other)
         end
 
+        # NEWPROPERTY
         property_supported :unchanged? do |other|
           self == other ||
           self.content_for_scanner == other.content_for_scanner

data/lib/whois/answer/parser/whois.nic.ag.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.nic.am.rb

@@ -35,17 +35,23 @@ module Whois
       class WhoisNicAm < Base
 
         property_supported :status do
-          @status ||= if content_for_scanner =~ /\s+Status:\s+(.*)\n/
-            $1
+          @status ||= if content_for_scanner =~ /\s+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 match/)
+          @available  ||= !!(content_for_scanner =~ /No match/)
         end
 
         property_supported :registered? do
-          !available?
+          @registered ||= !available?
         end
 
 

data/lib/whois/answer/parser/whois.nic.as.rb

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

data/lib/whois/answer/parser/whois.nic.asia.rb

@@ -35,17 +35,23 @@ module Whois
       class WhoisNicAsia < 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
 
 

data/lib/whois/answer/parser/whois.nic.at.rb

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