whois 2.0.6 → 2.0.7

data/CHANGELOG.rdoc

@@ -1,9 +1,20 @@
 = Changelog
 
 
+== Release 2.0.7
+
+* CHANGED: whois.dns.pt changed nameservers response format.
+
+* CHANGED: whois.sgnic.sg changed nameservers response format.
+
+* FIXED: whois.markmonitor.com parser crashes when the contacts are empty.
+
+* FIXED: whois.educause.edu parser crashes when the updated_on property is `unknown'.
+
+
 == Release 2.0.6
 
-* CHANGED: whois.gg has changed response format.
+* CHANGED: whois.gg changed response format.
 
 * FIXED: whois.pnina.ps parser do not support `Active' status variants.
 

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

@@ -61,8 +61,8 @@ module Whois
 
 
         property_supported :nameservers do
-          content_for_scanner.scan(/Nameserver:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name.chomp("."))
+          content_for_scanner.scan(/Nameserver:\s(?:.+\t)?(.+?)\.\n/).flatten.map do |name|
+            Record::Nameserver.new(name)
           end
         end
 

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

@@ -52,7 +52,7 @@ module Whois
 
         property_supported :updated_on do
           if content_for_scanner =~ /Domain record last updated:\s+(.+?)\n/
-            Time.parse($1)
+            Time.parse($1) unless $1 == "unknown"
           end
         end
 

data/lib/whois/record/parser/whois.markmonitor.com.rb

@@ -61,8 +61,8 @@ module Whois
 
         property_supported :registrar do
           Record::Registrar.new(
-            :name => content_for_scanner[/Registrar Name: (.+)\n/, 1],
-            :url  => content_for_scanner[/Registrar Homepage: (.+)\n/, 1]
+            :name => content_for_scanner.slice(/Registrar Name: (.+)\n/, 1),
+            :url  => content_for_scanner.slice(/Registrar Homepage: (.+)\n/, 1)
           )
         end
 
@@ -81,7 +81,7 @@ module Whois
 
 
         property_supported :nameservers do
-          content_for_scanner[/Domain servers in listed order:\n\n((?:\s*[^\s\n]+\n)+)/, 1].split("\n").map do |line|
+          content_for_scanner.slice(/Domain servers in listed order:\n\n((?:\s*[^\s\n]+\n)+)/, 1).split("\n").map do |line|
             Record::Nameserver.new(line.strip)
           end
         end
@@ -90,7 +90,10 @@ module Whois
         private
 
           def contact(element, type)
