whois 1.0.5 → 1.0.6

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

@@ -54,15 +54,20 @@ module Whois
         property_not_supported :created_on
 
         property_not_supported :updated_on
-        
+
         property_supported :expires_on do
           @expires_on ||= if content_for_scanner =~ /renewal:\s+(.*)\n/
             Time.parse($1)
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -65,8 +65,13 @@ module Whois
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/Name Server:([^\s]*)\n/).flatten.map(&:downcase)
+        end
+
       end
-      
+
     end
   end
-end  
+end

data/lib/whois/answer/parser/whois.educause.edu.rb

@@ -69,8 +69,16 @@ module Whois
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= if content_for_scanner =~ /Name Servers: \n((.+\n)+)\n/
+            $1.split("\n").map { |value| value.split(" ").first.downcase }
+          end
+          @nameservers ||= []
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -57,8 +57,11 @@ module Whois
 
         property_not_supported :expires_on
 
+
+        property_not_supported :nameservers
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -58,16 +58,26 @@ module Whois
         property_not_supported :expires_on
 
 
+        # Nameservers are listed in the following formats:
+        # 
+        #   Nameservers:
+        #           dns1.servicemagic.eu
+        #           dns2.servicemagic.eu
+        #   
+        #   Nameservers:
+        #           dns1.servicemagic.eu (91.121.133.61)
+        #           dns2.servicemagic.eu (91.121.103.77)
+        # 
+        # In both cases, always return only the name.
         property_supported :nameservers do
-          @nameservers ||= if content_for_scanner =~ (/Nameservers:\n((?:\t.*?\n)+)/)
-            $1.split.map(&:strip)
-          else
-            []
+          @nameservers ||= if content_for_scanner =~ /Nameservers:\n((.+\n)+)\n/
+            $1.split("\n").map { |value| value.strip.split(" ").first }
           end
+          @nameservers ||= []
         end
 
       end
-      
+
     end
   end
-end  
+end

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

@@ -56,17 +56,22 @@ module Whois
             Time.parse($1)
           end
         end
-        
+
         property_supported :updated_on do
           @updated_on ||= if content_for_scanner =~ /\nLast Updated Date:\s+(.*)\n/
             Time.parse($1)
           end
         end
-        
+
         property_not_supported :expires_on
 
+
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/Nameserver:\s(.*)\n/).flatten.map { |value| value.chomp(".") }
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -65,8 +65,13 @@ module Whois
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -71,7 +71,7 @@ module Whois
         end
 
       end
-      
+
     end
   end
-end  
+end

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

@@ -56,21 +56,31 @@ module Whois
             Time.parse($1)
           end
         end
-        
+
         property_supported :updated_on do
           @updated_on ||= if content_for_scanner =~ /Last Updated On:(.*?)\n/
             Time.parse($1)
           end
         end
-        
+
         property_supported :expires_on do
           @expires_on ||= if content_for_scanner =~ /Expiration Date:(.*?)\n/
             Time.parse($1)
           end
         end
 
+        # Nameservers are listed in the following formats:
+        # 
+        #   Name Server: nic.frd.se
+        #   Name Server: nic.museum 130.242.24.5
+        # 
+        # In both cases, always return only the name.
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/Name Server:\s+(.*)\n/).flatten.map { |value| value.split(" ").first }
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -48,6 +48,7 @@ module Whois
           !available?
         end
 
+
         property_supported :created_on do
           @created_on ||= if content_for_scanner =~ /created:\s+(.*)\n/
             Time.parse($1)
@@ -59,13 +60,14 @@ module Whois
             Time.parse($1)
           end
         end
-        
+
         property_supported :updated_on do
           @updated_on ||= if content_for_scanner =~ /modified:\s+(.*?)\n/
             Time.parse($1)
           end
         end
 
+
         # Nameservers are listed in the following formats:
         # 
         #   nserver:  ns2.loopia.se
@@ -73,11 +75,11 @@ module Whois
         # 
         # In both cases, always return only the name.
         property_supported :nameservers do
-          @nameservers ||= content_for_scanner.scan(/nserver:\s+(.*)\n/).flatten.map { |value| value.split(" ").first }
+          @nameservers ||= content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map { |value| value.split(" ").first }
         end
 
       end
-      
+
     end
   end
 end

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

@@ -86,7 +86,7 @@ module Whois
         end
 
       end
-      
+
     end
   end
-end  
+end

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

@@ -54,21 +54,26 @@ module Whois
             Time.parse($1)
           end
         end
-        
+
         property_supported :updated_on do
           @updated_on ||= if content_for_scanner =~ /Domain Last Updated Date:(.*?)\n/
             Time.parse($1)
           end
         end
-        
+
         property_supported :expires_on do
           @expires_on ||= if content_for_scanner =~ /Domain Expiration Date:(.*?)\n/
             Time.parse($1)
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/Nameservers:([^\s]+)\n/).flatten.map(&:downcase)
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -39,9 +39,7 @@ module Whois
           node("Domain Name") { |raw| raw.downcase }
         end
 
