From 7ff1ef07d07f39aee7a598d4979da9f316c1fdc0 Mon Sep 17 00:00:00 2001 From: Sherwin Daganato Date: Sun, 13 May 2012 01:23:19 +0800 Subject: [PATCH] Implement registrar property for CoCCA --- lib/whois/record/parser/base_cocca.rb | 8 ++ .../status_registered.expected | 7 ++ .../whois.nic.af/status_registered.expected | 17 ++- .../whois.nic.af/status_registered.txt | 99 ++++++++++------- .../whois.nic.cx/status_registered.expected | 7 ++ .../whois.nic.gs/status_registered.expected | 7 ++ .../whois.nic.ht/status_registered.expected | 11 +- .../whois.nic.ht/status_registered.txt | 102 ++++++++++-------- .../whois.nic.ki/status_registered.expected | 7 ++ .../whois.nic.ms/status_registered.expected | 7 ++ .../whois.nic.mu/status_registered.expected | 11 +- .../whois.nic.mu/status_registered.txt | 60 +++++++++-- .../status_registered.expected | 7 ++ .../status_registered.expected | 7 ++ .../status_registered.expected | 7 ++ .../whois.nic.tl/status_registered.expected | 11 +- .../whois.nic.tl/status_registered.txt | 47 +++++++- .../status_registered.expected | 7 ++ .../status_registered_spec.rb | 8 ++ .../whois.nic.af/status_registered_spec.rb | 18 +++- .../whois.nic.cx/status_registered_spec.rb | 8 ++ .../whois.nic.gs/status_registered_spec.rb | 8 ++ .../whois.nic.ht/status_registered_spec.rb | 12 ++- .../whois.nic.ki/status_registered_spec.rb | 8 ++ .../whois.nic.ms/status_registered_spec.rb | 8 ++ .../whois.nic.mu/status_registered_spec.rb | 12 ++- .../status_registered_spec.rb | 8 ++ .../status_registered_spec.rb | 8 ++ .../status_registered_spec.rb | 8 ++ .../whois.nic.tl/status_registered_spec.rb | 12 ++- .../status_registered_spec.rb | 8 ++ 31 files changed, 440 insertions(+), 115 deletions(-) diff --git a/lib/whois/record/parser/base_cocca.rb b/lib/whois/record/parser/base_cocca.rb index 475c7474b..806107954 100644 --- a/lib/whois/record/parser/base_cocca.rb +++ b/lib/whois/record/parser/base_cocca.rb @@ -70,6 +70,14 @@ class BaseCocca < Base end + property_supported :registrar do + Record::Registrar.new( + :name => content_for_scanner.slice(/Registrar Name: (.+)\n/, 1), + :url => content_for_scanner.slice(/Registration URL: (.+)\n/, 1) + ) + end + + property_supported :nameservers do if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n/ $1.split("\n").map do |name| diff --git a/spec/fixtures/responses/whois.na-nic.com.na/status_registered.expected b/spec/fixtures/responses/whois.na-nic.com.na/status_registered.expected index 2786dda69..05d2f951c 100644 --- a/spec/fixtures/responses/whois.na-nic.com.na/status_registered.expected +++ b/spec/fixtures/responses/whois.na-nic.com.na/status_registered.expected @@ -28,6 +28,13 @@ should: %s == Time.parse("2012-08-20") +#registrar + should: %s CLASS(registrar) + should: %s.id == nil + should: %s.name == "MarkMonitor" + should: %s.url == "http://www.markmonitor.com" + + #nameservers should: %s CLASS(array) should: %s SIZE(2) diff --git a/spec/fixtures/responses/whois.nic.af/status_registered.expected b/spec/fixtures/responses/whois.nic.af/status_registered.expected index dd1446899..bc82f740f 100644 --- a/spec/fixtures/responses/whois.nic.af/status_registered.expected +++ b/spec/fixtures/responses/whois.nic.af/status_registered.expected @@ -21,17 +21,28 @@ #updated_on should: %s CLASS(time) - should: %s == Time.parse("2010-01-29") + should: %s == Time.parse("2012-05-01") #expires_on should: %s CLASS(time) - should: %s == Time.parse("2010-05-05") + should: %s == Time.parse("2013-05-05") + + +#registrar + should: %s CLASS(registrar) + should: %s.id == nil + should: %s.name == "MarkMonitor" + should: %s.url == "http://www.markmonitor.com" #nameservers should: %s CLASS(array) - should: %s SIZE(2) + should: %s SIZE(4) should: %s[0] CLASS(nameserver) should: %s[0].name == "ns1.google.com" should: %s[1] CLASS(nameserver) should: %s[1].name == "ns2.google.com" + should: %s[2] CLASS(nameserver) + should: %s[2].name == "ns3.google.com" + should: %s[3] CLASS(nameserver) + should: %s[3].name == "ns4.google.com" diff --git a/spec/fixtures/responses/whois.nic.af/status_registered.txt b/spec/fixtures/responses/whois.nic.af/status_registered.txt index 60629199e..199ced4fb 100644 --- a/spec/fixtures/responses/whois.nic.af/status_registered.txt +++ b/spec/fixtures/responses/whois.nic.af/status_registered.txt @@ -1,56 +1,75 @@ -TERMS OF USE: You are not authorized to access or query our Whois database through the use of electronic processes that are high-volume and automated. Whois database is provided by CoCCA as a service to the internet community on behalf of CoCCA members. (http://www.cocca.cx/members.jsp) +TERMS OF USE: You are not authorized to access or query our Whois database through the use of electronic processes that are high-volume and automated. Whois database is provided by AFGNIC as a service to the internet community. -The data is for information purposes only. CoCCA does not guarantee its accuracy. By submitting a Whois query, you agree to abide by the following terms of use: You agree that you may 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, telephone, or facsimile; or (2) enable high volume, automated, electronic processes that apply to CoCCA it's members (or CoCCA or member computer systems). The compilation, repackaging, dissemination or other use of this Data is expressly prohibited. +The data is for information purposes only. AFGNIC does not guarantee its accuracy. By submitting a Whois query, you agree to abide by the following terms of use: You agree that you may 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, telephone, or facsimile; or (2) enable high volume, automated, electronic processes that apply to CoCCA it's members (or CoCCA or member computer systems). The compilation, repackaging, dissemination or other use of this Data is expressly prohibited. ADRAS Helpdesk | http://helpdesk.adras.af - Domain Information Query: google.af +Status: Delegated Created: 05 Oct 2009 -Expires: 05 May 2010 -Modified: 29 Jan 2010 -Status: Active -Registrar: MarkMonitor +Modified: 01 May 2012 +Expires: 05 May 2013 Name Servers: ns1.google.com ns2.google.com + ns3.google.com + ns4.google.com + +Registrar Information +Registrar Name: MarkMonitor +Registration URL: http://www.markmonitor.com +Address: MarkMonitor +Emerald Tech Center +391 N. Ancestor Place +Boise, ID 83704 +Country: US +Phone: +1 (208) 389-5740 +Fax: +1 (208) 389-5771 +Customer Service Contact: ccops@markmonitor.com +Customer Service Email: ccops@markmonitor.com + + + Registrant: - Google Inc. - Google Inc. - 1600 Amphitheatre Parkway - Mountain View, CA 94043 - US - dns-admin@google.com - Voice: +1.6502530000 - Fax: +1.6506188571 - -Administrative Contact: - Google Inc. - Google Inc. - 1600 Amphitheatre Parkway - Mountain View, CA 94043 - US - dns-admin@google.com - Voice: +1.6502530000 - Fax: +1.6506188571 +Name: Google Inc. +Address: + 1600 Amphitheatre Parkway + Mountain View, CA 94043 + US +Email Address: dns-admin@google.com +Phone Number: +1.6502530000 +Fax Number: +1.6506188571 + + +Admin Contact: +Name: Google Inc. +Address: + 1600 Amphitheatre Parkway + Mountain View, CA 94043 + US +Email Address: dns-admin@google.com +Phone Number: +1.6502530000 +Fax Number: +1.6506188571 + Technical Contact: - Google Inc. - Google Inc. - 1600 Amphitheatre Parkway - Mountain View, CA 94043 - US - dns-admin@google.com - Voice: +1.6502530000 - Fax: +1.6506188571 +Name: Google Inc. +Address: + 1600 Amphitheatre Parkway + Mountain View, CA 94043 + US +Email Address: dns-admin@google.com +Phone Number: +1.6502530000 +Fax Number: +1.6506188571 -Billing Contact: - eMarkmonitor Inc. dba MarkMonitor - PMB 155 - 10400 Overland Road - Boise, Idaho 83709 US - ccops@markmonitor.com - Voice: +1 (208) 389 5799 +Billing Contact: +Name: eMarkmonitor Inc. dba MarkMonitor +Address: + PMB 155 + 10400 Overland Road + Boise, Idaho 83709 US +Email Address: ccops@markmonitor.com +Phone Number: +1 (208) 389 5799 diff --git a/spec/fixtures/responses/whois.nic.cx/status_registered.expected b/spec/fixtures/responses/whois.nic.cx/status_registered.expected index 0c9b851aa..66b6298a2 100644 --- a/spec/fixtures/responses/whois.nic.cx/status_registered.expected +++ b/spec/fixtures/responses/whois.nic.cx/status_registered.expected @@ -28,6 +28,13 @@ should: %s == Time.parse("2012-07-30") +#registrar + should: %s CLASS(registrar) + should: %s.id == nil + should: %s.name == "MarkMonitor" + should: %s.url == "http://www.markmonitor.com" + + #nameservers should: %s CLASS(array) should: %s SIZE(4) diff --git a/spec/fixtures/responses/whois.nic.gs/status_registered.expected b/spec/fixtures/responses/whois.nic.gs/status_registered.expected index d967ce411..c5c1b329b 100644 --- a/spec/fixtures/responses/whois.nic.gs/status_registered.expected +++ b/spec/fixtures/responses/whois.nic.gs/status_registered.expected @@ -28,6 +28,13 @@ should: %s == Time.parse("2011-07-08") +#registrar + should: %s CLASS(registrar) + should: %s.id == nil + should: %s.name == "MarkMonitor" + should: %s.url == "http://www.markmonitor.com" + + #nameservers should: %s CLASS(array) should: %s SIZE(2) diff --git a/spec/fixtures/responses/whois.nic.ht/status_registered.expected b/spec/fixtures/responses/whois.nic.ht/status_registered.expected index 4c6f7afa9..9a77698f3 100644 --- a/spec/fixtures/responses/whois.nic.ht/status_registered.expected +++ b/spec/fixtures/responses/whois.nic.ht/status_registered.expected @@ -21,11 +21,18 @@ #updated_on should: %s CLASS(time) - should: %s == Time.parse("2010-05-20 00:00:00") + should: %s == Time.parse("2012-03-30 00:00:00") #expires_on should: %s CLASS(time) - should: %s == Time.parse("2011-06-18 00:00:00") + should: %s == Time.parse("2012-06-18 00:00:00") + + +#registrar + should: %s CLASS(registrar) + should: %s.id == nil + should: %s.name == "MarkMonitor" + should: %s.url == "http://www.markmonitor.com" #nameservers diff --git a/spec/fixtures/responses/whois.nic.ht/status_registered.txt b/spec/fixtures/responses/whois.nic.ht/status_registered.txt index eca741dd4..92debdf38 100644 --- a/spec/fixtures/responses/whois.nic.ht/status_registered.txt +++ b/spec/fixtures/responses/whois.nic.ht/status_registered.txt @@ -1,59 +1,73 @@ -TERMS OF USE: You are not authorized to access or query our Whois -database through the use of electronic processes that are high-volume and -automated. Whois database is provided by Consortium FDS/RDDH as a service to the internet -community on by of Consortium FDS/RDDH. (http://www.nic.ht) +TERMS OF USE: You are not authorized to access or query our Whois database through the use of electronic processes that are high-volume and automated. Whois database is provided by Consortium FDS/RDDH as a service to the internet community on by of Consortium FDS/RDDH. (http://www.nic.ht) -The data is for information purposes only. Consortium FDS/RDDH does not -guarantee its accuracy. By submitting a Whois query, you agree to abide -by the following terms of use: You agree that you may 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, telephone, -or facsimile; or (2) enable high volume, automated, electronic processes -that apply to Consortium FDS/RDDH it's members (or Consortium FDS/RDDH or member computer systems). The -compilation, repackaging, dissemination or other use of this Data is -expressly prohibited. - +The data is for information purposes only. Consortium FDS/RDDH does not guarantee its accuracy. By submitting a Whois query, you agree to abide by the following terms of use: You agree that you may 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, telephone, or facsimile; or (2) enable high volume, automated, electronic processes that apply to Consortium FDS/RDDH it's members (or Consortium FDS/RDDH or member computer systems). The compilation, repackaging, dissemination or other use of this Data is expressly prohibited. Domain Information Query: google.ht +Status: Delegated Created: 18 Jun 2004 -Expires: 18 Jun 2011 -Modified: 20 May 2010 -Status: Active -Registrar: MarkMonitor +Modified: 30 Mar 2012 +Expires: 18 Jun 2012 Name Servers: ns1.google.com ns2.google.com ns3.google.com ns4.google.com +Registrar Information +Registrar Name: MarkMonitor +Registration URL: http://www.markmonitor.com +Address: MarkMonitor +Emerald Tech Center +391 N. Ancestor Place +Boise, ID 83704 +Country: US +Phone: +1 (208) 389-5740 +Fax: +1 (208) 389-5771 +Customer Service Contact: ccops@markmonitor.com +Customer Service Email: ccops@markmonitor.com + + + + Registrant: - Google Inc. - Google Inc. - 1600 Amphitheatre Parkway - Mountain View, CA 94043 - US - dns-admin@google.com - Voice: +1.6502530000 - Fax: +1.6506188571 - -Administrative Contact: - Google Inc. - Google Inc. - 1600 Amphitheatre Parkway - Mountain View, CA 94043 - US - dns-admin@google.com - Voice: +1.6502530000 - Fax: +1.6506188571 +Name: Google Inc. +Address: + 1600 Amphitheatre Parkway + Mountain View, CA 94043 + US +Email Address: dns-admin@google.com +Phone Number: +1.6502530000 +Fax Number: +1.6506188571 + + +Admin Contact: +Name: Google Inc. +Address: + 1600 Amphitheatre Parkway + Mountain View, CA 94043 + US +Email Address: dns-admin@google.com +Phone Number: +1.6502530000 +Fax Number: +1.6506188571 + Technical Contact: - Google Inc. - 1600 Amphitheatre Parkway - Mountain View, CA 94043 - US - dns-admin@google.com - Voice: +1.6502530000 - Fax: +1.6506188571 +Name: Google Inc. +Address: + 1600 Amphitheatre Parkway + Mountain View, CA 94043 + US +Email Address: dns-admin@google.com +Phone Number: +1.6502530000 +Fax Number: +1.6506188571 + +Billing Contact: +Name: eMarkmonitor Inc. dba MarkMonitor +Address: + PMB 155 + 10400 Overland Road + Boise, Idaho 83709 US +Email Address: ccops@markmonitor.com +Phone Number: +1 (208) 389 5799 diff --git a/spec/fixtures/responses/whois.nic.ki/status_registered.expected b/spec/fixtures/responses/whois.nic.ki/status_registered.expected index 08f0ca977..9bf0ee481 100644 --- a/spec/fixtures/responses/whois.nic.ki/status_registered.expected +++ b/spec/fixtures/responses/whois.nic.ki/status_registered.expected @@ -28,6 +28,13 @@ should: %s == Time.parse("2010-11-27") +#registrar + should: %s CLASS(registrar) + should: %s.id == nil + should: %s.name == "MarkMonitor" + should: %s.url == "http://www.markmonitor.com" + + #nameservers should: %s CLASS(array) should: %s SIZE(4) diff --git a/spec/fixtures/responses/whois.nic.ms/status_registered.expected b/spec/fixtures/responses/whois.nic.ms/status_registered.expected index 92144fc0b..664ce7242 100644 --- a/spec/fixtures/responses/whois.nic.ms/status_registered.expected +++ b/spec/fixtures/responses/whois.nic.ms/status_registered.expected @@ -28,6 +28,13 @@ should: %s == Time.parse("2011-06-04 08:00 AST") +#registrar + should: %s CLASS(registrar) + should: %s.id == nil + should: %s.name == "MarkMonitor" + should: %s.url == "http://www.markmonitor.com" + + #nameservers should: %s CLASS(array) should: %s SIZE(2) diff --git a/spec/fixtures/responses/whois.nic.mu/status_registered.expected b/spec/fixtures/responses/whois.nic.mu/status_registered.expected index 8b8eb3b93..7381a2856 100644 --- a/spec/fixtures/responses/whois.nic.mu/status_registered.expected +++ b/spec/fixtures/responses/whois.nic.mu/status_registered.expected @@ -21,11 +21,18 @@ #updated_on should: %s CLASS(time) - should: %s == Time.parse("2009-12-04") + should: %s == Time.parse("2012-03-21") #expires_on should: %s CLASS(time) - should: %s == Time.parse("2010-12-20") + should: %s == Time.parse("2012-12-20") + + +#registrar + should: %s CLASS(registrar) + should: %s.id == nil + should: %s.name == "MarkMonitor" + should: %s.url == "http://www.markmonitor.com" #nameservers diff --git a/spec/fixtures/responses/whois.nic.mu/status_registered.txt b/spec/fixtures/responses/whois.nic.mu/status_registered.txt index af9e0f60d..8e54db6bd 100644 --- a/spec/fixtures/responses/whois.nic.mu/status_registered.txt +++ b/spec/fixtures/responses/whois.nic.mu/status_registered.txt @@ -2,21 +2,65 @@ TERMS OF USE: You are not authorized to access or query our Whois database throu Internet Direct Ltd makes every effort to maintain the completeness and accuracy of the Whois data, but cannot guarantee that the results are error-free. Therefore, any data provided through the Whois service are on an "as is" basis without any warranties. BY USING THE WHOIS SERVICE AND THE DATA CONTAINED HEREIN OR IN ANY REPORT GENERATED WITH RESPECT THERETO, IT IS ACCEPTED THAT Internet Direct Ltd IS NOT LIABLE FOR ANY DAMAGES OF ANY KIND ARISING OUT OF, OR IN CONNECTION WITH, THE REPORT OR THE INFORMATION PROVIDED BY THE WHOIS SERVICE, NOR OMISSIONS OR MISSING INFORMATION. THE RESULTS OF ANY WHOIS REPORT OR INFORMATION PROVIDED BY THE WHOIS SERVICE CANNOT BE RELIED UPON IN CONTEMPLATION OF LEGAL PROCEEDINGS WITHOUT FURTHER VERIFICATION, NOR DO SUCH RESULTS CONSTITUTE A LEGAL OPINION. Acceptance of the results of the Whois constitutes acceptance of these terms, conditions and limitations. Whois data may be requested only for lawful purposes, in particular, to protect legal rights and obligations. Illegitimate uses of Whois data include, but are not limited to, unsolicited email, data mining, direct marketing or any other improper purpose. Any request made for Whois data will be documented by Internet Direct Ltd but will not be used for any commercial purpose whatsoever. NOTE: FAILURE TO LOCATE A RECORD IN THE WHOIS DATABASE IS NOT INDICATIVE OF THE AVAILABILITY OF A DOMAIN NAME. -© 1995-2009 Internet Direct Ltd, All rights reserved. - +? 1995-2009 Internet Direct Ltd, All rights reserved. Domain Information Query: google.mu +Status: Delegated Created: 21 Dec 2000 -Expires: 20 Dec 2010 -Modified: 04 Dec 2009 -Status: Active -Registrar: MarkMonitor +Modified: 21 Mar 2012 +Expires: 20 Dec 2012 Name Servers: ns1.google.com ns2.google.com ns3.google.com ns4.google.com -Registrant: - MarkMonitor +Registrar Information +Registrar Name: MarkMonitor +Registration URL: http://www.markmonitor.com +Address: MarkMonitor +Emerald Tech Center +391 N. Ancestor Place +Boise, ID 83704 +Country: US +Phone: +1 (208) 389-5740 +Fax: +1 (208) 389-5771 +Customer Service Contact: ccops@markmonitor.com +Customer Service Email: ccops@markmonitor.com + + + + +Registrant: +Name: DNS Admin +Organisation: Google Inc. +Address: + 1600 Amphitheatre Parkway + Mountain View, CA 94043 + US +Email Address: dns-admin@google.com +Phone Number: +1.6502530000 +Fax Number: +1.6506188571 + + +Admin Contact: +Organisation: Google Inc. +Address: + 1600 Amphitheatre Parkway + Mountain View, CA 94043 + US +Email Address: dns-admin@google.com +Phone Number: +1.6502530000 +Fax Number: +1.6506188571 + + +Technical Contact: +Organisation: Google Inc. +Address: + 1600 Amphitheatre Parkway + Mountain View, CA 94043 + US +Email Address: dns-admin@google.com +Phone Number: +1.6502530000 +Fax Number: +1.6506188571 diff --git a/spec/fixtures/responses/whois.nic.net.nf/status_registered.expected b/spec/fixtures/responses/whois.nic.net.nf/status_registered.expected index c217fbfa9..251c4d71a 100644 --- a/spec/fixtures/responses/whois.nic.net.nf/status_registered.expected +++ b/spec/fixtures/responses/whois.nic.net.nf/status_registered.expected @@ -28,6 +28,13 @@ should: %s == Time.parse("2010-11-27") +#registrar + should: %s CLASS(registrar) + should: %s.id == nil + should: %s.name == "MarkMonitor" + should: %s.url == "http://www.markmonitor.com" + + #nameservers should: %s CLASS(array) should: %s SIZE(4) diff --git a/spec/fixtures/responses/whois.nic.net.ng/status_registered.expected b/spec/fixtures/responses/whois.nic.net.ng/status_registered.expected index e1bc863eb..79a7cceff 100644 --- a/spec/fixtures/responses/whois.nic.net.ng/status_registered.expected +++ b/spec/fixtures/responses/whois.nic.net.ng/status_registered.expected @@ -21,6 +21,13 @@ should: %s == Time.parse("2020-07-31 00:00 WAT") +#registrar + should: %s CLASS(registrar) + should: %s.id == nil + should: %s.name == "nira" + should: %s.url == nil + + #nameservers should: %s CLASS(array) should: %s SIZE(4) diff --git a/spec/fixtures/responses/whois.nic.net.sb/status_registered.expected b/spec/fixtures/responses/whois.nic.net.sb/status_registered.expected index 5ae82860c..a50c82e3b 100644 --- a/spec/fixtures/responses/whois.nic.net.sb/status_registered.expected +++ b/spec/fixtures/responses/whois.nic.net.sb/status_registered.expected @@ -28,6 +28,13 @@ should: %s == Time.parse("2012-03-27") +#registrar + should: %s CLASS(registrar) + should: %s.id == nil + should: %s.name == "Key-Systems" + should: %s.url == "http://www.key-systems.net" + + #nameservers should: %s CLASS(array) should: %s SIZE(2) diff --git a/spec/fixtures/responses/whois.nic.tl/status_registered.expected b/spec/fixtures/responses/whois.nic.tl/status_registered.expected index 684068ace..3e6abdbf0 100644 --- a/spec/fixtures/responses/whois.nic.tl/status_registered.expected +++ b/spec/fixtures/responses/whois.nic.tl/status_registered.expected @@ -21,11 +21,18 @@ #updated_on should: %s CLASS(time) - should: %s == Time.parse("2009-08-05") + should: %s == Time.parse("2012-04-26") #expires_on should: %s CLASS(time) - should: %s == Time.parse("2010-05-23") + should: %s == Time.parse("2013-05-23") + + +#registrar + should: %s CLASS(registrar) + should: %s.id == nil + should: %s.name == "MarkMonitor" + should: %s.url == "http://www.markmonitor.com" #nameservers diff --git a/spec/fixtures/responses/whois.nic.tl/status_registered.txt b/spec/fixtures/responses/whois.nic.tl/status_registered.txt index 0f6625fe3..1c05567a1 100644 --- a/spec/fixtures/responses/whois.nic.tl/status_registered.txt +++ b/spec/fixtures/responses/whois.nic.tl/status_registered.txt @@ -15,15 +15,52 @@ compilation, repackaging, dissemination or other use of this Data is expressly prohibited. CoCCA Helpdesk | http://helpdesk.cocca.cx - Domain Information Query: google.tl +Status: Delegated Created: 23 May 2003 -Expires: 23 May 2010 -Modified: 05 Aug 2009 -Status: Active -Registrar: MarkMonitor +Modified: 26 Apr 2012 +Expires: 23 May 2013 Name Servers: ns1.google.com ns2.google.com +Registrar Information +Registrar Name: MarkMonitor +Registration URL: http://www.markmonitor.com +Address: MarkMonitor +Emerald Tech Center +391 N. Ancestor Place +Boise, ID 83704 +Country: US +Phone: +1 (208) 389-5740 +Fax: +1 (208) 389-5771 +Customer Service Contact: ccops@markmonitor.com +Customer Service Email: ccops@markmonitor.com + + + + +Registrant: +Name: DNS Admin +Organisation: Google Inc. +Address: + 1600 Amphitheatre Parkway + Mountain View, CA 94043 + US +Email Address: dns-admin@google.com +Phone Number: +1.6502530000 +Fax Number: +1.6506188571 + + +Admin Contact: +Name: DNS Admin +Organisation: Google Inc. +Address: + 1600 Amphitheatre Parkway + Mountain View, CA 94043 + US +Email Address: dns-admin@google.com +Phone Number: +1.6502530000 +Fax Number: +1.6506188571 + diff --git a/spec/fixtures/responses/whois.registry.gy/status_registered.expected b/spec/fixtures/responses/whois.registry.gy/status_registered.expected index 9276f22a5..09629e43a 100644 --- a/spec/fixtures/responses/whois.registry.gy/status_registered.expected +++ b/spec/fixtures/responses/whois.registry.gy/status_registered.expected @@ -28,6 +28,13 @@ should: %s == Time.parse("2011-10-05") +#registrar + should: %s CLASS(registrar) + should: %s.id == nil + should: %s.name == "MarkMonitor" + should: %s.url == nil + + #nameservers should: %s CLASS(array) should: %s SIZE(4) diff --git a/spec/whois/record/parser/responses/whois.na-nic.com.na/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.na-nic.com.na/status_registered_spec.rb index de8c7c19c..9a967a9f8 100644 --- a/spec/whois/record/parser/responses/whois.na-nic.com.na/status_registered_spec.rb +++ b/spec/whois/record/parser/responses/whois.na-nic.com.na/status_registered_spec.rb @@ -64,6 +64,14 @@ @parser.expires_on.should == Time.parse("2012-08-20") end end + describe "#registrar" do + it do + @parser.registrar.should be_a(Whois::Record::Registrar) + @parser.registrar.id.should == nil + @parser.registrar.name.should == "MarkMonitor" + @parser.registrar.url.should == "http://www.markmonitor.com" + end + end describe "#nameservers" do it do @parser.nameservers.should be_a(Array) diff --git a/spec/whois/record/parser/responses/whois.nic.af/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.nic.af/status_registered_spec.rb index 8382531fa..f2c455e4b 100644 --- a/spec/whois/record/parser/responses/whois.nic.af/status_registered_spec.rb +++ b/spec/whois/record/parser/responses/whois.nic.af/status_registered_spec.rb @@ -55,23 +55,35 @@ describe "#updated_on" do it do @parser.updated_on.should be_a(Time) - @parser.updated_on.should == Time.parse("2010-01-29") + @parser.updated_on.should == Time.parse("2012-05-01") end end describe "#expires_on" do it do @parser.expires_on.should be_a(Time) - @parser.expires_on.should == Time.parse("2010-05-05") + @parser.expires_on.should == Time.parse("2013-05-05") + end + end + describe "#registrar" do + it do + @parser.registrar.should be_a(Whois::Record::Registrar) + @parser.registrar.id.should == nil + @parser.registrar.name.should == "MarkMonitor" + @parser.registrar.url.should == "http://www.markmonitor.com" end end describe "#nameservers" do it do @parser.nameservers.should be_a(Array) - @parser.nameservers.should have(2).items + @parser.nameservers.should have(4).items @parser.nameservers[0].should be_a(Whois::Record::Nameserver) @parser.nameservers[0].name.should == "ns1.google.com" @parser.nameservers[1].should be_a(Whois::Record::Nameserver) @parser.nameservers[1].name.should == "ns2.google.com" + @parser.nameservers[2].should be_a(Whois::Record::Nameserver) + @parser.nameservers[2].name.should == "ns3.google.com" + @parser.nameservers[3].should be_a(Whois::Record::Nameserver) + @parser.nameservers[3].name.should == "ns4.google.com" end end end diff --git a/spec/whois/record/parser/responses/whois.nic.cx/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.nic.cx/status_registered_spec.rb index 01e455893..2c76e7979 100644 --- a/spec/whois/record/parser/responses/whois.nic.cx/status_registered_spec.rb +++ b/spec/whois/record/parser/responses/whois.nic.cx/status_registered_spec.rb @@ -64,6 +64,14 @@ @parser.expires_on.should == Time.parse("2012-07-30") end end + describe "#registrar" do + it do + @parser.registrar.should be_a(Whois::Record::Registrar) + @parser.registrar.id.should == nil + @parser.registrar.name.should == "MarkMonitor" + @parser.registrar.url.should == "http://www.markmonitor.com" + end + end describe "#nameservers" do it do @parser.nameservers.should be_a(Array) diff --git a/spec/whois/record/parser/responses/whois.nic.gs/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.nic.gs/status_registered_spec.rb index 3faeb47cd..091d91c83 100644 --- a/spec/whois/record/parser/responses/whois.nic.gs/status_registered_spec.rb +++ b/spec/whois/record/parser/responses/whois.nic.gs/status_registered_spec.rb @@ -64,6 +64,14 @@ @parser.expires_on.should == Time.parse("2011-07-08") end end + describe "#registrar" do + it do + @parser.registrar.should be_a(Whois::Record::Registrar) + @parser.registrar.id.should == nil + @parser.registrar.name.should == "MarkMonitor" + @parser.registrar.url.should == "http://www.markmonitor.com" + end + end describe "#nameservers" do it do @parser.nameservers.should be_a(Array) diff --git a/spec/whois/record/parser/responses/whois.nic.ht/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.nic.ht/status_registered_spec.rb index 68978d0e6..83b5c95a8 100644 --- a/spec/whois/record/parser/responses/whois.nic.ht/status_registered_spec.rb +++ b/spec/whois/record/parser/responses/whois.nic.ht/status_registered_spec.rb @@ -55,13 +55,21 @@ describe "#updated_on" do it do @parser.updated_on.should be_a(Time) - @parser.updated_on.should == Time.parse("2010-05-20 00:00:00") + @parser.updated_on.should == Time.parse("2012-03-30 00:00:00") end end describe "#expires_on" do it do @parser.expires_on.should be_a(Time) - @parser.expires_on.should == Time.parse("2011-06-18 00:00:00") + @parser.expires_on.should == Time.parse("2012-06-18 00:00:00") + end + end + describe "#registrar" do + it do + @parser.registrar.should be_a(Whois::Record::Registrar) + @parser.registrar.id.should == nil + @parser.registrar.name.should == "MarkMonitor" + @parser.registrar.url.should == "http://www.markmonitor.com" end end describe "#nameservers" do diff --git a/spec/whois/record/parser/responses/whois.nic.ki/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.nic.ki/status_registered_spec.rb index 1732411c2..e075eee07 100644 --- a/spec/whois/record/parser/responses/whois.nic.ki/status_registered_spec.rb +++ b/spec/whois/record/parser/responses/whois.nic.ki/status_registered_spec.rb @@ -64,6 +64,14 @@ @parser.expires_on.should == Time.parse("2010-11-27") end end + describe "#registrar" do + it do + @parser.registrar.should be_a(Whois::Record::Registrar) + @parser.registrar.id.should == nil + @parser.registrar.name.should == "MarkMonitor" + @parser.registrar.url.should == "http://www.markmonitor.com" + end + end describe "#nameservers" do it do @parser.nameservers.should be_a(Array) diff --git a/spec/whois/record/parser/responses/whois.nic.ms/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.nic.ms/status_registered_spec.rb index 8db2c4610..3cbb4326e 100644 --- a/spec/whois/record/parser/responses/whois.nic.ms/status_registered_spec.rb +++ b/spec/whois/record/parser/responses/whois.nic.ms/status_registered_spec.rb @@ -64,6 +64,14 @@ @parser.expires_on.should == Time.parse("2011-06-04 08:00 AST") end end + describe "#registrar" do + it do + @parser.registrar.should be_a(Whois::Record::Registrar) + @parser.registrar.id.should == nil + @parser.registrar.name.should == "MarkMonitor" + @parser.registrar.url.should == "http://www.markmonitor.com" + end + end describe "#nameservers" do it do @parser.nameservers.should be_a(Array) diff --git a/spec/whois/record/parser/responses/whois.nic.mu/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.nic.mu/status_registered_spec.rb index ce1b7bbcf..5fbd5bc99 100644 --- a/spec/whois/record/parser/responses/whois.nic.mu/status_registered_spec.rb +++ b/spec/whois/record/parser/responses/whois.nic.mu/status_registered_spec.rb @@ -55,13 +55,21 @@ describe "#updated_on" do it do @parser.updated_on.should be_a(Time) - @parser.updated_on.should == Time.parse("2009-12-04") + @parser.updated_on.should == Time.parse("2012-03-21") end end describe "#expires_on" do it do @parser.expires_on.should be_a(Time) - @parser.expires_on.should == Time.parse("2010-12-20") + @parser.expires_on.should == Time.parse("2012-12-20") + end + end + describe "#registrar" do + it do + @parser.registrar.should be_a(Whois::Record::Registrar) + @parser.registrar.id.should == nil + @parser.registrar.name.should == "MarkMonitor" + @parser.registrar.url.should == "http://www.markmonitor.com" end end describe "#nameservers" do diff --git a/spec/whois/record/parser/responses/whois.nic.net.nf/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.nic.net.nf/status_registered_spec.rb index a54969742..8371860ed 100644 --- a/spec/whois/record/parser/responses/whois.nic.net.nf/status_registered_spec.rb +++ b/spec/whois/record/parser/responses/whois.nic.net.nf/status_registered_spec.rb @@ -64,6 +64,14 @@ @parser.expires_on.should == Time.parse("2010-11-27") end end + describe "#registrar" do + it do + @parser.registrar.should be_a(Whois::Record::Registrar) + @parser.registrar.id.should == nil + @parser.registrar.name.should == "MarkMonitor" + @parser.registrar.url.should == "http://www.markmonitor.com" + end + end describe "#nameservers" do it do @parser.nameservers.should be_a(Array) diff --git a/spec/whois/record/parser/responses/whois.nic.net.ng/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.nic.net.ng/status_registered_spec.rb index 1a696be2b..92fa92fe5 100644 --- a/spec/whois/record/parser/responses/whois.nic.net.ng/status_registered_spec.rb +++ b/spec/whois/record/parser/responses/whois.nic.net.ng/status_registered_spec.rb @@ -54,6 +54,14 @@ @parser.expires_on.should == Time.parse("2020-07-31 00:00 WAT") end end + describe "#registrar" do + it do + @parser.registrar.should be_a(Whois::Record::Registrar) + @parser.registrar.id.should == nil + @parser.registrar.name.should == "nira" + @parser.registrar.url.should == nil + end + end describe "#nameservers" do it do @parser.nameservers.should be_a(Array) diff --git a/spec/whois/record/parser/responses/whois.nic.net.sb/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.nic.net.sb/status_registered_spec.rb index f74581c48..b63be79df 100644 --- a/spec/whois/record/parser/responses/whois.nic.net.sb/status_registered_spec.rb +++ b/spec/whois/record/parser/responses/whois.nic.net.sb/status_registered_spec.rb @@ -64,6 +64,14 @@ @parser.expires_on.should == Time.parse("2012-03-27") end end + describe "#registrar" do + it do + @parser.registrar.should be_a(Whois::Record::Registrar) + @parser.registrar.id.should == nil + @parser.registrar.name.should == "Key-Systems" + @parser.registrar.url.should == "http://www.key-systems.net" + end + end describe "#nameservers" do it do @parser.nameservers.should be_a(Array) diff --git a/spec/whois/record/parser/responses/whois.nic.tl/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.nic.tl/status_registered_spec.rb index deda7a049..e06c2cad3 100644 --- a/spec/whois/record/parser/responses/whois.nic.tl/status_registered_spec.rb +++ b/spec/whois/record/parser/responses/whois.nic.tl/status_registered_spec.rb @@ -55,13 +55,21 @@ describe "#updated_on" do it do @parser.updated_on.should be_a(Time) - @parser.updated_on.should == Time.parse("2009-08-05") + @parser.updated_on.should == Time.parse("2012-04-26") end end describe "#expires_on" do it do @parser.expires_on.should be_a(Time) - @parser.expires_on.should == Time.parse("2010-05-23") + @parser.expires_on.should == Time.parse("2013-05-23") + end + end + describe "#registrar" do + it do + @parser.registrar.should be_a(Whois::Record::Registrar) + @parser.registrar.id.should == nil + @parser.registrar.name.should == "MarkMonitor" + @parser.registrar.url.should == "http://www.markmonitor.com" end end describe "#nameservers" do diff --git a/spec/whois/record/parser/responses/whois.registry.gy/status_registered_spec.rb b/spec/whois/record/parser/responses/whois.registry.gy/status_registered_spec.rb index 2ece67491..d9e2889b7 100644 --- a/spec/whois/record/parser/responses/whois.registry.gy/status_registered_spec.rb +++ b/spec/whois/record/parser/responses/whois.registry.gy/status_registered_spec.rb @@ -64,6 +64,14 @@ @parser.expires_on.should == Time.parse("2011-10-05") end end + describe "#registrar" do + it do + @parser.registrar.should be_a(Whois::Record::Registrar) + @parser.registrar.id.should == nil + @parser.registrar.name.should == "MarkMonitor" + @parser.registrar.url.should == nil + end + end describe "#nameservers" do it do @parser.nameservers.should be_a(Array)