-            info = content_for_scanner[/#{element}\n((.+\n){6})/, 1].split("\n").map(&:strip)
+            match = content_for_scanner.slice(/#{element}\n((.+\n){6})/, 1)
+            return unless match
+
+            info  = match.split("\n").map(&:strip)
             # 0 DNS Admin
             # 1 Google Inc.
             # 2 1600 Amphitheatre Parkway

data/lib/whois/record/parser/whois.sgnic.sg.rb

@@ -57,8 +57,19 @@ 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.downcase)
+            values = case value = $1.downcase
+              # schema-1
+              when /^(?:\s+([\w.-]+)\n){2,}/
+                value.split("\n").map(&:strip)
+              # schema-2
+              when /^(?:\s+([\w.-]+)){2,}/
+                value.strip.split(/\s+/)
+              else
+                Whois.bug!("Unknown nameservers format `#{value}'")
+            end
+
+            values.map do |name|
+              Record::Nameserver.new(name)
             end
           end
         end

data/lib/whois/version.rb

@@ -13,7 +13,7 @@ module Whois
   module Version
     MAJOR = 2
     MINOR = 0
-    PATCH = 6
+    PATCH = 7
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/spec/fixtures/responses/whois.dns.pt/property_nameservers.expected

@@ -0,0 +1,11 @@
+#nameservers
+  should: %s be_a(Array)
+  should: %s have(4).items
+  should: %s[0] be_a(_nameserver)
+  should: %s[0].name == "ns4.google.com"
+  should: %s[1] be_a(_nameserver)
+  should: %s[1].name == "ns2.google.com"
+  should: %s[2] be_a(_nameserver)
+  should: %s[2].name == "ns1.google.com"
+  should: %s[3] be_a(_nameserver)
+  should: %s[3].name == "ns3.google.com"

data/spec/fixtures/responses/whois.dns.pt/property_nameservers.txt

@@ -0,0 +1,25 @@
+Nome de domínio / Domain Name: google.pt
+Data de registo / Creation Date (dd/mm/yyyy): 09/01/2003
+Data de expiração / Expiration Date (dd/mm/yyyy): 29/02/2012
+Estado / Status: ACTIVE
+
+Titular / Registrant
+   Google, Inc.
+   1600 Amphitheatre Parkway
+   Mountain View, CA
+   94043 null
+   Email: dns-admin@google.com
+
+Entidade Gestora / Billing Contact
+   Markmonitor - CCOPS
+   Email: ccops@markmonitor.com
+
+Responsável Técnico / Tech Contact
+   Markmonitor - CCOPS
+   Email: ccops@markmonitor.com
+
+Nameserver Information
+   Nameserver: google.pt	NS	ns4.google.com.
+   Nameserver: google.pt	NS	ns2.google.com.
+   Nameserver: google.pt	NS	ns1.google.com.
+   Nameserver: google.pt	NS	ns3.google.com.

data/spec/fixtures/responses/whois.dns.pt/property_nameservers_without_host.expected

@@ -0,0 +1,11 @@
+#nameservers
+  should: %s be_a(Array)
+  should: %s have(4).items
+  should: %s[0] be_a(_nameserver)
+  should: %s[0].name == "ns2.google.com"
+  should: %s[1] be_a(_nameserver)
+  should: %s[1].name == "ns4.google.com"
+  should: %s[2] be_a(_nameserver)
+  should: %s[2].name == "ns3.google.com"
+  should: %s[3] be_a(_nameserver)
+  should: %s[3].name == "ns1.google.com"

data/spec/fixtures/responses/whois.dns.pt/property_nameservers_without_host.txt

@@ -0,0 +1,32 @@
+Nome de domínio / Domain Name: google.pt
+Data de registo / Creation Date (dd/mm/yyyy): 09/01/2003
+Estado / Status: ACTIVE
+
+Titular / Registrant
+   Google, Inc.
+   1600 Amphitheatre Parkway
+   Mountain View, CA
+   94043 
+   US
+   Email: dns-admin@google.com
+
+Entidade Gestora / Billing Contact
+   Markmonitor - CCOPS
+   Email: ccops@markmonitor.com
+
+Responsável Administrativo / Admin Contact
+   Markmonitor - CCOPS
+   Email: ccops@markmonitor.com
+
+Responsável Técnico / Tech Contact
+   Markmonitor - CCOPS
+   Email: ccops@markmonitor.com
+
+Nameserver Information
+   Nameserver: ns2.google.com.
+   Nameserver: ns4.google.com.
+   Nameserver: ns3.google.com.
+   Nameserver: ns1.google.com.
+
+
+

data/spec/fixtures/responses/whois.dns.pt/status_registered.expected

@@ -23,10 +23,10 @@
   should: %s be_a(Array)
   should: %s have(4).items
   should: %s[0] be_a(_nameserver)
-  should: %s[0].name == "ns2.google.com"
+  should: %s[0].name == "ns4.google.com"
   should: %s[1] be_a(_nameserver)
-  should: %s[1].name == "ns4.google.com"
+  should: %s[1].name == "ns2.google.com"
   should: %s[2] be_a(_nameserver)
-  should: %s[2].name == "ns3.google.com"
+  should: %s[2].name == "ns1.google.com"
   should: %s[3] be_a(_nameserver)
-  should: %s[3].name == "ns1.google.com"
+  should: %s[3].name == "ns3.google.com"

data/spec/fixtures/responses/whois.dns.pt/status_registered.txt

@@ -1,32 +1,25 @@
-Nome de domínio / Domain Name: google.pt
-Data de registo / Creation Date (dd/mm/yyyy): 09/01/2003
-Estado / Status: ACTIVE
-
-Titular / Registrant
-   Google, Inc.
-   1600 Amphitheatre Parkway
-   Mountain View, CA
-   94043 
-   US
-   Email: dns-admin@google.com
-
-Entidade Gestora / Billing Contact
-   Markmonitor - CCOPS
-   Email: ccops@markmonitor.com
-
-Responsável Administrativo / Admin Contact
-   Markmonitor - CCOPS
-   Email: ccops@markmonitor.com
-
-Responsável Técnico / Tech Contact
-   Markmonitor - CCOPS
-   Email: ccops@markmonitor.com
-
-Nameserver Information
-   Nameserver: ns2.google.com.
-   Nameserver: ns4.google.com.
-   Nameserver: ns3.google.com.
-   Nameserver: ns1.google.com.
-
-
-
+Nome de domínio / Domain Name: google.pt
+Data de registo / Creation Date (dd/mm/yyyy): 09/01/2003
+Data de expiração / Expiration Date (dd/mm/yyyy): 29/02/2012
+Estado / Status: ACTIVE
+
+Titular / Registrant
+   Google, Inc.
+   1600 Amphitheatre Parkway
+   Mountain View, CA
+   94043 null
+   Email: dns-admin@google.com
+
+Entidade Gestora / Billing Contact
+   Markmonitor - CCOPS
+   Email: ccops@markmonitor.com
+
+Responsável Técnico / Tech Contact
+   Markmonitor - CCOPS
+   Email: ccops@markmonitor.com
+
+Nameserver Information
+   Nameserver: google.pt	NS	ns4.google.com.
+   Nameserver: google.pt	NS	ns2.google.com.
+   Nameserver: google.pt	NS	ns1.google.com.
+   Nameserver: google.pt	NS	ns3.google.com.

data/spec/fixtures/responses/whois.educause.edu/properties_updated_on_unknown.expected

@@ -0,0 +1,2 @@
+#updated_on
+  should: %s == nil

data/spec/fixtures/responses/whois.educause.edu/properties_updated_on_unknown.txt

@@ -0,0 +1,64 @@
+
+This Registry database contains ONLY .EDU domains. 
+The data in the EDUCAUSE Whois database is provided 
+by EDUCAUSE for information purposes in order to 
+assist in the process of obtaining information about 
+or related to .edu domain registration records. 
+
+The EDUCAUSE Whois database is authoritative for the 
+.EDU domain.         
+
+A Web interface for the .EDU EDUCAUSE Whois Server is 
+available at: http://whois.educause.net 
+
+By submitting a Whois query, you agree that this information 
+will not be used to allow, enable, or otherwise support 
+the transmission of unsolicited commercial advertising or 
+solicitations via e-mail.  The use of electronic processes to 
+harvest information from this server is generally prohibited 
+except as reasonably necessary to register or modify .edu 
+domain names.
+
+You may use "%" as a wildcard in your search. For further 
+information regarding the use of this WHOIS server, please 
+type: help 
+
+--------------------------
+
+Domain Name: PCIHEALTH.EDU
+
+Registrant:
+   PCI Health Training Center
+   8101 John Carpenter Freeway
+   Dallas, TX 75247-4720
+   UNITED STATES
+
+Administrative Contact:
+   Kelly Drake
+   admissions
+   PCI Health Training Center
+   8101 John Carpenter Freeway
+   Dallas, TX 75247-4720
+   UNITED STATES
+   (214) 630-0568
+   kdrake@pcihealth.net
+
+Technical Contact:
+   daniel Roy
+   InfoTech Services
+   PCI Health Training Center
+   8101 John Carpenter Freeway
+   Dallas, TX 75247-4720
+   UNITED STATES
+   (214) 215-1764
+   dan@nativetechnology.net
+
+Name Servers: 
+   NS1.MAXIMUMASP.COM      
+   NS2.MAXIMUMASP.COM      
+
+Domain record activated:    12-Mar-2004
+Domain record last updated: unknown
+Domain expires:             31-Jul-2012
+
+

data/spec/fixtures/responses/whois.markmonitor.com/properties_empty_contacts.expected

@@ -0,0 +1,17 @@
+#registrar
+  should: %s be_a(_registrar)
+  should: %s.id           == nil
+  should: %s.name         == "Markmonitor.com"
+  should: %s.url          == "http://www.markmonitor.com"
+
+#registrant_contacts
+  should: %s be_a(Array)
+  should: %s have(0).items
+
+#admin_contacts
+  should: %s be_a(Array)
+  should: %s have(0).items
+
+#technical_contacts
+  should: %s be_a(Array)
+  should: %s have(0).items

data/spec/fixtures/responses/whois.markmonitor.com/properties_empty_contacts.txt

@@ -0,0 +1,65 @@
+
+MarkMonitor is the Global Leader in Enterprise Brand Protection.
+
+Domain Management
+MarkMonitor Brand Protection™
+AntiFraud Solutions
+Corporate Consulting Services
+
+Visit MarkMonitor at www.markmonitor.com
+Contact us at 1 800 745 9229
+In Europe, at +44 (0) 20 7840 1300 
+
+
+The Data in MarkMonitor.com's WHOIS database is provided by MarkMonitor.com
+for information purposes, and to assist persons in obtaining information
+about or related to a domain name registration record.  MarkMonitor.com
+does not guarantee its accuracy.  By submitting a WHOIS query, you agree
+that you will use this Data only for lawful purposes and that, under no
+circumstances will you use this Data to: (1) allow, enable, or otherwise
+support the transmission of mass unsolicited, commercial advertising or
+solicitations via e-mail (spam); or  (2) enable high volume, automated,
+electronic processes that apply to MarkMonitor.com (or its systems).
+MarkMonitor.com reserves the right to modify these terms at any time.
+By submitting this query, you agree to abide by this policy.
+
+Registrant:
+        
+
+    Domain Name: zumbajams.com
+
+        Registrar Name: Markmonitor.com
+        Registrar Whois: whois.markmonitor.com
+        Registrar Homepage: http://www.markmonitor.com
+
+    Administrative Contact:
+        
+    Technical Contact, Zone Contact:
+        
+
+    Created on..............: 2010-03-05.
+    Expires on..............: 2015-03-05.
+    Record last updated on..: .
+
+    Domain servers in listed order:
+
+    c.ns.zerigo.net
+    a.ns.zerigo.net
+    d.ns.zerigo.net
+    e.ns.zerigo.net
+    b.ns.zerigo.net
+    
+
+
+
+MarkMonitor is the Global Leader in Enterprise Brand Protection.
+
+Domain Management
+MarkMonitor Brand Protection™
+AntiFraud Solutions
+Corporate Consulting Services
+
+Visit MarkMonitor at www.markmonitor.com
+Contact us at 1 800 745 9229
+In Europe, at +44 (0) 20 7840 1300 
+--

data/spec/fixtures/responses/whois.sgnic.sg/property_nameservers_schema_1.expected

@@ -0,0 +1,11 @@
+#nameservers
+  should: %s be_a(Array)
+  should: %s have(4).items
+  should: %s[0] be_a(_nameserver)
+  should: %s[0].name == "ns1.google.com"
+  should: %s[1] be_a(_nameserver)
+  should: %s[1].name == "ns2.google.com"
+  should: %s[2] be_a(_nameserver)
+  should: %s[2].name == "ns3.google.com"
+  should: %s[3] be_a(_nameserver)
+  should: %s[3].name == "ns4.google.com"

data/spec/fixtures/responses/whois.sgnic.sg/property_nameservers_schema_1.txt

@@ -0,0 +1,98 @@
+
+----------------------------------------------------------------------  
+ SGNIC WHOIS Server
+---------------------------------------------------------------------- 
+
+The following data is provided for information purposes only.
+
+Registrar:   MARKMONITOR INC 
+Registrant:  GOOGLE INC.
+
+    Domain Name:		GOOGLE.SG 
+    Creation Date:		03-Jan-2005 12:00:00
+    Expiration Date:		03-Jan-2011 00:00:00
+    Domain Status:		OK
+    Domain Status:		CLIENT UPDATE PROHIBITED
+    Domain Status:		CLIENT TRANSFER PROHIBITED
+    Domain Status:		CLIENT DELETE PROHIBITED
+
+
+    Owner/Main Contact:
+
+        Name:           GOOGLE INC. (SGNIC-ORG1076986)        
+        Registered Address(line1):	1600 AMPHITHEATRE PARKWAY
+        Registered Address(line2):	
+        Registered Address(line3):	
+        Registered State:		CA
+        Registered Country:		US
+        Registered Postalcode:		94043
+
+
+
+    Administrative Contact:
+          
+        Name:           IP MIRROR PTE. LTD. - SGNIC ORGIP60218 (SGNIC-ORG1076985)        
+        Registered Address(line1):	47 DUXTON ROAD
+        Registered Address(line2):	IP MIRROR TECHHAUS
+        Registered Address(line3):	
+        Registered State:		
+        Registered Country:		SG
+        Registered Postalcode:		089511
+
+
+
+    Technical Contact:
+        
+        Name:           GOOGLE INC. (SGNIC-ORG1076986)        
+        Registered Address(line1):	1600 AMPHITHEATRE PARKWAY
+        Registered Address(line2):	
+        Registered Address(line3):	
+        Registered State:		CA
+        Registered Country:		US
+        Registered Postalcode:		94043
+
+        Telephone:			+1.6503300100
+        Facsimile:			+1.6506181434  
+        EMAIL:				dns-admin@google.com
+
+
+
+    Billing Contact:
+          
+        Name:           MARKMONITOR (SGNIC-ORG1076984)        
+        Registered Address(line1):	391 N. ANCESTOR PLACE
+        Registered Address(line2):	SUITE 150
+        Registered Address(line3): 	
+        Registered State:		CA
+        Registered Country:		US
+        Registered Postalcode:		83704
+
+
+
+    Name Servers:
+        NS1.GOOGLE.COM
+        NS2.GOOGLE.COM
+        NS3.GOOGLE.COM
+        NS4.GOOGLE.COM
+
+
+         
+
+Note: With immediate effect from 1 Jun 2005 email address and phone numbers for Registrant,
+Administrative Contact and Billing Contact will not be shown in the above WHOIS results.
+This move is in-line with national and global efforts to curb SPAM.
+
+Technical Contact details will still be available for troubleshooting of technical problems
+which may be time-sensitive.
+
+Any party who has legitimate reason to obtain email address or phone numbers of the domain
+name contacts can either (1) obtain the contacts from the domain name's website (usually by
+prepending 'www.' in front of the domain name or perform an Internet search using the 
+organization name or; (2) Request the information from SGNIC via email (dnq@sgnic.sg), 
+stating the reasons.
+
+
+
+
+
+