-        property_supported :domain_id do
-          nil
-        end
+        property_not_supported :domain_id
 
 
         property_supported :referral_whois do
@@ -86,6 +84,12 @@ module Whois
         end
 
 
+        property_supported :nameservers do
+          @nameservers ||= node("Name Server") { |values| [*values].map(&:downcase) }
+          @nameservers ||= []
+        end
+
+
         protected
 
           def parse

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

@@ -61,8 +61,16 @@ module Whois
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n/
+            $1.split("\n").map { |value| value.strip.downcase }
+          end
+          @nameservers ||= []
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -57,8 +57,16 @@ module Whois
 
         property_not_supported :expires_on
 
+
+        property_supported :nameservers do
+          @nameservers ||= if content_for_scanner =~ /Name servers:\n((.+\n)+)(?:\n|\z)/
+            $1.split("\n")
+          end
+          @nameservers ||= []
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -67,8 +67,13 @@ module Whois
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/Host Name:\s+(.+)\n/).flatten
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -67,8 +67,13 @@ module Whois
 
         property_not_supported :expires_on
 
+
+        property_supported :nameservers do
+          @nameservers ||= content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map { |value| value.split(" ").first }
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -70,8 +70,16 @@ module Whois
           end
         end
 
+
+        property_supported :nameservers do
+          @nameservers ||= if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n/
+            $1.split("\n").map { |value| value.strip.downcase }
+          end
+          @nameservers ||= []
+        end
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -55,8 +55,11 @@ module Whois
 
         property_not_supported :expires_on
 
+
+        property_not_supported :nameservers
+
       end
-      
+
     end
   end
-end  
+end

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

@@ -29,23 +29,20 @@ module Whois
       class WhoisNicHu < Base
         include Ast
 
-        # Returns the registry disclaimer that comes with the answer.
         property_supported :disclaimer do
           node('Disclaimer')
         end
 
-        # If available, returns the domain name as stored by the registry.
+
         property_supported :domain do
           node('Domain')
         end
 
-        # If available, returns the unique domain ID set by the registry.
         property_supported :domain_id do
           node('hun-id')
         end
 
-        # Returns the record status: <tt>:available</tt>, <tt>:in_progress</tt>
-        # or <tt>:registered</tt>.
+
         property_supported :status do
           if node('NotFound')
             :available
@@ -56,30 +53,36 @@ module Whois
           end
         end
 
-        # Returns whether this record is available.
         property_supported :available? do
           @available ||= status == :available
         end
 
-        # Returns whether this record is registered.
         property_supported :registered? do
           @registered ||= status == :registered
         end
 
-        # If available, returns a Time object representing the date
-        # the record was created, according to the registry answer.
+
         property_supported :created_on do
           node('registered') { |raw| Time.parse(raw) }
         end
 
-        # If available, returns a Time object representing the date
-        # the record was last updated, according to the registry answer.
         property_supported :updated_on do
           node('changed') { |raw| Time.parse(raw) }
         end
 
-        # If available, returns a <tt>Whois::Answer::Contact</tt> record
-        # containing the registrant details extracted from the registry answer.
+        property_not_supported :expires_on
+
+
+        property_supported :registrar do
+          if c = registrar_contact
+            Answer::Registrar.new(
+              :id => c[:id],
+              :name => c[:name],
+              :organization => c[:organization]
+            )
+          end
+        end
+
         property_supported :registrant do
           if registered?
             a1 = (node('address') || [])[1].split(/\s/)
@@ -98,40 +101,14 @@ module Whois
           end
         end
 
-        # If available, returns a <tt>Whois::Answer::Contact</tt> record
-        # containing the admin contact details extracted from the registry answer.
         property_supported :admin do
           contact('admin-c')
         end
 
-        # If available, returns a <tt>Whois::Answer::Contact</tt> record
-        # containing the technical contact details extracted from the registry answer.
         property_supported :technical do
           contact('tech-c')
         end
 
-        # If available, returns a <tt>Whois::Answer::Contact</tt> record
-        # containing the zone contact details extracted from the registry answer.
-        property_supported :zone_contact do
-          contact('zone-c')
-        end
-
-        # If available, returns a <tt>Whois::Answer::Contact</tt> record
-        # containing the registrar contact details extracted from the registry answer.
-        property_supported :registrar_contact do
-          contact('registrar')
-        end
-
-        property_supported :registrar do
-          if rc = registrar_contact
-            Answer::Registrar.new(
-              :id => rc[:id],
-              :name => rc[:name],
-              :organization => rc[:organization]
-            )
-          end
-        end
-
 
         # If available, returns an array of name servers entries for this domain
         # if any name server is available in the registry answer.
@@ -140,6 +117,15 @@ module Whois
         end
 
 
+        def registrar_contact
+          contact('registrar')
+        end
+
+        def zone_contact
+          contact('zone-c')
+        end
+
+
         protected
 
           def parse
@@ -330,7 +316,7 @@ module Whois
         end
         
       end
-      
+
     end
   end
 end